summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorMuthu Subramanian <sumuthu@suse.com>2012-07-10 19:39:36 +0530
committerMuthu Subramanian <sumuthu@suse.com>2012-07-10 19:41:42 +0530
commit752c83258899be8b3541e25933905393b9c38698 (patch)
treea9be8d2e6cd3357bc38e52c329e3a0a531161d17 /oox
parentc854d36984789c1ffac8c83c929406c10ba99462 (diff)
Crash fix.
Though getTheme() is not supposed to be returning NULL. It seems like doing that sometimes.
Diffstat (limited to 'oox')
-rw-r--r--oox/source/ppt/slidefragmenthandler.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/oox/source/ppt/slidefragmenthandler.cxx b/oox/source/ppt/slidefragmenthandler.cxx
index 29954f657fdd..1b34a1a1fec3 100644
--- a/oox/source/ppt/slidefragmenthandler.cxx
+++ b/oox/source/ppt/slidefragmenthandler.cxx
@@ -174,7 +174,9 @@ SlideFragmentHandler::~SlideFragmentHandler() throw()
case PPT_TOKEN( bgRef ): // a:CT_StyleMatrixReference
{
- const FillProperties *pFillProperties = mpSlidePersistPtr->getTheme()->getFillStyle( rAttribs.getInteger( XML_idx, -1 ) );
+ const FillProperties *pFillProperties = NULL;
+ if( mpSlidePersistPtr->getTheme() )
+ 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 );