diff options
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/CppunitTest_sw_odfexport.mk | 1 | ||||
| -rw-r--r-- | sw/qa/extras/odfexport/data/2_MathType3.docx | bin | 0 -> 15260 bytes | |||
| -rw-r--r-- | sw/qa/extras/odfexport/odfexport.cxx | 30 |
3 files changed, 31 insertions, 0 deletions
diff --git a/sw/CppunitTest_sw_odfexport.mk b/sw/CppunitTest_sw_odfexport.mk index c6ec626fb1ce..09307325ba74 100644 --- a/sw/CppunitTest_sw_odfexport.mk +++ b/sw/CppunitTest_sw_odfexport.mk @@ -81,6 +81,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_odfexport,\ writerfilter/util/writerfilter \ $(if $(filter DESKTOP,$(BUILD_TYPE)),xmlhelp/util/ucpchelp1) \ xmloff/util/xo \ + xmlscript/util/xmlscript \ )) $(eval $(call gb_CppunitTest_use_custom_headers,sw_odfexport,\ diff --git a/sw/qa/extras/odfexport/data/2_MathType3.docx b/sw/qa/extras/odfexport/data/2_MathType3.docx Binary files differnew file mode 100644 index 000000000000..0694921b3918 --- /dev/null +++ b/sw/qa/extras/odfexport/data/2_MathType3.docx diff --git a/sw/qa/extras/odfexport/odfexport.cxx b/sw/qa/extras/odfexport/odfexport.cxx index 2506ec3160a3..a91759620fea 100644 --- a/sw/qa/extras/odfexport/odfexport.cxx +++ b/sw/qa/extras/odfexport/odfexport.cxx @@ -68,10 +68,40 @@ public: pBatch->commit(); return pResetter; } + if (OString(pFilename) == "2_MathType3.docx") + { + std::unique_ptr<Resetter> pResetter(new Resetter( + [this] () { + mpFilter = "writer8"; + std::shared_ptr<comphelper::ConfigurationChanges> pBatch( + comphelper::ConfigurationChanges::create()); + officecfg::Office::Common::Cache::Writer::OLE_Objects::set(20, pBatch); + return pBatch->commit(); + })); + mpFilter = "OpenDocument Text Flat XML"; // doesn't happen with ODF package + std::shared_ptr<comphelper::ConfigurationChanges> pBatch( + comphelper::ConfigurationChanges::create()); + officecfg::Office::Common::Cache::Writer::OLE_Objects::set(1, pBatch); + pBatch->commit(); + return pResetter; + } return nullptr; } }; +DECLARE_ODFEXPORT_TEST(testMathObjectFlatExport, "2_MathType3.docx") +{ + uno::Reference<util::XModifiable> xModifiable(mxComponent, uno::UNO_QUERY); + CPPUNIT_ASSERT(!xModifiable->isModified()); + // see preTest(), set the OLE cache to 1 for this test + // and the problem was that the formulas that were in the cache + // (the second one) were lost + OUString formula1(getFormula(getRun(getParagraph(1), 1))); + CPPUNIT_ASSERT_EQUAL(OUString(" size 12{1+1=2} {}"), formula1); + OUString formula2(getFormula(getRun(getParagraph(2), 1))); + CPPUNIT_ASSERT_EQUAL(OUString(" size 12{2+2=4} {}"), formula2); +} + DECLARE_ODFEXPORT_TEST(testFramebackgrounds, "framebackgrounds.odt") { //Counting the Number of Frames and checking with the expected count |