From e9960f36675a025c0536dec30ae56c50f4adecb1 Mon Sep 17 00:00:00 2001
From: Radek Doulik <rodo@novell.com>
Date: Mon, 8 Oct 2012 18:03:18 +0200
Subject: implement a:overrideClrMapping (fixes n#783202)

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

(limited to 'oox')

diff --git a/oox/source/ppt/slidefragmenthandler.cxx b/oox/source/ppt/slidefragmenthandler.cxx
index 1f7e092bf830..b626612888d9 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;
-- 
cgit