sw/qa/extras/ooxmlexport/data/table-black_fill.docx |binary sw/qa/extras/ooxmlexport/ooxmlexport11.cxx | 10 ++++++++++ writerfilter/source/dmapper/TablePropertiesHandler.cxx | 2 ++ 3 files changed, 12 insertions(+)
New commits: commit 82fb7f9f90a3ba9d53b3412124e513aa78ddca10 Author: László Németh <[email protected]> AuthorDate: Tue Feb 5 23:13:23 2019 +0100 Commit: László Németh <[email protected]> CommitDate: Wed Feb 6 00:38:21 2019 +0100 tdf#123189 DOCX import: skip table bkground color settings to keep interoperability, use only cell properties, as MSO. Change-Id: I167eb0e8732fa7dc7f890c2a21d59a15299be8ba Reviewed-on: https://gerrit.libreoffice.org/67429 Tested-by: Jenkins Reviewed-by: László Németh <[email protected]> diff --git a/sw/qa/extras/ooxmlexport/data/table-black_fill.docx b/sw/qa/extras/ooxmlexport/data/table-black_fill.docx new file mode 100644 index 000000000000..c9d4e2289644 Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/table-black_fill.docx differ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx index ac701f8bbd75..71189d4e5e9b 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx @@ -931,6 +931,16 @@ DECLARE_OOXMLEXPORT_TEST(testTdf121597TrackedDeletionOfMultipleParagraphs, "tdf1 assertXPath(pXmlDoc, "/w:document/w:body/w:p[10]/w:pPr/w:rPr/w:del"); } +DECLARE_OOXMLEXPORT_TEST(testTdf123189_tableBackground, "table-black_fill.docx") +{ + uno::Reference<text::XTextTablesSupplier> xTextTablesSupplier(mxComponent, uno::UNO_QUERY); + uno::Reference<container::XIndexAccess> xTables(xTextTablesSupplier->getTextTables(), uno::UNO_QUERY); + uno::Reference<text::XTextTable> xTable(xTables->getByIndex(0), uno::UNO_QUERY); + + uno::Reference<table::XCell> xCell = xTable->getCellByName("A1"); + CPPUNIT_ASSERT_EQUAL(COL_TRANSPARENT, Color(getProperty<sal_uInt32>(xCell, "BackColor"))); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.cxx b/writerfilter/source/dmapper/TablePropertiesHandler.cxx index 2343361cfc1c..3ace6e58a8b2 100644 --- a/writerfilter/source/dmapper/TablePropertiesHandler.cxx +++ b/writerfilter/source/dmapper/TablePropertiesHandler.cxx @@ -273,6 +273,7 @@ namespace dmapper { } } break; +/* // tdf#123189 skip to keep MSO interoperability case NS_ooxml::LN_CT_TblPrBase_shd: { writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); @@ -284,6 +285,7 @@ namespace dmapper { insertTableProps( pCellColorHandler->getProperties() ); } } +*/ break; case NS_ooxml::LN_CT_TcPrBase_shd: { _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
