writerfilter/source/dmapper/DomainMapper_Impl.cxx | 1 -
1 file changed, 1 deletion(-)
New commits:
commit a06fe0d7ee665be29f3218f093fcabd601bf99ac
Author: Justin Luth <justin.l...@collabora.com>
AuthorDate: Tue Sep 22 08:48:51 2020 +0300
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Sep 22 13:53:05 2020 +0200
tdf#136706 writerfilter: revert my info-gathering assert
The assert was failing in crashTesting for:
wget http://bugs.documentfoundation.org/attachment.cgi?id=68205
-O tdf55725-1.docx
./instdir/program/soffice.bin --headless --convert-to docx
./tdf55725-1.docx
and also for
wget https://bugs.documentfoundation.org/attachment.cgi?id=127288
-O tdf102131-1.docx
Both of these documents have SAX errors when loading.
Running these interactively, saying "no, do not continue loading"
parses a bit more to give the specific error and that is what
was running into the assert. Actually importing the document
itself does not hit the assert, nor does round-tripping it.
Since this is a stupid enough situation, and because I
can't think of a good way to word a SAL_WARN, and because
I can't say that I have detailed knowledge about this area,
I'll just remove the whole thing instead of leaving a warning.
Change-Id: If50b06f0103adca348ca314ebc92e7e4045967dc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103133
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_l...@sil.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index dd13f18c7011..cd985e4fd995 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -679,7 +679,6 @@ void DomainMapper_Impl::PopProperties(ContextType eId)
{
if (m_aPropertyStacks[eId].size() == 1) // tdf#112202 only top level
!!!
{
- assert( !IsInFootOrEndnote() && !m_bIsInComments );
m_pLastSectionContext = m_aPropertyStacks[eId].top();
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
