commit e24707d64d2d4c59c2aedf0235f5b1a694ec5f65
author Serge Krot <Serge.Krot@cib.de> Mon May 13 15:43:44 2019 +0200
committer Thorsten Behrens <Thorsten.Behrens@CIB.de> Tue May 14 11:03:57 2019 +0200
tree e923ea8755ff5ebb50a591048d976237832e8aa7
parent 430c352139b96c7f26b95d730dc19123869520ee

tdf#124754 sw docx import: do not override text color with -1 (auto) color

Change-Id: Id821b0d8bef69a7124ee41558e822cf8b025df9d
Reviewed-on: https://gerrit.libreoffice.org/72232
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>

oox/source/shape/WpsContext.cxx

diff --git a/oox/source/shape/WpsContext.cxx b/oox/source/shape/WpsContext.cxx
index 0f39a85..0692ea4 100644
--- a/oox/source/shape/WpsContext.cxx
+++ b/oox/source/shape/WpsContext.cxx
@@ -140,8 +140,13 @@ oox::core::ContextHandlerRef WpsContext::onCreateContext(sal_Int32 nElementToken
                {
                    uno::Reference<beans::XPropertySet> xTextBoxPropertySet(xTextCursor,
                                                                            uno::UNO_QUERY);
                    xTextBoxPropertySet->setPropertyValue(
                        "CharColor", xPropertySet->getPropertyValue("CharColor"));
                    uno::Any xCharColor = xPropertySet->getPropertyValue("CharColor");
                    Color aColor = COL_AUTO;
                    if (xCharColor >>= aColor)
                    {
                        if (aColor != COL_AUTO)
                            xTextBoxPropertySet->setPropertyValue("CharColor", xCharColor);
                    }
                }
                return this;
            }

sw/qa/extras/ooxmlimport/data/tdf124754.docx

diff --git a/sw/qa/extras/ooxmlimport/data/tdf124754.docx b/sw/qa/extras/ooxmlimport/data/tdf124754.docx
new file mode 100644
index 0000000..2f7f4e1
--- /dev/null
+++ b/sw/qa/extras/ooxmlimport/data/tdf124754.docx
Binary files differ

sw/qa/extras/ooxmlimport/ooxmlimport2.cxx

diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
index fcd6d8d..1c72826 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
@@ -194,6 +194,7 @@ DECLARE_OOXMLIMPORT_TEST(testTdf117843, "tdf117843.docx")
        getProperty<sal_Int32>(getParagraphOfText(1, xHeaderText), "ParaTopMargin"));
}

// related tdf#124754
DECLARE_OOXMLIMPORT_TEST(testTdf43017, "tdf43017.docx")
{
    uno::Reference<text::XTextRange> xParagraph = getParagraph(1);
@@ -204,6 +205,20 @@ DECLARE_OOXMLIMPORT_TEST(testTdf43017, "tdf43017.docx")
                                 getProperty<sal_Int32>(xText, "CharColor"));
}

// related tdf#43017
DECLARE_OOXMLIMPORT_TEST(testTdf124754, "tdf124754.docx")
{
    uno::Reference<text::XText> textbox(getShape(1), uno::UNO_QUERY);
    CPPUNIT_ASSERT_EQUAL(1, getParagraphs(textbox));

    uno::Reference<text::XTextRange> xParagraph = getParagraphOfText(1, textbox);
    uno::Reference<text::XTextRange> xText = getRun(xParagraph, 2);

    // Ensure that hyperlink text color is not black
    CPPUNIT_ASSERT_EQUAL_MESSAGE("Hyperlink color should be not black!", sal_Int32(353217),
                                 getProperty<sal_Int32>(xText, "CharColor"));
}

DECLARE_OOXMLIMPORT_TEST(testTdf112443, "tdf112443.docx")
{
    // the position of the flying text frame should be off page