[Libreoffice-commits] core.git: sw/qa

Justin Luth justin_luth at sil.org
Fri Jul 1 07:14:54 UTC 2016


 sw/qa/extras/rtfimport/rtfimport.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1a13a9a46ae240966fa9152b35671384c07e7004
Author: Justin Luth <justin_luth at sil.org>
Date:   Tue Jun 28 08:34:26 2016 +0300

    remove stylename dependency from rtfimport
    
    It was not the intention of this unittest
    to specify the name of the style.
    Better not to hardcode a "random" name in a unit test.
    
    Change-Id: Ibf96f8c0e88ec61c4994d57c67d8958cde9a8d25
    Reviewed-on: https://gerrit.libreoffice.org/26735
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx
index 73096c8..cfa2f85 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -1675,8 +1675,8 @@ DECLARE_RTFIMPORT_TEST(testContSectionPageBreak, "cont-section-pagebreak.rtf")
     // SECOND and THIRD - important is that the page break is on there
     uno::Reference<text::XTextRange> xParaNext = getParagraph(3);
     CPPUNIT_ASSERT_EQUAL(OUString(""), xParaNext->getString());
-    CPPUNIT_ASSERT_EQUAL(OUString("Converted1"),
-                         getProperty<OUString>(xParaNext, "PageDescName"));
+    //If PageDescName is not empty, a page break / switch to page style is defined
+    CPPUNIT_ASSERT(uno::Any() != getProperty<OUString>(xParaNext, "PageDescName"));
     uno::Reference<text::XTextRange> xParaThird = getParagraph(4);
     CPPUNIT_ASSERT_EQUAL(OUString("THIRD"), xParaThird->getString());
     CPPUNIT_ASSERT_EQUAL(style::BreakType_NONE,


More information about the Libreoffice-commits mailing list