From 7798ce2e8c938b9d05a3f39e50a2737e64957197 Mon Sep 17 00:00:00 2001 From: László Németh Date: Mon, 7 Jan 2019 21:28:29 +0100 Subject: tdf#122224 DOCX import: fix formula field syntax MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit by removing the DOCX custom number format string which caused a syntax error message here instead of the formula calculation. Change-Id: Ia643e966440117871f6b4ddceab610100ac34138 Reviewed-on: https://gerrit.libreoffice.org/65945 Tested-by: Jenkins Reviewed-by: László Németh (cherry picked from commit 7209feef41c3c858476a2ae9795a7d2264c0ffc0) Reviewed-on: https://gerrit.libreoffice.org/65959 Tested-by: Xisco Faulí Reviewed-by: Xisco Faulí (cherry picked from commit b095e8f3b27331f0d646b1d33e51e17c37e43e2c) Reviewed-on: https://gerrit.libreoffice.org/66470 Reviewed-by: Christian Lohmaier --- sw/qa/extras/ooxmlimport/data/tdf122224.docx | Bin 0 -> 19306 bytes sw/qa/extras/ooxmlimport/ooxmlimport2.cxx | 11 +++++++++++ writerfilter/source/dmapper/DomainMapper_Impl.cxx | 9 +++++++++ 3 files changed, 20 insertions(+) create mode 100644 sw/qa/extras/ooxmlimport/data/tdf122224.docx diff --git a/sw/qa/extras/ooxmlimport/data/tdf122224.docx b/sw/qa/extras/ooxmlimport/data/tdf122224.docx new file mode 100644 index 000000000000..14518403cae1 Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf122224.docx differ diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx index 833c2ed7e822..45480023495f 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx @@ -240,6 +240,17 @@ DECLARE_OOXMLIMPORT_TEST(testTdf116486, "tdf116486.docx") CPPUNIT_ASSERT_EQUAL(OUString("4006"), aTop); } +DECLARE_OOXMLIMPORT_TEST(testTdf122224, "tdf122224.docx") +{ + uno::Reference xTextTablesSupplier(mxComponent, uno::UNO_QUERY); + uno::Reference xTables(xTextTablesSupplier->getTextTables(), + uno::UNO_QUERY); + uno::Reference xTable(xTables->getByIndex(0), uno::UNO_QUERY); + uno::Reference xCell(xTable->getCellByName("A2"), uno::UNO_QUERY_THROW); + // This was "** Expression is faulty **", because of the unnecessary DOCX number format string + CPPUNIT_ASSERT_EQUAL(OUString("2000"), xCell->getString()); +} + // tests should only be added to ooxmlIMPORT *if* they fail round-tripping in ooxmlEXPORT CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 8114600a68aa..82db1031bc88 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -3217,6 +3217,15 @@ void DomainMapper_Impl::handleFieldFormula uno::Reference< beans::XPropertySet > const& xFieldProperties) { OUString command = pContext->GetCommand().trim(); + + // Remove number formatting from \# to end of command + // TODO: handle custom number formatting + sal_Int32 delimPos = command.indexOf("\\#"); + if (delimPos != -1) + { + command = command.replaceAt(delimPos, command.getLength() - delimPos, "").trim(); + } + // command must contains = and at least another char if (command.getLength() < 2) return; -- cgit