diff options
author | Miklos Vajna <vmiklos@suse.cz> | 2013-01-15 09:58:48 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@suse.cz> | 2013-01-15 11:17:02 +0100 |
commit | b6a2083b9dfe5aceb0900315363ef41e2f3abef5 (patch) | |
tree | 91e2fffaffe97746da5b0f595f96f0c944f8421e /sw/qa/extras | |
parent | 63d0f95dd61ea85da08c6be0b53f323e57069f3f (diff) |
fdo#59338 fix RTF paste into footnote
Change-Id: I89501f267fd4256eb3b1316ef41a0f9b0786e0f0
Diffstat (limited to 'sw/qa/extras')
-rw-r--r-- | sw/qa/extras/rtfimport/data/copypaste-footnote-paste.rtf | 3 | ||||
-rw-r--r-- | sw/qa/extras/rtfimport/data/copypaste-footnote.rtf | 6 | ||||
-rw-r--r-- | sw/qa/extras/rtfimport/rtfimport.cxx | 27 |
3 files changed, 36 insertions, 0 deletions
diff --git a/sw/qa/extras/rtfimport/data/copypaste-footnote-paste.rtf b/sw/qa/extras/rtfimport/data/copypaste-footnote-paste.rtf new file mode 100644 index 000000000000..1f4a75e44629 --- /dev/null +++ b/sw/qa/extras/rtfimport/data/copypaste-footnote-paste.rtf @@ -0,0 +1,3 @@ +{\rtf1 +bbb +\par } diff --git a/sw/qa/extras/rtfimport/data/copypaste-footnote.rtf b/sw/qa/extras/rtfimport/data/copypaste-footnote.rtf new file mode 100644 index 000000000000..93e4613397e5 --- /dev/null +++ b/sw/qa/extras/rtfimport/data/copypaste-footnote.rtf @@ -0,0 +1,6 @@ +{\rtf1 +aaa +{\super \chftn +{\*\footnote \chftn\pard\plain \li339\fi-339 \par} +} +\par } diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index 4f5b8c0930fb..2e07e3b4b42b 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -117,6 +117,7 @@ public: void testFdo52475(); void testFdo55493(); void testCopyPastePageStyle(); + void testCopyPasteFootnote(); void testShptxtPard(); void testDoDhgt(); void testDplinehollow(); @@ -203,6 +204,7 @@ void Test::run() {"fdo52475.rtf", &Test::testFdo52475}, {"fdo55493.rtf", &Test::testFdo55493}, {"copypaste-pagestyle.rtf", &Test::testCopyPastePageStyle}, + {"copypaste-footnote.rtf", &Test::testCopyPasteFootnote}, {"shptxt-pard.rtf", &Test::testShptxtPard}, {"do-dhgt.rtf", &Test::testDoDhgt}, {"dplinehollow.rtf", &Test::testDplinehollow}, @@ -864,6 +866,31 @@ void Test::testCopyPastePageStyle() CPPUNIT_ASSERT_EQUAL(sal_Int32(21001), getProperty<sal_Int32>(xPropertySet, "Width")); // Was letter, i.e. 21590 } +void Test::testCopyPasteFootnote() +{ + // The RTF import did not handle the case when the position wasn't the main document XText, but something different, e.g. a footnote. + uno::Reference<text::XFootnotesSupplier> xFootnotesSupplier(mxComponent, uno::UNO_QUERY); + uno::Reference<container::XIndexAccess> xFootnotes(xFootnotesSupplier->getFootnotes(), uno::UNO_QUERY); + uno::Reference<text::XTextRange> xTextRange(xFootnotes->getByIndex(0), uno::UNO_QUERY); + + uno::Reference<uno::XInterface> xInterface(m_xSFactory->createInstance("com.sun.star.comp.Writer.RtfFilter"), uno::UNO_QUERY_THROW); + uno::Reference<document::XImporter> xImporter(xInterface, uno::UNO_QUERY_THROW); + xImporter->setTargetDocument(mxComponent); + uno::Reference<document::XFilter> xFilter(xInterface, uno::UNO_QUERY_THROW); + uno::Sequence<beans::PropertyValue> aDescriptor(3); + aDescriptor[0].Name = "InputStream"; + SvStream* pStream = utl::UcbStreamHelper::CreateStream(getURLFromSrc("/sw/qa/extras/rtfimport/data/") + "copypaste-footnote-paste.rtf", STREAM_WRITE); + uno::Reference<io::XStream> xStream(new utl::OStreamWrapper(*pStream)); + aDescriptor[0].Value <<= xStream; + aDescriptor[1].Name = "IsNewDoc"; + aDescriptor[1].Value <<= sal_False; + aDescriptor[2].Name = "TextInsertModeRange"; + aDescriptor[2].Value <<= xTextRange; + xFilter->filter(aDescriptor); + + CPPUNIT_ASSERT_EQUAL(OUString("bbb"), xTextRange->getString()); +} + void Test::testShptxtPard() { // The problem was that \pard inside \shptxt caused loss of shape text |