sw/qa/extras/rtfexport/rtfexport2.cxx | 1573 +++++++++++++++++++++-------------
1 file changed, 1008 insertions(+), 565 deletions(-)
New commits:
commit 4dc788ea10e0b0d89ed1edf3cde39af4c304fa9f
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Wed Apr 10 07:17:46 2024 +0100
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Wed Apr 10 09:28:19 2024 +0200
CppunitTest_sw_rtfexport2: avoid DECLARE_RTFEXPORT_TEST
No need to go via Writer-specific macros here.
Change-Id: I50de20f3199878db2b9fe7e66f09b2620e43cc3c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165918
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Tested-by: Jenkins
diff --git a/sw/qa/extras/rtfexport/rtfexport2.cxx
b/sw/qa/extras/rtfexport/rtfexport2.cxx
index 29f3ec3eb4b4..2226a622104a 100644
--- a/sw/qa/extras/rtfexport/rtfexport2.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport2.cxx
@@ -45,257 +45,374 @@ public:
}
};
-DECLARE_RTFEXPORT_TEST(testFdo45553, "fdo45553.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo45553)
{
- uno::Reference<text::XTextDocument> xTextDocument(mxComponent,
uno::UNO_QUERY);
- uno::Reference<container::XEnumerationAccess>
xParaEnumAccess(xTextDocument->getText(),
-
uno::UNO_QUERY);
- uno::Reference<container::XEnumeration> xParaEnum =
xParaEnumAccess->createEnumeration();
- while (xParaEnum->hasMoreElements())
- {
- uno::Reference<container::XEnumerationAccess>
xRangeEnumAccess(xParaEnum->nextElement(),
-
uno::UNO_QUERY);
- uno::Reference<container::XEnumeration> xRangeEnum =
xRangeEnumAccess->createEnumeration();
- while (xRangeEnum->hasMoreElements())
+ auto verify = [this]() {
+ uno::Reference<text::XTextDocument> xTextDocument(mxComponent,
uno::UNO_QUERY);
+ uno::Reference<container::XEnumerationAccess>
xParaEnumAccess(xTextDocument->getText(),
+
uno::UNO_QUERY);
+ uno::Reference<container::XEnumeration> xParaEnum =
xParaEnumAccess->createEnumeration();
+ while (xParaEnum->hasMoreElements())
{
- uno::Reference<text::XTextRange> xRange(xRangeEnum->nextElement(),
uno::UNO_QUERY);
- OUString aStr = xRange->getString();
- if (aStr == "space-before")
- CPPUNIT_ASSERT_EQUAL(sal_Int32(convertTwipToMm100(120)),
- getProperty<sal_Int32>(xRange,
"ParaTopMargin"));
- else if (aStr == "space-after")
- CPPUNIT_ASSERT_EQUAL(sal_Int32(convertTwipToMm100(240)),
- getProperty<sal_Int32>(xRange,
"ParaBottomMargin"));
+ uno::Reference<container::XEnumerationAccess>
xRangeEnumAccess(xParaEnum->nextElement(),
+
uno::UNO_QUERY);
+ uno::Reference<container::XEnumeration> xRangeEnum
+ = xRangeEnumAccess->createEnumeration();
+ while (xRangeEnum->hasMoreElements())
+ {
+ uno::Reference<text::XTextRange>
xRange(xRangeEnum->nextElement(), uno::UNO_QUERY);
+ OUString aStr = xRange->getString();
+ if (aStr == "space-before")
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(convertTwipToMm100(120)),
+ getProperty<sal_Int32>(xRange,
"ParaTopMargin"));
+ else if (aStr == "space-after")
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(convertTwipToMm100(240)),
+ getProperty<sal_Int32>(xRange,
"ParaBottomMargin"));
+ }
}
- }
+ };
+ createSwDoc("fdo45553.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testN192129, "n192129.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testN192129)
{
- // We expect that the result will be 16x16px.
- Size aExpectedSize(16, 16);
- MapMode aMap(MapUnit::Map100thMM);
- aExpectedSize =
Application::GetDefaultDevice()->PixelToLogic(aExpectedSize, aMap);
-
- uno::Reference<text::XTextGraphicObjectsSupplier>
xTextGraphicObjectsSupplier(mxComponent,
-
uno::UNO_QUERY);
- uno::Reference<container::XIndexAccess> xIndexAccess(
- xTextGraphicObjectsSupplier->getGraphicObjects(), uno::UNO_QUERY);
- uno::Reference<drawing::XShape> xShape(xIndexAccess->getByIndex(0),
uno::UNO_QUERY);
- awt::Size aActualSize(xShape->getSize());
- if ((aExpectedSize.Width() - aActualSize.Width) / 2 != 0)
- {
- CPPUNIT_ASSERT_EQUAL(sal_Int32(aExpectedSize.Width()),
aActualSize.Width);
- }
- if ((aExpectedSize.Height() - aActualSize.Height) / 2 != 0)
- {
- CPPUNIT_ASSERT_EQUAL(sal_Int32(aExpectedSize.Height()),
aActualSize.Height);
- }
+ auto verify = [this]() {
+ // We expect that the result will be 16x16px.
+ Size aExpectedSize(16, 16);
+ MapMode aMap(MapUnit::Map100thMM);
+ aExpectedSize =
Application::GetDefaultDevice()->PixelToLogic(aExpectedSize, aMap);
+
+ uno::Reference<text::XTextGraphicObjectsSupplier>
xTextGraphicObjectsSupplier(
+ mxComponent, uno::UNO_QUERY);
+ uno::Reference<container::XIndexAccess> xIndexAccess(
+ xTextGraphicObjectsSupplier->getGraphicObjects(), uno::UNO_QUERY);
+ uno::Reference<drawing::XShape> xShape(xIndexAccess->getByIndex(0),
uno::UNO_QUERY);
+ awt::Size aActualSize(xShape->getSize());
+ if ((aExpectedSize.Width() - aActualSize.Width) / 2 != 0)
+ {
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(aExpectedSize.Width()),
aActualSize.Width);
+ }
+ if ((aExpectedSize.Height() - aActualSize.Height) / 2 != 0)
+ {
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(aExpectedSize.Height()),
aActualSize.Height);
+ }
+ };
+ createSwDoc("n192129.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testFdo45543, "fdo45543.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo45543)
{
- CPPUNIT_ASSERT_EQUAL(u"この文書は"_ustr, getBodyText());
+ auto verify = [this]() { CPPUNIT_ASSERT_EQUAL(u"この文書は"_ustr,
getBodyText()); };
+ createSwDoc("fdo45543.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testFdo42465, "fdo42465.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo42465)
{
- CPPUNIT_ASSERT_EQUAL(u"kód"_ustr, getBodyText());
+ auto verify = [this]() { CPPUNIT_ASSERT_EQUAL(u"kód"_ustr, getBodyText());
};
+ createSwDoc("fdo42465.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testFdo45187, "fdo45187.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo45187)
{
- // There should be two shapes.
- CPPUNIT_ASSERT_EQUAL(2, getShapes());
+ auto verify = [this]() {
+ // There should be two shapes.
+ CPPUNIT_ASSERT_EQUAL(2, getShapes());
- // They should be anchored to different paragraphs.
- uno::Reference<text::XTextDocument> xTextDocument(mxComponent,
uno::UNO_QUERY);
- uno::Reference<text::XTextRangeCompare>
xTextRangeCompare(xTextDocument->getText(),
- uno::UNO_QUERY);
- uno::Reference<text::XTextRange> xAnchor0
- = uno::Reference<text::XTextContent>(getShape(1),
uno::UNO_QUERY_THROW)->getAnchor();
- uno::Reference<text::XTextRange> xAnchor1
- = uno::Reference<text::XTextContent>(getShape(2),
uno::UNO_QUERY_THROW)->getAnchor();
- // Was 0 ("starts at the same position"), should be 1 ("starts before")
- CPPUNIT_ASSERT_EQUAL(sal_Int16(1),
xTextRangeCompare->compareRegionStarts(xAnchor0, xAnchor1));
+ // They should be anchored to different paragraphs.
+ uno::Reference<text::XTextDocument> xTextDocument(mxComponent,
uno::UNO_QUERY);
+ uno::Reference<text::XTextRangeCompare>
xTextRangeCompare(xTextDocument->getText(),
+
uno::UNO_QUERY);
+ uno::Reference<text::XTextRange> xAnchor0
+ = uno::Reference<text::XTextContent>(getShape(1),
uno::UNO_QUERY_THROW)->getAnchor();
+ uno::Reference<text::XTextRange> xAnchor1
+ = uno::Reference<text::XTextContent>(getShape(2),
uno::UNO_QUERY_THROW)->getAnchor();
+ // Was 0 ("starts at the same position"), should be 1 ("starts before")
+ CPPUNIT_ASSERT_EQUAL(sal_Int16(1),
+ xTextRangeCompare->compareRegionStarts(xAnchor0,
xAnchor1));
+ };
+ createSwDoc("fdo45187.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testN750757, "n750757.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testN750757)
{
- uno::Reference<text::XTextDocument> xTextDocument(mxComponent,
uno::UNO_QUERY);
- uno::Reference<container::XEnumerationAccess>
xParaEnumAccess(xTextDocument->getText(),
-
uno::UNO_QUERY);
- uno::Reference<container::XEnumeration> xParaEnum =
xParaEnumAccess->createEnumeration();
-
- CPPUNIT_ASSERT_EQUAL(false, getProperty<bool>(xParaEnum->nextElement(),
"ParaContextMargin"));
- CPPUNIT_ASSERT_EQUAL(true, getProperty<bool>(xParaEnum->nextElement(),
"ParaContextMargin"));
+ auto verify = [this]() {
+ uno::Reference<text::XTextDocument> xTextDocument(mxComponent,
uno::UNO_QUERY);
+ uno::Reference<container::XEnumerationAccess>
xParaEnumAccess(xTextDocument->getText(),
+
uno::UNO_QUERY);
+ uno::Reference<container::XEnumeration> xParaEnum =
xParaEnumAccess->createEnumeration();
+
+ CPPUNIT_ASSERT_EQUAL(false,
+ getProperty<bool>(xParaEnum->nextElement(),
"ParaContextMargin"));
+ CPPUNIT_ASSERT_EQUAL(true,
+ getProperty<bool>(xParaEnum->nextElement(),
"ParaContextMargin"));
+ };
+ createSwDoc("n750757.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testFdo45563, "fdo45563.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo45563)
{
- uno::Reference<text::XTextDocument> xTextDocument(mxComponent,
uno::UNO_QUERY);
- uno::Reference<container::XEnumerationAccess>
xParaEnumAccess(xTextDocument->getText(),
-
uno::UNO_QUERY);
- uno::Reference<container::XEnumeration> xParaEnum =
xParaEnumAccess->createEnumeration();
- int i = 0;
- while (xParaEnum->hasMoreElements())
- {
- xParaEnum->nextElement();
- i++;
- }
- CPPUNIT_ASSERT_EQUAL(4, i);
+ auto verify = [this]() {
+ uno::Reference<text::XTextDocument> xTextDocument(mxComponent,
uno::UNO_QUERY);
+ uno::Reference<container::XEnumerationAccess>
xParaEnumAccess(xTextDocument->getText(),
+
uno::UNO_QUERY);
+ uno::Reference<container::XEnumeration> xParaEnum =
xParaEnumAccess->createEnumeration();
+ int i = 0;
+ while (xParaEnum->hasMoreElements())
+ {
+ xParaEnum->nextElement();
+ i++;
+ }
+ CPPUNIT_ASSERT_EQUAL(4, i);
+ };
+ createSwDoc("fdo45563.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testFdo43965, "fdo43965.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo43965)
{
- uno::Reference<text::XTextDocument> xTextDocument(mxComponent,
uno::UNO_QUERY);
- uno::Reference<container::XEnumerationAccess>
xParaEnumAccess(xTextDocument->getText(),
-
uno::UNO_QUERY);
- uno::Reference<container::XEnumeration> xParaEnum =
xParaEnumAccess->createEnumeration();
+ auto verify = [this]() {
+ uno::Reference<text::XTextDocument> xTextDocument(mxComponent,
uno::UNO_QUERY);
+ uno::Reference<container::XEnumerationAccess>
xParaEnumAccess(xTextDocument->getText(),
+
uno::UNO_QUERY);
+ uno::Reference<container::XEnumeration> xParaEnum =
xParaEnumAccess->createEnumeration();
- // First paragraph: the parameter of \up was ignored
- uno::Reference<container::XEnumerationAccess>
xRangeEnumAccess(xParaEnum->nextElement(),
-
uno::UNO_QUERY);
- uno::Reference<container::XEnumeration> xRangeEnum =
xRangeEnumAccess->createEnumeration();
- uno::Reference<beans::XPropertySet>
xPropertySet(xRangeEnum->nextElement(), uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(sal_Int32(36), getProperty<sal_Int32>(xPropertySet,
"CharEscapement"));
- CPPUNIT_ASSERT_EQUAL(sal_Int32(100),
- getProperty<sal_Int32>(xPropertySet,
"CharEscapementHeight"));
+ // First paragraph: the parameter of \up was ignored
+ uno::Reference<container::XEnumerationAccess>
xRangeEnumAccess(xParaEnum->nextElement(),
+
uno::UNO_QUERY);
+ uno::Reference<container::XEnumeration> xRangeEnum =
xRangeEnumAccess->createEnumeration();
+ uno::Reference<beans::XPropertySet>
xPropertySet(xRangeEnum->nextElement(), uno::UNO_QUERY);
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(36),
getProperty<sal_Int32>(xPropertySet, "CharEscapement"));
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(100),
+ getProperty<sal_Int32>(xPropertySet,
"CharEscapementHeight"));
- // Second paragraph: Word vs Writer border default problem
- CPPUNIT_ASSERT_EQUAL(
- sal_uInt32(26),
- getProperty<table::BorderLine2>(xParaEnum->nextElement(),
"TopBorder").LineWidth);
+ // Second paragraph: Word vs Writer border default problem
+ CPPUNIT_ASSERT_EQUAL(
+ sal_uInt32(26),
+ getProperty<table::BorderLine2>(xParaEnum->nextElement(),
"TopBorder").LineWidth);
- // Finally, make sure that we have two pages
- CPPUNIT_ASSERT_EQUAL(2, getPages());
+ // Finally, make sure that we have two pages
+ CPPUNIT_ASSERT_EQUAL(2, getPages());
+ };
+ createSwDoc("fdo43965.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testN751020, "n751020.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testN751020)
{
- uno::Reference<text::XTextDocument> xTextDocument(mxComponent,
uno::UNO_QUERY);
- uno::Reference<container::XEnumerationAccess>
xParaEnumAccess(xTextDocument->getText(),
-
uno::UNO_QUERY);
- uno::Reference<container::XEnumeration> xParaEnum =
xParaEnumAccess->createEnumeration();
- CPPUNIT_ASSERT(xParaEnum->hasMoreElements());
- CPPUNIT_ASSERT_EQUAL(sal_Int32(convertTwipToMm100(200)),
- getProperty<sal_Int32>(xParaEnum->nextElement(),
"ParaBottomMargin"));
+ auto verify = [this]() {
+ uno::Reference<text::XTextDocument> xTextDocument(mxComponent,
uno::UNO_QUERY);
+ uno::Reference<container::XEnumerationAccess>
xParaEnumAccess(xTextDocument->getText(),
+
uno::UNO_QUERY);
+ uno::Reference<container::XEnumeration> xParaEnum =
xParaEnumAccess->createEnumeration();
+ CPPUNIT_ASSERT(xParaEnum->hasMoreElements());
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(convertTwipToMm100(200)),
+ getProperty<sal_Int32>(xParaEnum->nextElement(),
"ParaBottomMargin"));
+ };
+ createSwDoc("n751020.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testFdo79384, "fdo79384.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo79384)
{
- uno::Reference<text::XTextRange> xTextRange = getRun(getParagraph(1), 1);
+ auto verify = [this]() {
+ uno::Reference<text::XTextRange> xTextRange = getRun(getParagraph(1),
1);
- CPPUNIT_ASSERT_EQUAL(u"Маркеры спискамЫ"_ustr, xTextRange->getString());
+ CPPUNIT_ASSERT_EQUAL(u"Маркеры спискамЫ"_ustr,
xTextRange->getString());
+ };
+ createSwDoc("fdo79384.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testFdo47326, "fdo47326.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo47326)
{
- // Length was 15 only, as \super buffered text, then the contents of it
got lost.
- CPPUNIT_ASSERT_EQUAL(u"Windows®XP: Cartes:"_ustr, getBodyText());
+ auto verify = [this]() {
+ // Length was 15 only, as \super buffered text, then the contents of
it got lost.
+ CPPUNIT_ASSERT_EQUAL(u"Windows®XP: Cartes:"_ustr, getBodyText());
+ };
+ createSwDoc("fdo47326.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testFdo46955, "fdo46955.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo46955)
{
- uno::Reference<text::XTextDocument> xTextDocument(mxComponent,
uno::UNO_QUERY);
- uno::Reference<container::XEnumerationAccess>
xParaEnumAccess(xTextDocument->getText(),
-
uno::UNO_QUERY);
- uno::Reference<container::XEnumeration> xParaEnum =
xParaEnumAccess->createEnumeration();
- while (xParaEnum->hasMoreElements())
- {
- uno::Reference<container::XEnumerationAccess>
xRangeEnumAccess(xParaEnum->nextElement(),
-
uno::UNO_QUERY);
- uno::Reference<container::XEnumeration> xRangeEnum =
xRangeEnumAccess->createEnumeration();
- while (xRangeEnum->hasMoreElements())
- CPPUNIT_ASSERT_EQUAL(style::CaseMap::UPPERCASE,
-
getProperty<sal_Int16>(xRangeEnum->nextElement(), "CharCaseMap"));
- }
+ auto verify = [this]() {
+ uno::Reference<text::XTextDocument> xTextDocument(mxComponent,
uno::UNO_QUERY);
+ uno::Reference<container::XEnumerationAccess>
xParaEnumAccess(xTextDocument->getText(),
+
uno::UNO_QUERY);
+ uno::Reference<container::XEnumeration> xParaEnum =
xParaEnumAccess->createEnumeration();
+ while (xParaEnum->hasMoreElements())
+ {
+ uno::Reference<container::XEnumerationAccess>
xRangeEnumAccess(xParaEnum->nextElement(),
+
uno::UNO_QUERY);
+ uno::Reference<container::XEnumeration> xRangeEnum
+ = xRangeEnumAccess->createEnumeration();
+ while (xRangeEnum->hasMoreElements())
+ CPPUNIT_ASSERT_EQUAL(
+ style::CaseMap::UPPERCASE,
+ getProperty<sal_Int16>(xRangeEnum->nextElement(),
"CharCaseMap"));
+ }
+ };
+ createSwDoc("fdo46955.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testFdo81892, "fdo81892.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo81892)
{
- // table was not centered
- 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);
- CPPUNIT_ASSERT_EQUAL(text::HoriOrientation::CENTER,
- getProperty<sal_Int16>(xTable, "HoriOrient"));
-
- // fdo#81893: paragraph with \page was not centered
- uno::Reference<text::XTextRange> xPara(getParagraph(2, "Performance"));
- CPPUNIT_ASSERT_EQUAL(
- style::ParagraphAdjust_CENTER,
- static_cast<style::ParagraphAdjust>(getProperty<sal_Int16>(xPara,
"ParaAdjust")));
+ auto verify = [this]() {
+ // table was not centered
+ 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);
+ CPPUNIT_ASSERT_EQUAL(text::HoriOrientation::CENTER,
+ getProperty<sal_Int16>(xTable, "HoriOrient"));
+
+ // fdo#81893: paragraph with \page was not centered
+ uno::Reference<text::XTextRange> xPara(getParagraph(2, "Performance"));
+ CPPUNIT_ASSERT_EQUAL(
+ style::ParagraphAdjust_CENTER,
+ static_cast<style::ParagraphAdjust>(getProperty<sal_Int16>(xPara,
"ParaAdjust")));
+ };
+ createSwDoc("fdo81892.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testFdo45394, "fdo45394.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo45394)
{
- uno::Reference<text::XText> xHeaderText =
getProperty<uno::Reference<text::XText>>(
- getStyles("PageStyles")->getByName("Standard"), "HeaderText");
- OUString aActual = xHeaderText->getString();
- // Encoding in the header was wrong.
- CPPUNIT_ASSERT_EQUAL(u"\u041F\u041A \u0420\u0418\u041A"_ustr, aActual);
-
- uno::Reference<text::XTextTablesSupplier> xTextTablesSupplier(mxComponent,
uno::UNO_QUERY);
- uno::Reference<container::XIndexAccess>
xIndexAccess(xTextTablesSupplier->getTextTables(),
- uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
+ auto verify = [this]() {
+ uno::Reference<text::XText> xHeaderText =
getProperty<uno::Reference<text::XText>>(
+ getStyles("PageStyles")->getByName("Standard"), "HeaderText");
+ OUString aActual = xHeaderText->getString();
+ // Encoding in the header was wrong.
+ CPPUNIT_ASSERT_EQUAL(u"\u041F\u041A \u0420\u0418\u041A"_ustr, aActual);
+
+ uno::Reference<text::XTextTablesSupplier>
xTextTablesSupplier(mxComponent, uno::UNO_QUERY);
+ uno::Reference<container::XIndexAccess>
xIndexAccess(xTextTablesSupplier->getTextTables(),
+ uno::UNO_QUERY);
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
+ };
+ createSwDoc("fdo45394.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testFdo48104, "fdo48104.rtf") { CPPUNIT_ASSERT_EQUAL(2,
getPages()); }
+CPPUNIT_TEST_FIXTURE(Test, testFdo48104)
+{
+ auto verify = [this]() { CPPUNIT_ASSERT_EQUAL(2, getPages()); };
+ createSwDoc("fdo48104.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
+}
-DECLARE_RTFEXPORT_TEST(testFdo47107, "fdo47107.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo47107)
{
- uno::Reference<container::XNameAccess>
xNumberingStyles(getStyles("NumberingStyles"));
- // Make sure numbered and bullet legacy syntax is recognized, this used to
throw a NoSuchElementException
- xNumberingStyles->getByName("WWNum1");
- xNumberingStyles->getByName("WWNum2");
+ auto verify = [this]() {
+ uno::Reference<container::XNameAccess>
xNumberingStyles(getStyles("NumberingStyles"));
+ // Make sure numbered and bullet legacy syntax is recognized, this
used to throw a NoSuchElementException
+ xNumberingStyles->getByName("WWNum1");
+ xNumberingStyles->getByName("WWNum2");
+ };
+ createSwDoc("fdo47107.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
// TODO - First Page Headers Support
// This assumption is false now - we only have "Standard" page style, which
should have properties properly set
-/*DECLARE_RTFEXPORT_TEST(testFdo44176, "fdo44176.rtf")
+/*CPPUNIT_TEST_FIXTURE(Test, testFdo44176)
{
- uno::Reference<container::XNameAccess>
xPageStyles(getStyles("PageStyles"));
- uno::Reference<beans::XPropertySet>
xFirstPage(xPageStyles->getByName("First Page"),
- uno::UNO_QUERY);
- uno::Reference<beans::XPropertySet>
xDefault(xPageStyles->getByName("Standard"),
- uno::UNO_QUERY);
- sal_Int32 nFirstTop = 0, nDefaultTop = 0, nDefaultHeader = 0;
- xFirstPage->getPropertyValue("TopMargin") >>= nFirstTop;
- xDefault->getPropertyValue("TopMargin") >>= nDefaultTop;
- xDefault->getPropertyValue("HeaderHeight") >>= nDefaultHeader;
- CPPUNIT_ASSERT_EQUAL(nFirstTop, nDefaultTop + nDefaultHeader);
+ auto verify = [this]() {
+ uno::Reference<container::XNameAccess>
xPageStyles(getStyles("PageStyles"));
+ uno::Reference<beans::XPropertySet>
xFirstPage(xPageStyles->getByName("First Page"),
+ uno::UNO_QUERY);
+ uno::Reference<beans::XPropertySet>
xDefault(xPageStyles->getByName("Standard"),
+ uno::UNO_QUERY);
+ sal_Int32 nFirstTop = 0, nDefaultTop = 0, nDefaultHeader = 0;
+ xFirstPage->getPropertyValue("TopMargin") >>= nFirstTop;
+ xDefault->getPropertyValue("TopMargin") >>= nDefaultTop;
+ xDefault->getPropertyValue("HeaderHeight") >>= nDefaultHeader;
+ CPPUNIT_ASSERT_EQUAL(nFirstTop, nDefaultTop + nDefaultHeader);
+ };
+ createSwDoc("fdo44176.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}*/
-DECLARE_RTFEXPORT_TEST(testFdo39053, "fdo39053.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo39053)
{
- int nShapes = getShapes();
- CPPUNIT_ASSERT_EQUAL(1, nShapes);
- int nAsCharacter = 0;
- for (int i = 0; i < nShapes; ++i)
- if (getProperty<text::TextContentAnchorType>(getShape(i + 1),
"AnchorType")
- == text::TextContentAnchorType_AS_CHARACTER)
- nAsCharacter++;
- // The image in binary format was ignored.
- CPPUNIT_ASSERT_EQUAL(1, nAsCharacter);
+ auto verify = [this]() {
+ int nShapes = getShapes();
+ CPPUNIT_ASSERT_EQUAL(1, nShapes);
+ int nAsCharacter = 0;
+ for (int i = 0; i < nShapes; ++i)
+ if (getProperty<text::TextContentAnchorType>(getShape(i + 1),
"AnchorType")
+ == text::TextContentAnchorType_AS_CHARACTER)
+ nAsCharacter++;
+ // The image in binary format was ignored.
+ CPPUNIT_ASSERT_EQUAL(1, nAsCharacter);
+ };
+ createSwDoc("fdo39053.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testFdo48356, "fdo48356.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo48356)
{
- uno::Reference<text::XTextDocument> xTextDocument(mxComponent,
uno::UNO_QUERY);
- uno::Reference<container::XEnumerationAccess>
xParaEnumAccess(xTextDocument->getText(),
-
uno::UNO_QUERY);
- uno::Reference<container::XEnumeration> xParaEnum =
xParaEnumAccess->createEnumeration();
- int i = 0;
- while (xParaEnum->hasMoreElements())
- {
- xParaEnum->nextElement();
- i++;
- }
- // The document used to be imported as two paragraphs.
- CPPUNIT_ASSERT_EQUAL(1, i);
+ auto verify = [this]() {
+ uno::Reference<text::XTextDocument> xTextDocument(mxComponent,
uno::UNO_QUERY);
+ uno::Reference<container::XEnumerationAccess>
xParaEnumAccess(xTextDocument->getText(),
+
uno::UNO_QUERY);
+ uno::Reference<container::XEnumeration> xParaEnum =
xParaEnumAccess->createEnumeration();
+ int i = 0;
+ while (xParaEnum->hasMoreElements())
+ {
+ xParaEnum->nextElement();
+ i++;
+ }
+ // The document used to be imported as two paragraphs.
+ CPPUNIT_ASSERT_EQUAL(1, i);
+ };
+ createSwDoc("fdo48356.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
CPPUNIT_TEST_FIXTURE(Test, testFdo48023)
@@ -321,21 +438,31 @@ CPPUNIT_TEST_FIXTURE(Test, testFdo48023)
verify();
}
-DECLARE_RTFEXPORT_TEST(testFdo48876, "fdo48876.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo48876)
{
- uno::Reference<text::XTextDocument> xTextDocument(mxComponent,
uno::UNO_QUERY);
- uno::Reference<container::XEnumerationAccess>
xParaEnumAccess(xTextDocument->getText(),
-
uno::UNO_QUERY);
- uno::Reference<container::XEnumeration> xParaEnum =
xParaEnumAccess->createEnumeration();
- CPPUNIT_ASSERT(xParaEnum->hasMoreElements());
- CPPUNIT_ASSERT_EQUAL(
- style::LineSpacingMode::MINIMUM,
- getProperty<style::LineSpacing>(xParaEnum->nextElement(),
"ParaLineSpacing").Mode);
+ auto verify = [this]() {
+ uno::Reference<text::XTextDocument> xTextDocument(mxComponent,
uno::UNO_QUERY);
+ uno::Reference<container::XEnumerationAccess>
xParaEnumAccess(xTextDocument->getText(),
+
uno::UNO_QUERY);
+ uno::Reference<container::XEnumeration> xParaEnum =
xParaEnumAccess->createEnumeration();
+ CPPUNIT_ASSERT(xParaEnum->hasMoreElements());
+ CPPUNIT_ASSERT_EQUAL(
+ style::LineSpacingMode::MINIMUM,
+ getProperty<style::LineSpacing>(xParaEnum->nextElement(),
"ParaLineSpacing").Mode);
+ };
+ createSwDoc("fdo48876.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testFdo48193, "fdo48193.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo48193)
{
- CPPUNIT_ASSERT_EQUAL(OUString("foo1bar"), getBodyText());
+ auto verify = [this]() { CPPUNIT_ASSERT_EQUAL(OUString("foo1bar"),
getBodyText()); };
+ createSwDoc("fdo48193.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
CPPUNIT_TEST_FIXTURE(Test, testFdo44211)
@@ -358,236 +485,371 @@ CPPUNIT_TEST_FIXTURE(Test, testFdo44211)
verify();
}
-DECLARE_RTFEXPORT_TEST(testFdo48037, "fdo48037.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo48037)
{
- uno::Reference<util::XNumberFormatsSupplier> xNumberSupplier(mxComponent,
uno::UNO_QUERY_THROW);
- lang::Locale aUSLocale, aFRLocale;
- aUSLocale.Language = "en";
- aFRLocale.Language = "fr";
- sal_Int32 nExpected
- = xNumberSupplier->getNumberFormats()->addNewConverted("d MMMM yyyy",
aUSLocale, aFRLocale);
-
- 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<beans::XPropertySet> xPropertySet(xFields->nextElement(),
uno::UNO_QUERY);
- sal_Int32 nActual = 0;
- xPropertySet->getPropertyValue("NumberFormat") >>= nActual;
-
- CPPUNIT_ASSERT_EQUAL(nExpected, nActual);
+ auto verify = [this]() {
+ uno::Reference<util::XNumberFormatsSupplier>
xNumberSupplier(mxComponent,
+
uno::UNO_QUERY_THROW);
+ lang::Locale aUSLocale, aFRLocale;
+ aUSLocale.Language = "en";
+ aFRLocale.Language = "fr";
+ sal_Int32 nExpected =
xNumberSupplier->getNumberFormats()->addNewConverted(
+ "d MMMM yyyy", aUSLocale, aFRLocale);
+
+ 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<beans::XPropertySet>
xPropertySet(xFields->nextElement(), uno::UNO_QUERY);
+ sal_Int32 nActual = 0;
+ xPropertySet->getPropertyValue("NumberFormat") >>= nActual;
+
+ CPPUNIT_ASSERT_EQUAL(nExpected, nActual);
+ };
+ createSwDoc("fdo48037.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testFdo47764, "fdo47764.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo47764)
{
- // - CPPUNIT_ASSERT_EQUAL(COL_AUTO, getProperty<Color>(getParagraph(1),
"ParaBackColor"));
+ auto verify = [this]() {
+ // + CPPUNIT_ASSERT_EQUAL(COL_AUTO,
getProperty<Color>(getParagraph(1), "ParaBackColor"));
+ };
+ createSwDoc("fdo47764.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testFdo38786, "fdo38786.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo38786)
{
- uno::Reference<text::XTextFieldsSupplier> xTextFieldsSupplier(mxComponent,
uno::UNO_QUERY);
- uno::Reference<container::XEnumerationAccess> xFieldsAccess(
- xTextFieldsSupplier->getTextFields());
- uno::Reference<container::XEnumeration>
xFields(xFieldsAccess->createEnumeration());
- // - xFields->nextElement();
+ auto verify = [this]() {
+ uno::Reference<text::XTextFieldsSupplier>
xTextFieldsSupplier(mxComponent, uno::UNO_QUERY);
+ uno::Reference<container::XEnumerationAccess> xFieldsAccess(
+ xTextFieldsSupplier->getTextFields());
+ uno::Reference<container::XEnumeration>
xFields(xFieldsAccess->createEnumeration());
+ // + xFields->nextElement();
+ };
+ createSwDoc("fdo38786.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testN757651, "n757651.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testN757651)
{
- // The bug was that due to buggy layout the text expanded to two pages.
- if (Application::GetDefaultDevice()->IsFontAvailable(u"Times New Roman"))
- CPPUNIT_ASSERT_EQUAL(1, getPages());
+ auto verify = [this]() {
+ // The bug was that due to buggy layout the text expanded to two pages.
+ if (Application::GetDefaultDevice()->IsFontAvailable(u"Times New
Roman"))
+ CPPUNIT_ASSERT_EQUAL(1, getPages());
+ };
+ createSwDoc("n757651.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testFdo49501, "fdo49501.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo49501)
{
- uno::Reference<beans::XPropertySet>
xStyle(getStyles("PageStyles")->getByName("Standard"),
- uno::UNO_QUERY);
+ auto verify = [this]() {
+ uno::Reference<beans::XPropertySet>
xStyle(getStyles("PageStyles")->getByName("Standard"),
+ uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(true, getProperty<bool>(xStyle, "IsLandscape"));
- sal_Int32 nExpected(convertTwipToMm100(567));
- CPPUNIT_ASSERT_EQUAL(nExpected, getProperty<sal_Int32>(xStyle,
"LeftMargin"));
- CPPUNIT_ASSERT_EQUAL(nExpected, getProperty<sal_Int32>(xStyle,
"RightMargin"));
- CPPUNIT_ASSERT_EQUAL(nExpected, getProperty<sal_Int32>(xStyle,
"TopMargin"));
- CPPUNIT_ASSERT_EQUAL(nExpected, getProperty<sal_Int32>(xStyle,
"BottomMargin"));
+ CPPUNIT_ASSERT_EQUAL(true, getProperty<bool>(xStyle, "IsLandscape"));
+ sal_Int32 nExpected(convertTwipToMm100(567));
+ CPPUNIT_ASSERT_EQUAL(nExpected, getProperty<sal_Int32>(xStyle,
"LeftMargin"));
+ CPPUNIT_ASSERT_EQUAL(nExpected, getProperty<sal_Int32>(xStyle,
"RightMargin"));
+ CPPUNIT_ASSERT_EQUAL(nExpected, getProperty<sal_Int32>(xStyle,
"TopMargin"));
+ CPPUNIT_ASSERT_EQUAL(nExpected, getProperty<sal_Int32>(xStyle,
"BottomMargin"));
+ };
+ createSwDoc("fdo49501.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testFdo49271, "fdo49271.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo49271)
{
- CPPUNIT_ASSERT_EQUAL(25.f, getProperty<float>(getParagraph(2),
"CharHeight"));
+ auto verify = [this]() {
+ CPPUNIT_ASSERT_EQUAL(25.f, getProperty<float>(getParagraph(2),
"CharHeight"));
+ };
+ createSwDoc("fdo49271.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testFdo50539, "fdo50539.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo50539)
{
- // - CPPUNIT_ASSERT_EQUAL(COL_AUTO,
getProperty<Color>(getRun(getParagraph(1), 1), "CharBackColor"));
+ auto verify = [this]() {
+ // + CPPUNIT_ASSERT_EQUAL(COL_AUTO,
+ getProperty<Color>(getRun(getParagraph(1), 1),
"CharBackColor"));
+ };
+ createSwDoc("fdo50539.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testFdo50665, "fdo50665.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo50665)
{
- // Access the second run, which is a textfield
- uno::Reference<beans::XPropertySet> xRun(getRun(getParagraph(1), 2),
uno::UNO_QUERY);
- // This used to be the default, as character properties were ignored.
- CPPUNIT_ASSERT_EQUAL(OUString("Book Antiqua"), getProperty<OUString>(xRun,
"CharFontName"));
+ auto verify = [this]() {
+ // Access the second run, which is a textfield
+ uno::Reference<beans::XPropertySet> xRun(getRun(getParagraph(1), 2),
uno::UNO_QUERY);
+ // This used to be the default, as character properties were ignored.
+ CPPUNIT_ASSERT_EQUAL(OUString("Book Antiqua"),
getProperty<OUString>(xRun, "CharFontName"));
+ };
+ createSwDoc("fdo50665.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testFdo49659, "fdo49659.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo49659)
{
- // Both tables were ignored: 1) was in the header, 2) was ignored due to
missing empty par at the end of the doc
- uno::Reference<text::XTextTablesSupplier> xTextTablesSupplier(mxComponent,
uno::UNO_QUERY);
- uno::Reference<container::XIndexAccess>
xIndexAccess(xTextTablesSupplier->getTextTables(),
- uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexAccess->getCount());
-
- // The graphic was also empty
- uno::Reference<beans::XPropertySet> xGraphic
- = getProperty<uno::Reference<beans::XPropertySet>>(getShape(1),
"Graphic");
- CPPUNIT_ASSERT_EQUAL(graphic::GraphicType::PIXEL,
- getProperty<sal_Int8>(xGraphic, "GraphicType"));
+ auto verify = [this]() {
+ // Both tables were ignored: 1) was in the header, 2) was ignored due
to missing empty par at the end of the doc
+ uno::Reference<text::XTextTablesSupplier>
xTextTablesSupplier(mxComponent, uno::UNO_QUERY);
+ uno::Reference<container::XIndexAccess>
xIndexAccess(xTextTablesSupplier->getTextTables(),
+ uno::UNO_QUERY);
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexAccess->getCount());
+
+ // The graphic was also empty
+ uno::Reference<beans::XPropertySet> xGraphic
+ = getProperty<uno::Reference<beans::XPropertySet>>(getShape(1),
"Graphic");
+ CPPUNIT_ASSERT_EQUAL(graphic::GraphicType::PIXEL,
+ getProperty<sal_Int8>(xGraphic, "GraphicType"));
+ };
+ createSwDoc("fdo49659.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testFdo46966, "fdo46966.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo46966)
{
- /*
- * The problem was the top margin was 1440 (1 inch), but it should be 720
(0.5 inch).
- *
- * xray ThisComponent.StyleFamilies.PageStyles.Default.TopMargin
- */
- uno::Reference<beans::XPropertySet>
xPropertySet(getStyles("PageStyles")->getByName("Standard"),
- uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(sal_Int32(convertTwipToMm100(720)),
- getProperty<sal_Int32>(xPropertySet, "TopMargin"));
+ auto verify = [this]() {
+ /*
+ * The problem was the top margin was 1440 (1 inch), but it should be
720 (0.5 inch).
+ *
+ * xray ThisComponent.StyleFamilies.PageStyles.Default.TopMargin
+ */
+ uno::Reference<beans::XPropertySet> xPropertySet(
+ getStyles("PageStyles")->getByName("Standard"), uno::UNO_QUERY);
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(convertTwipToMm100(720)),
+ getProperty<sal_Int32>(xPropertySet,
"TopMargin"));
+ };
+ createSwDoc("fdo46966.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testFdo76633, "fdo76633.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo76633)
{
- // check that there is only a graphic object, not an additional rectangle
- CPPUNIT_ASSERT_EQUAL(1, getShapes());
- uno::Reference<lang::XServiceInfo> xShape(getShape(1), uno::UNO_QUERY);
- CPPUNIT_ASSERT(xShape.is());
-
CPPUNIT_ASSERT(xShape->supportsService("com.sun.star.text.TextGraphicObject"));
+ auto verify = [this]() {
+ // check that there is only a graphic object, not an additional
rectangle
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
+ uno::Reference<lang::XServiceInfo> xShape(getShape(1), uno::UNO_QUERY);
+ CPPUNIT_ASSERT(xShape.is());
+
CPPUNIT_ASSERT(xShape->supportsService("com.sun.star.text.TextGraphicObject"));
+ };
+ createSwDoc("fdo76633.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testFdo48033, "fdo48033.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo48033)
{
- /*
- * The problem was that the picture (48033) or OLE object (53594) was in
the first cell,
- * instead of the second one.
- *
- * oTable = ThisComponent.TextTables(0)
- * oParas = oTable.getCellByName("B1").Text.createEnumeration
- * oPara = oParas.nextElement
- * oRuns = oPara.createEnumeration
- * oRun = oRuns.nextElement
- * xray oRun.TextPortionType ' Frame, was Text
- */
- 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<text::XTextRange> xCell(xTable->getCellByName("B1"),
uno::UNO_QUERY);
- uno::Reference<container::XEnumerationAccess>
xParaEnumAccess(xCell->getText(), uno::UNO_QUERY);
- uno::Reference<container::XEnumeration> xParaEnum =
xParaEnumAccess->createEnumeration();
- uno::Reference<text::XTextRange> xPara(xParaEnum->nextElement(),
uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(OUString("Frame"),
- getProperty<OUString>(getRun(xPara, 1),
"TextPortionType"));
+ auto verify = [this]() {
+ /*
+ * The problem was that the picture (48033) or OLE object (53594) was
in the first cell,
+ * instead of the second one.
+ *
+ * oTable = ThisComponent.TextTables(0)
+ * oParas = oTable.getCellByName("B1").Text.createEnumeration
+ * oPara = oParas.nextElement
+ * oRuns = oPara.createEnumeration
+ * oRun = oRuns.nextElement
+ * xray oRun.TextPortionType ' Frame, was Text
+ */
+ 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<text::XTextRange> xCell(xTable->getCellByName("B1"),
uno::UNO_QUERY);
+ uno::Reference<container::XEnumerationAccess>
xParaEnumAccess(xCell->getText(),
+
uno::UNO_QUERY);
+ uno::Reference<container::XEnumeration> xParaEnum =
xParaEnumAccess->createEnumeration();
+ uno::Reference<text::XTextRange> xPara(xParaEnum->nextElement(),
uno::UNO_QUERY);
+ CPPUNIT_ASSERT_EQUAL(OUString("Frame"),
+ getProperty<OUString>(getRun(xPara, 1),
"TextPortionType"));
+ };
+ createSwDoc("fdo48033.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testFdo53594, "fdo53594.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo53594)
{
- /*
- * The problem was that the picture (48033) or OLE object (53594) was in
the first cell,
- * instead of the second one.
- *
- * oTable = ThisComponent.TextTables(0)
- * oParas = oTable.getCellByName("B1").Text.createEnumeration
- * oPara = oParas.nextElement
- * oRuns = oPara.createEnumeration
- * oRun = oRuns.nextElement
- * xray oRun.TextPortionType ' Frame, was Text
- */
- 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<text::XTextRange> xCell(xTable->getCellByName("B1"),
uno::UNO_QUERY);
- uno::Reference<container::XEnumerationAccess>
xParaEnumAccess(xCell->getText(), uno::UNO_QUERY);
- uno::Reference<container::XEnumeration> xParaEnum =
xParaEnumAccess->createEnumeration();
- uno::Reference<text::XTextRange> xPara(xParaEnum->nextElement(),
uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(OUString("Frame"),
- getProperty<OUString>(getRun(xPara, 1),
"TextPortionType"));
+ auto verify = [this]() {
+ /*
+ * The problem was that the picture (48033) or OLE object (53594) was
in the first cell,
+ * instead of the second one.
+ *
+ * oTable = ThisComponent.TextTables(0)
+ * oParas = oTable.getCellByName("B1").Text.createEnumeration
+ * oPara = oParas.nextElement
+ * oRuns = oPara.createEnumeration
+ * oRun = oRuns.nextElement
+ * xray oRun.TextPortionType ' Frame, was Text
+ */
+ 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<text::XTextRange> xCell(xTable->getCellByName("B1"),
uno::UNO_QUERY);
+ uno::Reference<container::XEnumerationAccess>
xParaEnumAccess(xCell->getText(),
+
uno::UNO_QUERY);
+ uno::Reference<container::XEnumeration> xParaEnum =
xParaEnumAccess->createEnumeration();
+ uno::Reference<text::XTextRange> xPara(xParaEnum->nextElement(),
uno::UNO_QUERY);
+ CPPUNIT_ASSERT_EQUAL(OUString("Frame"),
+ getProperty<OUString>(getRun(xPara, 1),
"TextPortionType"));
+ };
+ createSwDoc("fdo53594.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testFdo36089, "fdo36089.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo36089)
{
- CPPUNIT_ASSERT_EQUAL(sal_Int16(-50),
- getProperty<sal_Int16>(getRun(getParagraph(1), 2),
"CharEscapement"));
+ auto verify = [this]() {
+ CPPUNIT_ASSERT_EQUAL(sal_Int16(-50),
+ getProperty<sal_Int16>(getRun(getParagraph(1),
2), "CharEscapement"));
+ };
+ createSwDoc("fdo36089.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testFdo48446, "fdo48446.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo48446)
{
- getParagraph(1, u"\u0418\u043C\u044F"_ustr);
+ auto verify = [this]() { getParagraph(1, u"\u0418\u043C\u044F"_ustr); };
+ createSwDoc("fdo48446.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testFdo47495, "fdo47495.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo47495)
{
- // Used to have 4 paragraphs, as a result the original bugdoc had 2 pages
instead of 1.
- // Word 2013 shows 1 paragraph
- CPPUNIT_ASSERT_EQUAL(1, getParagraphs());
+ auto verify = [this]() {
+ // Used to have 4 paragraphs, as a result the original bugdoc had 2
pages instead of 1.
+ // Word 2013 shows 1 paragraph
+ CPPUNIT_ASSERT_EQUAL(1, getParagraphs());
+ };
+ createSwDoc("fdo47495.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testAllGapsWord, "all_gaps_word.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testAllGapsWord)
{
- BorderTest borderTest;
- BorderTest::testTheBorders(mxComponent, false);
+ auto verify = [this]() {
+ BorderTest borderTest;
+ BorderTest::testTheBorders(mxComponent, false);
+ };
+ createSwDoc("all_gaps_word.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testFdo52389, "fdo52389.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo52389)
{
- // The last '!' character at the end of the document was lost
- CPPUNIT_ASSERT_EQUAL(u"dania!"_ustr, getBodyText());
+ auto verify = [this]() {
+ // The last '!' character at the end of the document was lost
+ CPPUNIT_ASSERT_EQUAL(u"dania!"_ustr, getBodyText());
+ };
+ createSwDoc("fdo52389.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testFdo49655, "fdo49655.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo49655)
{
- /*
- * 49655 :
- * The problem was that the table was not imported due to the ' ' string
in the middle of the table definition.
- *
- * xray ThisComponent.TextTables.Count 'was 0
- */
- uno::Reference<text::XTextTablesSupplier> xTextTablesSupplier(mxComponent,
uno::UNO_QUERY);
- uno::Reference<container::XIndexAccess>
xIndexAccess(xTextTablesSupplier->getTextTables(),
- uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
+ auto verify = [this]() {
+ /*
+ * 49655 :
+ * The problem was that the table was not imported due to the ' '
string in the middle of the table definition.
+ *
+ * xray ThisComponent.TextTables.Count 'was 0
+ */
+ uno::Reference<text::XTextTablesSupplier>
xTextTablesSupplier(mxComponent, uno::UNO_QUERY);
+ uno::Reference<container::XIndexAccess>
xIndexAccess(xTextTablesSupplier->getTextTables(),
+ uno::UNO_QUERY);
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
+ };
+ createSwDoc("fdo49655.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testFdo62805, "fdo62805.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo62805)
{
- /*
- * 62805 :
- * The problem was that the table was not imported due to the absence of
\pard after ow.
- * The table was instead in a group (the '}' replace the \pard).
- */
- uno::Reference<text::XTextTablesSupplier> xTextTablesSupplier(mxComponent,
uno::UNO_QUERY);
- uno::Reference<container::XIndexAccess>
xIndexAccess(xTextTablesSupplier->getTextTables(),
- uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
+ auto verify = [this]() {
+ /*
+ * 62805 :
+ * The problem was that the table was not imported due to the absence
of \pard after ow.
+ * The table was instead in a group (the '}' replace the \pard).
+ */
+ uno::Reference<text::XTextTablesSupplier>
xTextTablesSupplier(mxComponent, uno::UNO_QUERY);
+ uno::Reference<container::XIndexAccess>
xIndexAccess(xTextTablesSupplier->getTextTables(),
+ uno::UNO_QUERY);
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
+ };
+ createSwDoc("fdo62805.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testFdo52475, "fdo52475.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo52475)
{
- // The problem was that - CPPUNIT_ASSERT_EQUAL(COL_AUTO,
getProperty<Color>(getRun(getParagraph(1), 3), "CharBackColor"));
+ auto verify = [this]() {
+ // The problem was that + CPPUNIT_ASSERT_EQUAL(COL_AUTO,
+ getProperty<Color>(getRun(getParagraph(1), 3),
"CharBackColor"));
+ };
+ createSwDoc("fdo52475.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testFdo55493, "fdo55493.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo55493)
{
- // The problem was that the width of the PNG was detected as 15,24cm,
instead of 3.97cm
- uno::Reference<drawing::XShape> xShape = getShape(1);
- CPPUNIT_ASSERT_EQUAL(sal_Int32(3969), xShape->getSize().Width);
+ auto verify = [this]() {
+ // The problem was that the width of the PNG was detected as 15,24cm,
instead of 3.97cm
+ uno::Reference<drawing::XShape> xShape = getShape(1);
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(3969), xShape->getSize().Width);
+ };
+ createSwDoc("fdo55493.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
CPPUNIT_TEST_FIXTURE(Test, testCopyPastePageStyle)
@@ -636,14 +898,20 @@ CPPUNIT_TEST_FIXTURE(Test, testFdo63428)
getProperty<OUString>(getRun(getParagraph(1), 4),
"TextPortionType"));
}
-DECLARE_RTFEXPORT_TEST(testFdo69384, "fdo69384-paste.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo69384)
{
- // Ensure non-default style is loaded
- getStyles("ParagraphStyles")->getByName("Text body justified");
- // Ensure default styles were modified, vs testFdo69384Inserted where it
is not
- uno::Reference<beans::XPropertySet> xPropertySet(
- getStyles("ParagraphStyles")->getByName("Text body"), uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(68.f, getProperty<float>(xPropertySet, "CharHeight"));
+ auto verify = [this]() {
+ // Ensure non-default style is loaded
+ getStyles("ParagraphStyles")->getByName("Text body justified");
+ // Ensure default styles were modified, vs testFdo69384Inserted where
it is not
+ uno::Reference<beans::XPropertySet> xPropertySet(
+ getStyles("ParagraphStyles")->getByName("Text body"),
uno::UNO_QUERY);
+ CPPUNIT_ASSERT_EQUAL(68.f, getProperty<float>(xPropertySet,
"CharHeight"));
+ };
+ createSwDoc("fdo69384-paste.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
CPPUNIT_TEST_FIXTURE(Test, testFdo69384Inserted)
@@ -682,290 +950,465 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf108123)
paste(u"rtfexport/data/tdf108123.rtf",
"com.sun.star.comp.Writer.RtfFilter", xEnd);
}
-DECLARE_RTFEXPORT_TEST(testShptxtPard, "shptxt-pard.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testShptxtPard)
{
- // The problem was that \pard inside \shptxt caused loss of shape text
- uno::Reference<text::XText> xText(getShape(1), uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(OUString("shape text"), xText->getString());
+ auto verify = [this]() {
+ // The problem was that \pard inside \shptxt caused loss of shape text
+ uno::Reference<text::XText> xText(getShape(1), uno::UNO_QUERY);
+ CPPUNIT_ASSERT_EQUAL(OUString("shape text"), xText->getString());
+ };
+ createSwDoc("shptxt-pard.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testDoDhgt, "do-dhgt.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testDoDhgt)
{
- int nShapes = getShapes();
- CPPUNIT_ASSERT_EQUAL(3, nShapes);
- for (int i = 0; i < nShapes; ++i)
- {
- Color nFillColor = getProperty<Color>(getShape(i + 1), "FillColor");
- if (nFillColor == 0xc0504d) // red
- CPPUNIT_ASSERT_EQUAL(sal_Int32(0),
getProperty<sal_Int32>(getShape(i + 1), "ZOrder"));
- else if (nFillColor == 0x9bbb59) // green
- CPPUNIT_ASSERT_EQUAL(sal_Int32(1),
getProperty<sal_Int32>(getShape(i + 1), "ZOrder"));
- else if (nFillColor == 0x4f81bd) // blue
- CPPUNIT_ASSERT_EQUAL(sal_Int32(2),
getProperty<sal_Int32>(getShape(i + 1), "ZOrder"));
- }
+ auto verify = [this]() {
+ int nShapes = getShapes();
+ CPPUNIT_ASSERT_EQUAL(3, nShapes);
+ for (int i = 0; i < nShapes; ++i)
+ {
+ Color nFillColor = getProperty<Color>(getShape(i + 1),
"FillColor");
+ if (nFillColor == 0xc0504d) // red
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(0),
+ getProperty<sal_Int32>(getShape(i + 1),
"ZOrder"));
+ else if (nFillColor == 0x9bbb59) // green
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(1),
+ getProperty<sal_Int32>(getShape(i + 1),
"ZOrder"));
+ else if (nFillColor == 0x4f81bd) // blue
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(2),
+ getProperty<sal_Int32>(getShape(i + 1),
"ZOrder"));
+ }
+ };
+ createSwDoc("do-dhgt.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testDplinehollow, "dplinehollow.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testDplinehollow)
{
- uno::Reference<beans::XPropertySet> xPropertySet(getShape(1),
uno::UNO_QUERY);
- table::BorderLine2 line(getProperty<table::BorderLine2>(xPropertySet,
"TopBorder"));
- CPPUNIT_ASSERT_EQUAL(table::BorderLineStyle::NONE, line.LineStyle);
+ auto verify = [this]() {
+ uno::Reference<beans::XPropertySet> xPropertySet(getShape(1),
uno::UNO_QUERY);
+ table::BorderLine2 line(getProperty<table::BorderLine2>(xPropertySet,
"TopBorder"));
+ CPPUNIT_ASSERT_EQUAL(table::BorderLineStyle::NONE, line.LineStyle);
+ };
+ createSwDoc("dplinehollow.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testLeftmarginDefault, "leftmargin-default.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testLeftmarginDefault)
{
- // The default left/right margin was incorrect when the top margin was set
to zero.
- CPPUNIT_ASSERT_EQUAL(
- sal_Int32(2540),
- getProperty<sal_Int32>(getStyles("PageStyles")->getByName("Standard"),
"LeftMargin"));
+ auto verify = [this]() {
+ // The default left/right margin was incorrect when the top margin was
set to zero.
+ CPPUNIT_ASSERT_EQUAL(
+ sal_Int32(2540),
+
getProperty<sal_Int32>(getStyles("PageStyles")->getByName("Standard"),
"LeftMargin"));
+ };
+ createSwDoc("leftmargin-default.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testDppolyline, "dppolyline.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testDppolyline)
{
- // This was completely ignored, for now, just make sure we have all 4
lines.
- CPPUNIT_ASSERT_EQUAL(4, getShapes());
+ auto verify = [this]() {
+ // This was completely ignored, for now, just make sure we have all 4
lines.
+ CPPUNIT_ASSERT_EQUAL(4, getShapes());
+ };
+ createSwDoc("dppolyline.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testFdo56512, "fdo56512.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo56512)
{
- uno::Reference<text::XTextFramesSupplier> xTextFramesSupplier(mxComponent,
uno::UNO_QUERY);
- uno::Reference<container::XIndexAccess>
xIndexAccess(xTextFramesSupplier->getTextFrames(),
- uno::UNO_QUERY);
- uno::Reference<text::XTextRange> xTextRange(xIndexAccess->getByIndex(0),
uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(u"\u05E2\u05D5\u05E1\u05E7
\u05DE\u05D5\u05E8\u05E9\u05D4 "_ustr,
- xTextRange->getString());
+ auto verify = [this]() {
+ uno::Reference<text::XTextFramesSupplier>
xTextFramesSupplier(mxComponent, uno::UNO_QUERY);
+ uno::Reference<container::XIndexAccess>
xIndexAccess(xTextFramesSupplier->getTextFrames(),
+ uno::UNO_QUERY);
+ uno::Reference<text::XTextRange>
xTextRange(xIndexAccess->getByIndex(0), uno::UNO_QUERY);
+ CPPUNIT_ASSERT_EQUAL(u"\u05E2\u05D5\u05E1\u05E7
\u05DE\u05D5\u05E8\u05E9\u05D4 "_ustr,
+ xTextRange->getString());
+ };
+ createSwDoc("fdo56512.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testFdo52989, "fdo52989.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo52989)
{
- // Same as n#192129, but for JPEG files.
- uno::Reference<drawing::XShape> xShape = getShape(1);
- OString aMessage = "xShape->getSize().Width() = " +
OString::number(xShape->getSize().Width);
+ auto verify = [this]() {
+ // Same as n#192129, but for JPEG files.
+ uno::Reference<drawing::XShape> xShape = getShape(1);
+ OString aMessage
+ = "xShape->getSize().Width() = " +
OString::number(xShape->getSize().Width);
- // This was 2, should be 423 (or 369?).
- CPPUNIT_ASSERT_MESSAGE(aMessage.getStr(), xShape->getSize().Width >= 273);
+ // This was 2, should be 423 (or 369?).
+ CPPUNIT_ASSERT_MESSAGE(aMessage.getStr(), xShape->getSize().Width >=
273);
+ };
+ createSwDoc("fdo52989.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testFdo54473, "fdo54473.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo54473)
{
- // The problem was that character styles were not imported due to a typo.
- CPPUNIT_ASSERT_EQUAL(
- OUString("Anot"),
- getProperty<OUString>(getRun(getParagraph(1), 1, "Text "),
"CharStyleName"));
- CPPUNIT_ASSERT_EQUAL(
- OUString("ForeignTxt"),
- getProperty<OUString>(getRun(getParagraph(1), 3, "character "),
"CharStyleName"));
+ auto verify = [this]() {
+ // The problem was that character styles were not imported due to a
typo.
+ CPPUNIT_ASSERT_EQUAL(
+ OUString("Anot"),
+ getProperty<OUString>(getRun(getParagraph(1), 1, "Text "),
"CharStyleName"));
+ CPPUNIT_ASSERT_EQUAL(
+ OUString("ForeignTxt"),
+ getProperty<OUString>(getRun(getParagraph(1), 3, "character "),
"CharStyleName"));
+ };
+ createSwDoc("fdo54473.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testFdo49934, "fdo49934.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo49934)
{
- // Column break without columns defined should be a page break, but it was
just ignored.
- CPPUNIT_ASSERT_EQUAL(2, getPages());
+ auto verify = [this]() {
+ // Column break without columns defined should be a page break, but it
was just ignored.
+ CPPUNIT_ASSERT_EQUAL(2, getPages());
+ };
+ createSwDoc("fdo49934.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testFdo57886, "fdo57886.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo57886)
{
- // Was 'int from <?> to <?> <?>'.
- CPPUNIT_ASSERT_EQUAL(OUString("int from {firstlower} to {firstupper}
{firstbody}"),
- getFormula(getRun(getParagraph(1), 1)));
+ auto verify = [this]() {
+ // Was 'int from <?> to <?> <?>'.
+ CPPUNIT_ASSERT_EQUAL(OUString("int from {firstlower} to {firstupper}
{firstbody}"),
+ getFormula(getRun(getParagraph(1), 1)));
+ };
+ createSwDoc("fdo57886.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testFdo58076, "fdo58076.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo58076)
{
- // An additional section was created, so the default page style didn't
have the custom margins.
- uno::Reference<beans::XPropertySet>
xStyle(getStyles("PageStyles")->getByName("Standard"),
- uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(sal_Int32(2251), getProperty<sal_Int32>(xStyle,
"LeftMargin"));
- CPPUNIT_ASSERT_EQUAL(sal_Int32(1752), getProperty<sal_Int32>(xStyle,
"RightMargin"));
- CPPUNIT_ASSERT_EQUAL(sal_Int32(635), getProperty<sal_Int32>(xStyle,
"TopMargin"));
- CPPUNIT_ASSERT_EQUAL(sal_Int32(635), getProperty<sal_Int32>(xStyle,
"BottomMargin"));
+ auto verify = [this]() {
+ // An additional section was created, so the default page style didn't
have the custom margins.
+ uno::Reference<beans::XPropertySet>
xStyle(getStyles("PageStyles")->getByName("Standard"),
+ uno::UNO_QUERY);
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(2251), getProperty<sal_Int32>(xStyle,
"LeftMargin"));
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(1752), getProperty<sal_Int32>(xStyle,
"RightMargin"));
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(635), getProperty<sal_Int32>(xStyle,
"TopMargin"));
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(635), getProperty<sal_Int32>(xStyle,
"BottomMargin"));
+ };
+ createSwDoc("fdo58076.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testFdo57678, "fdo57678.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo57678)
{
- // Paragraphs of the two tables were not converted to tables.
- uno::Reference<text::XTextTablesSupplier> xTextTablesSupplier(mxComponent,
uno::UNO_QUERY);
- uno::Reference<container::XIndexAccess>
xIndexAccess(xTextTablesSupplier->getTextTables(),
- uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexAccess->getCount());
+ auto verify = [this]() {
+ // Paragraphs of the two tables were not converted to tables.
+ uno::Reference<text::XTextTablesSupplier>
xTextTablesSupplier(mxComponent, uno::UNO_QUERY);
+ uno::Reference<container::XIndexAccess>
xIndexAccess(xTextTablesSupplier->getTextTables(),
+ uno::UNO_QUERY);
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexAccess->getCount());
+ };
+ createSwDoc("fdo57678.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testFdo54612, "fdo54612.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo54612)
{
- // \dpptx without a \dppolycount caused a crash.
- CPPUNIT_ASSERT_EQUAL(8, getShapes());
+ auto verify = [this]() {
+ // \dpptx without a \dppolycount caused a crash.
+ CPPUNIT_ASSERT_EQUAL(8, getShapes());
+ };
+ createSwDoc("fdo54612.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testFdo58933, "fdo58933.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo58933)
{
- // The problem was that the table had an additional cell in its first line.
- 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);
- // This was 4.
- CPPUNIT_ASSERT_EQUAL(sal_Int32(3), xTable->getCellNames().getLength());
+ auto verify = [this]() {
+ // The problem was that the table had an additional cell in its first
line.
+ 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);
+ // This was 4.
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(3), xTable->getCellNames().getLength());
+ };
+ createSwDoc("fdo58933.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testFdo44053, "fdo44053.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo44053)
{
- uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent,
uno::UNO_QUERY);
- uno::Reference<container::XIndexAccess>
xTables(xTablesSupplier->getTextTables(),
- uno::UNO_QUERY);
- uno::Reference<text::XTextTable> xTextTable(xTables->getByIndex(0),
uno::UNO_QUERY);
- uno::Reference<table::XTableRows> xTableRows = xTextTable->getRows();
- // The with of the table's A1 and A2 cell should equal.
-
CPPUNIT_ASSERT_EQUAL(getProperty<uno::Sequence<text::TableColumnSeparator>>(
- xTableRows->getByIndex(0),
"TableColumnSeparators")[0]
- .Position,
-
getProperty<uno::Sequence<text::TableColumnSeparator>>(
- xTableRows->getByIndex(1),
"TableColumnSeparators")[0]
- .Position);
+ auto verify = [this]() {
+ uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent,
uno::UNO_QUERY);
+ uno::Reference<container::XIndexAccess>
xTables(xTablesSupplier->getTextTables(),
+ uno::UNO_QUERY);
+ uno::Reference<text::XTextTable> xTextTable(xTables->getByIndex(0),
uno::UNO_QUERY);
+ uno::Reference<table::XTableRows> xTableRows = xTextTable->getRows();
+ // The with of the table's A1 and A2 cell should equal.
+
CPPUNIT_ASSERT_EQUAL(getProperty<uno::Sequence<text::TableColumnSeparator>>(
+ xTableRows->getByIndex(0),
"TableColumnSeparators")[0]
+ .Position,
+
getProperty<uno::Sequence<text::TableColumnSeparator>>(
+ xTableRows->getByIndex(1),
"TableColumnSeparators")[0]
+ .Position);
+ };
+ createSwDoc("fdo44053.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testFdo48440, "fdo48440.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo48440)
{
- // Page break was ignored.
- CPPUNIT_ASSERT_EQUAL(2, getPages());
+ auto verify = [this]() {
+ // Page break was ignored.
+ CPPUNIT_ASSERT_EQUAL(2, getPages());
+ };
+ createSwDoc("fdo48440.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testFdo58646line, "fdo58646line.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo58646line)
{
- // \line symbol was ignored
- getParagraph(1, "foo
bar");
+ auto verify = [this]() {
+ // \line symbol was ignored
+ getParagraph(1, "foo
bar");
+ };
+ createSwDoc("fdo58646line.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testFdo78502, "fdo78502.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo78502)
{
- // ";" separators were inserted as text
- getParagraph(1, "foo");
+ auto verify = [this]() {
+ // ";" separators were inserted as text
+ getParagraph(1, "foo");
+ };
+ createSwDoc("fdo78502.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testFdo58646, "fdo58646.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo58646)
{
- // Page break was ignored inside a continuous section, on title page.
- CPPUNIT_ASSERT_EQUAL(2, getPages());
+ auto verify = [this]() {
+ // Page break was ignored inside a continuous section, on title page.
+ CPPUNIT_ASSERT_EQUAL(2, getPages());
+ };
+ createSwDoc("fdo58646.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testFdo59419, "fdo59419.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo59419)
{
- // Junk to be ignored broke import of the table.
- uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent,
uno::UNO_QUERY);
- uno::Reference<container::XIndexAccess>
xTables(xTablesSupplier->getTextTables(),
- uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTables->getCount());
+ auto verify = [this]() {
+ // Junk to be ignored broke import of the table.
+ uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent,
uno::UNO_QUERY);
+ uno::Reference<container::XIndexAccess>
xTables(xTablesSupplier->getTextTables(),
+ uno::UNO_QUERY);
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTables->getCount());
+ };
+ createSwDoc("fdo59419.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testHexCRLF, "hexcrlf.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testHexCRLF)
{
- // hex-escaped and
should create a paragraph break
- getParagraph(1, "foo");
- getParagraph(2, "bar");
- getParagraph(3, "baz");
- getParagraph(4, "");
- getParagraph(5, "quux");
+ auto verify = [this]() {
+ // hex-escaped and
should create a paragraph break
+ getParagraph(1, "foo");
+ getParagraph(2, "bar");
+ getParagraph(3, "baz");
+ getParagraph(4, "");
+ getParagraph(5, "quux");
+ };
+ createSwDoc("hexcrlf.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testFdo58076_2, "fdo58076-2.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo58076_2)
{
- // Position of the picture wasn't correct.
- CPPUNIT_ASSERT_EQUAL(sal_Int32(convertTwipToMm100(8345)),
- getProperty<sal_Int32>(getShape(1),
"HoriOrientPosition"));
+ auto verify = [this]() {
+ // Position of the picture wasn't correct.
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(convertTwipToMm100(8345)),
+ getProperty<sal_Int32>(getShape(1),
"HoriOrientPosition"));
+ };
+ createSwDoc("fdo58076-2.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testFdo59638, "fdo59638.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo59638)
{
- // The problem was that w:lvlOverride inside w:num was ignores by dmapper.
+ auto verify = [this]() {
+ // The problem was that w:lvlOverride inside w:num was ignores by
dmapper.
- uno::Reference<beans::XPropertySet> xPropertySet(
- getStyles("NumberingStyles")->getByName("WWNum1"), uno::UNO_QUERY);
- uno::Reference<container::XIndexAccess> xLevels(
- xPropertySet->getPropertyValue("NumberingRules"), uno::UNO_QUERY);
- uno::Sequence<beans::PropertyValue> aProps;
- xLevels->getByIndex(0) >>= aProps; // 1st level
+ uno::Reference<beans::XPropertySet> xPropertySet(
+ getStyles("NumberingStyles")->getByName("WWNum1"), uno::UNO_QUERY);
+ uno::Reference<container::XIndexAccess> xLevels(
+ xPropertySet->getPropertyValue("NumberingRules"), uno::UNO_QUERY);
+ uno::Sequence<beans::PropertyValue> aProps;
+ xLevels->getByIndex(0) >>= aProps; // 1st level
- for (beans::PropertyValue const& rProp : aProps)
- {
- if (rProp.Name == "BulletChar")
+ for (beans::PropertyValue const& rProp : aProps)
{
- // Was '*', should be 'o'.
- CPPUNIT_ASSERT_EQUAL(u"\uF0B7"_ustr, rProp.Value.get<OUString>());
- return;
+ if (rProp.Name == "BulletChar")
+ {
+ // Was '*', should be 'o'.
+ CPPUNIT_ASSERT_EQUAL(u"\uF0B7"_ustr,
rProp.Value.get<OUString>());
+ return;
+ }
}
- }
- CPPUNIT_FAIL("no BulletChar property");
+ CPPUNIT_FAIL("no BulletChar property");
+ };
+ createSwDoc("fdo59638.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testFdo60722, "fdo60722.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo60722)
{
- // The problem was that the larger shape was over the smaller one, and not
the other way around.
- uno::Reference<beans::XPropertySet> xShape(getShape(1), uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty<sal_Int32>(xShape,
"ZOrder"));
- CPPUNIT_ASSERT_EQUAL(OUString("larger"), getProperty<OUString>(xShape,
"Description"));
-
- xShape.set(getShape(2), uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(sal_Int32(1), getProperty<sal_Int32>(xShape,
"ZOrder"));
- CPPUNIT_ASSERT_EQUAL(OUString("smaller"), getProperty<OUString>(xShape,
"Description"));
-
- // Color of the line was blue, and it had zero width.
- xShape.set(getShape(3), uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(sal_uInt32(26), getProperty<sal_uInt32>(xShape,
"LineWidth"));
- CPPUNIT_ASSERT_EQUAL(COL_BLACK, getProperty<Color>(xShape, "LineColor"));
+ auto verify = [this]() {
+ // The problem was that the larger shape was over the smaller one, and
not the other way around.
+ uno::Reference<beans::XPropertySet> xShape(getShape(1),
uno::UNO_QUERY);
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty<sal_Int32>(xShape,
"ZOrder"));
+ CPPUNIT_ASSERT_EQUAL(OUString("larger"), getProperty<OUString>(xShape,
"Description"));
+
+ xShape.set(getShape(2), uno::UNO_QUERY);
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(1), getProperty<sal_Int32>(xShape,
"ZOrder"));
+ CPPUNIT_ASSERT_EQUAL(OUString("smaller"),
getProperty<OUString>(xShape, "Description"));
+
+ // Color of the line was blue, and it had zero width.
+ xShape.set(getShape(3), uno::UNO_QUERY);
+ CPPUNIT_ASSERT_EQUAL(sal_uInt32(26), getProperty<sal_uInt32>(xShape,
"LineWidth"));
+ CPPUNIT_ASSERT_EQUAL(COL_BLACK, getProperty<Color>(xShape,
"LineColor"));
+ };
+ createSwDoc("fdo60722.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testDoDhgtOld, "do-dhgt-old.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testDoDhgtOld)
{
- // The file contains 3 shapes which have the same dhgt (z-order).
- // Test that the order is 1) a 2) black rectangle 3) b, and not something
else
- uno::Reference<text::XText> xShape(getShape(1), uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty<sal_Int32>(xShape,
"ZOrder"));
- CPPUNIT_ASSERT_EQUAL(OUString("a"), xShape->getString());
-
- xShape.set(getShape(2), uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(sal_Int32(1), getProperty<sal_Int32>(xShape,
"ZOrder"));
- CPPUNIT_ASSERT_EQUAL(COL_BLACK, getProperty<Color>(xShape, "FillColor"));
-
- xShape.set(getShape(3), uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(sal_Int32(2), getProperty<sal_Int32>(xShape,
"ZOrder"));
- CPPUNIT_ASSERT_EQUAL(OUString("b"), xShape->getString());
+ auto verify = [this]() {
+ // The file contains 3 shapes which have the same dhgt (z-order).
+ // Test that the order is 1) a 2) black rectangle 3) b, and not
something else
+ uno::Reference<text::XText> xShape(getShape(1), uno::UNO_QUERY);
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty<sal_Int32>(xShape,
"ZOrder"));
+ CPPUNIT_ASSERT_EQUAL(OUString("a"), xShape->getString());
+
+ xShape.set(getShape(2), uno::UNO_QUERY);
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(1), getProperty<sal_Int32>(xShape,
"ZOrder"));
+ CPPUNIT_ASSERT_EQUAL(COL_BLACK, getProperty<Color>(xShape,
"FillColor"));
+
+ xShape.set(getShape(3), uno::UNO_QUERY);
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(2), getProperty<sal_Int32>(xShape,
"ZOrder"));
+ CPPUNIT_ASSERT_EQUAL(OUString("b"), xShape->getString());
+ };
+ createSwDoc("do-dhgt-old.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testFdo61909, "fdo61909.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo61909)
{
- uno::Reference<text::XTextRange> xTextRange = getRun(getParagraph(1), 1);
- // Was the Writer default font.
- CPPUNIT_ASSERT_EQUAL(OUString("Courier New"),
- getProperty<OUString>(xTextRange, "CharFontName"));
- CPPUNIT_ASSERT_EQUAL(COL_AUTO, getProperty<Color>(xTextRange,
"CharBackColor"));
+ auto verify = [this]() {
+ uno::Reference<text::XTextRange> xTextRange = getRun(getParagraph(1),
1);
+ // Was the Writer default font.
+ CPPUNIT_ASSERT_EQUAL(OUString("Courier New"),
+ getProperty<OUString>(xTextRange,
"CharFontName"));
+ CPPUNIT_ASSERT_EQUAL(COL_AUTO, getProperty<Color>(xTextRange,
"CharBackColor"));
+ };
+ createSwDoc("fdo61909.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testFdo62288, "fdo62288.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo62288)
{
- 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<text::XTextRange> xCell(xTable->getCellByName("B1"),
uno::UNO_QUERY);
- uno::Reference<container::XEnumerationAccess>
xParaEnumAccess(xCell->getText(), uno::UNO_QUERY);
- uno::Reference<container::XEnumeration> xParaEnum =
xParaEnumAccess->createEnumeration();
- uno::Reference<text::XTextRange> xPara(xParaEnum->nextElement(),
uno::UNO_QUERY);
- // Margins were inherited from the previous cell, even there was a \pard
there.
- CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty<sal_Int32>(xPara,
"ParaLeftMargin"));
+ auto verify = [this]() {
+ 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<text::XTextRange> xCell(xTable->getCellByName("B1"),
uno::UNO_QUERY);
+ uno::Reference<container::XEnumerationAccess>
xParaEnumAccess(xCell->getText(),
+
uno::UNO_QUERY);
+ uno::Reference<container::XEnumeration> xParaEnum =
xParaEnumAccess->createEnumeration();
+ uno::Reference<text::XTextRange> xPara(xParaEnum->nextElement(),
uno::UNO_QUERY);
+ // Margins were inherited from the previous cell, even there was a
\pard there.
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty<sal_Int32>(xPara,
"ParaLeftMargin"));
+ };
+ createSwDoc("fdo62288.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testFdo37716, "fdo37716.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo37716)
{
- uno::Reference<text::XTextFramesSupplier> xTextFramesSupplier(mxComponent,
uno::UNO_QUERY);
- uno::Reference<container::XIndexAccess>
xFrames(xTextFramesSupplier->getTextFrames(),
- uno::UNO_QUERY);
- //
owrap got ignored, so Surround was text::WrapTextMode_PARALLEL
- CPPUNIT_ASSERT_EQUAL(text::WrapTextMode_NONE,
-
getProperty<text::WrapTextMode>(xFrames->getByIndex(0), "Surround"));
+ auto verify = [this]() {
+ uno::Reference<text::XTextFramesSupplier>
xTextFramesSupplier(mxComponent, uno::UNO_QUERY);
+ uno::Reference<container::XIndexAccess>
xFrames(xTextFramesSupplier->getTextFrames(),
+ uno::UNO_QUERY);
+ //
owrap got ignored, so Surround was text::WrapTextMode_PARALLEL
+ CPPUNIT_ASSERT_EQUAL(text::WrapTextMode_NONE,
+
getProperty<text::WrapTextMode>(xFrames->getByIndex(0), "Surround"));
+ };
+ createSwDoc("fdo37716.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
}
-DECLARE_RTFEXPORT_TEST(testFdo51916, "fdo51916.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testFdo51916)
{
// Complex nested table caused a crash.
+ createSwDoc("fdo51916.rtf");
+ saveAndReload(mpFilter);
}
} // end of anonymous namespace
