diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@libreoffice.org> | 2021-01-03 23:27:49 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@libreoffice.org> | 2021-01-09 03:59:46 +0100 |
| commit | d656da9bc4f2df0bb99c65a288847e3fdd43a37c (patch) | |
| tree | 9a39ad3b93e02af6a5944c8fecc5455d9cdb3b2d /sw/source/core/graphic/ndgrf.cxx | |
| parent | 3e6c27ac7c42668152b8a636ab875bbf0b9994b2 (diff) | |
~SwModify: do not silently tolerate clients registered past death
- Make SwFormat/SwContentNode explicitly resetting the page desc. before
death instead of SwFormatPageDesc trying to do that on the dying hint:
* the dying hints is send _after_ the SwFormat/SwContentNode dtor are
completed, so the RTTI magic did not work anyway
* simply resetting the attribute in a final dtor and make
SwFormatPageDesc just check to never get a dying hint (because it
should have been destructed by reset) is a lot less errorprone.
Change-Id: I231f1729729491ba7544e5ba93d81192b212e2ae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108648
Tested-by: Jenkins
Reviewed-by: Bjoern Michaelsen <bjoern.michaelsen@libreoffice.org>
Diffstat (limited to 'sw/source/core/graphic/ndgrf.cxx')
| -rw-r--r-- | sw/source/core/graphic/ndgrf.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx index b7ab6e94e44a..19db918cc8ff 100644 --- a/sw/source/core/graphic/ndgrf.cxx +++ b/sw/source/core/graphic/ndgrf.cxx @@ -302,6 +302,7 @@ SwGrfNode::~SwGrfNode() //#39289# delete frames already here since the Frames' dtor needs the graphic for its StopAnimation if( HasWriterListeners() ) DelFrames(nullptr); + ResetAttr(RES_PAGEDESC); } /// allow reaction on change of content of GraphicObject |