sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 20 +++-----------------
1 file changed, 3 insertions(+), 17 deletions(-)
New commits:
commit 0f9666134e58d5b03189636335b3a1f407b968b5
Author: Justin Luth <justin_l...@sil.org>
Date: Mon Jun 27 17:03:26 2016 +0300
remove stylename dependency on testunit n750255
The bugtest was to check whether a column break pushed text to
pages 2 and 3, not to check the name of the style.
Better to do a simple layout test in this case.
Change-Id: I97fd6bfdb382d0acda20f6f7aae7068db3394a53
Reviewed-on: https://gerrit.libreoffice.org/26718
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Justin Luth <justin_l...@sil.org>
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index cdac7d0..4a50eac 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -432,24 +432,10 @@ DECLARE_OOXMLIMPORT_TEST(testN750255, "n750255.docx")
/*
Column break without columns on the page is a page break, so check those
paragraphs
-are on page 2 (page style 'Converted1') and page 3 (page style 'Converted2')
-enum = ThisComponent.Text.createEnumeration
-enum.nextElement
-para1 = enum.nextElement
-xray para1.String
-xray para1.PageStyleName
-para2 = enum.nextElement
-xray para2.String
-xray para2.PageStyleName
+are on page 2 and page 3
*/
- // get the 2nd and 3rd paragraph
- uno::Reference<uno::XInterface> paragraph1(getParagraph( 2, "one" ));
- uno::Reference<uno::XInterface> paragraph2(getParagraph( 3, "two" ));
- OUString pageStyle1 = getProperty< OUString >( paragraph1, "PageStyleName"
);
- OUString pageStyle2 = getProperty< OUString >( paragraph2, "PageStyleName"
);
- CPPUNIT_ASSERT_EQUAL( OUString( "Converted1" ), pageStyle1 );
- CPPUNIT_ASSERT_EQUAL( OUString( "Converted2" ), pageStyle2 );
-
+ CPPUNIT_ASSERT_EQUAL( OUString("one"),
parseDump("/root/page[2]/body/txt/text()") );
+ CPPUNIT_ASSERT_EQUAL( OUString("two"),
parseDump("/root/page[3]/body/txt/text()") );
}
DECLARE_OOXMLIMPORT_TEST(testN652364, "n652364.docx")
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
