diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2016-11-30 03:55:35 +0100 |
---|---|---|
committer | Björn Michaelsen <bjoern.michaelsen@canonical.com> | 2016-12-02 14:24:59 +0000 |
commit | 095d22c93222e76e55eb9c7311a5307551767be4 (patch) | |
tree | c37750d891022ebd2486465ee6af67e500392c61 /sw/inc/dcontact.hxx | |
parent | a064f1226b9864f0d0ef6d969f2ae53cc413eb51 (diff) |
SwDrawContact, SwFlyDrawContact: move code from Modify to SwClientNotify
- also move from deprecated OSL_ENSURE to SAL_ macros
- also flattened and refactored the deeply nested copypasta
Change-Id: Ib7333ae9589b93bca999c8b1d003b712c59920ee
Reviewed-on: https://gerrit.libreoffice.org/31391
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Diffstat (limited to 'sw/inc/dcontact.hxx')
-rw-r--r-- | sw/inc/dcontact.hxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx index 82a3ae2fb1fc..9c2b628d4bfe 100644 --- a/sw/inc/dcontact.hxx +++ b/sw/inc/dcontact.hxx @@ -191,7 +191,7 @@ private: SwFlyDrawObj* mpMasterObj; protected: - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) override; + virtual void SwClientNotify(const SwModify&, const SfxHint& rHint) override; public: @@ -377,8 +377,7 @@ class SwDrawContact : public SwContact SwDrawContact& operator=( const SwDrawContact& ) = delete; protected: - /// virtuelle Methoden von SwClient - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) override; + virtual void SwClientNotify(const SwModify&, const SfxHint& rHint) override; public: |