diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2015-03-13 12:59:46 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2015-03-14 02:23:42 +0100 |
| commit | e07c6a6fea726904b5669baa50fc8ea45b4328f8 (patch) | |
| tree | a16491ed450d5ddbc6386f0518f4773d546a84ea /sw/source | |
| parent | c2655a58527ec6b63af7c1191535d06ff71cee0c (diff) | |
fix naming conventions while at it
Change-Id: I2d2daa78869764ebf236444187d4dcdc508208be
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/core/attr/calbck.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/core/attr/calbck.cxx b/sw/source/core/attr/calbck.cxx index bb0a8dc9afde..58fe03ee30f3 100644 --- a/sw/source/core/attr/calbck.cxx +++ b/sw/source/core/attr/calbck.cxx @@ -205,9 +205,9 @@ void SwModify::Add( SwClient* pDepend ) if(pDepend->pRegisteredIn != this ) { #if OSL_DEBUG_LEVEL > 0 - if(SwClientIter::pClientIters) + if(SwClientIter::our_pClientIters) { - for(auto& rIter : SwClientIter::pClientIters->GetRingContainer()) + for(auto& rIter : SwClientIter::our_pClientIters->GetRingContainer()) OSL_ENSURE( &rIter.GetModify() != pRoot, "Client added to active ClientIter" ); } #endif @@ -257,15 +257,15 @@ SwClient* SwModify::Remove( SwClient* pDepend ) pR->m_pLeft = pL; // update ClientIters - if(SwClientIter::pClientIters) + if(SwClientIter::our_pClientIters) { - for(auto& rIter : SwClientIter::pClientIters->GetRingContainer()) + for(auto& rIter : SwClientIter::our_pClientIters->GetRingContainer()) { - if( rIter.pAct == pDepend || rIter.pDelNext == pDepend ) + if( rIter.m_pCurrent == pDepend || rIter.m_pPosition == pDepend ) { // if object being removed is the current or next object in an // iterator, advance this iterator - rIter.pDelNext = static_cast<SwClient*>(pR); + rIter.m_pPosition = static_cast<SwClient*>(pR); } } } @@ -361,5 +361,5 @@ bool SwDepend::GetInfo( SfxPoolItem& rInfo ) const return pToTell ? pToTell->GetInfo( rInfo ) : true; } -SwClientIter* SwClientIter::pClientIters = nullptr; +SwClientIter* SwClientIter::our_pClientIters = nullptr; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |