commit 009776a16410024a9437847af065d2160b434f30
author Muthu Subramanian <sumuthu@suse.com> Sat May 05 12:48:57 2012 +0530
committer Michael Stahl <mstahl@redhat.com> Mon May 07 14:29:16 2012 +0200
tree c4c5a6ec4711532bd0bf93b7b32b70ec790f7a81
parent bf9ab0b486ee336bd4fb91e5ad2320d25593d696

fdo#48778: PPTX import crashes.

This probably occurs when the document has wrong idx (?)
(cherry picked from commit 11713989b1580799635fff997b920d9bd4bf619f)

Signed-off-by: Michael Stahl <mstahl@redhat.com>

oox/source/ppt/slidefragmenthandler.cxx

diff --git a/oox/source/ppt/slidefragmenthandler.cxx b/oox/source/ppt/slidefragmenthandler.cxx
index 4652690..59844ef 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;