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-02 15:47:14 +0200 |
commit | ccef956c4f11ac6c0612a0d22845d02743c91039 (patch) | |
tree | 06a01e3e1c7f85e45121143598fffe49402e4226 /include | |
parent | c1f393d899360e11e25d562d90285895f1e751e9 (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
Diffstat (limited to 'include')
-rw-r--r-- | include/filter/msfilter/util.hxx | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/filter/msfilter/util.hxx b/include/filter/msfilter/util.hxx index 8aa01f5be952..66183e35f2b9 100644 --- a/include/filter/msfilter/util.hxx +++ b/include/filter/msfilter/util.hxx @@ -58,15 +58,12 @@ MSFILTER_DLLPUBLIC sal_Unicode bestFitOpenSymbolToMSFont(sal_Unicode cBullet, rtl_TextEncoding& r_ioChrSet, OUString& r_ioFontName); -#define OOXML_COLOR_AUTO 0x0a - /** * Converts tools Color to HTML color (without leading hashmark). * * @param rColor color to convert - * @param bAutoColor if OOXML_COLOR_AUTO should be recognized as an auto color */ -MSFILTER_DLLPUBLIC OString ConvertColor( const Color &rColor, bool bAutoColor = false ); +MSFILTER_DLLPUBLIC OString ConvertColor( const Color &rColor ); /** Paper size in 1/100 millimeters. */ |