diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-01-09 12:18:12 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-01-09 12:21:26 +0100 |
| commit | 347d83d1cc87222719c50ebe9ed1c61944e8914e (patch) | |
| tree | 10516e7ec2770e99d5902955b26ba47530285da0 /sw | |
| parent | 6cb6370711f1072e3266d9218f7e42534e8ed58c (diff) | |
RTF import: handle RTF_ATNREF
Otherwise dmapper won't create an annotation mark for us.
Change-Id: I868c3ffd65fbaa9a5115ba7300310fa3585d2d05
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/rtfimport/rtfimport.cxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index d184cd6a7b11..2534099cda3e 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -1288,8 +1288,6 @@ DECLARE_RTFIMPORT_TEST(testFdo53556, "fdo53556.rtf") DECLARE_RTFIMPORT_TEST(testFdo63428, "hello.rtf") { -#if 0 - // FIXME port to AnnotationMarks // Pasting content that contained an annotation caused a crash. uno::Reference<text::XTextDocument> xTextDocument(mxComponent, uno::UNO_QUERY); uno::Reference<text::XTextRange> xText(xTextDocument->getText(), uno::UNO_QUERY); @@ -1297,9 +1295,8 @@ DECLARE_RTFIMPORT_TEST(testFdo63428, "hello.rtf") paste("fdo63428.rtf", xEnd); // Additionally, commented range was imported as a normal comment. - CPPUNIT_ASSERT_EQUAL(OUString("TextFieldStart"), getProperty<OUString>(getRun(getParagraph(1), 2), "TextPortionType")); - CPPUNIT_ASSERT_EQUAL(OUString("TextFieldEnd"), getProperty<OUString>(getRun(getParagraph(1), 4), "TextPortionType")); -#endif + CPPUNIT_ASSERT_EQUAL(OUString("Annotation"), getProperty<OUString>(getRun(getParagraph(1), 2), "TextPortionType")); + CPPUNIT_ASSERT_EQUAL(OUString("AnnotationEnd"), getProperty<OUString>(getRun(getParagraph(1), 4), "TextPortionType")); } DECLARE_RTFIMPORT_TEST(testGroupshapeRotation, "groupshape-rotation.rtf") |