diff options
| author | Xisco Fauli <xiscofauli@libreoffice.org> | 2019-10-13 20:59:20 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-11-25 12:43:25 +0100 |
| commit | e01df3488abe6d319c6874ca870afb82a3ad9b1e (patch) | |
| tree | 06bff7e3e2064526e5a5349ab1a5296310670d3b /oox/source/drawingml/textcharacterproperties.cxx | |
| parent | 916746a5155a1a17225e85d2c30a1c2322aac589 (diff) | |
tdf#118776: pptx import: draw char noFill as transparent
The problem is that LibreOffice doesn't have the property
fill=none for text
Change-Id: I0c7c62be102e05729f0b2cf09d95e208694b1d2b
Reviewed-on: https://gerrit.libreoffice.org/80743
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'oox/source/drawingml/textcharacterproperties.cxx')
| -rw-r--r-- | oox/source/drawingml/textcharacterproperties.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/oox/source/drawingml/textcharacterproperties.cxx b/oox/source/drawingml/textcharacterproperties.cxx index de47058e60ca..54b939ac6827 100644 --- a/oox/source/drawingml/textcharacterproperties.cxx +++ b/oox/source/drawingml/textcharacterproperties.cxx @@ -113,7 +113,12 @@ void TextCharacterProperties::pushToPropMap( PropertyMap& rPropMap, const XmlFil Color aColor = maFillProperties.getBestSolidColor(); rPropMap.setProperty(PROP_CharColor, aColor.getColor(rFilter.getGraphicHelper())); - if (aColor.hasTransparency()) + 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()) { rPropMap.setProperty(PROP_CharTransparence, aColor.getTransparency()); } |