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

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Thu Jul 26 18:36:20 UTC 2018


 sw/inc/calbck.hxx |    2 +-
 sw/inc/node.hxx   |    5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 847848d1401f23d51501e4b3396967a4bc193913
Author:     Bjoern Michaelsen <bjoern.michaelsen at libreoffice.org>
AuthorDate: Wed Jul 25 23:19:35 2018 +0200
Commit:     Björn Michaelsen <bjoern.michaelsen at libreoffice.org>
CommitDate: Thu Jul 26 20:35:55 2018 +0200

    make SwContentNode handle legacy ModifyNotification() again (tdf#117749)
    
    Change-Id: If5fe61b6bfd4012be63c27d531100018fb31dd21
    Reviewed-on: https://gerrit.libreoffice.org/58024
    Tested-by: Jenkins
    Tested-by: Xisco Faulí <xiscofauli at libreoffice.org>
    Reviewed-by: Björn Michaelsen <bjoern.michaelsen at libreoffice.org>

diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx
index 7b3ff97fc442..8b029c75fe71 100644
--- a/sw/inc/calbck.hxx
+++ b/sw/inc/calbck.hxx
@@ -150,7 +150,7 @@ public:
 
     // controlled access to Modify method
     // mba: this is still considered a hack and it should be fixed; the name makes grep-ing easier
-    void ModifyNotification( const SfxPoolItem *pOldValue, const SfxPoolItem *pNewValue ) { Modify ( pOldValue, pNewValue ); }
+    virtual void ModifyNotification( const SfxPoolItem *pOldValue, const SfxPoolItem *pNewValue ) { Modify ( pOldValue, pNewValue ); }
     void SwClientNotifyCall( const SwModify& rModify, const SfxHint& rHint ) { SwClientNotify( rModify, rHint ); }
 
     const SwModify* GetRegisteredIn() const { return m_pRegisteredIn; }
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index 3e50db779aaa..50086d45b045 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -482,6 +482,11 @@ public:
     // Access to DrawingLayer FillAttributes in a preprocessed form for primitive usage
     virtual drawinglayer::attribute::SdrAllFillAttributesHelperPtr getSdrAllFillAttributesHelper() const;
 
+    virtual void ModifyNotification(const SfxPoolItem* pOld, const SfxPoolItem* pNew) override
+    {
+        SwClientNotify(*this, sw::LegacyModifyHint(pOld, pNew));
+    }
+
 private:
     SwContentNode( const SwContentNode & rNode ) = delete;
     SwContentNode & operator= ( const SwContentNode & rNode ) = delete;


More information about the Libreoffice-commits mailing list