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

Bjoern Michaelsen (via logerrit) logerrit at kemper.freedesktop.org
Sun Dec 6 03:11:52 UTC 2020


 sw/source/core/docnode/section.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 0b5e4ce50b224a182904ceb29f26e3ace9b0a365
Author:     Bjoern Michaelsen <bjoern.michaelsen at libreoffice.org>
AuthorDate: Sun Dec 6 02:08:04 2020 +0100
Commit:     Bjoern Michaelsen <bjoern.michaelsen at libreoffice.org>
CommitDate: Sun Dec 6 04:11:12 2020 +0100

    SwSectionFormat: Call SwFrameFormat::SwClientNotify instead of ::Modify
    
    Change-Id: Ic24002ed519b120e83df117fccd76f49753bd3a3
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107272
    Tested-by: Jenkins
    Reviewed-by: Bjoern Michaelsen <bjoern.michaelsen at libreoffice.org>

diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx
index e20a5f14319a..ba9641b3d42f 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -731,7 +731,7 @@ void SwSectionFormat::MakeFrames()
     }
 }
 
-void SwSectionFormat::SwClientNotify(const SwModify&, const SfxHint& rHint)
+void SwSectionFormat::SwClientNotify(const SwModify& rMod, const SfxHint& rHint)
 {
     auto pLegacy = dynamic_cast<const sw::LegacyModifyHint*>(&rHint);
     if(!pLegacy)
@@ -807,7 +807,7 @@ void SwSectionFormat::SwClientNotify(const SwModify&, const SfxHint& rHint)
         {
             // My Parents will be destroyed, so get the Parent's Parent
             // and update
-            SwFrameFormat::Modify( pOld, pNew ); // Rewire first!
+            SwFrameFormat::SwClientNotify(rMod, rHint);
             UpdateParent();
             return;
         }
@@ -819,13 +819,13 @@ void SwSectionFormat::SwClientNotify(const SwModify&, const SfxHint& rHint)
             dynamic_cast<const SwSectionFormat*>(static_cast<const SwFormatChg*>(pNew)->pChangedFormat) != nullptr )
         {
             // My Parent will be changed, thus I need to update
-            SwFrameFormat::Modify( pOld, pNew ); // Rewire first!
+            SwFrameFormat::SwClientNotify(rMod, rHint);
             UpdateParent();
             return;
         }
         break;
     }
-    SwFrameFormat::Modify( pOld, pNew );
+    SwFrameFormat::SwClientNotify(rMod, rHint);
 
     if (pOld && (RES_REMOVE_UNO_OBJECT == pOld->Which()))
     {   // invalidate cached uno object


More information about the Libreoffice-commits mailing list