summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-11-22 12:33:26 +0000
committerCaolán McNamara <caolanm@redhat.com>2019-11-22 15:42:38 +0100
commitfb843f7ade221cb56af51389d6bfbcb43841be3a (patch)
treee0e9146ed62eb8dbdf8af19a86aedbbea0986b4c
parent77cb90532d14d5035990d078977fce7b407c4fad (diff)
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@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--writerfilter/source/dmapper/DomainMapper_Impl.cxx3
1 files changed, 1 insertions, 2 deletions
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;