[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sc/source

[Caolán McNamara (via logerrit)]

 sc/source/ui/navipi/content.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit e5773d383ac4ab43c03b88dfe8deb4f16515feba
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Jan 13 10:15:19 2021 +0000
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Tue Jan 19 18:27:43 2021 +0100

    Resolves: tdf#138972 dnd is moving instead of copying the data
    
    Change-Id: Icb2a3882704bf38c14b7a46154d51c3171268ca6
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109220
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit 1095b7bdf1bb33b3dc0fb5ae73342ae6ca0396fc)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109521
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index 31fce4ea8bb8..423bef3ef8a1 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -144,7 +144,7 @@ ScContentTree::ScContentTree(std::unique_ptr<weld::TreeView> xTreeView, ScNaviga
     m_xTreeView->connect_query_tooltip(LINK(this, ScContentTree, QueryTooltipHdl));
 
     rtl::Reference<TransferDataContainer> xHelper(m_xTransferObj.get());
-    m_xTreeView->enable_drag_source(xHelper, DND_ACTION_COPYMOVE | DND_ACTION_LINK);
+    m_xTreeView->enable_drag_source(xHelper, DND_ACTION_COPY | DND_ACTION_LINK);
 
     m_xTreeView->connect_drag_begin(LINK(this, ScContentTree, DragBeginHdl));
 }
@@ -1177,7 +1177,7 @@ static bool lcl_DoDragObject( ScDocShell* pSrcShell, const OUString& rName, ScCo
             SC_MOD()->SetDragObject( nullptr, pTransferObj.get() );
 
             rtl::Reference<TransferDataContainer> xHelper(pTransferObj.get());
-            rTreeView.enable_drag_source(xHelper, DND_ACTION_COPYMOVE | DND_ACTION_LINK);
+            rTreeView.enable_drag_source(xHelper, DND_ACTION_COPY | DND_ACTION_LINK);
 
             bDisallow = false;
         }
@@ -1217,7 +1217,7 @@ static bool lcl_DoDragCells( ScDocShell* pSrcShell, const ScRange& rRange, ScDra
         SC_MOD()->SetDragObject( pTransferObj.get(), nullptr );      // for internal D&D
 
         rtl::Reference<TransferDataContainer> xHelper(pTransferObj.get());
-        rTreeView.enable_drag_source(xHelper, DND_ACTION_COPYMOVE | DND_ACTION_LINK);
+        rTreeView.enable_drag_source(xHelper, DND_ACTION_COPY | DND_ACTION_LINK);
 
         bDisallow = false;
     }
@@ -1371,7 +1371,7 @@ IMPL_LINK(ScContentTree, DragBeginHdl, bool&, rUnsetDragIcon, bool)
                 m_xTransferObj->SetLinkURL(aLinkURL, aLinkText);
 
             rtl::Reference<TransferDataContainer> xHelper(m_xTransferObj.get());
-            m_xTreeView->enable_drag_source(xHelper, DND_ACTION_COPYMOVE | DND_ACTION_LINK);
+            m_xTreeView->enable_drag_source(xHelper, DND_ACTION_COPY | DND_ACTION_LINK);
 
             bDisallow = false;
         }