core.git: Branch 'feature/cib_contract49d' - sw/source

[Oliver Specht (via logerrit)]

 sw/source/core/doc/docfmt.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 6cdcaefe94597df028f935f08b2079ecbba020ec
Author:     Oliver Specht <oliver.spe...@cib.de>
AuthorDate: Thu Dec 5 09:51:03 2024 +0100
Commit:     Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Thu Dec 19 10:35:28 2024 +0100

    fix regression from 075560420a7aa238182e2d80dfe1c5fbaad3edbd
    
    Applying a paragraph style with an attached list style does now
    overwrite a list style at a paragraph that had a list(style) applied
    
    Change-Id: I0dc124dc2db167370dab8416a6cc97d563bcc03c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178727
    Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
    Tested-by: allotropia jenkins <jenk...@allotropia.de>

diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index abce04888365..daf7e6812556 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -1054,8 +1054,7 @@ static bool lcl_SetTextFormatColl( SwNode* pNode, void* 
pArgs )
                 SwNumRule* pNumRuleAtParagraph(rTNd.GetNumRule());
                 if ( pNumRuleAtParagraph )
                 {
-                    const SwNumRuleItem& rNumRuleItemAtParagraphStyle =
-                        rTNd.GetTextColl()->GetNumRule();
+                    const SwNumRuleItem& rNumRuleItemAtParagraphStyle = 
pFormat->GetNumRule();
                     if ( rNumRuleItemAtParagraphStyle.GetValue() ==
                             pNumRuleAtParagraph->GetName() )
                     {