[Libreoffice-commits] core.git: writerfilter/source

[Caolán McNamara (via logerrit)]

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 4d85cf64bde5ad7d59deba2d8211404f1ec61fb3
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Jul 18 16:45:16 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Jul 26 19:30:41 2021 +0200

    crashtesting: assert on loading ooo127821-1.docx
    
    there is another later assert unchanged by this commit
    
    Change-Id: I1691007c27195dcb02d8db3ab903b31e0cbce1ce
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119127
    Tested-by: Jenkins
    Tested-by: László Németh <nemeth at numbertext.org>
    Reviewed-by: László Németh <nemeth at numbertext.org>

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index bc63eae6c0b0..d0bf42c041ad 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -3229,7 +3229,7 @@ void DomainMapper_Impl::PopFootOrEndnote()
                 xFootnotes->getByIndex(1) >>= xFootnoteFirst;
             else
                 xEndnotes->getByIndex(1) >>= xFootnoteFirst;
-            if (!m_bSaxError)
+            if (!m_bSaxError && xFootnoteFirst != xFootnoteLast)
             {
                 uno::Reference< text::XText > xSrc( xFootnoteFirst, uno::UNO_QUERY_THROW );
                 uno::Reference< text::XText > xDest( xFootnoteLast, uno::UNO_QUERY_THROW );
@@ -3248,10 +3248,10 @@ void DomainMapper_Impl::PopFootOrEndnote()
                 // remove processed redlines
                 for( size_t i = 0; redIdx > -1 && i <= sal::static_int_cast<size_t>(redIdx) + 2; i++)
                     m_aStoredRedlines[eType].pop_front();
-            }
 
-            // remove temporary footnote
-            xFootnoteFirst->getAnchor()->setString("");
+                // remove temporary footnote
+                xFootnoteFirst->getAnchor()->setString("");
+            }
         }
     }