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

New commits:
commit 668bd34288952019d6013758b435294f4fd83a87
Author:     Justin Luth <justin.l...@collabora.com>
AuthorDate: Mon Dec 16 14:02:18 2024 -0500
Commit:     Justin Luth <jl...@mail.com>
CommitDate: Tue Dec 17 01:16:44 2024 +0100

    tdf#164075 rtfimport: ignore assert developed for DOCX fixing
    
    I don't exactly remember why I put the assert there,
    but it sounds reasonable to expect that if
    the paragraph defined the numbering
    that it should also have numbering rule content,
    and if it doesn't, then it is worth investigating why.
    
    Investing anything related to RTF is never worthwhile.
    
    Change-Id: I6525d0a40d9535f1888056a610576085941605a3
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178607
    Reviewed-by: Justin Luth <jl...@mail.com>
    Tested-by: Jenkins

diff --git a/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx 
b/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx
index d095afef0b35..777122e97ebc 100644
--- a/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx
+++ b/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx
@@ -2653,7 +2653,7 @@ void DomainMapper_Impl::finishParagraph( const 
PropertyMapPtr& pPropertyMap, con
                         return rValue.Name == "NumberingRules";
                     });
 
-                    assert( isNumberingViaRule == (itNumberingRules != 
aProperties.end()) );
+                    assert(isNumberingViaRule == (itNumberingRules != 
aProperties.end()) || IsRTFImport());
                     isNumberingViaRule = (itNumberingRules != 
aProperties.end());
                     if (m_StreamStateStack.top().xPreviousParagraph.is()
                         && (isNumberingViaRule || isNumberingViaStyle))

Reply via email to