diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2017-05-04 11:57:20 +0200 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2017-05-04 13:54:04 +0200 |
| commit | f7f7621cce0d9b91bec2807ddd0134e8b25957bb (patch) | |
| tree | d8a50cd52ccf07a669df9b67fb3f26b5b384bef9 /sw/qa | |
| parent | f18b17ddbd58e64683f7f806e913878f756e7a26 (diff) | |
AutoText: fix dotm support
+ dotm files don't contain additional empty paragraphs
at the end of AutoText entry
+ added test for dotm import
Change-Id: I336145dcf8a5dd69aa9ed82318a0f05a6f62596c
Reviewed-on: https://gerrit.libreoffice.org/37230
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Diffstat (limited to 'sw/qa')
| -rw-r--r-- | sw/qa/extras/uiwriter/data/autotext-dotm.dotm | bin | 0 -> 19456 bytes | |||
| -rw-r--r-- | sw/qa/extras/uiwriter/uiwriter.cxx | 18 |
2 files changed, 18 insertions, 0 deletions
diff --git a/sw/qa/extras/uiwriter/data/autotext-dotm.dotm b/sw/qa/extras/uiwriter/data/autotext-dotm.dotm Binary files differnew file mode 100644 index 000000000000..4909296d2117 --- /dev/null +++ b/sw/qa/extras/uiwriter/data/autotext-dotm.dotm diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index c64e8b124f2e..62958cfbac8e 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -122,6 +122,7 @@ public: void testExportRTF(); void testDOCXAutoTextEmpty(); void testDOCXAutoTextMultiple(); + void testDOTMAutoText(); void testTdf67238(); void testFdo75110(); void testFdo75898(); @@ -252,6 +253,7 @@ public: CPPUNIT_TEST(testExportRTF); CPPUNIT_TEST(testDOCXAutoTextEmpty); CPPUNIT_TEST(testDOCXAutoTextMultiple); + CPPUNIT_TEST(testDOTMAutoText); CPPUNIT_TEST(testTdf67238); CPPUNIT_TEST(testFdo75110); CPPUNIT_TEST(testFdo75898); @@ -806,6 +808,22 @@ void SwUiWriterTest::testDOCXAutoTextMultiple() CPPUNIT_ASSERT_EQUAL(OUString("complex"), rLastNode.GetTextNode()->GetText()); } +void SwUiWriterTest::testDOTMAutoText() +{ + // this is dotm file difference is that in the dotm + // there are no empty paragraphs at the end of each entry + SwTextBlocks* pGlossary = readDOCXAutotext("autotext-dotm.dotm"); + + SwDoc* pDoc = pGlossary->GetDoc(); + CPPUNIT_ASSERT(pDoc != nullptr); + + // check if content is correct + SwNodeIndex aDocEnd(pDoc->GetNodes().GetEndOfContent()); + SwNodeIndex aStart(*aDocEnd.GetNode().StartOfSectionNode(), 1); + SwNode& rNode = aStart.GetNode(); + CPPUNIT_ASSERT_EQUAL(OUString("paragraph"), rNode.GetTextNode()->GetText()); +} + void SwUiWriterTest::testFdo74981() { // create a document with an input field |