summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMuthu Subramanian <sumuthu@suse.com>2012-05-05 12:48:57 +0530
committerMuthu Subramanian <sumuthu@suse.com>2012-05-05 12:48:57 +0530
commit11713989b1580799635fff997b920d9bd4bf619f (patch)
treee88a4001cdccb74372d155cbc43f80ba9af8affd
parent32f4c79f7a72fc312ae3eec02492d6bc1da7d86c (diff)
fdo#48778: PPTX import crashes.
This probably occurs when the document has wrong idx (?)
-rw-r--r--oox/source/ppt/slidefragmenthandler.cxx4
1 files 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;