diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-03-31 08:37:43 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-03-31 08:38:05 +0200 |
| commit | 3d922d7da4fa11b8c22bbdffd141fa1398b2fcd4 (patch) | |
| tree | da22f6bb8fd88444c288f902ba7a7637721aa8e4 /sw/qa | |
| parent | e944b64a3ec3b6dbe8d91638eb46478d6f88d8dc (diff) | |
tdf#98806 RTF import: handle bookmarks in table text
Mapper().props() was called directly, so all bookmarks pointed to the
start of the A1 cell instead of the correct text range.
Change-Id: I40eeb85b61d2ae9138cd666d4a6a3c08eda47da3
Diffstat (limited to 'sw/qa')
| -rw-r--r-- | sw/qa/extras/rtfexport/data/tdf98806.rtf | 11 | ||||
| -rw-r--r-- | sw/qa/extras/rtfexport/rtfexport.cxx | 8 |
2 files changed, 19 insertions, 0 deletions
diff --git a/sw/qa/extras/rtfexport/data/tdf98806.rtf b/sw/qa/extras/rtfexport/data/tdf98806.rtf new file mode 100644 index 000000000000..e356682b30a4 --- /dev/null +++ b/sw/qa/extras/rtfexport/data/tdf98806.rtf @@ -0,0 +1,11 @@ +{\rtf1 +\trowd\cellx4000\cellx8000\pard\plain\intbl +A1\cell AAA +{\*\bkmkstart bookmark} +BBB +{\*\bkmkend bookmark} +CCC\cell +\row +\pard\plain +\par +} diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx b/sw/qa/extras/rtfexport/rtfexport.cxx index da0712aaa428..6a7d19f2a78c 100644 --- a/sw/qa/extras/rtfexport/rtfexport.cxx +++ b/sw/qa/extras/rtfexport/rtfexport.cxx @@ -1013,6 +1013,14 @@ DECLARE_RTFEXPORT_TEST(testPgnlcltr, "pgnlcltr.rtf") CPPUNIT_ASSERT_EQUAL(style::NumberingType::CHARS_LOWER_LETTER_N, getProperty<sal_Int16>(getStyles("PageStyles")->getByName("Converted1"), "NumberingType")); } +DECLARE_RTFEXPORT_TEST(testTdf98806, "tdf98806.rtf") +{ + uno::Reference<text::XBookmarksSupplier> xBookmarksSupplier(mxComponent, uno::UNO_QUERY); + uno::Reference<text::XTextContent> xBookmark(xBookmarksSupplier->getBookmarks()->getByName("bookmark"), uno::UNO_QUERY); + // This was empty, bookmark in table wasn't imported correctly. + CPPUNIT_ASSERT_EQUAL(OUString("BBB"), xBookmark->getAnchor()->getString()); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |