diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2016-12-05 01:06:12 +0100 |
---|---|---|
committer | Björn Michaelsen <bjoern.michaelsen@canonical.com> | 2016-12-05 18:19:49 +0000 |
commit | 47203f2cff8afb2d4e57be479089f39d36160bb4 (patch) | |
tree | 9dd443685b813a4560ecec2c34e771f78df8752e | |
parent | 6816994ffb0b8776605d1ce87889f3d54c8aaf57 (diff) |
use proper message passing
Change-Id: Ie516712b3474a0eb800e2d9e3e41921b10059fe8
Reviewed-on: https://gerrit.libreoffice.org/31613
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 | 1 | ||||
-rw-r--r-- | sw/source/core/draw/dcontact.cxx | 3 | ||||
-rw-r--r-- | sw/source/core/layout/atrfrm.cxx | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx index 0dd00dcc71cf..2f17bc6f83cb 100644 --- a/sw/inc/frmfmt.hxx +++ b/sw/inc/frmfmt.hxx @@ -242,6 +242,7 @@ namespace sw PREP_INSERT_FLY, PREP_DELETE_FLY, PAGE_OUT_OF_BOUNDS, + MAKE_FRAMES }; struct SW_DLLPUBLIC DrawFrameFormatHint final: SfxHint { diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx index 82425a0da424..4bee3ccfe592 100644 --- a/sw/source/core/draw/dcontact.cxx +++ b/sw/source/core/draw/dcontact.cxx @@ -1551,6 +1551,9 @@ void SwDrawContact::SwClientNotify(const SwModify& rMod, const SfxHint& rHint) case sw::DrawFrameFormatHintId::PAGE_OUT_OF_BOUNDS: DisconnectFromLayout(); break; + case sw::DrawFrameFormatHintId::MAKE_FRAMES: + ConnectToLayout(); + break; default: SAL_WARN("sw.core", "unhandled DrawFrameFormatHintId"); } diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index 4d5cd195d885..fb6fa1753530 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -3339,9 +3339,7 @@ SwDrawFrameFormat::~SwDrawFrameFormat() void SwDrawFrameFormat::MakeFrames() { - SwDrawContact *pContact = static_cast<SwDrawContact*>(FindContactObj()); - if ( pContact ) - pContact->ConnectToLayout(); + CallSwClientNotify(sw::DrawFrameFormatHint(sw::DrawFrameFormatHintId::MAKE_FRAMES)); } void SwDrawFrameFormat::DelFrames() |