[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - 2 commits - oox/source

[Libreoffice Gerrit user]

 oox/source/ppt/slidefragmenthandler.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 997b202528730abc4b47510befa19a44131a37f4
Author: Radek Doulik <rodo at novell.com>
Date:   Tue Oct 9 11:24:28 2012 +0200

    added safety check
    
    Change-Id: I05ca3e5b176202d26c2f2e45cc674ea54934a30b

diff --git a/oox/source/ppt/slidefragmenthandler.cxx b/oox/source/ppt/slidefragmenthandler.cxx
index 85d3c9b..9f98742 100644
--- a/oox/source/ppt/slidefragmenthandler.cxx
+++ b/oox/source/ppt/slidefragmenthandler.cxx
@@ -151,7 +151,7 @@ SlideFragmentHandler::~SlideFragmentHandler() throw()
     case A_TOKEN( overrideClrMapping ):
     case PPT_TOKEN( clrMap ):           // CT_ColorMapping
         {
-            oox::drawingml::ClrMapPtr pClrMapPtr( aElementToken == PPT_TOKEN( clrMap ) ? new oox::drawingml::ClrMap() : new oox::drawingml::ClrMap( *mpSlidePersistPtr->getClrMap() ) );
+            oox::drawingml::ClrMapPtr pClrMapPtr( ( aElementToken == PPT_TOKEN( clrMap ) || !mpSlidePersistPtr.get() ) ? new oox::drawingml::ClrMap() : new oox::drawingml::ClrMap( *mpSlidePersistPtr->getClrMap() ) );
             ContextHandlerRef ret = new oox::drawingml::clrMapContext( *this, rAttribs.getFastAttributeList(), *pClrMapPtr );
             mpSlidePersistPtr->setClrMap( pClrMapPtr );
             return ret;
commit 0800dd9982c50ee953b103ca73f3781e324a6acc
Author: Radek Doulik <rodo at novell.com>
Date:   Mon Oct 8 18:03:18 2012 +0200

    implement a:overrideClrMapping (fixes n#783202)
    
    Change-Id: Ib6c0fd6d9b64f2bff446f919c58027fea76a00cb

diff --git a/oox/source/ppt/slidefragmenthandler.cxx b/oox/source/ppt/slidefragmenthandler.cxx
index 952a57c..85d3c9b 100644
--- a/oox/source/ppt/slidefragmenthandler.cxx
+++ b/oox/source/ppt/slidefragmenthandler.cxx
@@ -148,9 +148,10 @@ SlideFragmentHandler::~SlideFragmentHandler() throw()
         }
         break;
 
+    case A_TOKEN( overrideClrMapping ):
     case PPT_TOKEN( clrMap ):           // CT_ColorMapping
         {
-            oox::drawingml::ClrMapPtr pClrMapPtr( new oox::drawingml::ClrMap() );
+            oox::drawingml::ClrMapPtr pClrMapPtr( aElementToken == PPT_TOKEN( clrMap ) ? new oox::drawingml::ClrMap() : new oox::drawingml::ClrMap( *mpSlidePersistPtr->getClrMap() ) );
             ContextHandlerRef ret = new oox::drawingml::clrMapContext( *this, rAttribs.getFastAttributeList(), *pClrMapPtr );
             mpSlidePersistPtr->setClrMap( pClrMapPtr );
             return ret;