From 71d25406d9039633fea0bc07132ed180d8f661e6 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Wed, 3 Sep 2014 19:55:35 +0200 Subject: MSO finally decided to follow the spec, fdo#83312 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I8c611b49e3bf4645736425bd33c2994ae2c28337 Reviewed-on: https://gerrit.libreoffice.org/11270 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- oox/source/drawingml/colorchoicecontext.cxx | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'oox') diff --git a/oox/source/drawingml/colorchoicecontext.cxx b/oox/source/drawingml/colorchoicecontext.cxx index 1ee3129ba91c..9891bf1a0d2a 100644 --- a/oox/source/drawingml/colorchoicecontext.cxx +++ b/oox/source/drawingml/colorchoicecontext.cxx @@ -111,7 +111,17 @@ void ColorValueContext::onStartElement( const AttributeList& rAttribs ) case A_TOKEN( satOff ): case A_TOKEN( shade ): case A_TOKEN( tint ): - mrColor.addTransformation( nElement, rAttribs.getInteger( XML_val, 0 ) ); + { + OUString aValue = rAttribs.getString( XML_val, OUString() ); + sal_Int32 nVal = 0; + if (aValue.endsWith("%")) + { + nVal = aValue.toDouble() * PER_PERCENT; + } + else + nVal = rAttribs.getInteger(XML_val, 0); + mrColor.addTransformation( nElement, nVal ); + } break; case A_TOKEN( comp ): case A_TOKEN( gamma ): -- cgit v1.2.3