[Libreoffice-commits] core.git: sd/source

[Caolán McNamara (via logerrit)]

 sd/source/ui/sidebar/LayoutMenu.cxx |   18 ------------------
 sd/source/ui/sidebar/LayoutMenu.hxx |    9 ---------
 2 files changed, 27 deletions(-)

New commits:
commit f0860d59dfa5cc951cfdb74f9342678e9acfdc24
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Feb 3 21:28:12 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Feb 4 09:48:53 2020 +0100

    dnd doesn't do anything
    
    inherits from DragSourceHelper and DropTargetHelper but doesn't do anything
    and it doesn't override some default dnd to explicitly disable it.
    
    AFAICS this doesn't do anything
    
    Change-Id: I428385af32e49f26c8c24e40208fe9b1ab373de9
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87925
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index b1563c1c1d33..f28bd776d7d6 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -132,8 +132,6 @@ LayoutMenu::LayoutMenu (
     ViewShellBase& rViewShellBase,
     const css::uno::Reference<css::ui::XSidebar>& rxSidebar)
     : ValueSet (pParent, WB_ITEMBORDER),
-      DragSourceHelper(this),
-      DropTargetHelper(this),
       mrBase(rViewShellBase),
       mbIsMainViewChangePending(false),
       mxSidebar(rxSidebar),
@@ -196,8 +194,6 @@ void LayoutMenu::dispose()
 {
     SAL_INFO("sd.ui", "destroying LayoutMenu at " << this);
     Dispose();
-    DragSourceHelper::dispose();
-    DropTargetHelper::dispose();
     ValueSet::dispose();
 }
 
@@ -555,20 +551,6 @@ void LayoutMenu::Clear()
     ValueSet::Clear();
 }
 
-void LayoutMenu::StartDrag (sal_Int8 , const Point& )
-{
-}
-
-sal_Int8 LayoutMenu::AcceptDrop (const AcceptDropEvent& )
-{
-    return 0;
-}
-
-sal_Int8 LayoutMenu::ExecuteDrop (const ExecuteDropEvent& )
-{
-    return 0;
-}
-
 void LayoutMenu::Command (const CommandEvent& rEvent)
 {
     switch (rEvent.GetCommand())
diff --git a/sd/source/ui/sidebar/LayoutMenu.hxx b/sd/source/ui/sidebar/LayoutMenu.hxx
index 8146479cd3c9..51e99a5ed794 100644
--- a/sd/source/ui/sidebar/LayoutMenu.hxx
+++ b/sd/source/ui/sidebar/LayoutMenu.hxx
@@ -44,8 +44,6 @@ namespace sd { namespace sidebar {
 
 class LayoutMenu
     : public ValueSet,
-      public DragSourceHelper,
-      public DropTargetHelper,
       public sfx2::sidebar::ILayoutableWindow
 {
 public:
@@ -87,13 +85,6 @@ public:
     */
     void InvalidateContent();
 
-    // DragSourceHelper
-    virtual void StartDrag (sal_Int8 nAction, const Point& rPosPixel) override;
-
-    // DropTargetHelper
-    virtual sal_Int8 AcceptDrop (const AcceptDropEvent& rEvent) override;
-    virtual sal_Int8 ExecuteDrop (const ExecuteDropEvent& rEvent) override;
-
     /** The context menu is requested over this Command() method.
     */
     virtual void Command (const CommandEvent& rEvent) override;