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

[Justin Luth (via logerrit)]

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

New commits:
commit 4450137924eb8626a57283e1ab4f4ad62dd2d595
Author:     Justin Luth <justin_luth at sil.org>
AuthorDate: Sat Jul 10 10:39:03 2021 +0200
Commit:     Justin Luth <justin_luth at sil.org>
CommitDate: Sat Jul 10 19:48:18 2021 +0200

    related tdf141964 writerfilter CN: drop obsolete exception
    
    First of all, the presence of an outlineLevel is not
    equivalent to being part of Chapter Numbering.
    Plus even if it is a chapter numbering style
    it should be fine to write "Outline" as the numStyleName
    after all of the prior rework of numbering import.
    So lets not keep unnecessary exceptions.
    
    Change-Id: I89149e199eddacefd0971c805e03d3ad66a1672b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118706
    Tested-by: Jenkins
    Reviewed-by: Justin Luth <justin_luth at sil.org>

diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index af4eefc0d54f..57df581ac9c8 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -912,8 +912,7 @@ void StyleSheetTable::ApplyNumberingStyleNameToParaStyles()
             if ( pEntry->nStyleTypeCode == STYLE_TYPE_PARA && (pStyleSheetProperties = dynamic_cast<StyleSheetPropertyMap*>(pEntry->pProperties.get())) )
             {
                 // ListId 0 means turn off numbering - to cancel inheritance - so make sure that can be set.
-                // Ignore the special "chapter numbering" outline styles as they are handled internally.
-                if ( pStyleSheetProperties->GetListId() > -1 && pStyleSheetProperties->GetOutlineLevel() == -1 )
+                if (pStyleSheetProperties->GetListId() > -1)
                 {
                     uno::Reference< style::XStyle > xStyle;
                     xParaStyles->getByName( ConvertStyleName(pEntry->sStyleName) ) >>= xStyle;