summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-02-23 13:29:29 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-02-23 14:22:43 +0000
commit619b751f909421d03c1424f2c2b318d3c747d7c5 (patch)
tree4dd396ca0ca37f11b1787e1e4b0694af060d8e47
parent324f33cb44b3b60061b31eb69e4e13d6f4be9e41 (diff)
coverity#704641 Dereference after null check
Change-Id: Ib30bcefedb2685038f22e33b4c7a97b0295b224c
-rw-r--r--filter/source/msfilter/svdfppt.cxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 9e684321f86c..60e9c26e5477 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -2503,9 +2503,11 @@ bool SdrPowerPointImport::GetColorFromPalette( sal_uInt16 nNum, Color& rColor )
{
PptSlidePersistEntry* pE = (*pPageList)[ nAktPageNum ];
if ( pE )
+ {
nSlideFlags = pE->aSlideAtom.nFlags;
- if ( ! ( nSlideFlags & 2 ) )
- ((SdrPowerPointImport*)this)->aPageColors = pE->aColorScheme;
+ if ( ! ( nSlideFlags & 2 ) )
+ ((SdrPowerPointImport*)this)->aPageColors = pE->aColorScheme;
+ }
}
if ( nSlideFlags & 2 ) // follow master colorscheme?
{