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

[Caolán McNamara (via logerrit)]

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

New commits:
commit fb843f7ade221cb56af51389d6bfbcb43841be3a
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 15:42:38 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/83485
    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 dedf2214a453..bd93881a6a4f 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -2238,10 +2238,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;