summaryrefslogtreecommitdiff
path: root/sw/qa/extras/rtfexport
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2014-01-15 20:29:48 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2014-01-15 20:32:44 +0100
commit30696e84268de28d8eec58693eed2d3df98ef82e (patch)
treeb64e67482d39f56ca20e7b1dd48605cd1be3f338 /sw/qa/extras/rtfexport
parent4a924576e415f16e0571542bb0d683529f9046ff (diff)
RTF export: fix nested comments
Change-Id: I9986855f3160ed6f5856aec9f7d33fc416962e77
Diffstat (limited to 'sw/qa/extras/rtfexport')
-rw-r--r--sw/qa/extras/rtfexport/data/comments-nested.odtbin0 -> 11343 bytes
-rw-r--r--sw/qa/extras/rtfexport/rtfexport.cxx9
2 files changed, 9 insertions, 0 deletions
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
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/comments-nested.odt
Binary files 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<OUString>(xPropertySet, "Initials"));
}
+DECLARE_RTFEXPORT_TEST(testCommentsNested, "comments-nested.odt")
+{
+ uno::Reference<beans::XPropertySet> xOuter(getProperty< uno::Reference<beans::XPropertySet> >(getRun(getParagraph(1), 2), "TextField"), uno::UNO_QUERY);
+ CPPUNIT_ASSERT_EQUAL(OUString("Outer"), getProperty<OUString>(xOuter, "Content"));
+
+ uno::Reference<beans::XPropertySet> xInner(getProperty< uno::Reference<beans::XPropertySet> >(getRun(getParagraph(1), 4), "TextField"), uno::UNO_QUERY);
+ CPPUNIT_ASSERT_EQUAL(OUString("Inner"), getProperty<OUString>(xInner, "Content"));
+}
+
DECLARE_RTFEXPORT_TEST(testMathAccents, "math-accents.rtf")
{
OUString aActual = getFormula(getRun(getParagraph(1), 1));