1 files changed, 13 insertions, 0 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 944fdf32e109..5ff66e97ac26 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -208,6 +208,7 @@ DomainMapper_Impl::DomainMapper_Impl(
         m_bInHeaderFooterImport( false ),
         m_bDiscardHeaderFooter( false ),
         m_bInFootOrEndnote(false),
+        m_bSeenFootOrEndnoteSeparator(false),
         m_bLineNumberingSet( false ),
         m_bIsInFootnoteProperties( false ),
         m_bIsCustomFtnMark( false ),
@@ -1747,6 +1748,9 @@ void DomainMapper_Impl::PushAnnotation()
 
 void DomainMapper_Impl::PopFootOrEndnote()
 {
+    if (!IsRTFImport())
+        RemoveLastParagraph();
+
     // In case the foot or endnote did not contain a tab.
     m_bIgnoreNextTab = false;
 
@@ -1759,9 +1763,18 @@ void DomainMapper_Impl::PopFootOrEndnote()
         return;
     }
     m_aRedlines.pop();
+    m_bSeenFootOrEndnoteSeparator = false;
     m_bInFootOrEndnote = false;
 }
 
+void DomainMapper_Impl::SeenFootOrEndnoteSeparator()
+{
+    if (!m_bSeenFootOrEndnoteSeparator)
+    {
+        m_bSeenFootOrEndnoteSeparator = true;
+        m_bIgnoreNextPara = true;
+    }
+}
 
 void DomainMapper_Impl::PopAnnotation()
 {