summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@suse.com>2012-11-05 11:36:27 +0200
committerTor Lillqvist <tlillqvist@suse.com>2012-11-05 11:47:54 +0200
commit9c248f9265747351f32bf52d608a91393bfdf1e2 (patch)
tree949984a34085a020a40bff896293a9e6233b7e9f
parenta0796a641224adb15be153b7b0a94ccd788daf65 (diff)
bnc#785727: Add more safety checks, exact bug mechanism unclear
Change-Id: Ieef2ce470613f6adfbb134d2bd59f2a6fd4a848d
-rw-r--r--oox/source/ppt/slidefragmenthandler.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/oox/source/ppt/slidefragmenthandler.cxx b/oox/source/ppt/slidefragmenthandler.cxx
index bb1e3e201e50..789821b4bcc0 100644
--- a/oox/source/ppt/slidefragmenthandler.cxx
+++ b/oox/source/ppt/slidefragmenthandler.cxx
@@ -178,7 +178,7 @@ SlideFragmentHandler::~SlideFragmentHandler() throw()
case A_TOKEN( overrideClrMapping ):
case PPT_TOKEN( clrMap ): // CT_ColorMapping
{
- oox::drawingml::ClrMapPtr pClrMapPtr( ( aElementToken == PPT_TOKEN( clrMap ) || !mpSlidePersistPtr.get() ) ? new oox::drawingml::ClrMap() : new oox::drawingml::ClrMap( *mpSlidePersistPtr->getClrMap() ) );
+ oox::drawingml::ClrMapPtr pClrMapPtr( ( aElementToken == PPT_TOKEN( clrMap ) || !mpSlidePersistPtr.get() || !mpSlidePersistPtr->getClrMap().get() ) ? new oox::drawingml::ClrMap() : new oox::drawingml::ClrMap( *mpSlidePersistPtr->getClrMap() ) );
ContextHandlerRef ret = new oox::drawingml::clrMapContext( *this, rAttribs.getFastAttributeList(), *pClrMapPtr );
mpSlidePersistPtr->setClrMap( pClrMapPtr );
return ret;