sw: prefix members of SwFlyFrm

Change-Id: I69ff87617e4be128b1db6a04c80ce948c1901683

5 files changed, 90 insertions, 90 deletions

diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx
index a619b080ca3b..054318b47b54 100644
--- a/sw/source/core/inc/flyfrm.hxx
+++ b/sw/source/core/inc/flyfrm.hxx
@@ -74,7 +74,7 @@ class SwFlyFrm : public SwLayoutFrm, public SwAnchoredObject
 
 protected:
     // Predecessor/Successor for chaining with text flow
-    SwFlyFrm *pPrevLink, *pNextLink;
+    SwFlyFrm *m_pPrevLink, *m_pNextLink;
 
 private:
     // It must be possible to block Content-bound flys so that they will be not
@@ -83,38 +83,38 @@ private:
     // the constructor call of the root object since otherwise the anchor will
     // be formatted before the root is anchored correctly to a shell and
     // because too much would be formatted as a result.
-    bool bLocked :1;
+    bool m_bLocked :1;
     // true if the background of NotifyDTor needs to be notified at the end
     // of a MakeAll() call.
-    bool bNotifyBack :1;
+    bool m_bNotifyBack :1;
 
 protected:
     // Pos, PrtArea or SSize have been invalidated - they will be evaluated
     // again immediately because they have to be valid _at all time_.
     // The invalidation is tracked here so that LayAction knows about it and
     // can handle it properly. Exceptions prove the rule.
-    bool bInvalid :1;
+    bool m_bInvalid :1;
 
     // true if the proposed height of an attribute is a minimal height
     // (this means that the frame can grow higher if needed)
-    bool bMinHeight :1;
+    bool m_bMinHeight :1;
     // true if the fly frame could not format position/size based on its
     // attributes, e.g. because there was not enough space.
-    bool bHeightClipped :1;
-    bool bWidthClipped :1;
+    bool m_bHeightClipped :1;
+    bool m_bWidthClipped :1;
     // If true then call only the format after adjusting the width (CheckClip);
     // but the width will not be re-evaluated based on the attributes.
-    bool bFormatHeightOnly :1;
+    bool m_bFormatHeightOnly :1;
 
-    bool bInCnt :1;        ///< FLY_AS_CHAR, anchored as character
-    bool bAtCnt :1;        ///< FLY_AT_PARA, anchored at paragraph
-    bool bLayout :1;       ///< FLY_AT_PAGE, FLY_AT_FLY, at page or at frame
-    bool bAutoPosition :1; ///< FLY_AT_CHAR, anchored at character
+    bool m_bInCnt :1;        ///< FLY_AS_CHAR, anchored as character
+    bool m_bAtCnt :1;        ///< FLY_AT_PARA, anchored at paragraph
+    bool m_bLayout :1;       ///< FLY_AT_PAGE, FLY_AT_FLY, at page or at frame
+    bool m_bAutoPosition :1; ///< FLY_AT_CHAR, anchored at character
 
-    bool bNoShrink :1;     ///< temporary forbid shrinking to avoid loops
+    bool m_bNoShrink :1;     ///< temporary forbid shrinking to avoid loops
     // If true, the content of the fly frame will not be deleted when it
     // is moved to an invisible layer.
-    bool bLockDeleteContent :1;
+    bool m_bLockDeleteContent :1;
 
     friend class SwNoTextFrm; // is allowed to call NotifyBackground
 
@@ -125,8 +125,8 @@ protected:
     void MakePrtArea( const SwBorderAttrs &rAttrs );
     void MakeContentPos( const SwBorderAttrs &rAttrs );
 
-    void Lock()         { bLocked = true; }
-    void Unlock()       { bLocked = false; }
+    void Lock()         { m_bLocked = true; }
+    void Unlock()       { m_bLocked = false; }
 
     Size CalcRel( const SwFormatFrmSize &rSz ) const;
     SwTwips CalcAutoWidth() const;
@@ -175,8 +175,8 @@ public:
 
     bool FrmSizeChg( const SwFormatFrmSize & );
 
-    SwFlyFrm *GetPrevLink() const { return pPrevLink; }
-    SwFlyFrm *GetNextLink() const { return pNextLink; }
+    SwFlyFrm *GetPrevLink() const { return m_pPrevLink; }
+    SwFlyFrm *GetNextLink() const { return m_pNextLink; }
 
     static void ChainFrames( SwFlyFrm *pMaster, SwFlyFrm *pFollow );
     static void UnchainFrames( SwFlyFrm *pMaster, SwFlyFrm *pFollow );
