summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-06-18 16:37:23 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-06-18 16:39:57 +0100
commit5ffdce457326366154fb6c50d14f4b2bc322f355 (patch)
tree6d222603a9aa7990ae4eab30ec75f04d5a17ebed /cui
parent23b5284f8c4e9b784a748e765b4d48abbf615d47 (diff)
coverity#1307697 Dereference null return value
(cherry picked from commit a7e7d057a4a574b337f3df6e9a600aac918be09c) Change-Id: I48bf70689153b83bd1da7ff1553a4a3ec823d1b2
Diffstat (limited to 'cui')
-rw-r--r--cui/source/tabpages/backgrnd.cxx20
1 files changed, 12 insertions, 8 deletions
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index a396f49b048e..2e7e2b4e9baf 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -837,14 +837,18 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet* rCoreSet )
if ( !bIsLink && !bIsGraphicValid )
bIsGraphicValid = LoadLinkedGraphic_Impl();
- if ( bGraphTransparencyChanged ||
- eNewPos != eOldPos
- || bIsLink != bWasLink
- || ( bWasLink && rOldItem.GetGraphicLink()
- != aBgdGraphicPath )
- || ( !bWasLink && rOldItem.GetGraphic()->GetBitmap()
- != aBgdGraphic.GetBitmap() )
- )
+ bool bModifyBrush = false;
+ if (bGraphTransparencyChanged || eNewPos != eOldPos || bIsLink != bWasLink)
+ bModifyBrush = true;
+ else if (bWasLink && rOldItem.GetGraphicLink() != aBgdGraphicPath)
+ bModifyBrush = true;
+ else if (!bWasLink)
+ {
+ const Graphic* pGraphic = rOldItem.GetGraphic();
+ if (pGraphic)
+ bModifyBrush = pGraphic->GetBitmap() != aBgdGraphic.GetBitmap();
+ }
+ if (bModifyBrush)
{
bModified = true;