commit cc02c0e32fda654cb4bcb93f87ceb48b356e1d84
author Michael Stahl <michael.stahl@allotropia.de> Wed Dec 15 12:16:35 2021 +0100
committer Michael Stahl <michael.stahl@allotropia.de> Wed Dec 15 15:34:49 2021 +0100
tree af95876e613275a5ef0282092835f40a35da64c9
parent 023ebf17898db4bca63129f079fd90b5cf76c1a9

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.stahl@allotropia.de>

sw/inc/ndtxt.hxx

diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index 4236027..c77e062 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -512,7 +512,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.

sw/source/core/fields/reffld.cxx

diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index 3355203..9d25550 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -797,7 +797,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),
@@ -821,7 +821,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);

sw/source/core/txtnode/ndtxt.cxx

diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 5134d76..2fefd8b 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -3045,11 +3045,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())));