diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2016-12-05 01:22:45 +0100 |
|---|---|---|
| committer | Björn Michaelsen <bjoern.michaelsen@canonical.com> | 2016-12-05 18:20:32 +0000 |
| commit | 8725c011de34206a91aa4d422a0b67a845cf2e1c (patch) | |
| tree | 9bcdbd293bcb80fb2140ab2b03ed4cfa0bc8f5b3 | |
| parent | 47203f2cff8afb2d4e57be479089f39d36160bb4 (diff) | |
use proper message passing
Change-Id: Ibf02e22d7dcca2338da34376a70e9383e366920d
Reviewed-on: https://gerrit.libreoffice.org/31614
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
| -rw-r--r-- | sw/inc/frmfmt.hxx | 3 | ||||
| -rw-r--r-- | sw/source/core/draw/dcontact.cxx | 1 | ||||
| -rw-r--r-- | sw/source/core/layout/atrfrm.cxx | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx index 2f17bc6f83cb..b273f44a319f 100644 --- a/sw/inc/frmfmt.hxx +++ b/sw/inc/frmfmt.hxx @@ -242,7 +242,8 @@ namespace sw PREP_INSERT_FLY, PREP_DELETE_FLY, PAGE_OUT_OF_BOUNDS, - MAKE_FRAMES + MAKE_FRAMES, + DELETE_FRAMES }; struct SW_DLLPUBLIC DrawFrameFormatHint final: SfxHint { diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx index 4bee3ccfe592..1ee4787575ea 100644 --- a/sw/source/core/draw/dcontact.cxx +++ b/sw/source/core/draw/dcontact.cxx @@ -1549,6 +1549,7 @@ void SwDrawContact::SwClientNotify(const SwModify& rMod, const SfxHint& rHint) RemoveMasterFromDrawPage(); break; case sw::DrawFrameFormatHintId::PAGE_OUT_OF_BOUNDS: + case sw::DrawFrameFormatHintId::DELETE_FRAMES: DisconnectFromLayout(); break; case sw::DrawFrameFormatHintId::MAKE_FRAMES: diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index fb6fa1753530..d199be3f9234 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -3344,9 +3344,7 @@ void SwDrawFrameFormat::MakeFrames() void SwDrawFrameFormat::DelFrames() { - SwDrawContact *pContact = static_cast<SwDrawContact *>(FindContactObj()); - if ( pContact ) //for the reader and other unpredictable things. - pContact->DisconnectFromLayout(); + CallSwClientNotify(sw::DrawFrameFormatHint(sw::DrawFrameFormatHintId::DELETE_FRAMES)); } // #i31698# |