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

Bjoern Michaelsen (via logerrit) logerrit at kemper.freedesktop.org
Sat Oct 31 11:39:33 UTC 2020


 sw/source/core/doc/visiturl.cxx    |    2 +-
 sw/source/core/txtnode/atrftn.cxx  |    6 +++---
 sw/source/core/txtnode/txtatr2.cxx |    6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit a4d8f8930d96da59505f73e9f063243eafa1efc9
Author:     Bjoern Michaelsen <bjoern.michaelsen at libreoffice.org>
AuthorDate: Fri Oct 30 20:40:45 2020 +0100
Commit:     Bjoern Michaelsen <bjoern.michaelsen at libreoffice.org>
CommitDate: Sat Oct 31 12:38:59 2020 +0100

    Remove remaining ModifyNotifications on TextNode
    
    Change-Id: I120dfe756dacf4d97c5708c4c46e4184349226e9
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105084
    Tested-by: Jenkins
    Reviewed-by: Bjoern Michaelsen <bjoern.michaelsen at libreoffice.org>

diff --git a/sw/source/core/doc/visiturl.cxx b/sw/source/core/doc/visiturl.cxx
index 31c7c9ef64cd..1f462e06e448 100644
--- a/sw/source/core/doc/visiturl.cxx
+++ b/sw/source/core/doc/visiturl.cxx
@@ -83,7 +83,7 @@ void SwURLStateChanged::Notify( SfxBroadcaster& , const SfxHint& rHint )
                         *pAttr->End(),
                         RES_FMT_CHG);
 
-                    const_cast< SwTextNode* >(pTextNd)->ModifyNotification(&aUpdateAttr, &aUpdateAttr);
+                    const_cast<SwTextNode*>(pTextNd)->TriggerNodeUpdate(sw::LegacyModifyHint(&aUpdateAttr, &aUpdateAttr));
                 }
             }
         }
diff --git a/sw/source/core/txtnode/atrftn.cxx b/sw/source/core/txtnode/atrftn.cxx
index ff4b9e683286..ecf9f2d3ff37 100644
--- a/sw/source/core/txtnode/atrftn.cxx
+++ b/sw/source/core/txtnode/atrftn.cxx
@@ -371,9 +371,9 @@ void SwTextFootnote::SetNumber(const sal_uInt16 nNewNum,
 void SwTextFootnote::InvalidateNumberInLayout()
 {
     assert(m_pTextNode);
-    SwFormatFootnote const& rFootnote(GetFootnote());
     SwNodes &rNodes = m_pTextNode->GetDoc().GetNodes();
-    m_pTextNode->ModifyNotification( nullptr, &rFootnote );
+    const sw::LegacyModifyHint aHint(nullptr, &GetFootnote());
+    m_pTextNode->TriggerNodeUpdate(aHint);
     if ( m_pStartNode )
     {
         // must iterate over all TextNodes because of footnotes on other pages
@@ -383,7 +383,7 @@ void SwTextFootnote::InvalidateNumberInLayout()
         {
             SwNode* pNd;
             if( ( pNd = rNodes[ nSttIdx ] )->IsTextNode() )
-                static_cast<SwTextNode*>(pNd)->ModifyNotification( nullptr, &rFootnote );
+                static_cast<SwTextNode*>(pNd)->TriggerNodeUpdate(aHint);
         }
     }
 }
diff --git a/sw/source/core/txtnode/txtatr2.cxx b/sw/source/core/txtnode/txtatr2.cxx
index 2f4d75b3d713..fff614058984 100644
--- a/sw/source/core/txtnode/txtatr2.cxx
+++ b/sw/source/core/txtnode/txtatr2.cxx
@@ -63,7 +63,7 @@ void SwTextCharFormat::ModifyNotification( const SfxPoolItem* pOld, const SfxPoo
             *GetEnd(),
             nWhich);
 
-        m_pTextNode->ModifyNotification( &aUpdateAttr, &aUpdateAttr );
+        m_pTextNode->TriggerNodeUpdate(sw::LegacyModifyHint(&aUpdateAttr, &aUpdateAttr));
     }
 }
 
@@ -171,7 +171,7 @@ void SwTextINetFormat::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew
             *GetEnd(),
             nWhich);
 
-        m_pTextNode->ModifyNotification( &aUpdateAttr, &aUpdateAttr );
+        m_pTextNode->TriggerNodeUpdate(sw::LegacyModifyHint(&aUpdateAttr, &aUpdateAttr));
     }
 }
 
@@ -214,7 +214,7 @@ void SwTextRuby::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
             *GetEnd(),
             nWhich);
 
-        m_pTextNode->ModifyNotification( &aUpdateAttr, &aUpdateAttr );
+        m_pTextNode->TriggerNodeUpdate(sw::LegacyModifyHint(&aUpdateAttr, &aUpdateAttr));
     }
 }
 


More information about the Libreoffice-commits mailing list