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

[Bjoern Michaelsen (via logerrit)]

 sw/source/core/layout/ssfrm.cxx |   15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

New commits:
commit 84e2b5a2bd2822f802ce0892c92efb239923965f
Author:     Bjoern Michaelsen <bjoern.michaelsen at libreoffice.org>
AuthorDate: Mon Nov 2 18:22:30 2020 +0100
Commit:     Bjoern Michaelsen <bjoern.michaelsen at libreoffice.org>
CommitDate: Mon Nov 2 19:38:13 2020 +0100

    SwLayoutFrame::SetFrameFormat: ModifyNotification no more ...
    
    Change-Id: Ice30d7830a32396e0b0b55f3971294f45228be81
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105194
    Tested-by: Jenkins
    Reviewed-by: Bjoern Michaelsen <bjoern.michaelsen at libreoffice.org>

diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx
index 9f0da8f708b6..6293b7b33f46 100644
--- a/sw/source/core/layout/ssfrm.cxx
+++ b/sw/source/core/layout/ssfrm.cxx
@@ -400,15 +400,14 @@ SwFrameFormat * SwLayoutFrame::GetFormat()
     return static_cast< SwFrameFormat * >( GetDep() );
 }
 
-void SwLayoutFrame::SetFrameFormat( SwFrameFormat *pNew )
+void SwLayoutFrame::SetFrameFormat(SwFrameFormat* pNew)
 {
-    if ( pNew != GetFormat() )
-    {
-        SwFormatChg aOldFormat( GetFormat() );
-        pNew->Add( this );
-        SwFormatChg aNewFormat( pNew );
-        ModifyNotification( &aOldFormat, &aNewFormat );
-    }
+    if(pNew == GetFormat())
+        return;
+    const SwFormatChg aOldFormat(GetFormat());
+    pNew->Add(this);
+    const SwFormatChg aNewFormat(pNew);
+    SwClientNotify(*pNew, sw::LegacyModifyHint(&aOldFormat, &aNewFormat));
 }
 
 SwContentFrame::SwContentFrame( SwContentNode * const pContent, SwFrame* pSib ) :