diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2014-06-11 14:59:45 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2014-06-11 16:17:15 +0200 |
| commit | 5deaac4ff9956c80ad16dc14c9085d91b5eb0aba (patch) | |
| tree | 6b6f09a92d567e465bc95b9a7bc55e8217b85b72 /sw | |
| parent | 6c7f0e8bfacac44493e44c4ea613d064c3fb5348 (diff) | |
simplify cascading conditionals
Change-Id: I957d7c368f6b7158c74268f7274d59e8a25b83e8
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/doc/docbm.cxx | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx index 53423bac9b08..3cdfbd3c4a6b 100644 --- a/sw/source/core/doc/docbm.cxx +++ b/sw/source/core/doc/docbm.cxx @@ -2058,19 +2058,16 @@ void CntntIdxStoreImpl::RestoreBkmks(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nOf pEntry != m_aBkmkEntries.end(); ++pEntry) { - if(pEntry->m_bOther) + if (MarkBase* pMark = dynamic_cast<MarkBase*>(pMarkAccess->getAllMarksBegin()[pEntry->m_nBkmkIdx].get())) { - if (MarkBase* pMark = dynamic_cast<MarkBase*>(pMarkAccess->getAllMarksBegin()[pEntry->m_nBkmkIdx].get())) + if(pEntry->m_bOther) { SwPosition aNewPos(pMark->GetOtherMarkPos()); aNewPos.nNode = *pCNd; aNewPos.nContent.Assign(pCNd, pEntry->m_nCntnt + nOffset); pMark->SetOtherMarkPos(aNewPos); } - } - else - { - if (MarkBase* pMark = dynamic_cast<MarkBase*>(pMarkAccess->getAllMarksBegin()[pEntry->m_nBkmkIdx].get())) + else { SwPosition aNewPos(pMark->GetMarkPos()); aNewPos.nNode = *pCNd; @@ -2093,19 +2090,16 @@ void CntntIdxStoreImpl::RestoreBkmksLen(SwNode& rNd, sal_uLong nLen, sal_Int32 n { if( !pEntry->m_nCntnt >= nCorrLen ) { - if(pEntry->m_bOther) + if (MarkBase* pMark = dynamic_cast<MarkBase*>(pMarkAccess->getAllMarksBegin()[pEntry->m_nBkmkIdx].get())) { - if (MarkBase* pMark = dynamic_cast<MarkBase*>(pMarkAccess->getAllMarksBegin()[pEntry->m_nBkmkIdx].get())) + if(pEntry->m_bOther) { SwPosition aNewPos(pMark->GetOtherMarkPos()); aNewPos.nNode = *pCNd; aNewPos.nContent.Assign(pCNd, ::std::min(pEntry->m_nCntnt, static_cast<sal_Int32>(nLen))); pMark->SetOtherMarkPos(aNewPos); } - } - else - { - if (MarkBase* pMark = dynamic_cast<MarkBase*>(pMarkAccess->getAllMarksBegin()[pEntry->m_nBkmkIdx].get())) + else { SwPosition aNewPos(pMark->GetMarkPos()); aNewPos.nNode = *pCNd; |