[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - writerfilter/CppunitTest_writerfilter_dmapper.mk writerfilter/qa writerfilter/source

[Miklos Vajna (via logerrit)]

 writerfilter/CppunitTest_writerfilter_dmapper.mk          |    1 
 writerfilter/qa/cppunittests/dmapper/CellColorHandler.cxx |   75 ++++++++++++++
 writerfilter/qa/cppunittests/dmapper/data/tdf129205.docx  |binary
 writerfilter/source/dmapper/CellColorHandler.cxx          |    2 
 4 files changed, 77 insertions(+), 1 deletion(-)

New commits:
commit 62eee51aeaee380139126e21ac550e6e367164ab
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Thu Jan 2 09:01:17 2020 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Jan 9 12:08:15 2020 +0100

    tdf#129205 DOCX import: handle the <w:shd w:val="nil" ...> paragraph property
    
    Reading the spec, "nil" is the opposite of "clear": i.e. if the
    (background) color is red and the fill (color) is green, then "clear"
    means green. And you would expect "nil" means red, but it's just nothing
    in Word.
    
    Fix the problem by doing the same: don't set any paragraph property for
    the "nil" case and keep doing it for the common "clear" case.
    
    (cherry picked from commit fbe7612d654be9dfe1ea6f2e67900eb4eec4202a)
    
    Change-Id: I30af8a7fb55fb9bab2d12e120069a479fc7ab0a9
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86098
    Tested-by: Jenkins
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    (cherry picked from commit dfd75ec6d4dcfec57607a8cf7c7a509c33bf2caa)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86344
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/writerfilter/CppunitTest_writerfilter_dmapper.mk b/writerfilter/CppunitTest_writerfilter_dmapper.mk
index fbb302297c94..9805e28228a0 100644
--- a/writerfilter/CppunitTest_writerfilter_dmapper.mk
+++ b/writerfilter/CppunitTest_writerfilter_dmapper.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_CppunitTest_use_externals,writerfilter_dmapper,\
 ))
 
 $(eval $(call gb_CppunitTest_add_exception_objects,writerfilter_dmapper, \
+    writerfilter/qa/cppunittests/dmapper/CellColorHandler \
     writerfilter/qa/cppunittests/dmapper/DomainMapperTableHandler \
 ))
 
diff --git a/writerfilter/qa/cppunittests/dmapper/CellColorHandler.cxx b/writerfilter/qa/cppunittests/dmapper/CellColorHandler.cxx
new file mode 100644
index 000000000000..ab3dc7cec6c3
--- /dev/null
+++ b/writerfilter/qa/cppunittests/dmapper/CellColorHandler.cxx
@@ -0,0 +1,75 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include <test/bootstrapfixture.hxx>
+#include <unotest/macros_test.hxx>
+
+#include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
+#include <com/sun/star/frame/Desktop.hpp>
+#include <com/sun/star/text/XTextDocument.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/drawing/FillStyle.hpp>
+
+#include <comphelper/processfactory.hxx>
+
+using namespace ::com::sun::star;
+
+namespace
+{
+/// Tests for writerfilter/source/dmapper/CellColorHandler.cxx.
+class Test : public test::BootstrapFixture, public unotest::MacrosTest
+{
+private:
+    uno::Reference<uno::XComponentContext> mxComponentContext;
+    uno::Reference<lang::XComponent> mxComponent;
+
+public:
+    void setUp() override;
+    void tearDown() override;
+    uno::Reference<lang::XComponent>& getComponent() { return mxComponent; }
+};
+
+void Test::setUp()
+{
+    test::BootstrapFixture::setUp();
+
+    mxComponentContext.set(comphelper::getComponentContext(getMultiServiceFactory()));
+    mxDesktop.set(frame::Desktop::create(mxComponentContext));
+}
+
+void Test::tearDown()
+{
+    if (mxComponent.is())
+        mxComponent->dispose();
+
+    test::BootstrapFixture::tearDown();
+}
+
+char const DATA_DIRECTORY[] = "/writerfilter/qa/cppunittests/dmapper/data/";
+
+CPPUNIT_TEST_FIXTURE(Test, test129205)
+{
+    OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + "tdf129205.docx";
+    getComponent() = loadFromDesktop(aURL);
+    uno::Reference<text::XTextDocument> xTextDocument(getComponent(), uno::UNO_QUERY);
+    uno::Reference<container::XEnumerationAccess> xParaEnumAccess(xTextDocument->getText(),
+                                                                  uno::UNO_QUERY);
+    uno::Reference<container::XEnumeration> xParaEnum = xParaEnumAccess->createEnumeration();
+    uno::Reference<beans::XPropertySet> xPara(xParaEnum->nextElement(), uno::UNO_QUERY);
+    drawing::FillStyle eFillStyle = drawing::FillStyle::FillStyle_NONE;
+    xPara->getPropertyValue("FillStyle") >>= eFillStyle;
+    // Without the accompanying fix in place, this test would have failed with:
+    // - Expected: drawing::FillStyle_NONE
+    // - Actual  : FillStyle_SOLID
+    // i.e. the paragraph had a solid fill, making the header image invisible.
+    CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_NONE, eFillStyle);
+}
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/qa/cppunittests/dmapper/data/tdf129205.docx b/writerfilter/qa/cppunittests/dmapper/data/tdf129205.docx
new file mode 100644
index 000000000000..4289254d0a97
Binary files /dev/null and b/writerfilter/qa/cppunittests/dmapper/data/tdf129205.docx differ
diff --git a/writerfilter/source/dmapper/CellColorHandler.cxx b/writerfilter/source/dmapper/CellColorHandler.cxx
index 41248036ae40..964d5f4ba191 100644
--- a/writerfilter/source/dmapper/CellColorHandler.cxx
+++ b/writerfilter/source/dmapper/CellColorHandler.cxx
@@ -276,7 +276,7 @@ TablePropertyMapPtr  CellColorHandler::getProperties()
         pPropertyMap->Insert(PROP_CHAR_SHADING_VALUE, uno::makeAny( nShadingPattern ));
     }
 
-    if (m_OutputFormat == Paragraph)
+    if (m_OutputFormat == Paragraph && m_nShadingPattern != NS_ooxml::LN_Value_ST_Shd_nil)
     {
         if (nWW8BrushStyle || !m_bAutoFillColor)
             pPropertyMap->Insert(PROP_FILL_STYLE, uno::makeAny(drawing::FillStyle_SOLID));