diff options
| -rw-r--r-- | sw/inc/calbck.hxx | 12 | ||||
| -rw-r--r-- | sw/source/core/access/acctable.cxx | 8 | ||||
| -rw-r--r-- | sw/source/core/attr/calbck.cxx | 10 |
3 files changed, 15 insertions, 15 deletions
diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx index 967e4be6a314..25e815177f0a 100644 --- a/sw/inc/calbck.hxx +++ b/sw/inc/calbck.hxx @@ -285,13 +285,13 @@ namespace sw // is marked down to become the current object in the next step // this is necessary because iteration requires access to members of the current object WriterListener* m_pPosition; - static SW_DLLPUBLIC ClientIteratorBase* our_pClientIters; + static SW_DLLPUBLIC ClientIteratorBase* s_pClientIters; ClientIteratorBase( const SwModify& rModify ) : m_rRoot(rModify) { - MoveTo(our_pClientIters); - our_pClientIters = this; + MoveTo(s_pClientIters); + s_pClientIters = this; m_pCurrent = m_pPosition = m_rRoot.m_pWriterListeners; } WriterListener* GetLeftOfPos() { return m_pPosition->m_pLeft; } @@ -306,9 +306,9 @@ namespace sw } ~ClientIteratorBase() override { - assert(our_pClientIters); - if(our_pClientIters == this) - our_pClientIters = unique() ? nullptr : GetNextInRing(); + assert(s_pClientIters); + if(s_pClientIters == this) + s_pClientIters = unique() ? nullptr : GetNextInRing(); MoveTo(nullptr); } // return "true" if an object was removed from a client chain in iteration diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx index 0f770311fd11..f203335bd71b 100644 --- a/sw/source/core/access/acctable.cxx +++ b/sw/source/core/access/acctable.cxx @@ -478,7 +478,7 @@ void SwAccessibleTableData_Impl::GetRowColumnAndExtent( class SwAccSingleTableSelHander_Impl : public SwAccTableSelHander_Impl { - bool bSelected; + bool m_bSelected; public: @@ -486,19 +486,19 @@ public: virtual ~SwAccSingleTableSelHander_Impl() {} - bool IsSelected() const { return bSelected; } + bool IsSelected() const { return m_bSelected; } virtual void Unselect( sal_Int32, sal_Int32 ) override; }; inline SwAccSingleTableSelHander_Impl::SwAccSingleTableSelHander_Impl() : - bSelected( true ) + m_bSelected( true ) { } void SwAccSingleTableSelHander_Impl::Unselect( sal_Int32, sal_Int32 ) { - bSelected = false; + m_bSelected = false; } class SwAccAllTableSelHander_Impl : public SwAccTableSelHander_Impl diff --git a/sw/source/core/attr/calbck.cxx b/sw/source/core/attr/calbck.cxx index 59451cd06083..b6f00ca93d4a 100644 --- a/sw/source/core/attr/calbck.cxx +++ b/sw/source/core/attr/calbck.cxx @@ -220,9 +220,9 @@ void SwModify::Add( SwClient* pDepend ) if(pDepend->m_pRegisteredIn != this ) { #if OSL_DEBUG_LEVEL > 0 - if(sw::ClientIteratorBase::our_pClientIters) + if(sw::ClientIteratorBase::s_pClientIters) { - for(auto& rIter : sw::ClientIteratorBase::our_pClientIters->GetRingContainer()) + for(auto& rIter : sw::ClientIteratorBase::s_pClientIters->GetRingContainer()) { SAL_WARN_IF(&rIter.m_rRoot == m_pWriterListeners, "sw.core", "a " << typeid(*pDepend).name() << " client added as listener to a " << typeid(*this).name() << " during client iteration."); } @@ -272,9 +272,9 @@ SwClient* SwModify::Remove( SwClient* pDepend ) pR->m_pLeft = pL; // update ClientIterators - if(sw::ClientIteratorBase::our_pClientIters) + if(sw::ClientIteratorBase::s_pClientIters) { - for(auto& rIter : sw::ClientIteratorBase::our_pClientIters->GetRingContainer()) + for(auto& rIter : sw::ClientIteratorBase::s_pClientIters->GetRingContainer()) { if (&rIter.m_rRoot == this && (rIter.m_pCurrent == pDepend || rIter.m_pPosition == pDepend)) @@ -362,5 +362,5 @@ void sw::WriterMultiListener::EndListeningAll() m_vDepends.clear(); } -sw::ClientIteratorBase* sw::ClientIteratorBase::our_pClientIters = nullptr; +sw::ClientIteratorBase* sw::ClientIteratorBase::s_pClientIters = nullptr; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |