summaryrefslogtreecommitdiff
path: root/sw/qa/extras/rtfimport
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2014-09-29 23:44:08 +0200
committerMichael Stahl <mstahl@redhat.com>2014-09-30 21:49:23 +0200
commit9bb04da4bb18342a107bb843d8054e178d97ae28 (patch)
tree51e7ceed70f3fea79d2d178962f151a4d191c22d /sw/qa/extras/rtfimport
parent09046504749cb59cc5b8f257658f49ffa93622c9 (diff)
sw: when getting a property value in a unit test, a void result is a bug
Change-Id: Iba0e43c198c3380426d0572427c591f4d77ba09b
Diffstat (limited to 'sw/qa/extras/rtfimport')
-rw-r--r--sw/qa/extras/rtfimport/rtfimport.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx
index 2b2764e14750..a61d62f8fc71 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -1536,7 +1536,7 @@ DECLARE_RTFIMPORT_TEST(testFdo68291, "fdo68291.odt")
paste("fdo68291-paste.rtf", xEnd);
// This was "Standard", causing an unwanted page break on next paste.
- CPPUNIT_ASSERT_EQUAL(OUString(), getProperty<OUString>(getParagraph(1), "PageDescName"));
+ CPPUNIT_ASSERT_EQUAL(uno::Any(), uno::Reference<beans::XPropertySet>(getParagraph(1), uno::UNO_QUERY)->getPropertyValue("PageDescName"));
}
DECLARE_RTFIMPORT_TEST(testFdo69384, "hello.rtf")
@@ -1630,8 +1630,8 @@ DECLARE_RTFIMPORT_TEST(testContSectionPageBreak, "cont-section-pagebreak.rtf")
CPPUNIT_ASSERT_EQUAL(OUString("SECOND"), xParaSecond->getString());
CPPUNIT_ASSERT_EQUAL(style::BreakType_NONE,
getProperty<style::BreakType>(xParaSecond, "BreakType"));
- CPPUNIT_ASSERT_EQUAL(OUString(""),
- getProperty<OUString>(xParaSecond, "PageDescName"));
+ CPPUNIT_ASSERT_EQUAL(uno::Any(),
+ uno::Reference<beans::XPropertySet>(xParaSecond, uno::UNO_QUERY)->getPropertyValue("PageDescName"));
// actually not sure how many paragraph there should be between
// SECOND and THIRD - important is that the page break is on there
uno::Reference<text::XTextRange> xParaNext = getParagraph(3);
@@ -1642,8 +1642,8 @@ DECLARE_RTFIMPORT_TEST(testContSectionPageBreak, "cont-section-pagebreak.rtf")
CPPUNIT_ASSERT_EQUAL(OUString("THIRD"), xParaThird->getString());
CPPUNIT_ASSERT_EQUAL(style::BreakType_NONE,
getProperty<style::BreakType>(xParaThird, "BreakType"));
- CPPUNIT_ASSERT_EQUAL(OUString(""),
- getProperty<OUString>(xParaThird, "PageDescName"));
+ CPPUNIT_ASSERT_EQUAL(uno::Any(),
+ uno::Reference<beans::XPropertySet>(xParaThird, uno::UNO_QUERY)->getPropertyValue("PageDescName"));
CPPUNIT_ASSERT_EQUAL(2, getPages());
}