diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2021-01-05 10:49:45 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2021-01-05 12:23:16 +0100 |
| commit | d988b0cdeb54d84a0347a036a277c21c12544ab9 (patch) | |
| tree | 7c24b2034fb4169cd0e924dff91a4c6e3032c0ba /sw/inc | |
| parent | 2407f8aca45a3fde5a0c6808d62a0435ff1de565 (diff) | |
Revert "NotifyClients no more"
This reverts commit 96bafa464ebdbce3ef04bec9beae5e745bb37794. It started to
cause an ASan heap-use-after-free during CppunitTest_sw_uiwriter, see the
comments starting at <https://gerrit.libreoffice.org/c/core/+/108604/
5#message-681a6100cff11cb51d20e5a2b2fb38da1f92ab32> "NotifyClients no more".
Change-Id: Id0eef2e75ea047d4b337c51df929eea81fb69f5a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108717
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/anchoredobject.hxx | 2 | ||||
| -rw-r--r-- | sw/inc/calbck.hxx | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/sw/inc/anchoredobject.hxx b/sw/inc/anchoredobject.hxx index 50391e966bae..5309602f9ef0 100644 --- a/sw/inc/anchoredobject.hxx +++ b/sw/inc/anchoredobject.hxx @@ -107,8 +107,6 @@ 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 31df9791291b..ae4d3bd0b8fd 100644 --- a/sw/inc/calbck.hxx +++ b/sw/inc/calbck.hxx @@ -189,7 +189,11 @@ public: : SwClient(), m_pWriterListeners(nullptr), m_bModifyLocked(false), m_bInCache(false), m_bInSwFntCache(false) {} - // broadcasting mechanism + // 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 virtual void CallSwClientNotify( const SfxHint& rHint ) const; virtual ~SwModify() override; |