@@ -189,26 +189,26 @@ public:
     void NotifyDrawObj();
 
     void ChgRelPos( const Point &rAbsPos );
-    bool IsInvalid() const { return bInvalid; }
-    void Invalidate() const { const_cast<SwFlyFrm*>(this)->bInvalid = true; }
-    void Validate() const { const_cast<SwFlyFrm*>(this)->bInvalid = false; }
-
-    bool IsMinHeight()  const { return bMinHeight; }
-    bool IsLocked()     const { return bLocked; }
-    bool IsAutoPos()    const { return bAutoPosition; }
-    bool IsFlyInCntFrm() const { return bInCnt; }
-    bool IsFlyFreeFrm() const { return bAtCnt || bLayout; }
-    bool IsFlyLayFrm() const { return bLayout; }
-    bool IsFlyAtCntFrm() const { return bAtCnt; }
-
-    bool IsNotifyBack() const { return bNotifyBack; }
-    void SetNotifyBack()      { bNotifyBack = true; }
-    void ResetNotifyBack()    { bNotifyBack = false; }
-    bool IsNoShrink()   const { return bNoShrink; }
-    bool IsLockDeleteContent()  const { return bLockDeleteContent; }
-
-    bool IsClipped()        const   { return bHeightClipped || bWidthClipped; }
-    bool IsHeightClipped()  const   { return bHeightClipped; }
+    bool IsInvalid() const { return m_bInvalid; }
+    void Invalidate() const { const_cast<SwFlyFrm*>(this)->m_bInvalid = true; }
+    void Validate() const { const_cast<SwFlyFrm*>(this)->m_bInvalid = false; }
+
+    bool IsMinHeight()  const { return m_bMinHeight; }
+    bool IsLocked()     const { return m_bLocked; }
+    bool IsAutoPos()    const { return m_bAutoPosition; }
+    bool IsFlyInCntFrm() const { return m_bInCnt; }
+    bool IsFlyFreeFrm() const { return m_bAtCnt || m_bLayout; }
+    bool IsFlyLayFrm() const { return m_bLayout; }
+    bool IsFlyAtCntFrm() const { return m_bAtCnt; }
+
+    bool IsNotifyBack() const { return m_bNotifyBack; }
+    void SetNotifyBack()      { m_bNotifyBack = true; }
+    void ResetNotifyBack()    { m_bNotifyBack = false; }
+    bool IsNoShrink()   const { return m_bNoShrink; }
+    bool IsLockDeleteContent()  const { return m_bLockDeleteContent; }
+
+    bool IsClipped()        const   { return m_bHeightClipped || m_bWidthClipped; }
+    bool IsHeightClipped()  const   { return m_bHeightClipped; }
 
     bool IsLowerOf( const SwLayoutFrm* pUpper ) const;
     inline bool IsUpperOf( const SwFlyFrm& _rLower ) const
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 47838b1a046c..ff51d377f405 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -71,21 +71,21 @@ TYPEINIT2(SwFlyFrm,SwLayoutFrm,SwAnchoredObject);
 SwFlyFrm::SwFlyFrm( SwFlyFrameFormat *pFormat, SwFrm* pSib, SwFrm *pAnch ) :
     SwLayoutFrm( pFormat, pSib ),
     SwAnchoredObject(), // #i26791#
