diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-07-30 10:33:15 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-08-01 13:14:05 +0200 |
commit | fb34aeb7842eaa852c82c3d73c722411c11885d7 (patch) | |
tree | 73547992845972e7b25fbce01c2657b967122c40 /sw/source/core/attr/calbck.cxx | |
parent | a0ec43251e8b8a0805306ca5ad86794550916fce (diff) |
loplugin:flatten in sw/core/access..sc/core/crsr
Change-Id: I073545c11e2261703e5255abefaf82a2bbea5211
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99934
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/core/attr/calbck.cxx')
-rw-r--r-- | sw/source/core/attr/calbck.cxx | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/sw/source/core/attr/calbck.cxx b/sw/source/core/attr/calbck.cxx index cef9b02b059f..4eb04a5ede98 100644 --- a/sw/source/core/attr/calbck.cxx +++ b/sw/source/core/attr/calbck.cxx @@ -219,41 +219,41 @@ void SwModify::Add( SwClient* pDepend ) DBG_TESTSOLARMUTEX(); OSL_ENSURE( !m_bLockClientList, "Client inserted while in Modify" ); - if(pDepend->m_pRegisteredIn != this ) - { + if(pDepend->m_pRegisteredIn == this ) + return; + #if OSL_DEBUG_LEVEL > 0 - if(sw::ClientIteratorBase::s_pClientIters) + if(sw::ClientIteratorBase::s_pClientIters) + { + for(auto& rIter : sw::ClientIteratorBase::s_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."); - } + 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."); } + } #endif - // deregister new client in case it is already registered elsewhere - if( pDepend->m_pRegisteredIn != nullptr ) - pDepend->m_pRegisteredIn->Remove( pDepend ); + // deregister new client in case it is already registered elsewhere + if( pDepend->m_pRegisteredIn != nullptr ) + pDepend->m_pRegisteredIn->Remove( pDepend ); - if( !m_pWriterListeners ) - { - // first client added - m_pWriterListeners = pDepend; - m_pWriterListeners->m_pLeft = nullptr; - m_pWriterListeners->m_pRight = nullptr; - } - else - { - // append client - pDepend->m_pRight = m_pWriterListeners->m_pRight; - m_pWriterListeners->m_pRight = pDepend; - pDepend->m_pLeft = m_pWriterListeners; - if( pDepend->m_pRight ) - pDepend->m_pRight->m_pLeft = pDepend; - } - - // connect client to me - pDepend->m_pRegisteredIn = this; + if( !m_pWriterListeners ) + { + // first client added + m_pWriterListeners = pDepend; + m_pWriterListeners->m_pLeft = nullptr; + m_pWriterListeners->m_pRight = nullptr; } + else + { + // append client + pDepend->m_pRight = m_pWriterListeners->m_pRight; + m_pWriterListeners->m_pRight = pDepend; + pDepend->m_pLeft = m_pWriterListeners; + if( pDepend->m_pRight ) + pDepend->m_pRight->m_pLeft = pDepend; + } + + // connect client to me + pDepend->m_pRegisteredIn = this; } SwClient* SwModify::Remove( SwClient* pDepend ) |