diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2012-03-24 14:55:09 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2012-03-24 16:49:28 +0100 |
| commit | 5e994d528c67e4db1e0ef7ba01349a51acbdacb3 (patch) | |
| tree | 71daa08106110393c8505261099812dd5a5376b9 /sw | |
| parent | 0d9132c5046e15540abc20e45d64080708626441 (diff) | |
fdo#47036 fix RTF import of multi-paragraph exact height textboxes
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/rtftok/data/fdo47036.rtf | 12 | ||||
| -rw-r--r-- | sw/qa/extras/rtftok/rtftok.cxx | 5 |
2 files changed, 17 insertions, 0 deletions
diff --git a/sw/qa/extras/rtftok/data/fdo47036.rtf b/sw/qa/extras/rtftok/data/fdo47036.rtf index 0b5602f2bca4..cc988f1eac0d 100644 --- a/sw/qa/extras/rtftok/data/fdo47036.rtf +++ b/sw/qa/extras/rtftok/data/fdo47036.rtf @@ -58,4 +58,16 @@ \b\f1\fs33\cf1\insrsid15426039 Booking Advice} {\rtlch\fcs1 \af1 \ltrch\fcs0 \f1\insrsid15426039 \par } +\pard \pvpg\phpg\posx1914\posy4761\absh-2400\absw7674\wrapdefault +\faauto\rin0\lin0\itap0 +{\rtlch\fcs1 \af1\afs19 \ltrch\fcs0 \f1\fs19\cf1\insrsid15426039 foo \tab \tab \tab \tab \tab \tab } +{\rtlch\fcs1 \af1 \ltrch\fcs0 \f1\insrsid15426039 +\par } +{\rtlch\fcs1 \af1\afs19 \ltrch\fcs0 \f1\fs19\cf1\insrsid15426039 x\tab +\par +\par } +{\rtlch\fcs1 \af1\afs19 \ltrch\fcs0 \f1\fs19\cf6\insrsid16139741 y} +{\rtlch\fcs1 \af1 \ltrch\fcs0 +\f1\cf6\insrsid15426039\charrsid15426039 +\par } } diff --git a/sw/qa/extras/rtftok/rtftok.cxx b/sw/qa/extras/rtftok/rtftok.cxx index a47ca3618d7a..0628268b9267 100644 --- a/sw/qa/extras/rtftok/rtftok.cxx +++ b/sw/qa/extras/rtftok/rtftok.cxx @@ -418,6 +418,11 @@ void RtfModelTest::testFdo47036() } // The image at the document start was ignored. CPPUNIT_ASSERT_EQUAL(1, nAtCharacter); + + // There should be 2 textboxes, not 4 + uno::Reference<text::XTextFramesSupplier> xTextFramesSupplier(mxComponent, uno::UNO_QUERY); + uno::Reference<container::XIndexAccess> xIndexAccess(xTextFramesSupplier->getTextFrames(), uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexAccess->getCount()); } CPPUNIT_TEST_SUITE_REGISTRATION(RtfModelTest); |