[PATCH] Change in core[libreoffice-4-0]: fdo#59338 fix RTF paste into footnote

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/1691

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/91/1691/1

fdo#59338 fix RTF paste into footnote

(cherry picked from commit b6a2083b9dfe5aceb0900315363ef41e2f3abef5)

Change-Id: I89501f267fd4256eb3b1316ef41a0f9b0786e0f0
---
A sw/qa/extras/rtfimport/data/copypaste-footnote-paste.rtf
A sw/qa/extras/rtfimport/data/copypaste-footnote.rtf
M sw/qa/extras/rtfimport/rtfimport.cxx
M writerfilter/source/dmapper/DomainMapper_Impl.cxx
4 files changed, 41 insertions(+), 2 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 0000000..1f4a75e
--- /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 0000000..93e4613
--- /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 68b7aa5..3dc2f1b 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -117,6 +117,7 @@
     void testFdo52475();
     void testFdo55493();
     void testCopyPastePageStyle();
+    void testCopyPasteFootnote();
     void testShptxtPard();
     void testDoDhgt();
     void testDplinehollow();
@@ -202,6 +203,7 @@
         {"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},
@@ -861,6 +863,31 @@
     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
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index f8730b9..68449a0 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -228,9 +228,12 @@
 
 uno::Reference< text::XText > DomainMapper_Impl::GetBodyText()
 {
-    if(!m_xBodyText.is() && m_xTextDocument.is())
+    if(!m_xBodyText.is())
     {
-        m_xBodyText = m_xTextDocument->getText();
+        if (m_xInsertTextRange.is())
+            m_xBodyText = m_xInsertTextRange->getText();
+        else if (m_xTextDocument.is())
+            m_xBodyText = m_xTextDocument->getText();
     }
     return m_xBodyText;
 }

-- 
To view, visit https://gerrit.libreoffice.org/1691
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I89501f267fd4256eb3b1316ef41a0f9b0786e0f0
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Miklos Vajna <vmiklos@suse.cz>