summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2016-03-30 09:04:57 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2016-03-30 09:05:22 +0200
commit1250ad9561e8f7d3227bb97b9e1f7b2968b5c900 (patch)
treeeda8f918ae6fe9d19898777bb8759268bad5a6b4
parenttdf#97361 Refactor load_save_test (diff)
downloadcore-1250ad9561e8f7d3227bb97b9e1f7b2968b5c900.tar.gz
core-1250ad9561e8f7d3227bb97b9e1f7b2968b5c900.zip
Related: tdf#65642 RTF export: \pgnucltr testcase
There is no reason this unit test is import-only, this area of the export filter was untested so far. Change-Id: Ia271bccf59c1b21474e7b854cbaa0992b722e552
-rw-r--r--sw/qa/extras/rtfexport/data/tdf65642.rtf (renamed from sw/qa/extras/rtfimport/data/tdf65642.rtf)0
-rw-r--r--sw/qa/extras/rtfexport/rtfexport.cxx8
-rw-r--r--sw/qa/extras/rtfimport/rtfimport.cxx8
3 files changed, 8 insertions, 8 deletions
diff --git a/sw/qa/extras/rtfimport/data/tdf65642.rtf b/sw/qa/extras/rtfexport/data/tdf65642.rtf
index f13d2211948b..f13d2211948b 100644
--- a/sw/qa/extras/rtfimport/data/tdf65642.rtf
+++ b/sw/qa/extras/rtfexport/data/tdf65642.rtf
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx b/sw/qa/extras/rtfexport/rtfexport.cxx
index 24faee23a2f2..8a544ce72934 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -999,6 +999,14 @@ DECLARE_RTFEXPORT_TEST(testCustomDocProps, "custom-doc-props.rtf")
CPPUNIT_ASSERT_EQUAL(OUString("None"), getProperty<OUString>(xUserDefinedProperties, "urn:bails:IntellectualProperty:Authorization:StopValidity"));
}
+DECLARE_RTFEXPORT_TEST(testTdf65642, "tdf65642.rtf")
+{
+ // The second page's numbering type: this was style::NumberingType::ARABIC.
+ CPPUNIT_ASSERT_EQUAL(style::NumberingType::CHARS_UPPER_LETTER_N, getProperty<sal_Int16>(getStyles("PageStyles")->getByName("Converted1"), "NumberingType"));
+ // The second page's restart value: this was 0.
+ CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), getProperty<sal_Int32>(getParagraph(2), "PageNumberOffset"));
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx
index cd0eb55bbd94..a8c8f79a3606 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -2554,14 +2554,6 @@ DECLARE_RTFIMPORT_TEST(testClassificatonPasteLevels, "classification-confidentia
CPPUNIT_ASSERT_EQUAL(aOld, xText->getString());
}
-DECLARE_RTFIMPORT_TEST(testTdf65642, "tdf65642.rtf")
-{
- // The second page's numbering type: this was style::NumberingType::ARABIC.
- CPPUNIT_ASSERT_EQUAL(style::NumberingType::CHARS_UPPER_LETTER_N, getProperty<sal_Int16>(getStyles("PageStyles")->getByName("Converted1"), "NumberingType"));
- // The second page's restart value: this was 0.
- CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), getProperty<sal_Int32>(getParagraph(2), "PageNumberOffset"));
-}
-
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */