rtfexport: drop isExported

Change-Id: I5b5fd5e866c2e6c8df247fa70370d7404eb88423
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174992
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>

4 files changed, 18 insertions, 18 deletions

diff --git a/sw/qa/extras/rtfexport/rtfexport3.cxx b/sw/qa/extras/rtfexport/rtfexport3.cxx
index 17ee1a92ed1e..5dd0b9af4ad5 100644
--- a/sw/qa/extras/rtfexport/rtfexport3.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport3.cxx
@@ -179,25 +179,25 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf137683_charHighlightNone)
 
 CPPUNIT_TEST_FIXTURE(Test, testTdf116436_tableBackground)
 {
-    auto verify = [this]() {
+    auto verify = [this](bool bIsExport = false) {
         CPPUNIT_ASSERT_EQUAL(1, getPages());
         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<table::XCell> xCell = xTable->getCellByName(u"A1"_ustr);
-        if (isExported())
+        if (bIsExport)
             CPPUNIT_ASSERT_EQUAL(Color(0xF8DF7C), getProperty<Color>(xCell, u"BackColor"_ustr));
         xCell.set(xTable->getCellByName(u"A6"_ustr));
         CPPUNIT_ASSERT_EQUAL(Color(0x81D41A), getProperty<Color>(xCell, u"BackColor"_ustr));
         xCell.set(xTable->getCellByName(u"B6"_ustr));
-        if (isExported())
+        if (bIsExport)
             CPPUNIT_ASSERT_EQUAL(Color(0xFFFBCC), getProperty<Color>(xCell, u"BackColor"_ustr));
     };
     createSwDoc("tdf116436_tableBackground.odt");
     verify();
     saveAndReload(mpFilter);
-    verify();
+    verify(/*bIsExport*/ true);
 }
 
 CPPUNIT_TEST_FIXTURE(Test, testTdf122589_firstSection)
diff --git a/sw/qa/extras/rtfexport/rtfexport4.cxx b/sw/qa/extras/rtfexport/rtfexport4.cxx
index 488200f0a05d..1a695a62110d 100644
--- a/sw/qa/extras/rtfexport/rtfexport4.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport4.cxx
@@ -318,14 +318,14 @@ CPPUNIT_TEST_FIXTURE(Test, test150382)
 
 CPPUNIT_TEST_FIXTURE(Test, testAnchoredAtSamePosition)
 {
-    auto verify = [this]() {
+    auto verify = [this](bool bIsExport = false) {
         SwXTextDocument* const pTextDoc = dynamic_cast<SwXTextDocument*>(mxComponent.get());
         SwDoc* const pDoc = pTextDoc->GetDocShell()->GetDoc();
 
         CPPUNIT_ASSERT_EQUAL(u"foobar"_ustr, getParagraph(1)->getString());
 
         auto& rFlys = *pDoc->GetSpzFrameFormats();
-        if (isExported())
+        if (bIsExport)
         { // 2, not 3: the form control becomes a field on export...
             CPPUNIT_ASSERT_EQUAL(size_t(2), rFlys.size());
         }
@@ -334,7 +334,7 @@ CPPUNIT_TEST_FIXTURE(Test, testAnchoredAtSamePosition)
             CPPUNIT_ASSERT_EQUAL(size_t(3), rFlys.size());
         }
 
-        sal_Int32 const nIndex(isExported() ? 4 : 3);
+        sal_Int32 const nIndex(bIsExport ? 4 : 3);
         CPPUNIT_ASSERT_EQUAL(RndStdIds::FLY_AT_CHAR, rFlys[0]->GetAnchor().GetAnchorId());
         CPPUNIT_ASSERT_EQUAL(SwNodeOffset(12), rFlys[0]->GetAnchor().GetAnchorNode()->GetIndex());
         CPPUNIT_ASSERT_EQUAL(nIndex, rFlys[0]->GetAnchor().GetAnchorContentOffset());
@@ -345,7 +345,7 @@ CPPUNIT_TEST_FIXTURE(Test, testAnchoredAtSamePosition)
     createSwDoc("anchor.fodt");
     verify();
     saveAndReload(mpFilter);
-    verify();
+    verify(/*bIsExport*/ true);
 }
 
 CPPUNIT_TEST_FIXTURE(Test, testRedlineInsdel)
@@ -619,7 +619,7 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf129631_lostBorders)
 
 CPPUNIT_TEST_FIXTURE(Test, testTdf129522_removeShadowStyle)
 {
-    auto verify = [this]() {
+    auto verify = [this](bool bIsExport = false) {
         CPPUNIT_ASSERT_EQUAL(1, getPages());
         uno::Reference<container::XNameAccess> paragraphStyles = getStyles(u"ParagraphStyles"_ustr);
         uno::Reference<beans::XPropertySet> xStyleProps(paragraphStyles->getByName(u"Shadow"_ustr),
@@ -654,7 +654,7 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf129522_removeShadowStyle)
             = getProperty<table::BorderLine2>(xRun, u"CharRightBorder"_ustr);
         // MS formats can't have a shadow without a border.
         // Char borders are all or none, so have to decide to add borders, or throw away shadow...
-        if (isExported())
+        if (bIsExport)
             CPPUNIT_ASSERT(sal_uInt32(0) != aBorderLine.LineWidth);
 
         xRun.set(getRun(getParagraph(4), 2, u"shadow"_ustr));
@@ -670,7 +670,7 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf129522_removeShadowStyle)
     createSwDoc("tdf129522_removeShadowStyle.odt");
     verify();
     saveAndReload(mpFilter);
-    verify();
+    verify(/*bIsExport*/ true);
 }
 
 CPPUNIT_TEST_FIXTURE(Test, testTdf136587_noStyleName)
diff --git a/sw/qa/extras/rtfexport/rtfexport6.cxx b/sw/qa/extras/rtfexport/rtfexport6.cxx
index 65798e059274..0a0e4651e912 100644
--- a/sw/qa/extras/rtfexport/rtfexport6.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport6.cxx
@@ -260,13 +260,13 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf108505_fieldCharFormat)
 
 CPPUNIT_TEST_FIXTURE(Test, testTdf108505_fieldCharFormat2)
 {
-    auto verify = [this]() {
+    auto verify = [this](bool bIsExport = false) {
         uno::Reference<text::XTextTable> xTable(getParagraphOrTable(1), uno::UNO_QUERY);
         uno::Reference<text::XTextRange> xCell(xTable->getCellByName(u"C1"_ustr), uno::UNO_QUERY);
         uno::Reference<text::XTextRange> xPara = getParagraphOfText(1, xCell->getText());
 
-        const sal_Int32 nRun = isExported() ? 6 : 5;
-        const Color aColor = isExported() ? COL_BLACK : COL_AUTO;
+        const sal_Int32 nRun = bIsExport ? 6 : 5;
+        const Color aColor = bIsExport ? COL_BLACK : COL_AUTO;
 
         // Character formatting should only be defined by the \fldrslt, and not by prior formatting.
         // Prior formatting is italic, red, 20pt.
@@ -279,7 +279,7 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf108505_fieldCharFormat2)
     createSwDoc("tdf108505_fieldCharFormat2.rtf");
     verify();
     saveAndReload(mpFilter);
-    verify();
+    verify(/*bIsExport*/ true);
 }
 
 /** Make sure that the document variable "Unused", which is not referenced in the document,
diff --git a/sw/qa/extras/rtfexport/rtfexport8.cxx b/sw/qa/extras/rtfexport/rtfexport8.cxx
index 59aa621420e8..7184b7cc5b89 100644
--- a/sw/qa/extras/rtfexport/rtfexport8.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport8.cxx
@@ -57,9 +57,9 @@ public:
 
 CPPUNIT_TEST_FIXTURE(Test, testTdf155663)
 {
-    auto verify = [this]() {
+    auto verify = [this](bool bIsExport = false) {
         auto const xShape(getShape(1));
-        if (!isExported())
+        if (!bIsExport)
         {
             CPPUNIT_ASSERT_EQUAL(sal_Int32(2004), xShape->getSize().Height);
             CPPUNIT_ASSERT_EQUAL(sal_Int32(2004), xShape->getSize().Width);
@@ -81,7 +81,7 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf155663)
     createSwDoc("piccrop.rtf");
     verify();
     saveAndReload(mpFilter);
-    verify();
+    verify(/*bIsExport*/ true);
 }
 
 CPPUNIT_TEST_FIXTURE(Test, testTdf158586_0)