diff options
Diffstat (limited to 'sc/source/ui/view/viewutil.cxx')
| -rw-r--r-- | sc/source/ui/view/viewutil.cxx | 60 |
1 files changed, 31 insertions, 29 deletions
diff --git a/sc/source/ui/view/viewutil.cxx b/sc/source/ui/view/viewutil.cxx index 91a3d4855..964695cb6 100644 --- a/sc/source/ui/view/viewutil.cxx +++ b/sc/source/ui/view/viewutil.cxx @@ -481,12 +481,13 @@ BOOL ScUpdateRect::GetDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 ) return TRUE; } +#ifdef OLD_SELECTION_PAINT BOOL ScUpdateRect::GetXorDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2, BOOL& rCont ) { rCont = FALSE; - if ( nNewStartX == nOldStartX && nNewEndX == nOldEndX && - nNewStartY == nOldStartY && nNewEndY == nOldEndY ) + if (nNewStartX == nOldStartX && nNewEndX == nOldEndX && + nNewStartY == nOldStartY && nNewEndY == nOldEndY) { rX1 = nNewStartX; rY1 = nNewStartY; @@ -500,14 +501,14 @@ BOOL ScUpdateRect::GetXorDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2, B rX2 = Max(nNewEndX,nOldEndX); rY2 = Max(nNewEndY,nOldEndY); - if ( nNewStartX == nOldStartX && nNewEndX == nOldEndX ) // nur vertikal + if (nNewStartX == nOldStartX && nNewEndX == nOldEndX) // nur vertikal { - if ( nNewStartY == nOldStartY ) + if (nNewStartY == nOldStartY) { rY1 = Min( nNewEndY, nOldEndY ) + 1; rY2 = Max( nNewEndY, nOldEndY ); } - else if ( nNewEndY == nOldEndY ) + else if (nNewEndY == nOldEndY) { rY1 = Min( nNewStartY, nOldStartY ); rY2 = Max( nNewStartY, nOldStartY ) - 1; @@ -523,14 +524,14 @@ BOOL ScUpdateRect::GetXorDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2, B nContX2 = rX2; } } - else if ( nNewStartY == nOldStartY && nNewEndY == nOldEndY ) // nur horizontal + else if (nNewStartY == nOldStartY && nNewEndY == nOldEndY) // nur horizontal { - if ( nNewStartX == nOldStartX ) + if (nNewStartX == nOldStartX) { rX1 = Min( nNewEndX, nOldEndX ) + 1; rX2 = Max( nNewEndX, nOldEndX ); } - else if ( nNewEndX == nOldEndX ) + else if (nNewEndX == nOldEndX) { rX1 = Min( nNewStartX, nOldStartX ); rX2 = Max( nNewStartX, nOldStartX ) - 1; @@ -546,67 +547,67 @@ BOOL ScUpdateRect::GetXorDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2, B nContY2 = rY2; } } - else if ( nNewEndX == nOldEndX && nNewEndY == nOldEndY ) // links oben + else if (nNewEndX == nOldEndX && nNewEndY == nOldEndY) // links oben { - if ( (nNewStartX<nOldStartX) == (nNewStartY<nOldStartY) ) + if ((nNewStartX<nOldStartX) == (nNewStartY<nOldStartY)) rX1 = Min( nNewStartX, nOldStartX ); else - rX1 = Max( nNewStartX, nOldStartX ); // Ecke weglassen + rX1 = Max( nNewStartX, nOldStartX ); // Ecke weglassen rX2 = nOldEndX; - rY1 = Min( nNewStartY, nOldStartY ); // oben + rY1 = Min( nNewStartY, nOldStartY ); // oben rY2 = Max( nNewStartY, nOldStartY ) - 1; rCont = TRUE; nContY1 = rY2+1; nContY2 = nOldEndY; - nContX1 = Min( nNewStartX, nOldStartX ); // links + nContX1 = Min( nNewStartX, nOldStartX ); // links nContX2 = Max( nNewStartX, nOldStartX ) - 1; } - else if ( nNewStartX == nOldStartX && nNewEndY == nOldEndY ) // rechts oben + else if (nNewStartX == nOldStartX && nNewEndY == nOldEndY) // rechts oben { - if ( (nNewEndX<nOldEndX) != (nNewStartY<nOldStartY) ) + if ((nNewEndX<nOldEndX) != (nNewStartY<nOldStartY)) rX2 = Max( nNewEndX, nOldEndX ); else - rX2 = Min( nNewEndX, nOldEndX ); // Ecke weglassen + rX2 = Min( nNewEndX, nOldEndX ); // Ecke weglassen rX1 = nOldStartX; - rY1 = Min( nNewStartY, nOldStartY ); // oben + rY1 = Min( nNewStartY, nOldStartY ); // oben rY2 = Max( nNewStartY, nOldStartY ) - 1; rCont = TRUE; nContY1 = rY2+1; nContY2 = nOldEndY; - nContX1 = Min( nNewEndX, nOldEndX ) + 1; // rechts + nContX1 = Min( nNewEndX, nOldEndX ) + 1; // rechts nContX2 = Max( nNewEndX, nOldEndX ); } - else if ( nNewEndX == nOldEndX && nNewStartY == nOldStartY ) // links unten + else if (nNewEndX == nOldEndX && nNewStartY == nOldStartY) // links unten { - if ( (nNewStartX<nOldStartX) != (nNewEndY<nOldEndY) ) + if ((nNewStartX<nOldStartX) != (nNewEndY<nOldEndY)) rX1 = Min( nNewStartX, nOldStartX ); else - rX1 = Max( nNewStartX, nOldStartX ); // Ecke weglassen + rX1 = Max( nNewStartX, nOldStartX ); // Ecke weglassen rX2 = nOldEndX; - rY1 = Min( nNewEndY, nOldEndY ) + 1; // unten + rY1 = Min( nNewEndY, nOldEndY ) + 1; // unten rY2 = Max( nNewEndY, nOldEndY ); rCont = TRUE; nContY1 = nOldStartY; nContY2 = rY1-1; - nContX1 = Min( nNewStartX, nOldStartX ); // links + nContX1 = Min( nNewStartX, nOldStartX ); // links nContX2 = Max( nNewStartX, nOldStartX ) - 1; } - else if ( nNewStartX == nOldStartX && nNewStartY == nOldStartY ) // rechts unten + else if (nNewStartX == nOldStartX && nNewStartY == nOldStartY) // rechts unten { - if ( (nNewEndX<nOldEndX) == (nNewEndY<nOldEndY) ) + if ((nNewEndX<nOldEndX) == (nNewEndY<nOldEndY)) rX2 = Max( nNewEndX, nOldEndX ); else - rX2 = Min( nNewEndX, nOldEndX ); // Ecke weglassen + rX2 = Min( nNewEndX, nOldEndX ); // Ecke weglassen rX1 = nOldStartX; - rY1 = Min( nNewEndY, nOldEndY ) + 1; // unten + rY1 = Min( nNewEndY, nOldEndY ) + 1; // unten rY2 = Max( nNewEndY, nOldEndY ); rCont = TRUE; nContY1 = nOldStartY; nContY2 = rY1-1; - nContX1 = Min( nNewEndX, nOldEndX ) + 1; // rechts + nContX1 = Min( nNewEndX, nOldEndX ) + 1; // rechts nContX2 = Max( nNewEndX, nOldEndX ); } - else // Ueberschlag + else // Ueberschlag { rX1 = nOldStartX; rY1 = nOldStartY; @@ -629,6 +630,7 @@ void ScUpdateRect::GetContDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 ) rX2 = nContX2; rY2 = nContY2; } +#endif |