diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-08-26 19:04:50 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-08-29 20:18:56 +0000 |
| commit | d7dbbae178598cb075512e8e1e54b7bbf2d68dce (patch) | |
| tree | 802402dcbac131fd8d7b51550e9fd744e3af4d10 /include | |
| parent | 8c4bb051d644996eb92e3a6c6dd8d09972450733 (diff) | |
ODF import: workaround dubious draw:fill="solid" on frame styles
Since the gradient frame backgrounds were added in LO 4.1, we export
this:
fo:background-color="transparent" draw:fill="solid"
Which doesn't make a whole lot of sense as this is really a "none" fill,
and now with the backward compatibility stuff in the style import code
we get the pool default color added when setting the BackTransparent
property, and with the draw:fill="solid" it becomes visible and the
background color is now Sky Blue 1.
So try to detect draw:fill="solid" without draw:fill-color attribute
and contradicting transparent legacy attribute and nerf it. This way
we also export draw:fill="none" again, although still with a bogus
draw:fill-color but that shouldn't cause any harm.
Change-Id: I1c2bea46ba7d9a3f042b875df0ca12c7f6037909
(cherry picked from commit 68efa6f5128abf4cd097ae81a4cfd7fecbcb2a80)
Reviewed-on: https://gerrit.libreoffice.org/18040
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/xmloff/txtprmap.hxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/xmloff/txtprmap.hxx b/include/xmloff/txtprmap.hxx index 2562abb5f1ef..5fa8e3cbb509 100644 --- a/include/xmloff/txtprmap.hxx +++ b/include/xmloff/txtprmap.hxx @@ -198,6 +198,8 @@ #define CTF_RELHEIGHTREL (XML_TEXT_CTF_START + 169) #define CTF_CHAR_BACKGROUND (XML_TEXT_CTF_START + 170) #define CTF_CHAR_HIGHLIGHT (XML_TEXT_CTF_START + 171) +#define CTF_FILLSTYLE (XML_TEXT_CTF_START + 172) +#define CTF_FILLCOLOR (XML_TEXT_CTF_START + 173) enum class TextPropMap { |