Kaydet (Commit) 755d4756 authored tarafından Bjoern Michaelsen's avatar Bjoern Michaelsen Kaydeden (comit) Björn Michaelsen

use proper message passing

Change-Id: Ibcdc6a492abe5e26fb9b5244119be5dacc01b7b4
Reviewed-on: https://gerrit.libreoffice.org/31487Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarBjörn Michaelsen <bjoern.michaelsen@canonical.com>
üst c697aa80
...@@ -237,7 +237,8 @@ public: ...@@ -237,7 +237,8 @@ public:
namespace sw namespace sw
{ {
enum class DrawFrameFormatHintId { enum class DrawFrameFormatHintId {
DYING DYING,
PREPPASTING
}; };
struct SW_DLLPUBLIC DrawFrameFormatHint final: SfxHint struct SW_DLLPUBLIC DrawFrameFormatHint final: SfxHint
{ {
......
...@@ -1536,6 +1536,9 @@ void SwDrawContact::SwClientNotify(const SwModify& rMod, const SfxHint& rHint) ...@@ -1536,6 +1536,9 @@ void SwDrawContact::SwClientNotify(const SwModify& rMod, const SfxHint& rHint)
case sw::DrawFrameFormatHintId::DYING: case sw::DrawFrameFormatHintId::DYING:
delete this; delete this;
break; break;
case sw::DrawFrameFormatHintId::PREPPASTING:
MoveObjToVisibleLayer(GetMaster());
break;
default: default:
SAL_WARN("sw.core", "unhandled DrawFrameFormatHintId"); SAL_WARN("sw.core", "unhandled DrawFrameFormatHintId");
} }
......
...@@ -1007,11 +1007,7 @@ bool SwFEShell::Paste( SwDoc* pClpDoc ) ...@@ -1007,11 +1007,7 @@ bool SwFEShell::Paste( SwDoc* pClpDoc )
OSL_ENSURE( RES_DRAWFRMFMT == pNew->Which(), "Neues Format."); OSL_ENSURE( RES_DRAWFRMFMT == pNew->Which(), "Neues Format.");
// #i52780# - drawing object has // #i52780# - drawing object has
// to be made visible on paste. // to be made visible on paste.
{ pNew->CallSwClientNotify(sw::DrawFrameFormatHint(sw::DrawFrameFormatHintId::PREPPASTING));
SwDrawContact* pContact =
static_cast<SwDrawContact*>(pNew->FindContactObj());
pContact->MoveObjToVisibleLayer( pContact->GetMaster() );
}
SdrObject *pObj = pNew->FindSdrObject(); SdrObject *pObj = pNew->FindSdrObject();
SwDrawView *pDV = Imp()->GetDrawView(); SwDrawView *pDV = Imp()->GetDrawView();
pDV->MarkObj( pObj, pDV->GetSdrPageView() ); pDV->MarkObj( pObj, pDV->GetSdrPageView() );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment