sw: prefix members of SwPageFrm

Change-Id: I7587c587a52310dbfee8e79a038495eb26b108b0

4 files changed, 48 insertions, 48 deletions

diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx
index e404302126ec..fb66080b808f 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -734,15 +734,15 @@ void SwPageFrm::MakeAll(vcl::RenderContext* pRenderContext)
                             nBot += nTmp;
                             // Here we check whether paragraph anchored objects
                             // protrude outside the Body/FootnoteCont.
-                            if( pSortedObjs && !pFrm->IsHeaderFrm() &&
+                            if( m_pSortedObjs && !pFrm->IsHeaderFrm() &&
                                 !pFrm->IsFooterFrm() )
-                                lcl_CheckObjects( pSortedObjs, pFrm, nBot );
+                                lcl_CheckObjects( m_pSortedObjs, pFrm, nBot );
                             pFrm = pFrm->GetNext();
                         }
                         nBot += nBottom;
                         // And the page anchored ones
-                        if ( pSortedObjs )
-                            lcl_CheckObjects( pSortedObjs, this, nBot );
+                        if ( m_pSortedObjs )
+                            lcl_CheckObjects( m_pSortedObjs, this, nBot );
                         nBot -= Frm().Top();
                         // #i35143# - If second page frame
                         // exists, the first page doesn't have to fulfill the
diff --git a/sw/source/core/layout/flylay.cxx b/sw/source/core/layout/flylay.cxx
index 45b6a22171fd..1c96097a42d8 100644
--- a/sw/source/core/layout/flylay.cxx
+++ b/sw/source/core/layout/flylay.cxx
@@ -587,10 +587,10 @@ void SwPageFrm::AppendFlyToPage( SwFlyFrm *pNew )
     {
         InvalidateFlyContent();
 
-        if ( !pSortedObjs )
-            pSortedObjs = new SwSortedObjs();
+        if ( !m_pSortedObjs )
+            m_pSortedObjs = new SwSortedObjs();
 
-        const bool bSucessInserted = pSortedObjs->Insert( *pNew );
+        const bool bSucessInserted = m_pSortedObjs->Insert( *pNew );
         OSL_ENSURE( bSucessInserted, "Fly not inserted in Sorted." );
         (void) bSucessInserted;
 
@@ -669,13 +669,13 @@ void SwPageFrm::RemoveFlyFromPage( SwFlyFrm *pToRemove )
     // executed.
     // Remove it _before_ disposing accessible frames to avoid accesses to
     // the Frm from event handlers.
-    if (pSortedObjs)
+    if (m_pSortedObjs)
     {
-        pSortedObjs->Remove(*pToRemove);
-        if (!pSortedObjs->size())
+        m_pSortedObjs->Remove(*pToRemove);
+        if (!m_pSortedObjs->size())
         {
-            delete pSortedObjs;
-            pSortedObjs = 0;
+            delete m_pSortedObjs;
+            m_pSortedObjs = 0;
         }
     }
 
@@ -727,18 +727,18 @@ void SwPageFrm::MoveFly( SwFlyFrm *pToMove, SwPageFrm *pDest )
     }
 
     // The FlyColl might be gone already, because the page's dtor is being executed.
-    if ( pSortedObjs )
+    if ( m_pSortedObjs )
     {
-        pSortedObjs->Remove( *pToMove );
-        if ( !pSortedObjs->size() )
+        m_pSortedObjs->Remove( *pToMove );
+        if ( !m_pSortedObjs->size() )
         {
-            DELETEZ( pSortedObjs );
+            DELETEZ( m_pSortedObjs );
         }
     }
 
     // Register
     if ( !pDest->GetSortedObjs() )
-        pDest->pSortedObjs = new SwSortedObjs();
+        pDest->m_pSortedObjs = new SwSortedObjs();
 
     const bool bSucessInserted = pDest->GetSortedObjs()->Insert( *pToMove );
     OSL_ENSURE( bSucessInserted, "Fly not inserted in Sorted." );
