Kaydet (Commit) 82d1e7f1 authored tarafından Kohei Yoshida's avatar Kohei Yoshida

More clean up of unnecessary code.

üst 56d3ce7c
...@@ -244,17 +244,11 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, ...@@ -244,17 +244,11 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
nBlockStartZ, rMark.IsMarkNegative(), bCols, bRows ); nBlockStartZ, rMark.IsMarkNegative(), bCols, bRows );
} }
SCCOL nOldBlockEndX = nBlockEndX;
SCROW nOldBlockEndY = nBlockEndY;
if ( nCurX != nOldCurX || nCurY != nOldCurY ) if ( nCurX != nOldCurX || nCurY != nOldCurY )
{ {
// Current cursor has moved // Current cursor has moved
SCTAB nTab = nCurZ; SCTAB nTab = nCurZ;
// Set old selection area
ScUpdateRect aRect( nBlockStartX, nBlockStartY, nOldBlockEndX, nOldBlockEndY );
if ( bCellSelection ) if ( bCellSelection )
{ {
...@@ -266,7 +260,7 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, ...@@ -266,7 +260,7 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
SCsCOL nBlockStartXOffset = 0; SCsCOL nBlockStartXOffset = 0;
SCsROW nCurYOffset = 0; SCsROW nCurYOffset = 0;
SCsROW nBlockStartYOffset = 0; SCsROW nBlockStartYOffset = 0;
sal_Bool bBlockStartMerged = false; bool bBlockStartMerged = false;
const ScMergeAttr* pMergeAttr = NULL; const ScMergeAttr* pMergeAttr = NULL;
ScDocument* pDocument = aViewData.GetDocument(); ScDocument* pDocument = aViewData.GetDocument();
...@@ -351,10 +345,8 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, ...@@ -351,10 +345,8 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
nBlockEndX = nCurX; nBlockEndX = nCurX;
nBlockEndY = nCurY; nBlockEndY = nCurY;
} }
// end of "if ( bCellSelection )"
// Set new selection area // Set new selection area
aRect.SetNew( nBlockStartX, nBlockStartY, nBlockEndX, nBlockEndY );
rMark.SetMarkArea( ScRange( nBlockStartX, nBlockStartY, nTab, nBlockEndX, nBlockEndY, nTab ) ); rMark.SetMarkArea( ScRange( nBlockStartX, nBlockStartY, nTab, nBlockEndX, nBlockEndY, nTab ) );
UpdateSelectionOverlay(); UpdateSelectionOverlay();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment