From 11713989b1580799635fff997b920d9bd4bf619f Mon Sep 17 00:00:00 2001 From: Muthu Subramanian Date: Sat, 5 May 2012 12:48:57 +0530 Subject: fdo#48778: PPTX import crashes. This probably occurs when the document has wrong idx (?) --- oox/source/ppt/slidefragmenthandler.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/oox/source/ppt/slidefragmenthandler.cxx b/oox/source/ppt/slidefragmenthandler.cxx index a27e5e3ede50..952a57cdd863 100644 --- a/oox/source/ppt/slidefragmenthandler.cxx +++ b/oox/source/ppt/slidefragmenthandler.cxx @@ -140,8 +140,8 @@ SlideFragmentHandler::~SlideFragmentHandler() throw() case PPT_TOKEN( bgRef ): // a:CT_StyleMatrixReference { - FillPropertiesPtr pFillPropertiesPtr( new FillProperties( - *mpSlidePersistPtr->getTheme()->getFillStyle( rAttribs.getInteger( XML_idx, -1 ) ) ) ); + const FillProperties *pFillProperties = mpSlidePersistPtr->getTheme()->getFillStyle( rAttribs.getInteger( XML_idx, -1 ) ); + FillPropertiesPtr pFillPropertiesPtr( pFillProperties ? new FillProperties( *pFillProperties ) : new FillProperties() ); ContextHandlerRef ret = new ColorContext( *this, mpSlidePersistPtr->getBackgroundColor() ); mpSlidePersistPtr->setBackgroundProperties( pFillPropertiesPtr ); return ret; -- cgit v1.2.3