sw/inc/frmfmt.hxx | 3 ++-
sw/source/core/draw/dcontact.cxx | 3 +++
sw/source/core/frmedt/fecopy.cxx | 6 +-----
3 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 755d4756b9b105c035986ffb184630e62a47a2ba
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Thu Dec 1 12:47:12 2016 +0100
use proper message passing
Change-Id: Ibcdc6a492abe5e26fb9b5244119be5dacc01b7b4
Reviewed-on: https://gerrit.libreoffice.org/31487
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Björn Michaelsen <bjoern.michael...@canonical.com>
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx
index 66511d0..12df535 100644
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.hxx
@@ -237,7 +237,8 @@ public:
namespace sw
{
enum class DrawFrameFormatHintId {
- DYING
+ DYING,
+ PREPPASTING
};
struct SW_DLLPUBLIC DrawFrameFormatHint final: SfxHint
{
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index a80517e..06287d0 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -1536,6 +1536,9 @@ void SwDrawContact::SwClientNotify(const SwModify& rMod,
const SfxHint& rHint)
case sw::DrawFrameFormatHintId::DYING:
delete this;
break;
+ case sw::DrawFrameFormatHintId::PREPPASTING:
+ MoveObjToVisibleLayer(GetMaster());
+ break;
default:
SAL_WARN("sw.core", "unhandled DrawFrameFormatHintId");
}
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index 419c147..dc95e72 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -1007,11 +1007,7 @@ bool SwFEShell::Paste( SwDoc* pClpDoc )
OSL_ENSURE( RES_DRAWFRMFMT == pNew->Which(),
"Neues Format.");
// #i52780# - drawing object has
// to be made visible on paste.
- {
- SwDrawContact* pContact =
-
static_cast<SwDrawContact*>(pNew->FindContactObj());
- pContact->MoveObjToVisibleLayer(
pContact->GetMaster() );
- }
+
pNew->CallSwClientNotify(sw::DrawFrameFormatHint(sw::DrawFrameFormatHintId::PREPPASTING));
SdrObject *pObj = pNew->FindSdrObject();
SwDrawView *pDV = Imp()->GetDrawView();
pDV->MarkObj( pObj, pDV->GetSdrPageView() );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
