diff options
author | Matúš Kukan <matus.kukan@collabora.com> | 2014-09-09 10:37:23 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-09-10 08:20:45 +0000 |
commit | aa653d4e34e2b982caffe4cb9a5f2da3aaa52ed7 (patch) | |
tree | fe7a3be25b280798a9f06b972e2cd68ac148a573 /include | |
parent | d468b72a27f9c20cea1c3df186ac7eb267df9a5b (diff) |
bnc#480256: OOXML import: Respect table background properties a bit more
Only getBackgroundFillProperties() (fill) was used.
Use also getBackgroundFillStyleRef() (fillRef).
Also, do not replace table background color value with cell color,
we have to interpolate the two colors (if cell color is transparent).
Unfortunately, we don't use background table property in LibreOffice, so
this seems to be a best workaround.
(cherry picked from commit 43efd9b40d40b791a2c2deedcac36b99f7efb2cf)
And add unit test.
(cherry picked from commit 5681725f1a2535a13b86104d8b8a33f750f34efc)
Change-Id: I21bcc87a149c9f6d865ebee4012132ccc3a54af2
Reviewed-on: https://gerrit.libreoffice.org/11353
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'include')
-rw-r--r-- | include/oox/drawingml/shape.hxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx index f8e1b7c8e8d7..1f0411a5bfab 100644 --- a/include/oox/drawingml/shape.hxx +++ b/include/oox/drawingml/shape.hxx @@ -50,6 +50,7 @@ struct ShapeStyleRef { Color maPhClr; sal_Int32 mnThemedIdx; + ShapeStyleRef() : mnThemedIdx(0) {} }; typedef ::std::map< sal_Int32, ShapeStyleRef > ShapeStyleRefMap; |