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

[Caolán McNamara (via logerrit)]

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 78e148b8989eff34ad91f12a2dd52111124be387
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Nov 22 12:33:26 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Nov 22 16:28:40 2019 +0100

    crashtesting: failure on import of tdf10306-1.docx
    
    downgrade to warning instead of assert as per
    https://lists.freedesktop.org/archives/libreoffice/2019-November/083836.html
    
    Change-Id: If561930ca9733899cf0f4e3a6d8bb6609c94fc1d
    Reviewed-on: https://gerrit.libreoffice.org/83486
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 41612fefe9b8..a77a241fb7dc 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -2234,10 +2234,9 @@ void DomainMapper_Impl::PopPageHeaderFooter()
     }
 }
 
-
 void DomainMapper_Impl::PushFootOrEndnote( bool bIsFootnote )
 {
-    assert(!m_bInFootOrEndnote);
+    SAL_WARN_IF(m_bInFootOrEndnote, "writerfilter.dmapper", "PushFootOrEndnote() is called from another foot or endnote");
     m_bInFootOrEndnote = true;
     m_bCheckFirstFootnoteTab = true;
     m_bSaveFirstParagraphInCell = m_bFirstParagraphInCell;