diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-05-10 09:16:17 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-05-18 11:38:55 +0000 |
| commit | 7879b89da30025c8efb812bb31a88f9e382b42a5 (patch) | |
| tree | a929635e95f4a3bb090522175e28abe60de57bed /sw/qa/extras/rtfimport/rtfimport.cxx | |
| parent | 853df7a5fa2b48f62a350c0e9eb1be3f6014dedc (diff) | |
tdf#96275 RTF import: fix anchor of shapes inside tables
Table text is buffered, so buffer the shape import as well, otherwise
the anchor will precede the buffered text -> incorrect anchor position.
(cherry picked from commit 015fd55c94b7b650ed8e572cafaf3b0f903b01b9)
Conflicts:
writerfilter/source/rtftok/rtfdocumentimpl.cxx
Change-Id: I527b898e2cd5fafaf122a20e11df66ba8d3185cf
Reviewed-on: https://gerrit.libreoffice.org/24937
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/qa/extras/rtfimport/rtfimport.cxx')
| -rw-r--r-- | sw/qa/extras/rtfimport/rtfimport.cxx | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index dfbc21d52b0d..ae7af23b3ee0 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -2559,6 +2559,15 @@ DECLARE_RTFIMPORT_TEST(testTdf95707, "tdf95707.rtf") CPPUNIT_ASSERT(getProperty<OUString>(getShape(1), "GraphicURL") != "vnd.sun.star.GraphicObject:0000000000000000000000000000000000000000"); } +DECLARE_RTFIMPORT_TEST(testTdf96275, "tdf96275.rtf") +{ + uno::Reference<text::XTextTable> xTable(getParagraphOrTable(1), uno::UNO_QUERY); + uno::Reference<text::XTextRange> xCell(xTable->getCellByName("A1"), uno::UNO_QUERY); + uno::Reference<text::XTextRange> xParagraph = getParagraphOfText(3, xCell->getText()); + // This was text: the shape's frame was part of the 1st paragraph instead of the 3rd one. + CPPUNIT_ASSERT_EQUAL(OUString("Frame"), getProperty<OUString>(getRun(xParagraph, 1), "TextPortionType")); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |