diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-02-02 14:10:02 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-02-02 14:58:34 +0100 |
| commit | 8dadefc35f8b33648fb6adbdaca75ea52b2705db (patch) | |
| tree | 9c4126d53c027a2ba4809555bd706571ccf3b599 /include | |
| parent | 98183c3381ef20c32285027662d7ac4bab23038f (diff) | |
xmloff: tdf#96147: ODF export: fix duplicate fo:background-color
... attributes that happen if both CharHighlight and CharBackColor
properties are used, because the CharBackTransparent property wasn't
taken into account, and combining the CharBackColor and
CharBackTransparent properties happens *after*
XMLTextExportPropertySetMapper::ContextFilter() runs.
Also, it looks like a transparent highlight wouldn't export properly but
apparently DomainMapper::getColorFromId() won't create such.
(regression from f880962f5bf26bfaef06bd3f9e67e2d901a2e74c)
Change-Id: Ib628ef8bb377482f74fadb97c81afb95fbbf7184
Diffstat (limited to 'include')
| -rw-r--r-- | include/xmloff/txtprmap.hxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/xmloff/txtprmap.hxx b/include/xmloff/txtprmap.hxx index 5fa8e3cbb509..79baf8bbaa3c 100644 --- a/include/xmloff/txtprmap.hxx +++ b/include/xmloff/txtprmap.hxx @@ -197,9 +197,10 @@ #define CTF_RELWIDTHREL (XML_TEXT_CTF_START + 168) #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) +#define CTF_CHAR_BACKGROUND_TRANSPARENCY (XML_TEXT_CTF_START + 171) +#define CTF_CHAR_HIGHLIGHT (XML_TEXT_CTF_START + 172) +#define CTF_FILLSTYLE (XML_TEXT_CTF_START + 173) +#define CTF_FILLCOLOR (XML_TEXT_CTF_START + 174) enum class TextPropMap { |