summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-07-26 16:11:02 +0100
committerCaolán McNamara <caolanm@redhat.com>2017-08-03 14:30:26 +0200
commitfe3b0468884c3206f527f2afffbcb25482232452 (patch)
tree3b0f540996541a3431fb647dd698fbf4c7cca2b7
parentf17ce1f990c980346ab826781523b5afa45f8e0b (diff)
Resolves: tdf#33692 drawing objects not visible after creation via ctrl+drag
Change-Id: Iecdff08b36ebee0135c6cac1882702fc4d6dd087 Reviewed-on: https://gerrit.libreoffice.org/40457 Tested-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--sw/source/core/frmedt/fecopy.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index 743920a0b8f3..b091eeba134b 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -397,6 +397,8 @@ bool SwFEShell::CopyDrawSel( SwFEShell* pDestShell, const Point& rSttPt,
// Can be 0, as Draws are not allowed in Headers/Footers
if ( pFormat )
{
+ // #tdf33692 - drawing object has to be made visible on ctrl+drag copy.
+ pFormat->CallSwClientNotify(sw::DrawFrameFormatHint(sw::DrawFrameFormatHintId::PREPPASTING));
SdrObject* pNew = pFormat->FindSdrObject();
if ( RndStdIds::FLY_AS_CHAR != aAnchor.GetAnchorId() )
{
@@ -1006,8 +1008,7 @@ bool SwFEShell::Paste( SwDoc* pClpDoc )
else
{
OSL_ENSURE( RES_DRAWFRMFMT == pNew->Which(), "New format.");
- // #i52780# - drawing object has
- // to be made visible on paste.
+ // #i52780# - drawing object has to be made visible on paste.
pNew->CallSwClientNotify(sw::DrawFrameFormatHint(sw::DrawFrameFormatHintId::PREPPASTING));
SdrObject *pObj = pNew->FindSdrObject();
SwDrawView *pDV = Imp()->GetDrawView();