[Libreoffice-commits] core.git: sw/source

[Tor Lillqvist]

 sw/source/core/text/itrform2.cxx |    8 ++++----
 sw/source/core/text/itrform2.hxx |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 956002dc4448ced19348b31329ac114b3b65516e
Author: Tor Lillqvist <tml at iki.fi>
Date:   Fri Feb 22 09:29:05 2013 +0200

    s/bAllWays/bAlways/
    
    I assume the word "always" is what is meant, not "all ways".
    
    Change-Id: I95a2d98f3a6ef49cf52341fbb6d8a8c90e3ee27a

diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index 2c05536..4cee223 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -742,7 +742,7 @@ void SwTxtFormatter::CalcAdjustLine( SwLineLayout *pCurrent )
         {
             CalcAdjLine( pCurrent );
             // For e.g. centered fly we need to switch the RefPoint
-            // That's why bAllWays = sal_True
+            // That's why bAlways = sal_True
             UpdatePos( pCurrent, GetTopLeft(), GetStart(), sal_True );
         }
     }
@@ -2005,7 +2005,7 @@ void SwTxtFormatter::CalcUnclipped( SwTwips& rTop, SwTwips& rBottom )
 
 
 void SwTxtFormatter::UpdatePos( SwLineLayout *pCurrent, Point aStart,
-    xub_StrLen nStartIdx, sal_Bool bAllWays ) const
+    xub_StrLen nStartIdx, sal_Bool bAlways ) const
 {
     OSL_ENSURE( ! pFrm->IsVertical() || pFrm->IsSwapped(),
             "SwTxtFormatter::UpdatePos with unswapped frame" );
@@ -2060,7 +2060,7 @@ void SwTxtFormatter::UpdatePos( SwLineLayout *pCurrent, Point aStart,
         // adjustment) could be relevant for a portion: We need to SetRefPoint
         // for FlyCntPortions.
         if( ( pPos->IsFlyCntPortion() || pPos->IsGrfNumPortion() )
-            && ( bAllWays || !IsQuick() ) )
+            && ( bAlways || !IsQuick() ) )
         {
             pCurrent->MaxAscentDescent( nTmpAscent, nTmpDescent, nFlyAsc, nFlyDesc, pPos );
 
@@ -2114,7 +2114,7 @@ void SwTxtFormatter::UpdatePos( SwLineLayout *pCurrent, Point aStart,
             xub_StrLen nStIdx = aTmpInf.GetIdx();
             do
             {
-                UpdatePos( pLay, aSt, nStIdx, bAllWays );
+                UpdatePos( pLay, aSt, nStIdx, bAlways );
                 nStIdx = nStIdx + pLay->GetLen();
                 aSt.Y() += pLay->Height();
                 pLay = pLay->GetNext();
diff --git a/sw/source/core/text/itrform2.hxx b/sw/source/core/text/itrform2.hxx
index b6a18ff..832c95c 100644
--- a/sw/source/core/text/itrform2.hxx
+++ b/sw/source/core/text/itrform2.hxx
@@ -112,7 +112,7 @@ class SwTxtFormatter : public SwTxtPainter
         Mainly to correct the X position.
      */
     void UpdatePos( SwLineLayout *pCurr, Point aStart, xub_StrLen nStartIdx,
-            sal_Bool bAllWays = sal_False ) const;
+            sal_Bool bAlways = sal_False ) const;
 
     /**
         Set all anchored as character objects to the passed BaseLine