[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/qa writerfilter/source

[Miklos Vajna]

 sw/qa/extras/rtfimport/data/fdo82106.rtf          |    4 ++++
 sw/qa/extras/rtfimport/rtfimport.cxx              |    6 ++++++
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |    3 +++
 3 files changed, 13 insertions(+)

New commits:
commit 4c9f600eb3ab76f2f4f4fde0cdc3bc91862d029b
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Sun Aug 10 20:25:52 2014 +0200

    fdo#82106 RTF import: fix missing tab after special footnote
    
    (cherry picked from commit 8ae087b8fcc25f5ce83e339d447d2899d3059d45)
    
    Change-Id: I5ea45dbed652231acdcc3632ced728ed8bcb621a
    Reviewed-on: https://gerrit.libreoffice.org/10861
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sw/qa/extras/rtfimport/data/fdo82106.rtf b/sw/qa/extras/rtfimport/data/fdo82106.rtf
new file mode 100644
index 0000000..391914a
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo82106.rtf
@@ -0,0 +1,4 @@
+{\rtf1
+hello{\footnote footnote content}\par
+before\tab after\par
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx
index ff2cd1a..ad42e6c 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -1873,6 +1873,12 @@ DECLARE_RTFIMPORT_TEST(testFdo80742, "fdo80742.rtf")
     CPPUNIT_ASSERT_EQUAL(sal_Int32(2), getProperty<sal_Int32>(xPropertySet, "OutlineLevel"));
 }
 
+DECLARE_RTFIMPORT_TEST(testFdo82106, "fdo82106.rtf")
+{
+    // Tab was missing after footnote not containing a tab.
+    getParagraph(2, "before\tafter");
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index f44b2bd..ad460fa 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1721,6 +1721,9 @@ void DomainMapper_Impl::PushAnnotation()
 
 void DomainMapper_Impl::PopFootOrEndnote()
 {
+    // In case the foot or endnote did not contain a tab.
+    m_bIgnoreNextTab = false;
+
     if (!m_aTextAppendStack.empty())
         m_aTextAppendStack.pop();