diff options
| author | Muthu Subramanian <sumuthu@suse.com> | 2012-07-10 19:39:36 +0530 |
|---|---|---|
| committer | Muthu Subramanian K <sumuthu@suse.com> | 2012-10-13 13:50:23 +0530 |
| commit | 67e59a990a84729a651be3efb32bba3b3ab2e298 (patch) | |
| tree | 84c18c6ad86888cc4d70acf407b80af9deeeab00 /oox | |
| parent | c689856e3c608f436f399b134802a2c7a91ae342 (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.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/oox/source/ppt/slidefragmenthandler.cxx b/oox/source/ppt/slidefragmenthandler.cxx index 49736ddc82ae..6e6ba26fcfe0 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 ); |