sw/source/core/frmedt/fecopy.cxx | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 93887dc0ecd805754b106a8e2e6fa90d315d2491
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Jul 26 16:11:02 2017 +0100
Resolves: tdf#33692 drawing objects not visible after creation via ctrl+drag
Reviewed-on: https://gerrit.libreoffice.org/40457
Tested-by: Julien Nabet <serval2...@yahoo.fr>
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit fe3b0468884c3206f527f2afffbcb25482232452)
Change-Id: Iecdff08b36ebee0135c6cac1882702fc4d6dd087
Reviewed-on: https://gerrit.libreoffice.org/40715
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index 42c09bd5555a..ee988eb47c5b 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() )
{
@@ -1005,9 +1007,8 @@ bool SwFEShell::Paste( SwDoc* pClpDoc )
}
else
{
- OSL_ENSURE( RES_DRAWFRMFMT == pNew->Which(),
"Neues Format.");
- // #i52780# - drawing object has
- // to be made visible on paste.
+ OSL_ENSURE( RES_DRAWFRMFMT == pNew->Which(),
"New format.");
+ // #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();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
