sw: prefix members of SwOrderIter

Change-Id: I9bea22d07a95eb521d9c3729b2aba1694cf02def

2 files changed, 34 insertions, 34 deletions

diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx
index d40a2c48a17b..7d746ff4abfc 100644
--- a/sw/source/core/inc/frmtool.hxx
+++ b/sw/source/core/inc/frmtool.hxx
@@ -392,15 +392,15 @@ public:
 // SortArray needs to be traversed.
 class SwOrderIter
 {
-    const SwPageFrm *pPage;
-    const SdrObject *pCurrent;
-    const bool bFlysOnly;
+    const SwPageFrm *m_pPage;
+    const SdrObject *m_pCurrent;
+    const bool m_bFlysOnly;
 
 public:
     SwOrderIter( const SwPageFrm *pPage, bool bFlysOnly = true );
 
-    void             Current( const SdrObject *pNew ) { pCurrent = pNew; }
-    const SdrObject *operator()() const { return pCurrent; }
+    void             Current( const SdrObject *pNew ) { m_pCurrent = pNew; }
+    const SdrObject *operator()() const { return m_pCurrent; }
     const SdrObject *Top();
     const SdrObject *Bottom();
     const SdrObject *Next();
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index ce1db4047cd9..6928c1286118 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -2226,18 +2226,18 @@ SwBorderAttrs *SwBorderAttrAccess::Get()
 }
 
 SwOrderIter::SwOrderIter( const SwPageFrm *pPg, bool bFlys ) :
