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

[Justin Luth (via logerrit)]

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

New commits:
commit 1441e001938d6a0b19743ef8170980238b88d350
Author:     Justin Luth <justin_luth at sil.org>
AuthorDate: Mon Jul 26 14:39:17 2021 +0200
Commit:     Justin Luth <justin_luth at sil.org>
CommitDate: Mon Jul 26 19:24:04 2021 +0200

    tdf#143517 partial revert "tdf#141964 writerfilter CN: get para...
    
    ...paragraph and inherited listLevel
    
    IIRC, I changed GetCurrentNumberingCharStyle() on the premise that
    no matter where the level is defined (paragraph or style),
    any function looking for it should use the inherited/applied level.
    But GetCurrentNumberingCharStyle() itself looks like a bogus
    hack that probably should be eliminated completely.
    
    Unfortunately, 2123ede032ca64f696ef54af4ad3238974ca2b5d
    from 2012 which introduced it does not include a unit test,
    so there is no easy way to test whether it still has any
    function.
    [Eliminating it passes all unit tests and sounds similar to
    tdf#108518 revert OOo hack: Fix issue #i119405: Numbering text style.]
    
    In any case, just revert the changes to this function for now,
    since hopelessly faulty functions don't need to operate "better".
    
    Another alternative would be to just use GetListlevel(pEntry)
    to at least allow style inheritance, but since it seems like
    a completely faulty function to begin with, it seems better to
    leave the function completely untouched.
    
    Change-Id: I2eba777fdd68615d68b63288005a30301fa6ea2f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119521
    Tested-by: Jenkins
    Reviewed-by: Justin Luth <justin_luth at sil.org>

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 78f7dbc16b24..bc63eae6c0b0 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -7657,7 +7657,7 @@ uno::Reference<container::XIndexAccess> DomainMapper_Impl::GetCurrentNumberingRu
         if (nListId < 0)
             return xRet;
         if (pListLevel)
-            *pListLevel = GetListLevel(pEntry, GetTopContextOfType(CONTEXT_PARAGRAPH));
+            *pListLevel = pStyleSheetProperties->GetListLevel();
 
         // So we are in a paragraph style and it has numbering. Look up the relevant numbering rules.
         auto const pList(GetListTable()->GetList(nListId));