summaryrefslogtreecommitdiff
path: root/sw/source/core/layout
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2015-11-04 09:09:59 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-11-04 09:11:21 +0100
commit37e0e10fd8335eb4b6d25e542cdf163020e8d452 (patch)
tree0f127a30adbe694dcb568108354a0f271fbe6b10 /sw/source/core/layout
parent47f1529ca3f193f64929a3f777c578f25f3613a6 (diff)
sw: prefix members of SwOrderIter
Change-Id: I9bea22d07a95eb521d9c3729b2aba1694cf02def
Diffstat (limited to 'sw/source/core/layout')
-rw-r--r--sw/source/core/layout/frmtool.cxx58
1 files changed, 29 insertions, 29 deletions
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.