[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/koffice/1.5/koffice/kspread trunk/koffice/kspread
From:       Stefan Nikolaus <stefan.nikolaus () kdemail ! net>
Date:       2006-05-22 15:14:04
Message-ID: 1148310844.683453.4868.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 543671 by nikolaus:

Selection	Fix regression
		Entering named areas in the location combobox works again.


 M  +7 -12     branches/koffice/1.5/koffice/kspread/region.cc  
 M  +3 -0      branches/koffice/1.5/koffice/kspread/selection.cc  
 M  +7 -12     trunk/koffice/kspread/region.cc  
 M  +3 -0      trunk/koffice/kspread/selection.cc  


--- branches/koffice/1.5/koffice/kspread/region.cc #543670:543671
@@ -69,16 +69,16 @@
   QStringList::ConstIterator end = substrings.constEnd();
   for (QStringList::ConstIterator it = substrings.constBegin(); it != end; ++it)
   {
-    int delimiterPos = (*it).find(':');
+    QString sRegion = *it;
+    if (!sheet)
+    {
+      sheet = filterSheetName(sRegion);
+    }
+
+    int delimiterPos = sRegion.find(':');
     if (delimiterPos > -1)
     {
       // range
-      QString sRegion = *it;
-      if (!sheet)
-      {
-        sheet = filterSheetName(sRegion);
-      }
-
       Point ul(sRegion.left(delimiterPos));
       Point lr(sRegion.mid(delimiterPos + 1));
 
@@ -104,11 +104,6 @@
     else
     {
       // single cell
-      QString sRegion = *it;
-      if (!sheet)
-      {
-        sheet = filterSheetName(sRegion);
-      }
       Point* point = createPoint(sRegion);
       point->setSheet(sheet);
       d->cells.append(point);
--- branches/koffice/1.5/koffice/kspread/selection.cc #543670:543671
@@ -307,11 +307,14 @@
   d->marker = bottomRight;
 
   d->activeElement = --cells().end();
+  d->activeSubRegionStart = 0;
+  d->activeSubRegionLength = cells().count();
 
   if (changedRegion == *this)
   {
     return;
   }
+  changedRegion.add( region );
 
   emit changed(changedRegion);
 }
--- trunk/koffice/kspread/region.cc #543670:543671
@@ -70,16 +70,16 @@
   QStringList::ConstIterator end = substrings.constEnd();
   for (QStringList::ConstIterator it = substrings.constBegin(); it != end; ++it)
   {
-    int delimiterPos = (*it).indexOf(':');
+    QString sRegion = *it;
+    if (!sheet)
+    {
+      sheet = filterSheetName(sRegion);
+    }
+
+    int delimiterPos = sRegion.indexOf(':');
     if (delimiterPos > -1)
     {
       // range
-      QString sRegion = *it;
-      if (!sheet)
-      {
-        sheet = filterSheetName(sRegion);
-      }
-
       Point ul(sRegion.left(delimiterPos));
       Point lr(sRegion.mid(delimiterPos + 1));
 
@@ -105,11 +105,6 @@
     else
     {
       // single cell
-      QString sRegion = *it;
-      if (!sheet)
-      {
-        sheet = filterSheetName(sRegion);
-      }
       Point* point = createPoint(sRegion);
       point->setSheet(sheet);
       d->cells.append(point);
--- trunk/koffice/kspread/selection.cc #543670:543671
@@ -313,11 +313,14 @@
   d->marker = bottomRight;
 
   d->activeElement = cells().count() - 1;
+  d->activeSubRegionStart = 0;
+  d->activeSubRegionLength = cells().count();
 
   if (changedRegion == *this)
   {
     return;
   }
+  changedRegion.add( region );
 
   emit changed(changedRegion);
 }
[prev in list] [next in list] [prev in thread] [next in thread]