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:59:51 +0200
commita1b0ce05e851e9724c046888a01869eddf9e9db2 (patch)
tree488bdc595d557542a4dbe1ff8f704bb586bd4e7e
parent9201d802edf8fcce85381689e5e800d93b0459d5 (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 6e6ba26fcfe0..e752a67c2273 100644
--- a/oox/source/ppt/slidefragmenthandler.cxx
+++ b/oox/source/ppt/slidefragmenthandler.cxx
@@ -187,7 +187,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;