[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - sw/inc sw/source

[Michael Stahl (via logerrit)]

 sw/inc/ndtxt.hxx                 |    2 +-
 sw/source/core/fields/reffld.cxx |    4 ++--
 sw/source/core/txtnode/ndtxt.cxx |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 4c5d08abd567399ca1008ff8aac92d289bcf01a4
Author:     Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Wed Dec 15 12:16:35 2021 +0100
Commit:     Michael Stahl <michael.st...@allotropia.de>
CommitDate: Fri Dec 17 11:25:36 2021 +0100

    tdf#139843 sw_redlinehide: fix crash while updating reference fields
    
    Use layout in MakeRefNumStr() when checking if node is numbered,
    because a hidden node has a null SwNodeNum.
    
    (regression from ae246b44da1708417aaaefe4f9186cfbbb9a9137)
    
    Change-Id: Iea797c03018929601ea797f00e3cf2d7749e55ce
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126857
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
    (cherry picked from commit cc02c0e32fda654cb4bcb93f87ceb48b356e1d84)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126876
    Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
    (cherry picked from commit 0d05c7a566f0fd9660c48b3efb74d3c3d969226d)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126956
    Tested-by: Michael Stahl <michael.st...@allotropia.de>

diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index acef43b0010e..f4612d476ac4 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -504,7 +504,7 @@ public:
         @retval true    This text node has a number.
         @retval false   else
      */
-    bool HasNumber() const;
+    bool HasNumber(SwRootFrame const* pLayout = nullptr) const;
 
     /** Returns if this text node has a bullet.
 
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index c4825a9343df..9aaf9b2b9f34 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -771,7 +771,7 @@ static std::pair<OUString, bool> MakeRefNumStr(
     SwTextNode const& rTextNodeOfReferencedItem(pLayout
             ?   *sw::GetParaPropsNode(*pLayout, i_rTextNodeOfReferencedItem)
             :   i_rTextNodeOfReferencedItem);
-    if ( rTextNodeOfReferencedItem.HasNumber() &&
+    if ( rTextNodeOfReferencedItem.HasNumber(pLayout) &&
          rTextNodeOfReferencedItem.IsCountedInList() )
     {
         OSL_ENSURE( rTextNodeOfReferencedItem.GetNum(pLayout),
@@ -795,7 +795,7 @@ static std::pair<OUString, bool> MakeRefNumStr(
                             == rTextNodeOfReferencedItem.FindFooterStartNode() 
)
         {
             const SwNodeNum* pNodeNumForTextNodeOfField( nullptr );
-            if ( rTextNodeOfField.HasNumber() &&
+            if ( rTextNodeOfField.HasNumber(pLayout) &&
                  rTextNodeOfField.GetNumRule() == 
rTextNodeOfReferencedItem.GetNumRule() )
             {
                 pNodeNumForTextNodeOfField = rTextNodeOfField.GetNum(pLayout);
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 8da4d4cbc876..cfdfe4785df5 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -3080,11 +3080,11 @@ sal_uInt16 lcl_BoundListLevel(const int nActualLevel)
 }
 
 // -> #i29560#
-bool SwTextNode::HasNumber() const
+bool SwTextNode::HasNumber(SwRootFrame const*const pLayout) const
 {
     bool bResult = false;
 
-    const SwNumRule* pRule = GetNum() ? GetNum()->GetNumRule() : nullptr;
+    const SwNumRule *const pRule = GetNum(pLayout) ? 
GetNum(pLayout)->GetNumRule() : nullptr;
     if ( pRule )
     {
         const SwNumFormat& 
aFormat(pRule->Get(lcl_BoundListLevel(GetActualListLevel())));