Kaydet (Commit) 77da600b authored tarafından Caolán McNamara's avatar Caolán McNamara

coverity#1426167 refactor to be less obscure

no logic change intended

Change-Id: I10ef6038351b2808c2030aa55f05e078d80345ae
Reviewed-on: https://gerrit.libreoffice.org/46609Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 9cca2ca9
...@@ -2546,10 +2546,12 @@ bool SwFrameFormat::supportsFullDrawingLayerFillAttributeSet() const ...@@ -2546,10 +2546,12 @@ bool SwFrameFormat::supportsFullDrawingLayerFillAttributeSet() const
void SwFrameFormat::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) void SwFrameFormat::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
{ {
if (pNew)
{
SwFormatHeader const *pH = nullptr; SwFormatHeader const *pH = nullptr;
SwFormatFooter const *pF = nullptr; SwFormatFooter const *pF = nullptr;
const sal_uInt16 nWhich = pNew ? pNew->Which() : 0; const sal_uInt16 nWhich = pNew->Which();
if( RES_ATTRSET_CHG == nWhich ) if( RES_ATTRSET_CHG == nWhich )
{ {
...@@ -2599,6 +2601,7 @@ void SwFrameFormat::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) ...@@ -2599,6 +2601,7 @@ void SwFrameFormat::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
SwFrameFormat *pFormat = GetDoc()->getIDocumentLayoutAccess().MakeLayoutFormat( RndStdIds::FOOTER, nullptr ); SwFrameFormat *pFormat = GetDoc()->getIDocumentLayoutAccess().MakeLayoutFormat( RndStdIds::FOOTER, nullptr );
const_cast<SwFormatFooter *>(pF)->RegisterToFormat( *pFormat ); const_cast<SwFormatFooter *>(pF)->RegisterToFormat( *pFormat );
} }
}
SwFormat::Modify( pOld, pNew ); SwFormat::Modify( pOld, pNew );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment