diff options
author | László Németh <nemeth@numbertext.org> | 2019-11-13 11:27:21 +0100 |
---|---|---|
committer | László Németh <nemeth@numbertext.org> | 2019-11-13 16:28:53 +0100 |
commit | f4b472a218cbde432659cd4d70ddf47dd1d1619e (patch) | |
tree | 460d6b983a759fd85be388364ff87422f081bae2 /sw/source/uibase/dochdl/swdtflvr.cxx | |
parent | 886583645cf8d977f11f527691515c2a4d7c33e8 (diff) |
tdf#128776 Writer: fix Ctrl + drag and drop table copy
Regression from the commit 7fe64353dc9950e19182a59a486a1ecac27cf98e
(tdf#84806 Writer: drag and drop selected tables, don't empty).
Change-Id: I9061b80dd8fab29aa5ec74655dc6c3f7686a91ee
Reviewed-on: https://gerrit.libreoffice.org/82579
Reviewed-by: László Németh <nemeth@numbertext.org>
Tested-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'sw/source/uibase/dochdl/swdtflvr.cxx')
-rw-r--r-- | sw/source/uibase/dochdl/swdtflvr.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx index 155efd32296b..bcb5f60babe1 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -3696,7 +3696,7 @@ bool SwTransferable::PrivateDrop( SwWrtShell& rSh, const Point& rDragPt, bool bSttWrd = false; bool bSttPara = false; bool bTableSel = false; - bool bTableWholeSel = false; + bool bTableMove = false; bool bFrameSel = false; SwWrtShell& rSrcSh = *GetShell(); @@ -3762,8 +3762,8 @@ bool SwTransferable::PrivateDrop( SwWrtShell& rSh, const Point& rDragPt, if( rSrcSh.IsTableMode() ) { bTableSel = true; - if ( rSrcSh.HasWholeTabSelection() ) - bTableWholeSel = true; + if ( bMove && rSrcSh.HasWholeTabSelection() ) + bTableMove = true; } else if( rSrcSh.IsSelFrameMode() || rSrcSh.IsObjSelected() ) { @@ -3937,7 +3937,7 @@ bool SwTransferable::PrivateDrop( SwWrtShell& rSh, const Point& rDragPt, } } } - else if ( bRet && bTableWholeSel ) + else if ( bRet && bTableMove ) { SfxDispatcher* pDispatch = rSrcSh.GetView().GetViewFrame()->GetDispatcher(); pDispatch->Execute(FN_TABLE_DELETE_TABLE, SfxCallMode::SYNCHRON); |