diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-02-10 16:53:22 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-02-10 17:02:28 +0100 |
| commit | d285f273adf35acc21ac6659523b28b3321b49ae (patch) | |
| tree | e45255e337502568972de549444c8390ec9839f0 /sw | |
| parent | 9665911b79b75a82d1c287826087c717b8158976 (diff) | |
coverity#1267646 coverity#1267641: sw: logically dead code
... in SwPageFrm::_UpdateAttr()
It looks like SwFmtChg always is sent in pairs and shouldn't contain
null pointers.
Change-Id: Ib14650d5ac7ed579af915806e738aec8a92add32
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/layout/pagechg.cxx | 45 |
1 files changed, 21 insertions, 24 deletions
diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx index 0f677c5852ae..ceb326969e10 100644 --- a/sw/source/core/layout/pagechg.cxx +++ b/sw/source/core/layout/pagechg.cxx @@ -534,33 +534,30 @@ void SwPageFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew, // If the frame format is changed, several things might also change: // 1. columns: assert(pOld && pNew); //FMT_CHG Missing Format - const SwFmt* pOldFmt = pOld ? static_cast<const SwFmtChg*>(pOld)->pChangedFmt : NULL; - const SwFmt* pNewFmt = pNew ? static_cast<const SwFmtChg*>(pNew)->pChangedFmt : NULL; + const SwFmt *const pOldFmt = static_cast<const SwFmtChg*>(pOld)->pChangedFmt; + const SwFmt *const pNewFmt = static_cast<const SwFmtChg*>(pNew)->pChangedFmt; assert(pOldFmt && pNewFmt); //FMT_CHG Missing Format - if (pOldFmt && pNewFmt) + const SwFmtCol &rOldCol = pOldFmt->GetCol(); + const SwFmtCol &rNewCol = pNewFmt->GetCol(); + if( rOldCol != rNewCol ) { - const SwFmtCol &rOldCol = pOldFmt->GetCol(); - const SwFmtCol &rNewCol = pNewFmt->GetCol(); - if( rOldCol != rNewCol ) - { - SwLayoutFrm *pB = FindBodyCont(); - OSL_ENSURE( pB, "Seite ohne Body." ); - pB->ChgColumns( rOldCol, rNewCol ); - rInvFlags |= 0x20; - } - - // 2. header and footer: - const SwFmtHeader &rOldH = pOldFmt->GetHeader(); - const SwFmtHeader &rNewH = pNewFmt->GetHeader(); - if( rOldH != rNewH ) - rInvFlags |= 0x08; - - const SwFmtFooter &rOldF = pOldFmt->GetFooter(); - const SwFmtFooter &rNewF = pNewFmt->GetFooter(); - if( rOldF != rNewF ) - rInvFlags |= 0x10; - CheckDirChange(); + SwLayoutFrm *pB = FindBodyCont(); + OSL_ENSURE( pB, "Seite ohne Body." ); + pB->ChgColumns( rOldCol, rNewCol ); + rInvFlags |= 0x20; } + + // 2. header and footer: + const SwFmtHeader &rOldH = pOldFmt->GetHeader(); + const SwFmtHeader &rNewH = pNewFmt->GetHeader(); + if( rOldH != rNewH ) + rInvFlags |= 0x08; + + const SwFmtFooter &rOldF = pOldFmt->GetFooter(); + const SwFmtFooter &rNewF = pNewFmt->GetFooter(); + if( rOldF != rNewF ) + rInvFlags |= 0x10; + CheckDirChange(); } // no break case RES_FRM_SIZE: |