From 30696e84268de28d8eec58693eed2d3df98ef82e Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Wed, 15 Jan 2014 20:29:48 +0100 Subject: RTF export: fix nested comments Change-Id: I9986855f3160ed6f5856aec9f7d33fc416962e77 --- sw/qa/extras/rtfexport/data/comments-nested.odt | Bin 0 -> 11343 bytes sw/qa/extras/rtfexport/rtfexport.cxx | 9 +++++++++ 2 files changed, 9 insertions(+) create mode 100644 sw/qa/extras/rtfexport/data/comments-nested.odt (limited to 'sw/qa/extras/rtfexport') diff --git a/sw/qa/extras/rtfexport/data/comments-nested.odt b/sw/qa/extras/rtfexport/data/comments-nested.odt new file mode 100644 index 000000000000..e7686058dd3f Binary files /dev/null and b/sw/qa/extras/rtfexport/data/comments-nested.odt differ diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx b/sw/qa/extras/rtfexport/rtfexport.cxx index 2f9a82be9fdd..49e7dfbef316 100644 --- a/sw/qa/extras/rtfexport/rtfexport.cxx +++ b/sw/qa/extras/rtfexport/rtfexport.cxx @@ -156,6 +156,15 @@ DECLARE_RTFEXPORT_TEST(testFdo38244, "fdo38244.rtf") CPPUNIT_ASSERT_EQUAL(OUString("M"), getProperty(xPropertySet, "Initials")); } +DECLARE_RTFEXPORT_TEST(testCommentsNested, "comments-nested.odt") +{ + uno::Reference xOuter(getProperty< uno::Reference >(getRun(getParagraph(1), 2), "TextField"), uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(OUString("Outer"), getProperty(xOuter, "Content")); + + uno::Reference xInner(getProperty< uno::Reference >(getRun(getParagraph(1), 4), "TextField"), uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(OUString("Inner"), getProperty(xInner, "Content")); +} + DECLARE_RTFEXPORT_TEST(testMathAccents, "math-accents.rtf") { OUString aActual = getFormula(getRun(getParagraph(1), 1)); -- cgit