diff options
author | Justin Luth <justin_luth@sil.org> | 2016-10-06 16:53:23 +0300 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-10-10 06:27:40 +0000 |
commit | 7060c7b642fdc0a369505e430652ee44205e7eed (patch) | |
tree | c0e7ce2ac49a82d6910b0127f5d90914e1ffbf64 /sw/qa/extras/ooxmlimport | |
parent | 8bfbd7fbd74b69959929e29df3c99aa22ec13ca5 (diff) |
tdf#95367 DOCX: allow r-t of changed first/follow sections
Change-Id: Ibb97411a7dfeebc3edbdd149842bfe626942cf7f
Reviewed-on: https://gerrit.libreoffice.org/29559
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'sw/qa/extras/ooxmlimport')
-rw-r--r-- | sw/qa/extras/ooxmlimport/data/inheritFirstHeader.docx | bin | 15002 -> 0 bytes | |||
-rw-r--r-- | sw/qa/extras/ooxmlimport/data/tdf95367_inheritFollowStyle.docx | bin | 13861 -> 0 bytes | |||
-rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 28 |
3 files changed, 0 insertions, 28 deletions
diff --git a/sw/qa/extras/ooxmlimport/data/inheritFirstHeader.docx b/sw/qa/extras/ooxmlimport/data/inheritFirstHeader.docx Binary files differdeleted file mode 100644 index e3d7d20a2d23..000000000000 --- a/sw/qa/extras/ooxmlimport/data/inheritFirstHeader.docx +++ /dev/null diff --git a/sw/qa/extras/ooxmlimport/data/tdf95367_inheritFollowStyle.docx b/sw/qa/extras/ooxmlimport/data/tdf95367_inheritFollowStyle.docx Binary files differdeleted file mode 100644 index 96d91ddcafcd..000000000000 --- a/sw/qa/extras/ooxmlimport/data/tdf95367_inheritFollowStyle.docx +++ /dev/null diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index f42f1e61f507..912e01b55e70 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -443,11 +443,6 @@ are on page 2 and page 3 CPPUNIT_ASSERT_EQUAL( OUString("two"), parseDump("/root/page[3]/body/txt/text()") ); } -DECLARE_OOXMLIMPORT_TEST(testTdf95367_inheritFollowStyle, "tdf95367_inheritFollowStyle.docx") -{ - CPPUNIT_ASSERT_EQUAL(OUString("header"), parseDump("/root/page[2]/header/txt/text()")); -} - DECLARE_OOXMLIMPORT_TEST(testN652364, "n652364.docx") { /* @@ -993,29 +988,6 @@ DECLARE_OOXMLIMPORT_TEST(testN780843b, "n780843b.docx") CPPUNIT_ASSERT_EQUAL( OUString("hidden footer"), xFooterText->getString() ); } -DECLARE_OOXMLIMPORT_TEST(testInheritFirstHeader,"inheritFirstHeader.docx") -{ -// First page headers always link to last used first header, never to a follow header - uno::Reference<frame::XModel> xModel(mxComponent, uno::UNO_QUERY); - uno::Reference<text::XTextViewCursorSupplier> xTextViewCursorSupplier(xModel->getCurrentController(), uno::UNO_QUERY); - uno::Reference<text::XPageCursor> xCursor(xTextViewCursorSupplier->getViewCursor(), uno::UNO_QUERY); - - xCursor->jumpToLastPage(); - OUString sPageStyleName = getProperty<OUString>( xCursor, "PageStyleName" ); - uno::Reference<text::XText> xHeaderText = getProperty< uno::Reference<text::XText> >(getStyles("PageStyles")->getByName(sPageStyleName), "HeaderText"); - CPPUNIT_ASSERT_EQUAL( OUString("Last Header"), xHeaderText->getString() ); - - xCursor->jumpToPreviousPage(); - sPageStyleName = getProperty<OUString>( xCursor, "PageStyleName" ); - xHeaderText = getProperty< uno::Reference<text::XText> >(getStyles("PageStyles")->getByName(sPageStyleName), "HeaderText"); - CPPUNIT_ASSERT_EQUAL( OUString("First Header"), xHeaderText->getString() ); - - xCursor->jumpToPreviousPage(); - sPageStyleName = getProperty<OUString>( xCursor, "PageStyleName" ); - xHeaderText = getProperty< uno::Reference<text::XText> >(getStyles("PageStyles")->getByName(sPageStyleName), "HeaderText"); - CPPUNIT_ASSERT_EQUAL( OUString("Follow Header"), xHeaderText->getString() ); -} - DECLARE_OOXMLIMPORT_TEST(testShadow, "imgshadow.docx") { /* |