diff options
| author | Xisco Fauli <xiscofauli@libreoffice.org> | 2020-05-22 19:53:27 +0200 |
|---|---|---|
| committer | Xisco Faulí <xiscofauli@libreoffice.org> | 2020-05-22 21:03:42 +0200 |
| commit | 8bf3e3fbdb708a75237a120d4f6fc46fe67dbbb9 (patch) | |
| tree | 4bf4878be0222c5535cd20ed6caf7e5f961af742 /oox | |
| parent | 208d931861be4d5cf571c404f517fb5c26499aa0 (diff) | |
tdf#129686: Revert "tdf#118776: pptx import: draw char noFill as transparent"
Revert it for now towards LibreOffice 7.0 and add unittest
This reverts commit e01df3488abe6d319c6874ca870afb82a3ad9b1e.
Change-Id: Ic6aba5948f9c6e55199def0476918fbd496321bf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94704
Tested-by: Xisco Faulí <xiscofauli@libreoffice.org>
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/textcharacterproperties.cxx | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/oox/source/drawingml/textcharacterproperties.cxx b/oox/source/drawingml/textcharacterproperties.cxx index 19c55794b3d8..20965e33abb1 100644 --- a/oox/source/drawingml/textcharacterproperties.cxx +++ b/oox/source/drawingml/textcharacterproperties.cxx @@ -112,12 +112,7 @@ void TextCharacterProperties::pushToPropMap( PropertyMap& rPropMap, const XmlFil Color aColor = maFillProperties.getBestSolidColor(); rPropMap.setProperty(PROP_CharColor, aColor.getColor(rFilter.getGraphicHelper())); - if( maFillProperties.moFillType.get() == XML_noFill ) - { - // noFill doesn't exist for characters. Map noFill to 99% transparency - rPropMap.setProperty(PROP_CharTransparence, sal_Int16((MAX_PERCENT - 1) / PER_PERCENT) ); - } - else if (aColor.hasTransparency()) + if (aColor.hasTransparency()) { rPropMap.setProperty(PROP_CharTransparence, aColor.getTransparency()); } |