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

[Justin Luth (via logerrit)]

 writerfilter/source/dmapper/DomainMapper.cxx |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit 9a7c5d38a7a43c75c0f3d2f0c725196e916d0260
Author:     Justin Luth <justin.luth at collabora.com>
AuthorDate: Wed May 20 17:29:58 2020 +0300
Commit:     Justin Luth <justin_luth at sil.org>
CommitDate: Fri May 22 02:15:46 2020 +0200

    writerfilter: pStyle no longer defines PROP_NUMBERING_STYLE_NAME
    
    This is legacy code.
    Previously, this could be added every time
    pStyle was defined. So a pStyle might have copied
    its numbering style-name to the paragraph before
    the numId was processed.  But now the copying only runs at
    ::finishParagraph, so now nothing writes a
    PROP_NUMBERING_STYLE_NAME before numId is processed.
    
    Obsoleted by commit cc1c9c7484d97167021301f32c3397124c4d79f5
    Introduced by commit e7ab4bb6b0e83f01148ffff41e8c5eaa0c5ba0a4
    
    Change-Id: I6220106d16a531e61eadc8205f1d6b30db3af907
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94594
    Tested-by: Jenkins
    Reviewed-by: Justin Luth <justin_luth at sil.org>

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 8eab461992b6..a09271548e97 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1327,8 +1327,6 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext )
                         assert(dynamic_cast<ParagraphPropertyMap*>(pContext.get()));
                         static_cast<ParagraphPropertyMap*>(pContext.get())->SetListId(pList->GetId());
                     }
-                    // erase numbering from pStyle if already set
-                    rContext->Erase(PROP_NUMBERING_STYLE_NAME);
 
                     // Indentation can came from:
                     // 1) Paragraph style's numbering's indentation: the current non-style numId has priority over it.