diff options
| author | László Németh <nemeth@numbertext.org> | 2020-08-26 12:49:12 +0200 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2020-08-27 09:18:53 +0200 |
| commit | 3e6f5176bf433a3f1b543b3bb9fc10d6ad72545f (patch) | |
| tree | 8582d39c81382dd362e25b15dfaf304b4395ff82 /sw | |
| parent | 305c8993788b32685a1e6bfc8999fd8a43fcfdaf (diff) | |
Revert "tdf#123354 DOCX import: fix ABS formula"
This reverts commit e1aea22f3f4fbf0cc412a8867165a85a3c55f49c,
except some clean-up associated to the patch.
Change-Id: Id9f87b5a02a14ad304c755b10ab157ff0577e249
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101401
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/ooxmlexport/data/tdf123354.docx | bin | 33106 -> 0 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport15.cxx | 20 |
2 files changed, 0 insertions, 20 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/tdf123354.docx b/sw/qa/extras/ooxmlexport/data/tdf123354.docx Binary files differdeleted file mode 100644 index 15c7663c645c..000000000000 --- a/sw/qa/extras/ooxmlexport/data/tdf123354.docx +++ /dev/null diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx index 6df8475aaa26..e46f99e0c3e9 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx @@ -69,26 +69,6 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf118701, "tdf118701.docx") assertXPath(pXmlDoc, "/w:document/w:body/w:p[10]/w:pPr[1]/w:numPr", 1); } -DECLARE_OOXMLEXPORT_TEST(testTdf123354, "tdf123354.docx") -{ - // Tests cell formula ABS(x) to SQRT(x POW 2) conversion - uno::Reference<text::XTextFieldsSupplier> xTextFieldsSupplier(mxComponent, uno::UNO_QUERY); - uno::Reference<container::XEnumerationAccess> xFieldsAccess(xTextFieldsSupplier->getTextFields()); - uno::Reference<container::XEnumeration> xFields(xFieldsAccess->createEnumeration()); - - uno::Reference<text::XTextField> xEnumerationAccess1(xFields->nextElement(), uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(OUString("SQRT((-234) POW 2)"), xEnumerationAccess1->getPresentation(true).trim()); - CPPUNIT_ASSERT_EQUAL(OUString("234"), xEnumerationAccess1->getPresentation(false).trim()); - - uno::Reference<text::XTextField> xEnumerationAccess2(xFields->nextElement(), uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(OUString("SQRT((SUM(<A1:B1>)-SUM(<A2>)*2) POW 2)"), xEnumerationAccess2->getPresentation(true).trim()); - CPPUNIT_ASSERT_EQUAL(OUString("700035"), xEnumerationAccess2->getPresentation(false).trim()); - - uno::Reference<text::XTextField> xEnumerationAccess3(xFields->nextElement(), uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(OUString("SQRT((<A1>) POW 2)"), xEnumerationAccess3->getPresentation(true).trim()); - CPPUNIT_ASSERT_EQUAL(OUString("233423"), xEnumerationAccess3->getPresentation(false).trim()); -} - DECLARE_OOXMLEXPORT_TEST(testTdf123388, "tdf123388.docx") { uno::Reference<text::XTextFieldsSupplier> xTextFieldsSupplier(mxComponent, uno::UNO_QUERY); |