diff options
| author | Justin Luth <justin.luth@collabora.com> | 2018-08-18 19:35:01 +0300 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-09-12 09:56:11 +0200 |
| commit | 5063d9e7e677b0812ecfd81a5c4840fc1e58cbeb (patch) | |
| tree | 998adbdf35c91930cd94ab748c6c511c802dde7d | |
| parent | 43816e78744afdddd5116d8d598fcdd2f3e8767c (diff) | |
tdf#57589 writerfilter: support hash-encoded colors
Previously, a hash-encoded value would simply fail to zero
and thus the color would be dark black.
The unit test covers two conditions. Paragraph 1 has a valid
encoding, and pararaph 2 has an invalid coding (which is
ignored and fails to COL_AUTO).
Change-Id: I68940f5c4b0975a87feb6cab8fb3572b7546a077
Reviewed-on: https://gerrit.libreoffice.org/59295
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_luth@sil.org>
(cherry picked from commit 7d01ce4021bafde8184355f46d1cbe2c370767e1)
| -rw-r--r-- | sw/qa/extras/ooxmlexport/data/tdf57589_hashColor.docx | bin | 0 -> 11515 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport11.cxx | 8 | ||||
| -rw-r--r-- | writerfilter/source/ooxml/OOXMLPropertySet.cxx | 15 |
3 files changed, 23 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/tdf57589_hashColor.docx b/sw/qa/extras/ooxmlexport/data/tdf57589_hashColor.docx Binary files differnew file mode 100644 index 000000000000..d12b85b2da9c --- /dev/null +++ b/sw/qa/extras/ooxmlexport/data/tdf57589_hashColor.docx diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx index ec6153369569..f9c6524cafe8 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx @@ -42,6 +42,14 @@ protected: } }; +DECLARE_OOXMLEXPORT_TEST(testTdf57589_hashColor, "tdf57589_hashColor.docx") +{ + CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_SOLID, getProperty<drawing::FillStyle>(getParagraph(1), "FillStyle")); + CPPUNIT_ASSERT_EQUAL(COL_LIGHTMAGENTA, getProperty<sal_uInt32>(getParagraph(1), "ParaBackColor")); + CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_NONE, getProperty<drawing::FillStyle>(getParagraph(2), "FillStyle")); + CPPUNIT_ASSERT_EQUAL(COL_AUTO, getProperty<sal_uInt32>(getParagraph(2), "ParaBackColor")); +} + DECLARE_OOXMLEXPORT_TEST(testTdf92524_autoColor, "tdf92524_autoColor.doc") { CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_NONE, getProperty<drawing::FillStyle>(getParagraph(1), "FillStyle")); diff --git a/writerfilter/source/ooxml/OOXMLPropertySet.cxx b/writerfilter/source/ooxml/OOXMLPropertySet.cxx index 916c1b9a4902..79af27a96178 100644 --- a/writerfilter/source/ooxml/OOXMLPropertySet.cxx +++ b/writerfilter/source/ooxml/OOXMLPropertySet.cxx @@ -23,6 +23,7 @@ #include <ooxml/QNameToString.hxx> #include <com/sun/star/drawing/XShape.hpp> #include <oox/token/tokens.hxx> +#include <sax/tools/converter.hxx> #include <tools/color.hxx> namespace writerfilter { @@ -590,6 +591,20 @@ OOXMLHexColorValue::OOXMLHexColorValue(const char * pValue) else { mnValue = rtl_str_toUInt32(pValue, 16); + + // Convert hash-encoded values (like #FF0080) + const sal_Int32 nLen = strlen(pValue); + if ( !mnValue && nLen > 1 && pValue[0] == '#' ) + { + sal_Int32 nColor(COL_AUTO); + // Word appears to require strict 6 digit length, else it ignores it + if ( nLen == 7 ) + { + const OUString sHashColor(pValue, nLen, RTL_TEXTENCODING_ASCII_US); + sax::Converter::convertColor( nColor, sHashColor ); + } + mnValue = nColor; + } } } |