core.git: sw/source

[Caolán McNamara (via logerrit)]

 sw/source/core/docnode/node.cxx |    7 -------
 1 file changed, 7 deletions(-)

New commits:
commit 59aa16560e544ae89c15a85d99bfa22f0b857964
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sun Dec 29 11:52:19 2024 +0000
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sun Dec 29 20:25:00 2024 +0100

    cid#1637332 'Constant' variable guards dead code
    
    and
    
    cid#1637333 'Constant' variable guards dead code
    
    since:
    
    commit 2006145e9c8df557f3c1f1834bd4579c03a18f42
    CommitDate: Sat Dec 28 15:04:03 2024 +0100
    
        move RES_FMT_CHG to SfxHint
    
    Change-Id: If3212d76d3fc32b042f19a51535e77680688e1b3
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/179503
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index da1871a27dc9..054176a7682a 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -1118,7 +1118,6 @@ void SwContentNode::SwClientNotify( const SwModify&, 
const SfxHint& rHint)
         // If the Format parent was switched, register the Attrset at the new 
one
         // Skip own Modify!
         bool bSetParent = false;
-        bool bCalcHidden = false;
         SwFormatColl* pFormatColl = nullptr;
         if(GetpSwAttrSet()
                 && pChangeHint->m_pNewFormat == GetRegisteredIn())
@@ -1129,8 +1128,6 @@ void SwContentNode::SwClientNotify( const SwModify&, 
const SfxHint& rHint)
 
         if(bSetParent && GetpSwAttrSet())
             AttrSetHandleHelper::SetParent(mpAttrSet, *this, pFormatColl, 
pFormatColl);
-        if(bCalcHidden)
-            static_cast<SwTextNode*>(this)->SetCalcHiddenCharFlags();
         CallSwClientNotify(rHint);
     }
     else if (rHint.GetId() == SfxHintId::SwLegacyModify)
@@ -1139,9 +1136,7 @@ void SwContentNode::SwClientNotify( const SwModify&, 
const SfxHint& rHint)
         const sal_uInt16 nWhich = pLegacyHint->GetWhich();
         InvalidateInSwCache(nWhich);
 
-        bool bSetParent = false;
         bool bCalcHidden = false;
-        SwFormatColl* pFormatColl = nullptr;
         switch(nWhich)
         {
             case RES_OBJECTDYING:
@@ -1188,8 +1183,6 @@ void SwContentNode::SwClientNotify( const SwModify&, 
const SfxHint& rHint)
                 UpdateAttr(rUpdateAttr);
                 return;
         }
-        if(bSetParent && GetpSwAttrSet())
-            AttrSetHandleHelper::SetParent(mpAttrSet, *this, pFormatColl, 
pFormatColl);
         if(bCalcHidden)
             static_cast<SwTextNode*>(this)->SetCalcHiddenCharFlags();
         CallSwClientNotify(rHint);