diff options
| author | Radek Doulik <rodo@novell.com> | 2012-10-09 11:24:28 +0200 |
|---|---|---|
| committer | Radek Doulik <rodo@novell.com> | 2012-10-09 14:26:21 +0200 |
| commit | 4874a0dcbfe56028d5ac7f44bb994837eb003c35 (patch) | |
| tree | 24e407ca2107a8272377ceeddbe81f8493da6f98 | |
| parent | 9040130ade07bc1b6757a48928ad01a3510865f0 (diff) | |
added safety check
Change-Id: I05ca3e5b176202d26c2f2e45cc674ea54934a30b
| -rw-r--r-- | oox/source/ppt/slidefragmenthandler.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/oox/source/ppt/slidefragmenthandler.cxx b/oox/source/ppt/slidefragmenthandler.cxx index b626612888d9..bb1e3e201e50 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 ) ? new oox::drawingml::ClrMap() : new oox::drawingml::ClrMap( *mpSlidePersistPtr->getClrMap() ) ); + oox::drawingml::ClrMapPtr pClrMapPtr( ( aElementToken == PPT_TOKEN( clrMap ) || !mpSlidePersistPtr.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; |