-    pPrevLink( 0 ),
-    pNextLink( 0 ),
-    bInCnt( false ),
-    bAtCnt( false ),
-    bLayout( false ),
-    bAutoPosition( false ),
-    bNoShrink( false ),
-    bLockDeleteContent( false ),
+    m_pPrevLink( 0 ),
+    m_pNextLink( 0 ),
+    m_bInCnt( false ),
+    m_bAtCnt( false ),
+    m_bLayout( false ),
+    m_bAutoPosition( false ),
+    m_bNoShrink( false ),
+    m_bLockDeleteContent( false ),
     m_bValidContentPos( false )
 {
     mnFrmType = FRM_FLY;
 
-    bInvalid = bNotifyBack = true;
-    bLocked  = bMinHeight =
-    bHeightClipped = bWidthClipped = bFormatHeightOnly = false;
+    m_bInvalid = m_bNotifyBack = true;
+    m_bLocked  = m_bMinHeight =
+    m_bHeightClipped = m_bWidthClipped = m_bFormatHeightOnly = false;
 
     // Size setting: Fixed size is always the width
     const SwFormatFrmSize &rFrmSize = pFormat->GetFrmSize();
@@ -137,7 +137,7 @@ SwFlyFrm::SwFlyFrm( SwFlyFrameFormat *pFormat, SwFrm* pSib, SwFrm *pAnch ) :
 
     // Fixed or variable Height?
     if ( rFrmSize.GetHeightSizeType() == ATT_MIN_SIZE )
-        bMinHeight = true;
+        m_bMinHeight = true;
     else if ( rFrmSize.GetHeightSizeType() == ATT_FIX_SIZE )
         mbFixSize = true;
 
@@ -204,7 +204,7 @@ void SwFlyFrm::InsertCnt()
         if ( Lower() && Lower()->IsNoTextFrm() )
         {
             mbFixSize = true;
-            bMinHeight = false;
+            m_bMinHeight = false;
         }
     }
 }
@@ -486,8 +486,8 @@ void SwFlyFrm::ChainFrames( SwFlyFrm *pMaster, SwFlyFrm *pFollow )
     OSL_ENSURE( !pMaster->GetNextLink(), "link can not be changed" );
     OSL_ENSURE( !pFollow->GetPrevLink(), "link can not be changed" );
 
