summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorRadek Doulik <rodo@novell.com>2012-10-08 18:03:18 +0200
committerAndras Timar <atimar@suse.com>2012-10-10 16:47:55 +0200
commit0800dd9982c50ee953b103ca73f3781e324a6acc (patch)
treed12227ca7c3a446e1be1d304c3780208b343863a /oox
parent49bd4117a6b99ac944c77c7125669365a4d4f289 (diff)
implement a:overrideClrMapping (fixes n#783202)
Change-Id: Ib6c0fd6d9b64f2bff446f919c58027fea76a00cb
Diffstat (limited to 'oox')
-rw-r--r--oox/source/ppt/slidefragmenthandler.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/oox/source/ppt/slidefragmenthandler.cxx b/oox/source/ppt/slidefragmenthandler.cxx
index 952a57cdd863..85d3c9b69442 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;