oox/source/ppt/slidefragmenthandler.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9c248f9265747351f32bf52d608a91393bfdf1e2
Author: Tor Lillqvist <tlillqv...@suse.com>
Date: Mon Nov 5 11:36:27 2012 +0200
bnc#785727: Add more safety checks, exact bug mechanism unclear
Change-Id: Ieef2ce470613f6adfbb134d2bd59f2a6fd4a848d
diff --git a/oox/source/ppt/slidefragmenthandler.cxx
b/oox/source/ppt/slidefragmenthandler.cxx
index bb1e3e2..789821b 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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
