diff options
Diffstat (limited to 'sc/source/ui/view/gridmerg.cxx')
| -rw-r--r-- | sc/source/ui/view/gridmerg.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sc/source/ui/view/gridmerg.cxx b/sc/source/ui/view/gridmerg.cxx index 31dba191b2fd..2481d4fc18be 100644 --- a/sc/source/ui/view/gridmerg.cxx +++ b/sc/source/ui/view/gridmerg.cxx @@ -2,7 +2,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 @@ -44,8 +44,8 @@ ScGridMerger::ScGridMerger( OutputDevice* pOutDev, long nOnePixelX, long nOnePix nCount( 0 ), bVertical( FALSE ) { - // optimize (DrawGrid) only for pixel MapMode, - // to avoid rounding errors + // optimize (DrawGrid) only for pixel MapMode, + // to avoid rounding errors bOptimize = ( pDev->GetMapMode().GetMapUnit() == MAP_PIXEL ); } @@ -59,8 +59,8 @@ void ScGridMerger::AddLine( long nStart, long nEnd, long nPos ) { if ( nCount ) { - // not first line - test fix position - // more than one previous line - test distance + // not first line - test fix position + // more than one previous line - test distance if ( nStart != nFixStart || nEnd != nFixEnd ) { @@ -68,8 +68,8 @@ void ScGridMerger::AddLine( long nStart, long nEnd, long nPos ) ( nStart == nFixEnd || nStart == nFixEnd + ( bVertical ? nOneY : nOneX ) ) ) { - // additional optimization: extend connected lines - // keep nCount at 1 + // additional optimization: extend connected lines + // keep nCount at 1 nFixEnd = nEnd; } else @@ -80,7 +80,7 @@ void ScGridMerger::AddLine( long nStart, long nEnd, long nPos ) nVarDiff = nPos - nVarStart; ++nCount; } - else if ( nPos != nVarStart + nCount * nVarDiff ) //! keep VarEnd? + else if ( nPos != nVarStart + nCount * nVarDiff ) //! keep VarEnd? Flush(); else ++nCount; @@ -88,7 +88,7 @@ void ScGridMerger::AddLine( long nStart, long nEnd, long nPos ) if ( !nCount ) { - // first line (or flushed above) - just store + // first line (or flushed above) - just store nFixStart = nStart; nFixEnd = nEnd; @@ -141,9 +141,9 @@ void ScGridMerger::Flush() long nVarEnd = nVarStart + ( nCount - 1 ) * nVarDiff; if ( nVarDiff < 0 ) { - // nVarDiff is negative in RTL layout mode - // Change the positions so DrawGrid is called with a positive distance - // (nVarStart / nVarDiff can be modified, aren't used after Flush) + // nVarDiff is negative in RTL layout mode + // Change the positions so DrawGrid is called with a positive distance + // (nVarStart / nVarDiff can be modified, aren't used after Flush) nVarDiff = -nVarDiff; long nTemp = nVarStart; |