diff options
| author | Luke Deller <luke@deller.id.au> | 2018-03-08 01:11:40 +1100 |
|---|---|---|
| committer | Aron Budea <aron.budea@collabora.com> | 2018-04-03 19:06:47 +0200 |
| commit | e9c69bfa7254106458744bd832b101319ca518d8 (patch) | |
| tree | d34cd2901897333612616a629b34dfcf33064dea /writerfilter/source/ooxml/model.xml | |
| parent | 1cf9fcc723041ceb97dc637de658f3486a755edf (diff) | |
tdf#116179 Support reading "auto" colour from docx
In docx a colour value is represented as a 6-digit hex RGB value, or
alternatively the word "auto" to represent automatic colour.
- Add support for reading the value "auto" as COL_AUTO. Previously
this would be read as if it were a hex value, stopping at the
letter 'u' which is not a valid hex digit, resulting in the colour
0x00000A - a very dark blue, which looks close enough to black that
it went unnoticed for a long time :-)
- Remove code which tried to handle this wrong 0x00000A value,
including the constant OOXML_COLOR_AUTO, as it is no longer needed
and will cause surprises for anyone who really wanted this exact
shade of dark blue
- Fix unit tests that were checking for 0x00000A
Reviewed-on: https://gerrit.libreoffice.org/50995
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Reviewed-on: https://gerrit.libreoffice.org/51461
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit 3967aebca94be9ceea3e36b43f7f53589473ad4e)
Change-Id: I6000070341931147ff9341ad6281cd3b53c02b46
(cherry picked from commit ccef956c4f11ac6c0612a0d22845d02743c91039)
Diffstat (limited to 'writerfilter/source/ooxml/model.xml')
| -rw-r--r-- | writerfilter/source/ooxml/model.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index 453f15570451..76d718450e50 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -16708,7 +16708,7 @@ <value tokenid="ooxml:Value_ST_HexColorAuto_auto">auto</value> </resource> <resource name="ST_HexColorRGB" resource="Hex"/> - <resource name="ST_HexColor" resource="Hex"/> + <resource name="ST_HexColor" resource="HexColor"/> <resource name="CT_Color" resource="Properties"> <attribute name="val" tokenid="ooxml:CT_Color_val"/> <attribute name="themeColor" tokenid="ooxml:CT_Color_themeColor"/> |