-    pPage( pPg ),
-    pCurrent( 0 ),
-    bFlysOnly( bFlys )
+    m_pPage( pPg ),
+    m_pCurrent( 0 ),
+    m_bFlysOnly( bFlys )
 {
 }
 
 const SdrObject *SwOrderIter::Top()
 {
-    pCurrent = 0;
-    if ( pPage->GetSortedObjs() )
+    m_pCurrent = 0;
+    if ( m_pPage->GetSortedObjs() )
     {
-        const SwSortedObjs *pObjs = pPage->GetSortedObjs();
+        const SwSortedObjs *pObjs = m_pPage->GetSortedObjs();
         if ( pObjs->size() )
         {
             sal_uInt32 nTopOrd = 0;
@@ -2245,82 +2245,82 @@ const SdrObject *SwOrderIter::Top()
             for ( size_t i = 0; i < pObjs->size(); ++i )
             {
                 const SdrObject* pObj = (*pObjs)[i]->GetDrawObj();
-                if ( bFlysOnly && dynamic_cast<const SwVirtFlyDrawObj*>( pObj) ==  nullptr )
+                if ( m_bFlysOnly && dynamic_cast<const SwVirtFlyDrawObj*>( pObj) ==  nullptr )
                     continue;
                 sal_uInt32 nTmp = pObj->GetOrdNumDirect();
                 if ( nTmp >= nTopOrd )
                 {
                     nTopOrd = nTmp;
-                    pCurrent = pObj;
+                    m_pCurrent = pObj;
                 }
             }
         }
     }
-    return pCurrent;
+    return m_pCurrent;
 }
 
 const SdrObject *SwOrderIter::Bottom()
 {
-    pCurrent = 0;
-    if ( pPage->GetSortedObjs() )
+    m_pCurrent = 0;
+    if ( m_pPage->GetSortedObjs() )
     {
         sal_uInt32 nBotOrd = USHRT_MAX;
-        const SwSortedObjs *pObjs = pPage->GetSortedObjs();
+        const SwSortedObjs *pObjs = m_pPage->GetSortedObjs();
         if ( pObjs->size() )
         {
             (*pObjs)[0]->GetDrawObj()->GetOrdNum();  // force updating
             for ( size_t i = 0; i < pObjs->size(); ++i )
             {
                 const SdrObject* pObj = (*pObjs)[i]->GetDrawObj();
-                if ( bFlysOnly && dynamic_cast<const SwVirtFlyDrawObj*>( pObj) ==  nullptr )
+                if ( m_bFlysOnly && dynamic_cast<const SwVirtFlyDrawObj*>( pObj) ==  nullptr )
                     continue;
                 sal_uInt32 nTmp = pObj->GetOrdNumDirect();
                 if ( nTmp < nBotOrd )
                 {
                     nBotOrd = nTmp;
-                    pCurrent = pObj;
+                    m_pCurrent = pObj;
                 }
             }
         }
     }
-    return pCurrent;
+    return m_pCurrent;
 }
 
 const SdrObject *SwOrderIter::Next()
 {
-    const sal_uInt32 nCurOrd = pCurrent ? pCurrent->GetOrdNumDirect() : 0;
-    pCurrent = 0;
-    if ( pPage->GetSortedObjs() )
+    const sal_uInt32 nCurOrd = m_pCurrent ? m_pCurrent->GetOrdNumDirect() : 0;
+    m_pCurrent = 0;
+    if ( m_pPage->GetSortedObjs() )
     {
         sal_uInt32 nOrd = USHRT_MAX;
-        const SwSortedObjs *pObjs = pPage->GetSortedObjs();
+        const SwSortedObjs *pObjs = m_pPage->GetSortedObjs();
         if ( pObjs->size() )
         {
             (*pObjs)[0]->GetDrawObj()->GetOrdNum();  // force updating
             for ( size_t i = 0; i < pObjs->size(); ++i )
             {
                 const SdrObject* pObj = (*pObjs)[i]->GetDrawObj();
-                if ( bFlysOnly && dynamic_cast<const SwVirtFlyDrawObj*>( pObj) ==  nullptr )
+                if ( m_bFlysOnly && dynamic_cast<const SwVirtFlyDrawObj*>( pObj) ==  nullptr )
                     continue;
                 sal_uInt32 nTmp = pObj->GetOrdNumDirect();
                 if ( nTmp > nCurOrd && nTmp < nOrd )
                 {
                     nOrd = nTmp;
-                    pCurrent = pObj;
+                    m_pCurrent = pObj;
                 }
             }
         }
     }
-    return pCurrent;
+    return m_pCurrent;
 }
 
 const SdrObject *SwOrderIter::Prev()
 {
-    const sal_uInt32 nCurOrd = pCurrent ? pCurrent->GetOrdNumDirect() : 0;
-    pCurrent = 0;
-    if ( pPage->GetSortedObjs() )
+    const sal_uInt32 nCurOrd = m_pCurrent ? m_pCurrent->GetOrdNumDirect() : 0;
+    m_pCurrent = 0;
+    if ( m_pPage->GetSortedObjs() )
     {
-        const SwSortedObjs *pObjs = pPage->GetSortedObjs();
+        const SwSortedObjs *pObjs = m_pPage->GetSortedObjs();
         if ( pObjs->size() )
         {
             sal_uInt32 nOrd = 0;
@@ -2328,18 +2328,18 @@ const SdrObject *SwOrderIter::Prev()
             for ( size_t i = 0; i < pObjs->size(); ++i )
             {
                 const SdrObject* pObj = (*pObjs)[i]->GetDrawObj();
-                if ( bFlysOnly && dynamic_cast<const SwVirtFlyDrawObj*>( pObj) ==  nullptr )
+                if ( m_bFlysOnly && dynamic_cast<const SwVirtFlyDrawObj*>( pObj) ==  nullptr )
                     continue;
                 sal_uInt32 nTmp = pObj->GetOrdNumDirect();
                 if ( nTmp < nCurOrd && nTmp >= nOrd )
                 {
                     nOrd = nTmp;
-                    pCurrent = pObj;
+                    m_pCurrent = pObj;
                 }
             }
         }
     }
-    return pCurrent;
+    return m_pCurrent;
 }
 
 /// Keep and restore the substructure of a layout frame for an action.