sw/qa/extras/ooxmlexport/ooxmlexport14.cxx | 40 ++++-------------------------
1 file changed, 6 insertions(+), 34 deletions(-)
New commits:
commit ee1407608c0d228e4705215e9700af3200511cc8
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Thu May 27 10:41:23 2021 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Thu May 27 11:29:52 2021 +0200
sw_ooxmlexport14: simplify code
Change-Id: I2e52a042b514e6724dbd282a41a4ca7f66981f2e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116233
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index 293f82ed9c87..d309e3577b80 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -718,19 +718,8 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf121658,
"tdf121658.docx")
assertXPath(pXmlSettings, "/w:settings/w:doNotHyphenateCaps");
}
-CPPUNIT_TEST_FIXTURE(SwModelTestBase, testTableStyleConfNested)
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTableStyleConfNested,
"table-style-conf-nested.docx")
{
- // Create the doc model.
- OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) +
"table-style-conf-nested.docx";
- loadURL(aURL, nullptr);
-
- // Export to docx.
- uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY);
- utl::MediaDescriptor aMediaDescriptor;
- aMediaDescriptor["FilterName"] <<= OUString("Office Open XML Text");
- xStorable->storeToURL(maTempFile.GetURL(),
aMediaDescriptor.getAsConstPropertyValueList());
- validate(maTempFile.GetFileName(), test::OOXML);
- mbExported = true;
xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
CPPUNIT_ASSERT(pXmlDoc);
// Without the accompanying fix in place, this test would have failed, as
the custom table cell
@@ -750,11 +739,7 @@ CPPUNIT_TEST_FIXTURE(SwModelTestBase, testTdf133771)
// Without the fix in place, this test would have failed with
// "An uncaught exception of type com.sun.star.io.IOException"
// exporting to docx
- uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY);
- utl::MediaDescriptor aMediaDescriptor;
- aMediaDescriptor["FilterName"] <<= OUString("Office Open XML Text");
- xStorable->storeToURL(maTempFile.GetURL(),
aMediaDescriptor.getAsConstPropertyValueList());
- validate(maTempFile.GetFileName(), test::OOXML);
+ save("Office Open XML Text", maTempFile);
mbExported = true;
xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -772,10 +757,7 @@ CPPUNIT_TEST_FIXTURE(SwModelTestBase, testZeroLineSpacing)
xParagraph->setPropertyValue("ParaLineSpacing", uno::makeAny(aSpacing));
// Export to docx.
- uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY);
- utl::MediaDescriptor aMediaDescriptor;
- aMediaDescriptor["FilterName"] <<= OUString("Office Open XML Text");
- xStorable->storeToURL(maTempFile.GetURL(),
aMediaDescriptor.getAsConstPropertyValueList());
+ save("Office Open XML Text", maTempFile);
mbExported = true;
xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -803,10 +785,7 @@ CPPUNIT_TEST_FIXTURE(SwModelTestBase,
testSemiTransparentText)
xTextRange->setString("x");
// Export to docx.
- uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY);
- utl::MediaDescriptor aMediaDescriptor;
- aMediaDescriptor["FilterName"] <<= OUString("Office Open XML Text");
- xStorable->storeToURL(maTempFile.GetURL(),
aMediaDescriptor.getAsConstPropertyValueList());
+ save("Office Open XML Text", maTempFile);
mbExported = true;
xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -839,11 +818,7 @@ CPPUNIT_TEST_FIXTURE(SwModelTestBase, testUserField)
xText->insertTextContent(xText->createTextCursor(), xField,
/*bAbsorb=*/false);
// Export to docx.
- uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY);
- utl::MediaDescriptor aMediaDescriptor;
- aMediaDescriptor["FilterName"] <<= OUString("Office Open XML Text");
- xStorable->storeToURL(maTempFile.GetURL(),
aMediaDescriptor.getAsConstPropertyValueList());
- validate(maTempFile.GetFileName(), test::OOXML);
+ save("Office Open XML Text", maTempFile);
mbExported = true;
xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -897,10 +872,7 @@ CPPUNIT_TEST_FIXTURE(SwModelTestBase,
testHighlightEdit_numbering)
properties->setPropertyValue("ListAutoFormat",
uno::makeAny(aListAutoFormat));
// Export to docx.
- uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY);
- utl::MediaDescriptor aMediaDescriptor;
- aMediaDescriptor["FilterName"] <<= OUString("Office Open XML Text");
- xStorable->storeToURL(maTempFile.GetURL(),
aMediaDescriptor.getAsConstPropertyValueList());
+ save("Office Open XML Text", maTempFile);
mbExported = true;
// Paragraph 2 should have only one w:highlight written per w:rPr. Without
the fix, there were two.
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
