sw: prefix members of SwTextFrm

Change-Id: I6eb284d1858c0ea6576e172b2ac8368e8458b4e8

5 files changed, 87 insertions, 87 deletions

diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index 3d4fa5a253ea..72446daa9690 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -60,8 +60,8 @@ class SwTextFrm: public SwContentFrm
     static long nMinPrtLine;    // This Line must not be underrun when printing
                                 // Hack for table cells stretching multiple pages
 
-    sal_uLong  nAllLines        :24; // Line count for the Paint (including nThisLines)
-    sal_uLong  nThisLines       :8; // Count of Lines of the Frame
+    sal_uLong  mnAllLines        :24; // Line count for the Paint (including nThisLines)
+    sal_uLong  mnThisLines       :8; // Count of Lines of the Frame
 
     // The x position for flys anchored at this paragraph.
     // These values are calculated in SwTextFrm::CalcBaseOfstForFly()
@@ -78,9 +78,9 @@ class SwTextFrm: public SwContentFrm
     // It is NOT used for the determination of printing area.
     SwTwips mnAdditionalFirstLineOffset;
 
-    sal_Int32 nOfst; // Is the offset in the Content (character count)
+    sal_Int32 mnOffset; // Is the offset in the Content (character count)
 
-    sal_uInt16 nCacheIdx; // Index into the cache, USHRT_MAX if there's definitely no fitting object in the cache
+    sal_uInt16 mnCacheIndex; // Index into the cache, USHRT_MAX if there's definitely no fitting object in the cache
 
     // Separates the Master and creates a Follow or adjusts the data in the Follow
     void _AdjustFollow( SwTextFormatter &rLine, const sal_Int32 nOffset,
@@ -102,17 +102,17 @@ class SwTextFrm: public SwContentFrm
     void FormatAdjust( SwTextFormatter &rLine, WidowsAndOrphans &rFrmBreak,
                        const sal_Int32 nStrLen, const bool bDummy );
 
-    bool bLocked        : 1;        // In the Format?
-    bool bWidow         : 1;        // Are we a Widow?
-    bool bJustWidow     : 1;        // Did we just request to be a Widow?
-    bool bEmpty         : 1;        // Are we an empty paragraph?
-    bool bInFootnoteConnect  : 1;        // Is in Connect at the moment
-    bool bFootnote           : 1;        // Has at least one footnote
-    bool bRepaint       : 1;        // TextFrm: Repaint is ready to be fetched
-    bool bBlinkPor      : 1;        // Contains Blink Portions
-    bool bFieldFollow   : 1;        // Start with Field rest of the Master
-    bool bHasAnimation  : 1;        // Contains animated SwGrfNumPortion
-    bool bIsSwapped     : 1;        // during text formatting we swap the
+    bool mbLocked        : 1;        // In the Format?
+    bool mbWidow         : 1;        // Are we a Widow?
+    bool mbJustWidow     : 1;        // Did we just request to be a Widow?
+    bool mbEmpty         : 1;        // Are we an empty paragraph?
+    bool mbInFootnoteConnect  : 1;        // Is in Connect at the moment
+    bool mbFootnote           : 1;        // Has at least one footnote
+    bool mbRepaint       : 1;        // TextFrm: Repaint is ready to be fetched
+    bool mbHasBlinkPortions      : 1;        // Contains Blink Portions
+    bool mbFieldFollow   : 1;        // Start with Field rest of the Master
+    bool mbHasAnimation  : 1;        // Contains animated SwGrfNumPortion
+    bool mbIsSwapped     : 1;        // during text formatting we swap the
                                     // width and height for vertical formatting
     // OD 14.03.2003 #i11760# - flag to control, if follow is formatted in
     // method <CalcFollow(..)>.
@@ -121,12 +121,12 @@ class SwTextFrm: public SwContentFrm
     bool mbFollowFormatAllowed : 1;
 
     void ResetPreps();
-    inline void Lock() { bLocked = true; }
-    inline void Unlock() { bLocked = false; }
-    inline void SetWidow( const bool bNew ) { bWidow = bNew; }
-    inline void SetJustWidow( const bool bNew ) { bJustWidow = bNew; }
-    inline void SetEmpty( const bool bNew ) { bEmpty = bNew; }
-    inline void SetFieldFollow( const bool bNew ) { bFieldFollow = bNew; }
+    inline void Lock() { mbLocked = true; }
+    inline void Unlock() { mbLocked = false; }
+    inline void SetWidow( const bool bNew ) { mbWidow = bNew; }
+    inline void SetJustWidow( const bool bNew ) { mbJustWidow = bNew; }
+    inline void SetEmpty( const bool bNew ) { mbEmpty = bNew; }
+    inline void SetFieldFollow( const bool bNew ) { mbFieldFollow = bNew; }
 
     bool IsIdxInside( const sal_Int32 nPos, const sal_Int32 nLen ) const;
 
@@ -309,10 +309,10 @@ public:
     /// Methods to manage the FollowFrame
     SwContentFrm *SplitFrm( const sal_Int32 nTextPos );
     SwContentFrm *JoinFrm();
-    inline sal_Int32  GetOfst() const { return nOfst; }
+    inline sal_Int32  GetOfst() const { return mnOffset; }
            void        _SetOfst( const sal_Int32 nNewOfst );
     inline void        SetOfst ( const sal_Int32 nNewOfst );
-    inline void        ManipOfst ( const sal_Int32 nNewOfst ){ nOfst = nNewOfst; }
+    inline void        ManipOfst ( const sal_Int32 nNewOfst ){ mnOffset = nNewOfst; }
            SwTextFrm   *GetFrmAtPos ( const SwPosition &rPos);
     inline const SwTextFrm *GetFrmAtPos ( const SwPosition &rPos) const;
     SwTextFrm&   GetFrmAtOfst( const sal_Int32 nOfst );
@@ -378,26 +378,26 @@ public:
     DECL_FIXEDMEMPOOL_NEWDEL(SwTextFrm)
 
     // Locking
-    inline bool IsLocked()      const { return bLocked;     }
+    inline bool IsLocked()      const { return mbLocked;     }
 
-    inline bool IsWidow()       const { return bWidow;      }
-    inline bool IsJustWidow()   const { return bJustWidow;  }
-    inline bool IsEmpty()       const { return bEmpty;      }
-    inline bool HasFootnote()        const { return bFootnote;        }
-    inline bool IsInFootnoteConnect()const { return bInFootnoteConnect;}
-    inline bool IsFieldFollow() const { return bFieldFollow;}
+    inline bool IsWidow()       const { return mbWidow;      }
+    inline bool IsJustWidow()   const { return mbJustWidow;  }
+    inline bool IsEmpty()       const { return mbEmpty;      }
+    inline bool HasFootnote()        const { return mbFootnote;        }
+    inline bool IsInFootnoteConnect()const { return mbInFootnoteConnect;}
+    inline bool IsFieldFollow() const { return mbFieldFollow;}
 
     inline void SetRepaint() const;
     inline void ResetRepaint() const;
-    inline bool HasRepaint() const { return bRepaint; }
+    inline bool HasRepaint() const { return mbRepaint; }
     inline void SetBlinkPor() const;
     inline void ResetBlinkPor() const;
-    inline bool HasBlinkPor() const { return bBlinkPor; }
+    inline bool HasBlinkPor() const { return mbHasBlinkPortions; }
     inline void SetAnimation() const
-        { const_cast<SwTextFrm*>(this)->bHasAnimation = true; }
-    inline bool HasAnimation() const { return bHasAnimation; }
+        { const_cast<SwTextFrm*>(this)->mbHasAnimation = true; }
+    inline bool HasAnimation() const { return mbHasAnimation; }
 
-    inline bool IsSwapped() const { return bIsSwapped; }
+    inline bool IsSwapped() const { return mbIsSwapped; }
 
     /// Does the Frm have a local footnote (in this Frm or Follow)?
 #ifdef DBG_UTIL
@@ -456,7 +456,7 @@ public:
     SwTextFrm* GetFormatted( bool bForceQuickFormat = false );
 
     /// Will be moved soon
-    inline void SetFootnote( const bool bNew ) { bFootnote = bNew; }
+    inline void SetFootnote( const bool bNew ) { mbFootnote = bNew; }
 
     /// Respect the Follows
     inline bool IsInside( const sal_Int32 nPos ) const;
@@ -472,8 +472,8 @@ public:
 
     static long GetMinPrtLine() { return nMinPrtLine; }
 
-    inline sal_uInt16 GetCacheIdx() const { return nCacheIdx; }
-    inline void   SetCacheIdx( const sal_uInt16 nNew ) { nCacheIdx = nNew; }
+    inline sal_uInt16 GetCacheIdx() const { return mnCacheIndex; }
+    inline void   SetCacheIdx( const sal_uInt16 nNew ) { mnCacheIndex = nNew; }
 
     /// Removes the Line information from the Cache
     void ClearPara();
@@ -524,8 +524,8 @@ public:
     sal_uInt16 GetLineCount( sal_Int32 nPos );
 
     /// For displaying the line numbers
-    sal_uLong GetAllLines()  const { return nAllLines; }
-    sal_uLong GetThisLines() const { return nThisLines;}
+    sal_uLong GetAllLines()  const { return mnAllLines; }
+    sal_uLong GetThisLines() const { return mnThisLines;}
     void RecalcAllLines();
 
     /// Stops the animations within numberings
@@ -670,7 +670,7 @@ inline const SwParaPortion *SwTextFrm::GetPara() const
 
 inline bool SwTextFrm::HasPara() const
 {
-    return nCacheIdx!=USHRT_MAX && _HasPara();
+    return mnCacheIndex!=USHRT_MAX && _HasPara();
 }
 
 inline SwTwips SwTextFrm::GrowTst( const SwTwips nGrow )
@@ -716,26 +716,26 @@ inline const SwTextFrm *SwTextFrm::GetFrmAtPos( const SwPosition &rPos) const
 
 inline void SwTextFrm::SetOfst( const sal_Int32 nNewOfst )
 {
-    if ( nOfst != nNewOfst )
+    if ( mnOffset != nNewOfst )
         _SetOfst( nNewOfst );
 }
 
 inline void SwTextFrm::SetRepaint() const
 {
-    const_cast<SwTextFrm*>(this)->bRepaint = true;
+    const_cast<SwTextFrm*>(this)->mbRepaint = true;
 }
 inline void SwTextFrm::ResetRepaint() const
 {
-    const_cast<SwTextFrm*>(this)->bRepaint = false;
+    const_cast<SwTextFrm*>(this)->mbRepaint = false;
 }
 
 inline void SwTextFrm::SetBlinkPor() const
 {
-    const_cast<SwTextFrm*>(this)->bBlinkPor = true;
+    const_cast<SwTextFrm*>(this)->mbHasBlinkPortions = true;
 }
 inline void SwTextFrm::ResetBlinkPor() const
 {
-    const_cast<SwTextFrm*>(this)->bBlinkPor = false;
+    const_cast<SwTextFrm*>(this)->mbHasBlinkPortions = false;
 }
 
 class TemporarySwap {
diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index 9ff3f4d89a54..35876fc74103 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -746,7 +746,7 @@ void SwTextFrm::_SetOfst( const sal_Int32 nNewOfst )
     // We do not need to invalidate out Follow.
     // We are a Follow, get formatted right away and call
     // SetOfst() from there
-    nOfst = nNewOfst;
+    mnOffset = nNewOfst;
     SwParaPortion *pPara = GetPara();
     if( pPara )
     {
diff --git a/sw/source/core/text/txtcache.cxx b/sw/source/core/text/txtcache.cxx
index 389cb67ef918..898894726bd1 100644
--- a/sw/source/core/text/txtcache.cxx
+++ b/sw/source/core/text/txtcache.cxx
@@ -72,7 +72,7 @@ bool SwTextFrm::_HasPara() const
             return true;
     }
     else
-        const_cast<SwTextFrm*>(this)->nCacheIdx = USHRT_MAX;
+        const_cast<SwTextFrm*>(this)->mnCacheIndex = USHRT_MAX;
 
     return false;
 }
@@ -86,7 +86,7 @@ SwParaPortion *SwTextFrm::GetPara()
         if ( pLine )
             return pLine->GetPara();
         else
-            nCacheIdx = USHRT_MAX;
+            mnCacheIndex = USHRT_MAX;
     }
     return 0;
 }
