[Libreoffice-commits] .: sc/source

[Kohei Yoshida]

 sc/source/ui/inc/tabview.hxx   |    2 --
 sc/source/ui/view/tabview2.cxx |   30 ++++++++++++++++--------------
 2 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit ed2aa8e1ebd4bea03d958b86e721400ef59cb76d
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Fri May 27 21:40:14 2011 -0400

    Removed unnecessary data members.
    
    These two can be used as local variables as they are only used in
    one method.

diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx
index 583a689..185a325 100644
--- a/sc/source/ui/inc/tabview.hxx
+++ b/sc/source/ui/inc/tabview.hxx
@@ -152,11 +152,9 @@ private:
     sal_Bool				bBlockRows;				// werden ganze Zeilen markiert?
 
     SCCOL				nBlockStartX;
-    SCCOL               nBlockStartXOrig;
     SCCOL				nBlockEndX;
 
     SCROW				nBlockStartY;
-    SCROW               nBlockStartYOrig;
     SCROW				nBlockEndY;
 
     SCTAB				nBlockStartZ;
diff --git a/sc/source/ui/view/tabview2.cxx b/sc/source/ui/view/tabview2.cxx
index 36cbc0b..6b6b49c 100644
--- a/sc/source/ui/view/tabview2.cxx
+++ b/sc/source/ui/view/tabview2.cxx
@@ -144,8 +144,8 @@ void ScTabView::InitBlockMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
         bIsBlockMode = SC_BLOCKMODE_NORMAL;			//! Variable umbenennen!
         bBlockCols = bCols;
         bBlockRows = bRows;
-        nBlockStartX = nBlockStartXOrig = nCurX;
-        nBlockStartY = nBlockStartYOrig = nCurY;
+        nBlockStartX = nCurX;
+        nBlockStartY = nCurY;
         nBlockStartZ = nCurZ;
         nBlockEndX = nOldCurX = nBlockStartX;
         nBlockEndY = nOldCurY = nBlockStartY;
@@ -153,13 +153,13 @@ void ScTabView::InitBlockMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
 
         if (bBlockCols)
         {
-            nBlockStartY = nBlockStartYOrig = 0;
+            nBlockStartY = 0;
             nBlockEndY = MAXROW;
         }
 
         if (bBlockRows)
         {
-            nBlockStartX = nBlockStartXOrig = 0;
+            nBlockStartX = 0;
             nBlockEndX = MAXCOL;
         }
 
@@ -260,6 +260,8 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
         {
             // Expand selection area accordingly when the current selection ends
             // with a merged cell.
+            SCsCOL nBlockStartXOld = nBlockStartX;
+            SCsROW nBlockStartYOld = nBlockStartY;
             SCsCOL nCurXOffset = 0;
             SCsCOL nBlockStartXOffset = 0;
             SCsROW nCurYOffset = 0;
@@ -276,20 +278,20 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
             // move to the lower-right corner of the merged anchor cell, and so on.
 
             pMergeAttr = static_cast<const ScMergeAttr*>(
-                pDocument->GetAttr( nBlockStartXOrig, nBlockStartYOrig, nTab, ATTR_MERGE ) );
+                pDocument->GetAttr( nBlockStartX, nBlockStartY, nTab, ATTR_MERGE ) );
             if ( pMergeAttr->IsMerged() )
             {
                 SCsCOL nColSpan = pMergeAttr->GetColMerge();
                 SCsROW nRowSpan = pMergeAttr->GetRowMerge();
 
-                if ( !( nCurX >= nBlockStartXOrig + nColSpan - 1 && nCurY >= nBlockStartYOrig + nRowSpan - 1 ) )
+                if ( !( nCurX >= nBlockStartXOld + nColSpan - 1 && nCurY >= nBlockStartYOld + nRowSpan - 1 ) )
                 {
-                    nBlockStartX = nCurX >= nBlockStartXOrig ? nBlockStartXOrig : nBlockStartXOrig + nColSpan - 1;
-                    nBlockStartY = nCurY >= nBlockStartYOrig ? nBlockStartYOrig : nBlockStartYOrig + nRowSpan - 1;
-                    nCurXOffset  = nCurX >= nBlockStartXOrig && nCurX < nBlockStartXOrig + nColSpan - 1 ?
-                        nBlockStartXOrig - nCurX + nColSpan - 1 : 0;
-                    nCurYOffset  = nCurY >= nBlockStartYOrig && nCurY < nBlockStartYOrig + nRowSpan - 1 ?
-                        nBlockStartYOrig - nCurY + nRowSpan - 1 : 0;
+                    nBlockStartX = nCurX >= nBlockStartXOld ? nBlockStartXOld : nBlockStartXOld + nColSpan - 1;
+                    nBlockStartY = nCurY >= nBlockStartYOld ? nBlockStartYOld : nBlockStartYOld + nRowSpan - 1;
+                    nCurXOffset  = nCurX >= nBlockStartXOld && nCurX < nBlockStartXOld + nColSpan - 1 ?
+                        nBlockStartXOld - nCurX + nColSpan - 1 : 0;
+                    nCurYOffset  = nCurY >= nBlockStartYOld && nCurY < nBlockStartYOld + nRowSpan - 1 ?
+                        nBlockStartYOld - nCurY + nRowSpan - 1 : 0;
                     bBlockStartMerged = sal_True;
                 }
             }
@@ -334,8 +336,8 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
                 // original position.
                 if ( !bBlockStartMerged )
                 {
-                    nBlockStartX = nBlockStartXOrig;
-                    nBlockStartY = nBlockStartYOrig;
+                    nBlockStartX = nBlockStartXOld;
+                    nBlockStartY = nBlockStartYOld;
                 }
             }