From c66af8e7842b0e6dab23c2f8cd2b20147b26c3a9 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Thu, 18 Jun 2015 16:37:23 +0100
Subject: coverity#1307697 Dereference null return value

(cherry picked from commit a7e7d057a4a574b337f3df6e9a600aac918be09c)

Change-Id: I48bf70689153b83bd1da7ff1553a4a3ec823d1b2
---
 cui/source/tabpages/backgrnd.cxx | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'cui')

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;
 
-- 
cgit v1.2.3