@@ -104,7 +104,7 @@ void SwTextFrm::ClearPara()
             pTextLine->SetPara( 0 );
         }
         else
-            nCacheIdx = USHRT_MAX;
+            mnCacheIndex = USHRT_MAX;
     }
 }
 
@@ -124,14 +124,14 @@ void SwTextFrm::SetPara( SwParaPortion *pNew, bool bDelete )
         else
         {
             OSL_ENSURE( !pNew, "+SetPara: Losing SwParaPortion" );
-            nCacheIdx = USHRT_MAX;
+            mnCacheIndex = USHRT_MAX;
         }
     }
     else if ( pNew )
     {   // Insert a new one
         SwTextLine *pTextLine = new SwTextLine( this, pNew );
         if ( SwTextFrm::GetTextCache()->Insert( pTextLine ) )
-            nCacheIdx = pTextLine->GetCachePos();
+            mnCacheIndex = pTextLine->GetCachePos();
         else
         {
             OSL_FAIL( "+SetPara: InsertCache failed." );
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index 2e2e590d498c..e4488ec8f259 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -83,7 +83,7 @@ TYPEINIT1( SwTextFrm, SwContentFrm );
 /// Switches width and height of the text frame
 void SwTextFrm::SwapWidthAndHeight()
 {
-    if ( ! bIsSwapped )
+    if ( ! mbIsSwapped )
     {
         const long nPrtOfstX = Prt().Pos().X();
         Prt().Pos().X() = Prt().Pos().Y();
@@ -110,7 +110,7 @@ void SwTextFrm::SwapWidthAndHeight()
     Prt().Width( Prt().Height() );
     Prt().Height( nPrtWidth );
 
-    bIsSwapped = ! bIsSwapped;
+    mbIsSwapped = ! mbIsSwapped;
 }
 
 /**
@@ -139,7 +139,7 @@ void SwTextFrm::SwitchHorizontalToVertical( SwRect& rRect ) const
         rRect.Left(Frm().Left() + nOfstY);
     else
     {
-        if ( bIsSwapped )
+        if ( mbIsSwapped )
             rRect.Left( Frm().Left() + Frm().Height() - nOfstY );
         else
             // frame is rotated
@@ -164,7 +164,7 @@ void SwTextFrm::SwitchHorizontalToVertical( Point& rPoint ) const
         rPoint.X() = Frm().Left() + nOfstY;
     else
     {
-        if ( bIsSwapped )
+        if ( mbIsSwapped )
             rPoint.X() = Frm().Left() + Frm().Height() - nOfstY;
         else
             // calc rotated coords
@@ -198,7 +198,7 @@ void SwTextFrm::SwitchVerticalToHorizontal( SwRect& rRect ) const
         nOfstX = rRect.Left() - Frm().Left();
     else
     {
-        if ( bIsSwapped )
+        if ( mbIsSwapped )
             nOfstX = Frm().Left() + Frm().Height() - ( rRect.Left() + rRect.Width() );
         else
             nOfstX = Frm().Left() + Frm().Width() - ( rRect.Left() + rRect.Width() );
@@ -228,7 +228,7 @@ void SwTextFrm::SwitchVerticalToHorizontal( Point& rPoint ) const
         nOfstX = rPoint.X() - Frm().Left();
     else
     {
-        if ( bIsSwapped )
+        if ( mbIsSwapped )
             nOfstX = Frm().Left() + Frm().Height() - rPoint.X();
         else
             nOfstX = Frm().Left() + Frm().Width() - rPoint.X();
@@ -351,26 +351,26 @@ void SwTextFrm::Init()
 
 SwTextFrm::SwTextFrm(SwTextNode * const pNode, SwFrm* pSib )
     : SwContentFrm( pNode, pSib )
-    , nAllLines( 0 )
-    , nThisLines( 0 )
+    , mnAllLines( 0 )
+    , mnThisLines( 0 )
     , mnFlyAnchorOfst( 0 )
     , mnFlyAnchorOfstNoWrap( 0 )
     , mnFootnoteLine( 0 )
     , mnHeightOfLastLine( 0 ) // OD 2004-03-17 #i11860#
     , mnAdditionalFirstLineOffset( 0 )
-    , nOfst( 0 )
-    , nCacheIdx( USHRT_MAX )
-    , bLocked( false )
-    , bWidow( false )
-    , bJustWidow( false )
-    , bEmpty( false )
-    , bInFootnoteConnect( false )
-    , bFootnote( false )
-    , bRepaint( false )
-    , bBlinkPor( false )
-    , bFieldFollow( false )
-    , bHasAnimation( false )
-    , bIsSwapped( false )
+    , mnOffset( 0 )
+    , mnCacheIndex( USHRT_MAX )
+    , mbLocked( false )
+    , mbWidow( false )
+    , mbJustWidow( false )
+    , mbEmpty( false )
+    , mbInFootnoteConnect( false )
+    , mbFootnote( false )
+    , mbRepaint( false )
+    , mbHasBlinkPortions( false )
+    , mbFieldFollow( false )
+    , mbHasAnimation( false )
+    , mbIsSwapped( false )
     , mbFollowFormatAllowed( true ) // OD 14.03.2003 #i11760#
 {
     mnFrmType = FRM_TXT;
@@ -2468,13 +2468,13 @@ void SwTextFrm::ChgThisLines()
     else if ( rInf.IsCountBlankLines() )
         nNew = 1;
 
-    if ( nNew != nThisLines )
+    if ( nNew != mnThisLines )
     {
         if ( !IsInTab() && GetAttrSet()->GetLineNumber().IsCount() )
         {
-            nAllLines -= nThisLines;
-            nThisLines = nNew;
-            nAllLines  += nThisLines;
+            mnAllLines -= mnThisLines;
+            mnThisLines = nNew;
+            mnAllLines  += mnThisLines;
             SwFrm *pNxt = GetNextContentFrm();
             while( pNxt && pNxt->IsInTab() )
             {
@@ -2493,7 +2493,7 @@ void SwTextFrm::ChgThisLines()
             }
         }
         else // Paragraphs which are not counted should not manipulate the AllLines.
-            nThisLines = nNew;
+            mnThisLines = nNew;
     }
 }
 
@@ -2537,7 +2537,7 @@ void SwTextFrm::RecalcAllLines()
 
         if ( nOld != nNewNum )
         {
-            nAllLines = nNewNum;
+            mnAllLines = nNewNum;
             SwContentFrm *pNxt = GetNextContentFrm();
             while ( pNxt &&
                     (pNxt->IsInTab() || pNxt->IsInDocBody() != IsInDocBody()) )
diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx
index 4eff4874557b..4cc60f316727 100644
--- a/sw/source/core/text/txtftn.cxx
+++ b/sw/source/core/text/txtftn.cxx
@@ -86,7 +86,7 @@ void SwTextFrm::CalcFootnoteFlag( sal_Int32 nStop )// For testing the SplitFrm
 void SwTextFrm::CalcFootnoteFlag()
 #endif
 {
-    bFootnote = false;
+    mbFootnote = false;
 
     const SwpHints *pHints = GetTextNode()->GetpSwpHints();
     if( !pHints )
@@ -111,7 +111,7 @@ void SwTextFrm::CalcFootnoteFlag()
                 break;
             if( GetOfst() <= nIdx )
             {
-                bFootnote = true;
+                mbFootnote = true;
                 break;
             }
         }
@@ -584,8 +584,8 @@ void SwTextFrm::ConnectFootnote( SwTextFootnote *pFootnote, const SwTwips nDeadL
     OSL_ENSURE( !IsVertical() || !IsSwapped(),
             "SwTextFrm::ConnectFootnote with swapped frame" );
 
-    bFootnote = true;
-    bInFootnoteConnect = true; // Just reset!
+    mbFootnote = true;
+    mbInFootnoteConnect = true; // Just reset!
     const bool bEnd = pFootnote->GetFootnote().IsEndNote();
 
     // We want to store this value, because it is needed as a fallback
@@ -647,7 +647,7 @@ void SwTextFrm::ConnectFootnote( SwTextFootnote *pFootnote, const SwTwips nDeadL
             }
             else if( pSrcFrm != this )
                 SwFootnoteBossFrm::ChangeFootnoteRef( pSrcFrm, pFootnote, this );
-            bInFootnoteConnect = false;
+            mbInFootnoteConnect = false;
             return;
         }
         else if( pSrcFrm )
@@ -668,7 +668,7 @@ void SwTextFrm::ConnectFootnote( SwTextFootnote *pFootnote, const SwTwips nDeadL
             pBoss->AppendFootnote( this, pFootnote );
         else if( pSrcFrm != this )
             SwFootnoteBossFrm::ChangeFootnoteRef( pSrcFrm, pFootnote, this );
-        bInFootnoteConnect = false;
+        mbInFootnoteConnect = false;
         return;
     }
 
@@ -710,7 +710,7 @@ void SwTextFrm::ConnectFootnote( SwTextFootnote *pFootnote, const SwTwips nDeadL
                         // So that we don't miss anything
                         pSh->InvalidateWindows( pCont->Frm() );
                 }
-                bInFootnoteConnect = false;
+                mbInFootnoteConnect = false;
                 return;
             }
             else
@@ -781,7 +781,7 @@ void SwTextFrm::ConnectFootnote( SwTextFootnote *pFootnote, const SwTwips nDeadL
     nRstHeight = GetRstHeight();
     (void)nRstHeight;
 #endif
-    bInFootnoteConnect = false;
+    mbInFootnoteConnect = false;
     return;
 }