diff options
Diffstat (limited to 'sc/source/ui/view/invmerge.cxx')
| -rw-r--r-- | sc/source/ui/view/invmerge.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sc/source/ui/view/invmerge.cxx b/sc/source/ui/view/invmerge.cxx index a895dc5faec0..77af9751e766 100644 --- a/sc/source/ui/view/invmerge.cxx +++ b/sc/source/ui/view/invmerge.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ ScInvertMerger::ScInvertMerger( Window* pWindow ) : pWin( pWindow ), pRects( NULL ) { - // both rectangles empty + // both rectangles empty } ScInvertMerger::ScInvertMerger( ::std::vector< Rectangle >* pRectangles ) : @@ -110,7 +110,7 @@ void ScInvertMerger::Flush() void ScInvertMerger::FlushTotal() { if( aTotalRect.IsEmpty() ) - return; // nothing to do + return; // nothing to do if ( pWin ) pWin->Invert( aTotalRect, INVERT_HIGHLIGHT ); @@ -123,11 +123,11 @@ void ScInvertMerger::FlushTotal() void ScInvertMerger::FlushLine() { if( aLineRect.IsEmpty() ) - return; // nothing to do + return; // nothing to do if ( aTotalRect.IsEmpty() ) { - aTotalRect = aLineRect; // start new total rect + aTotalRect = aLineRect; // start new total rect } else { @@ -140,8 +140,8 @@ void ScInvertMerger::FlushLine() } else { - FlushTotal(); // draw old total rect - aTotalRect = aLineRect; // and start new one + FlushTotal(); // draw old total rect + aTotalRect = aLineRect; // and start new one } } @@ -173,7 +173,7 @@ void ScInvertMerger::AddRect( const Rectangle& rRect ) aLineRect.Right() = aJustified.Right(); bDone = TRUE; } - else if ( aJustified.Right() + 1 == aLineRect.Left() ) // for RTL layout + else if ( aJustified.Right() + 1 == aLineRect.Left() ) // for RTL layout { aLineRect.Left() = aJustified.Left(); bDone = TRUE; @@ -181,8 +181,8 @@ void ScInvertMerger::AddRect( const Rectangle& rRect ) } if (!bDone) { - FlushLine(); // use old line rect for total rect - aLineRect = aJustified; // and start new one + FlushLine(); // use old line rect for total rect + aLineRect = aJustified; // and start new one } } } |