diff options
| author | Adam Co <rattles2013@gmail.com> | 2013-07-09 10:18:05 +0300 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-07-10 09:17:00 +0200 |
| commit | 728f10576807970b3356eb0d5ad01722bdddd977 (patch) | |
| tree | dc1c646c7953016bc064c25412f160189733af09 /oox | |
| parent | 49436b2e6dbfe3eaedf60e999abb771d4f90f15b (diff) | |
fdo#66688: fix for crash on exit and opacity issue
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Change-Id: I32db54e2c49b40bf41005baeba380a4f631d615a
Reviewed-on: https://gerrit.libreoffice.org/4780
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/token/properties.txt | 1 | ||||
| -rw-r--r-- | oox/source/vml/vmlshape.cxx | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/oox/source/token/properties.txt b/oox/source/token/properties.txt index 0acfe069fccf..d89ae44a3792 100644 --- a/oox/source/token/properties.txt +++ b/oox/source/token/properties.txt @@ -20,6 +20,7 @@ AutoFilter AutoShowInfo Autocomplete BackColor +BackColorTransparency BackGraphicLocation BackGraphicURL Background diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx index efd5d750f219..bcf93b6bf3c0 100644 --- a/oox/source/vml/vmlshape.cxx +++ b/oox/source/vml/vmlshape.cxx @@ -390,6 +390,12 @@ void ShapeBase::convertShapeProperties( const Reference< XShape >& rxShape ) con aPropMap.setProperty(PROP_BackColor, aPropMap[PROP_FillColor]); aPropMap.erase(PROP_FillColor); } + // TextFrames have BackColorTransparency, not FillTransparence + if (aPropMap.hasProperty(PROP_FillTransparence)) + { + aPropMap.setProperty(PROP_BackColorTransparency, aPropMap[PROP_FillTransparence]); + aPropMap.erase(PROP_FillTransparence); + } // And no LineColor property; individual borders can have colors and widths boost::optional<sal_Int32> oLineWidth; if (maTypeModel.maStrokeModel.moWeight.has()) |