diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-09-03 19:55:35 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-09-05 10:34:30 -0500 |
| commit | 71d25406d9039633fea0bc07132ed180d8f661e6 (patch) | |
| tree | 82c2ebf38b1b6027e3436942229f5fc6d643203d | |
| parent | ec8c747b457c2b1161b875474d2ba4e15819a3c7 (diff) | |
MSO finally decided to follow the spec, fdo#83312
Change-Id: I8c611b49e3bf4645736425bd33c2994ae2c28337
Reviewed-on: https://gerrit.libreoffice.org/11270
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | oox/source/drawingml/colorchoicecontext.cxx | 12 |
1 files changed, 11 insertions, 1 deletions
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 ): |