[Libreoffice-commits] .: oox/source

[Libreoffice Gerrit user]

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

New commits:
commit e9960f36675a025c0536dec30ae56c50f4adecb1
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 1f7e092..b626612 100644
--- a/oox/source/ppt/slidefragmenthandler.cxx
+++ b/oox/source/ppt/slidefragmenthandler.cxx
@@ -175,9 +175,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;