@@ -823,13 +823,13 @@ void SwPageFrm::AppendDrawObjToPage( SwAnchoredObject& _rNewObj )
         return;
     }
 
-    if ( !pSortedObjs )
+    if ( !m_pSortedObjs )
     {
-        pSortedObjs = new SwSortedObjs();
+        m_pSortedObjs = new SwSortedObjs();
     }
-    if ( !pSortedObjs->Insert( _rNewObj ) )
+    if ( !m_pSortedObjs->Insert( _rNewObj ) )
     {
-        OSL_ENSURE( pSortedObjs->Contains( _rNewObj ),
+        OSL_ENSURE( m_pSortedObjs->Contains( _rNewObj ),
                 "Drawing object not appended into list <pSortedObjs>." );
     }
     // #i87493#
@@ -849,12 +849,12 @@ void SwPageFrm::RemoveDrawObjFromPage( SwAnchoredObject& _rToRemoveObj )
         return;
     }
 
-    if ( pSortedObjs )
+    if ( m_pSortedObjs )
     {
-        pSortedObjs->Remove( _rToRemoveObj );
-        if ( !pSortedObjs->size() )
+        m_pSortedObjs->Remove( _rToRemoveObj );
+        if ( !m_pSortedObjs->size() )
         {
-            DELETEZ( pSortedObjs );
+            DELETEZ( m_pSortedObjs );
         }
         if ( GetUpper() )
         {
diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx
index 71ec07ed4526..3c43775dcffe 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -155,26 +155,26 @@ void SwBodyFrm::Format( vcl::RenderContext* /*pRenderContext*/, const SwBorderAt
 
 SwPageFrm::SwPageFrm( SwFrameFormat *pFormat, SwFrm* pSib, SwPageDesc *pPgDsc ) :
     SwFootnoteBossFrm( pFormat, pSib ),
-    pSortedObjs( 0 ),
-    pDesc( pPgDsc ),
-    nPhyPageNum( 0 )
+    m_pSortedObjs( 0 ),
+    m_pDesc( pPgDsc ),
+    m_nPhyPageNum( 0 )
 {
     SetDerivedVert( false );
     SetDerivedR2L( false );
-    if( pDesc )
+    if( m_pDesc )
     {
-        bHasGrid = true;
+        m_bHasGrid = true;
         SwTextGridItem const*const pGrid(GetGridItem(this));
         if( !pGrid )
-            bHasGrid = false;
+            m_bHasGrid = false;
     }
     else
-        bHasGrid = false;
+        m_bHasGrid = false;
     SetMaxFootnoteHeight( pPgDsc->GetFootnoteInfo().GetHeight() ?
                      pPgDsc->GetFootnoteInfo().GetHeight() : LONG_MAX ),
     mnFrmType = FRM_PAGE;
-    bInvalidLayout = bInvalidContent = bInvalidSpelling = bInvalidSmartTags = bInvalidAutoCmplWrds = bInvalidWordCount = true;
-    bInvalidFlyLayout = bInvalidFlyContent = bInvalidFlyInCnt = bFootnotePage = bEndNotePage = false;
+    m_bInvalidLayout = m_bInvalidContent = m_bInvalidSpelling = m_bInvalidSmartTags = m_bInvalidAutoCmplWrds = m_bInvalidWordCount = true;
+    m_bInvalidFlyLayout = m_bInvalidFlyContent = m_bInvalidFlyInCnt = m_bFootnotePage = m_bEndNotePage = false;
 
     SwViewShell *pSh = getRootFrm()->GetCurrShell();
     const bool bBrowseMode = pSh && pSh->GetViewOptions()->getBrowseMode();
@@ -192,9 +192,9 @@ SwPageFrm::SwPageFrm( SwFrameFormat *pFormat, SwFrm* pSib, SwPageDesc *pPgDsc )
 
     // create and insert body area if it is not a blank page
     SwDoc *pDoc = pFormat->GetDoc();
-    if ( !(bEmptyPage = (pFormat == pDoc->GetEmptyPageFormat())) )
+    if ( !(m_bEmptyPage = (pFormat == pDoc->GetEmptyPageFormat())) )
     {
-        bEmptyPage = false;
+        m_bEmptyPage = false;
         Calc(pRenderContext); // so that the PrtArea is correct
         SwBodyFrm *pBodyFrm = new SwBodyFrm( pDoc->GetDfltFrameFormat(), this );
         pBodyFrm->ChgSize( Prt().SSize() );
@@ -232,17 +232,17 @@ void SwPageFrm::DestroyImpl()
     }
 
     // empty FlyContainer, deletion of the Flys is done by the anchor (in base class SwFrm)
-    if ( pSortedObjs )
+    if ( m_pSortedObjs )
     {
         // Objects can be anchored at pages that are before their anchors (why ever...).
         // In such cases, we would access already freed memory.
-        for ( size_t i = 0; i < pSortedObjs->size(); ++i )
+        for ( size_t i = 0; i < m_pSortedObjs->size(); ++i )
         {
-            SwAnchoredObject* pAnchoredObj = (*pSortedObjs)[i];
+            SwAnchoredObject* pAnchoredObj = (*m_pSortedObjs)[i];
             pAnchoredObj->SetPageFrm( 0L );
         }
-        delete pSortedObjs;
-        pSortedObjs = 0; // reset to zero to prevent problems when detaching the Flys
+        delete m_pSortedObjs;
+        m_pSortedObjs = 0; // reset to zero to prevent problems when detaching the Flys
     }
 
     if ( !IsEmptyPage() ) //#59184# unnessesary for empty pages
@@ -276,11 +276,11 @@ SwPageFrm::~SwPageFrm()
 
 void SwPageFrm::CheckGrid( bool bInvalidate )
 {
-    bool bOld = bHasGrid;
-    bHasGrid = true;
+    bool bOld = m_bHasGrid;
+    m_bHasGrid = true;
     SwTextGridItem const*const pGrid(GetGridItem(this));
-    bHasGrid = 0 != pGrid;
-    if( bInvalidate || bOld != bHasGrid )
+    m_bHasGrid = 0 != pGrid;
+    if( bInvalidate || bOld != m_bHasGrid )
     {
         SwLayoutFrm* pBody = FindBodyCont();
         if( pBody )
@@ -538,7 +538,7 @@ void SwPageFrm::SwClientNotify(const SwModify& rModify, const SfxHint& rHint)
     {
         // currently the savest way:
         static_cast<SwRootFrm*>(GetUpper())->SetSuperfluous();
-        SetMaxFootnoteHeight(pDesc->GetFootnoteInfo().GetHeight());
+        SetMaxFootnoteHeight(m_pDesc->GetFootnoteInfo().GetHeight());
         if(!GetMaxFootnoteHeight())
             SetMaxFootnoteHeight(LONG_MAX);
         SetColMaxFootnoteHeight();
@@ -690,7 +690,7 @@ bool SwPageFrm::GetInfo( SfxPoolItem & rInfo ) const
 
 void  SwPageFrm::SetPageDesc( SwPageDesc *pNew, SwFrameFormat *pFormat )
 {
-    pDesc = pNew;
+    m_pDesc = pNew;
     if ( pFormat )
         SetFrameFormat( pFormat );
 }
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index ac06ab9b76ca..69751e0de87f 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -5665,7 +5665,7 @@ void SwLayoutFrm::PaintColLines( const SwRect &rRect, const SwFormatCol &rFormat
 
 void SwPageFrm::PaintGrid( OutputDevice* pOut, SwRect &rRect ) const
 {
-    if( !bHasGrid || gProp.pSRetoucheFly || gProp.pSRetoucheFly2 )
+    if( !m_bHasGrid || gProp.pSRetoucheFly || gProp.pSRetoucheFly2 )
         return;
     SwTextGridItem const*const pGrid(GetGridItem(this));
     if( pGrid && ( OUTDEV_PRINTER != pOut->GetOutDevType() ?