-    pMaster->pNextLink = pFollow;
-    pFollow->pPrevLink = pMaster;
+    pMaster->m_pNextLink = pFollow;
+    pFollow->m_pPrevLink = pMaster;
 
     if ( pMaster->ContainsContent() )
     {
@@ -530,8 +530,8 @@ void SwFlyFrm::ChainFrames( SwFlyFrm *pMaster, SwFlyFrm *pFollow )
 
 void SwFlyFrm::UnchainFrames( SwFlyFrm *pMaster, SwFlyFrm *pFollow )
 {
-    pMaster->pNextLink = 0;
-    pFollow->pPrevLink = 0;
+    pMaster->m_pNextLink = 0;
+    pFollow->m_pPrevLink = 0;
 
     if ( pFollow->ContainsContent() )
     {
@@ -638,18 +638,18 @@ bool SwFlyFrm::FrmSizeChg( const SwFormatFrmSize &rFrmSize )
     bool bRet = false;
     SwTwips nDiffHeight = Frm().Height();
     if ( rFrmSize.GetHeightSizeType() == ATT_VAR_SIZE )
-        mbFixSize = bMinHeight = false;
+        mbFixSize = m_bMinHeight = false;
     else
     {
         if ( rFrmSize.GetHeightSizeType() == ATT_FIX_SIZE )
         {
             mbFixSize = true;
-            bMinHeight = false;
+            m_bMinHeight = false;
         }
         else if ( rFrmSize.GetHeightSizeType() == ATT_MIN_SIZE )
         {
             mbFixSize = false;
-            bMinHeight = true;
+            m_bMinHeight = true;
         }
         nDiffHeight -= rFrmSize.GetHeight();
     }
@@ -676,7 +676,7 @@ bool SwFlyFrm::FrmSizeChg( const SwFormatFrmSize &rFrmSize )
         else if ( Lower()->IsNoTextFrm() )
         {
             mbFixSize = true;
-            bMinHeight = false;
+            m_bMinHeight = false;
         }
     }
     return bRet;
@@ -1087,7 +1087,7 @@ bool SwFlyFrm::GetInfo( SfxPoolItem & rInfo ) const
 void SwFlyFrm::_Invalidate( SwPageFrm *pPage )
 {
     InvalidatePage( pPage );
-    bNotifyBack = bInvalid = true;
+    m_bNotifyBack = m_bInvalid = true;
 
     SwFlyFrm *pFrm;
     if ( GetAnchorFrm() && 0 != (pFrm = AnchorFrm()->FindFlyFrm()) )
@@ -1330,7 +1330,7 @@ void SwFlyFrm::Format( vcl::RenderContext* /*pRenderContext*/, const SwBorderAtt
             }
         }
 
-        if ( !bFormatHeightOnly )
+        if ( !m_bFormatHeightOnly )
         {
             OSL_ENSURE( aRelSize == CalcRel( rFrmSz ), "SwFlyFrm::Format CalcRel problem" );
             SwTwips nNewSize = bVert ? aRelSize.Height() : aRelSize.Width();
@@ -1826,7 +1826,7 @@ SwTwips SwFlyFrm::_Grow( SwTwips nDist, bool bTst )
         {
             const SwRect aOld( GetObjRectWithSpaces() );
             _InvalidateSize();
-            const bool bOldLock = bLocked;
+            const bool bOldLock = m_bLocked;
             Unlock();
             if ( IsFlyFreeFrm() )
             {
@@ -1841,11 +1841,11 @@ SwTwips SwFlyFrm::_Grow( SwTwips nDist, bool bTst )
                 // Suppress format of width for autowidth frame, because the
                 // format of the width would call <SwTextFrm::CalcFitToContent()>
                 // for the lower frame, which initiated this grow.
-                const bool bOldFormatHeightOnly = bFormatHeightOnly;
+                const bool bOldFormatHeightOnly = m_bFormatHeightOnly;
                 const SwFormatFrmSize& rFrmSz = GetFormat()->GetFrmSize();
                 if ( rFrmSz.GetWidthSizeType() != ATT_FIX_SIZE )
                 {
-                    bFormatHeightOnly = true;
+                    m_bFormatHeightOnly = true;
                 }
                 static_cast<SwFlyFreeFrm*>(this)->SetNoMoveOnCheckClip( true );
                 static_cast<SwFlyFreeFrm*>(this)->SwFlyFreeFrm::MakeAll(getRootFrm()->GetCurrShell()->GetOut());
@@ -1853,7 +1853,7 @@ SwTwips SwFlyFrm::_Grow( SwTwips nDist, bool bTst )
                 // #i55416#
                 if ( rFrmSz.GetWidthSizeType() != ATT_FIX_SIZE )
                 {
-                    bFormatHeightOnly = bOldFormatHeightOnly;
+                    m_bFormatHeightOnly = bOldFormatHeightOnly;
                 }
             }
             else
@@ -1921,7 +1921,7 @@ SwTwips SwFlyFrm::_Shrink( SwTwips nDist, bool bTst )
         {
             const SwRect aOld( GetObjRectWithSpaces() );
             _InvalidateSize();
-            const bool bOldLocked = bLocked;
+            const bool bOldLocked = m_bLocked;
             Unlock();
             if ( IsFlyFreeFrm() )
             {
@@ -1936,11 +1936,11 @@ SwTwips SwFlyFrm::_Shrink( SwTwips nDist, bool bTst )
                 // Suppress format of width for autowidth frame, because the
                 // format of the width would call <SwTextFrm::CalcFitToContent()>
                 // for the lower frame, which initiated this shrink.
-                const bool bOldFormatHeightOnly = bFormatHeightOnly;
+                const bool bOldFormatHeightOnly = m_bFormatHeightOnly;
                 const SwFormatFrmSize& rFrmSz = GetFormat()->GetFrmSize();
                 if ( rFrmSz.GetWidthSizeType() != ATT_FIX_SIZE )
                 {
-                    bFormatHeightOnly = true;
+                    m_bFormatHeightOnly = true;
                 }
                 static_cast<SwFlyFreeFrm*>(this)->SetNoMoveOnCheckClip( true );
                 static_cast<SwFlyFreeFrm*>(this)->SwFlyFreeFrm::MakeAll(getRootFrm()->GetCurrShell()->GetOut());
@@ -1948,7 +1948,7 @@ SwTwips SwFlyFrm::_Shrink( SwTwips nDist, bool bTst )
                 // #i55416#
                 if ( rFrmSz.GetWidthSizeType() != ATT_FIX_SIZE )
                 {
-                    bFormatHeightOnly = bOldFormatHeightOnly;
+                    m_bFormatHeightOnly = bOldFormatHeightOnly;
                 }
             }
             else
diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx
index 5f045d50b78f..df3527e5e661 100644
--- a/sw/source/core/layout/flycnt.cxx
+++ b/sw/source/core/layout/flycnt.cxx
@@ -69,8 +69,8 @@ static inline SwTwips lcl_GetTopForObjPos(const SwContentFrm* pCnt, const bool b
 SwFlyAtCntFrm::SwFlyAtCntFrm( SwFlyFrameFormat *pFormat, SwFrm* pSib, SwFrm *pAnch ) :
     SwFlyFreeFrm( pFormat, pSib, pAnch )
 {
-    bAtCnt = true;
-    bAutoPosition = (FLY_AT_CHAR == pFormat->GetAnchor().GetAnchorId());
+    m_bAtCnt = true;
+    m_bAutoPosition = (FLY_AT_CHAR == pFormat->GetAnchor().GetAnchorId());
 }
 
 // #i28701#
diff --git a/sw/source/core/layout/flyincnt.cxx b/sw/source/core/layout/flyincnt.cxx
index a30bfe5bb17a..832e465ab3e6 100644
--- a/sw/source/core/layout/flyincnt.cxx
+++ b/sw/source/core/layout/flyincnt.cxx
@@ -31,7 +31,7 @@
 SwFlyInCntFrm::SwFlyInCntFrm( SwFlyFrameFormat *pFormat, SwFrm* pSib, SwFrm *pAnch ) :
     SwFlyFrm( pFormat, pSib, pAnch )
 {
-    bInCnt = bInvalidLayout = bInvalidContent = true;
+    m_bInCnt = bInvalidLayout = bInvalidContent = true;
     SwTwips nRel = pFormat->GetVertOrient().GetPos();
     // OD 2004-05-27 #i26791# - member <aRelPos> moved to <SwAnchoredObject>
     Point aRelPos;
@@ -81,7 +81,7 @@ void SwFlyInCntFrm::SetRefPoint( const Point& rPoint,
     {
         InvalidatePage();
         mbValidPos = false;
-        bInvalid  = true;
+        m_bInvalid  = true;
         Calc(getRootFrm()->GetCurrShell()->GetOut());
         delete pNotify;
     }
@@ -223,7 +223,7 @@ void SwFlyInCntFrm::MakeAll(vcl::RenderContext* /*pRenderContext*/)
     const SwBorderAttrs &rAttrs = *aAccess.Get();
 
     if ( IsClipped() )
-        mbValidSize = bHeightClipped = bWidthClipped = false;
+        mbValidSize = m_bHeightClipped = m_bWidthClipped = false;
 
     while ( !mbValidPos || !mbValidSize || !mbValidPrtArea || !m_bValidContentPos )
     {
@@ -261,7 +261,7 @@ void SwFlyInCntFrm::MakeAll(vcl::RenderContext* /*pRenderContext*/)
             {
                 Frm().Width( pFrm->Prt().Width() );
                 mbValidPrtArea = false;
-                bWidthClipped = true;
+                m_bWidthClipped = true;
             }
         }
     }
diff --git a/sw/source/core/layout/flylay.cxx b/sw/source/core/layout/flylay.cxx
index d34f9d23dc47..7b6727d1f01b 100644
--- a/sw/source/core/layout/flylay.cxx
+++ b/sw/source/core/layout/flylay.cxx
@@ -127,7 +127,7 @@ void SwFlyFreeFrm::MakeAll(vcl::RenderContext* /*pRenderContext*/)
 
     if ( IsClipped() )
     {
-        mbValidSize = bHeightClipped = bWidthClipped = false;
+        mbValidSize = m_bHeightClipped = m_bWidthClipped = false;
         // no invalidation of position,
         // if anchored object is anchored inside a Writer fly frame,
         // its position is already locked, and it follows the text flow.
@@ -146,7 +146,7 @@ void SwFlyFreeFrm::MakeAll(vcl::RenderContext* /*pRenderContext*/)
     int nLoopControlRuns = 0;
     const int nLoopControlMax = 10;
 
-    while ( !mbValidPos || !mbValidSize || !mbValidPrtArea || bFormatHeightOnly || !m_bValidContentPos )
+    while ( !mbValidPos || !mbValidSize || !mbValidPrtArea || m_bFormatHeightOnly || !m_bValidContentPos )
     {
         SWRECTFN( this )
         const SwFormatFrmSize *pSz;
@@ -168,11 +168,11 @@ void SwFlyFreeFrm::MakeAll(vcl::RenderContext* /*pRenderContext*/)
                 m_bValidContentPos = false;
             }
 
-            if ( !mbValidSize || bFormatHeightOnly )
+            if ( !mbValidSize || m_bFormatHeightOnly )
             {
                 mbValidSize = false;
                 Format( getRootFrm()->GetCurrShell()->GetOut(), &rAttrs );
-                bFormatHeightOnly = false;
+                m_bFormatHeightOnly = false;
             }
         }
 
@@ -219,7 +219,7 @@ void SwFlyFreeFrm::MakeAll(vcl::RenderContext* /*pRenderContext*/)
 
 #if OSL_DEBUG_LEVEL > 0
     SWRECTFN( this )
-    OSL_ENSURE( bHeightClipped || ( (Frm().*fnRect->fnGetHeight)() > 0 &&
+    OSL_ENSURE( m_bHeightClipped || ( (Frm().*fnRect->fnGetHeight)() > 0 &&
             (Prt().*fnRect->fnGetHeight)() > 0),
             "SwFlyFreeFrm::Format(), flipping Fly." );
 
@@ -302,7 +302,7 @@ void SwFlyFreeFrm::CheckClip( const SwFormatFrmSize &rSz )
                 Frm().Pos().Y() = std::max( aClip.Top(), nClipBot - Frm().Height() );
                 if ( Frm().Top() != nOld )
                     bAgain = true;
-                bHeightClipped = true;
+                m_bHeightClipped = true;
             }
         }
         if ( bRig )
@@ -319,7 +319,7 @@ void SwFlyFreeFrm::CheckClip( const SwFormatFrmSize &rSz )
                 else
                     bAgain = true;
             }
-            bWidthClipped = true;
+            m_bWidthClipped = true;
         }
         if ( bAgain )
             mbValidSize = false;
@@ -342,7 +342,7 @@ void SwFlyFreeFrm::CheckClip( const SwFormatFrmSize &rSz )
                 nDiff -= aFrmRect.Top(); // nDiff represents the available distance
                 nDiff = aFrmRect.Height() - nDiff;
                 aFrmRect.Height( aFrmRect.Height() - nDiff );
-                bHeightClipped = true;
+                m_bHeightClipped = true;
             }
             if ( bRig )
             {
@@ -350,7 +350,7 @@ void SwFlyFreeFrm::CheckClip( const SwFormatFrmSize &rSz )
                 nDiff -= aFrmRect.Left();// nDiff represents the available distance
                 nDiff = aFrmRect.Width() - nDiff;
                 aFrmRect.Width( aFrmRect.Width() - nDiff );
-                bWidthClipped = true;
+                m_bWidthClipped = true;
             }
 
             // #i17297# - no proportional
@@ -384,14 +384,14 @@ void SwFlyFreeFrm::CheckClip( const SwFormatFrmSize &rSz )
                 {
                     aFrmRect.Height( aFrmRect.Width() * aOldSize.Height() /
                                      aOldSize.Width() );
-                    bHeightClipped = true;
+                    m_bHeightClipped = true;
                 }
                 // Adjusted the height? change width proportionally
                 else if( aFrmRect.Height() != aOldSize.Height() )
                 {
                     aFrmRect.Width( aFrmRect.Height() * aOldSize.Width() /
                                     aOldSize.Height() );
-                    bWidthClipped = true;
+                    m_bWidthClipped = true;
                 }
 
                 // #i17297# - reactivate change
@@ -405,7 +405,7 @@ void SwFlyFreeFrm::CheckClip( const SwFormatFrmSize &rSz )
                 // this code.
                 if ( aFrmRect.HasArea() &&
                      static_cast<SwContentFrm*>(Lower())->GetNode()->GetOLENode() &&
-                     ( bWidthClipped || bHeightClipped ) )
+                     ( m_bWidthClipped || m_bHeightClipped ) )
                 {
                     SwFlyFrameFormat *pFormat = GetFormat();
                     pFormat->LockModify();
@@ -441,8 +441,8 @@ void SwFlyFreeFrm::CheckClip( const SwFormatFrmSize &rSz )
                 } while ( pLow );
                 ::CalcContent( this );
                 ColUnlock();
-                if ( !mbValidSize && !bWidthClipped )
-                    bFormatHeightOnly = mbValidSize = true;
+                if ( !mbValidSize && !m_bWidthClipped )
+                    m_bFormatHeightOnly = mbValidSize = true;
             }
             else
             {
@@ -470,7 +470,7 @@ bool SwFlyFreeFrm::IsFormatPossible() const
 SwFlyLayFrm::SwFlyLayFrm( SwFlyFrameFormat *pFormat, SwFrm* pSib, SwFrm *pAnch ) :
     SwFlyFreeFrm( pFormat, pSib, pAnch )
 {
-    bLayout = true;
+    m_bLayout = true;
 }
 
 // #i28701#