oox/source/ppt/slidefragmenthandler.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 4874a0dcbfe56028d5ac7f44bb994837eb003c35
Author: Radek Doulik <r...@novell.com>
Date: Tue Oct 9 11:24:28 2012 +0200
added safety check
Change-Id: I05ca3e5b176202d26c2f2e45cc674ea54934a30b
diff --git a/oox/source/ppt/slidefragmenthandler.cxx
b/oox/source/ppt/slidefragmenthandler.cxx
index b626612..bb1e3e2 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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
