diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@libreoffice.org> | 2021-01-02 16:11:30 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@libreoffice.org> | 2021-01-03 22:47:00 +0100 |
| commit | 96bafa464ebdbce3ef04bec9beae5e745bb37794 (patch) | |
| tree | 9675ba4af4009253371f94c4e5fc1e1d530ffdc7 /sw/inc | |
| parent | b83c16834792874524019495662b2f23a066611c (diff) | |
NotifyClients no more
... and prevent recursive invalidation in SwAnchoredObject.
Change-Id: I6f386f3ffded29663fcc74c2679b76c1b839f367
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108604
Tested-by: Jenkins
Reviewed-by: Bjoern Michaelsen <bjoern.michaelsen@libreoffice.org>
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/anchoredobject.hxx | 2 | ||||
| -rw-r--r-- | sw/inc/calbck.hxx | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/sw/inc/anchoredobject.hxx b/sw/inc/anchoredobject.hxx index 5309602f9ef0..50391e966bae 100644 --- a/sw/inc/anchoredobject.hxx +++ b/sw/inc/anchoredobject.hxx @@ -107,6 +107,8 @@ class SW_DLLPUBLIC SwAnchoredObject // The boolean is reset to <false>, when the layout process for a // page frame starts. bool mbTmpConsiderWrapInfluence; + // tdf#128198: prevent recursive invalidation + bool mbInvalidatingObjects; mutable SwRect maObjRectWithSpaces; mutable bool mbObjRectWithSpacesValid; diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx index e469c3dd4134..b10058322813 100644 --- a/sw/inc/calbck.hxx +++ b/sw/inc/calbck.hxx @@ -187,11 +187,7 @@ public: : SwClient(), m_pWriterListeners(nullptr), m_bModifyLocked(false), m_bInCache(false), m_bInSwFntCache(false) {} - // broadcasting: send notifications to all clients - // DO NOT USE IN NEW CODE! use CallSwClientNotify instead. - void NotifyClients( const SfxPoolItem *pOldValue, const SfxPoolItem *pNewValue ); - - // a more universal broadcasting mechanism + // broadcasting mechanism virtual void CallSwClientNotify( const SfxHint& rHint ) const; virtual ~SwModify() override; |