summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-10-10 15:46:46 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-10-10 15:51:30 +0100
commitca7915037c2fedc0d69908a6d2d9ccb67aa02a15 (patch)
treea96c05c2b80a752e14cdff6d55cf6b35e79e9e2a
parent4b4d5a85859dda8bdc444033cda87e317fcaf269 (diff)
dropping document into these toolbars does nothing already
so might as well drop that support here. Dropping into the main panel works (for master documents its quite sensible) Change-Id: Ic7a088d7ff7054430d55032158a186d610f10da1
-rw-r--r--sw/source/uibase/cctrl/popbox.cxx13
-rw-r--r--sw/source/uibase/inc/popbox.hxx6
2 files changed, 2 insertions, 17 deletions
diff --git a/sw/source/uibase/cctrl/popbox.cxx b/sw/source/uibase/cctrl/popbox.cxx
index 6a1f301ddf96..7853e942b1b2 100644
--- a/sw/source/uibase/cctrl/popbox.cxx
+++ b/sw/source/uibase/cctrl/popbox.cxx
@@ -23,21 +23,10 @@
#include <navipi.hxx>
SwHelpToolBox::SwHelpToolBox( SwNavigationPI* pParent, const ResId& rResId )
- : ToolBox( pParent, rResId ),
- DropTargetHelper( this )
+ : ToolBox( pParent, rResId )
{
}
SwHelpToolBox::~SwHelpToolBox() {}
-sal_Int8 SwHelpToolBox::AcceptDrop( const AcceptDropEvent& rEvt )
-{
- return static_cast<SwNavigationPI*>(GetParent())->AcceptDrop( rEvt );
-}
-
-sal_Int8 SwHelpToolBox::ExecuteDrop( const ExecuteDropEvent& rEvt )
-{
- return static_cast<SwNavigationPI*>(GetParent())->ExecuteDrop( rEvt );
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/popbox.hxx b/sw/source/uibase/inc/popbox.hxx
index af89d0e07da2..3e9dbf90db08 100644
--- a/sw/source/uibase/inc/popbox.hxx
+++ b/sw/source/uibase/inc/popbox.hxx
@@ -24,12 +24,8 @@
class SwNavigationPI;
-class SwHelpToolBox: public ToolBox, public DropTargetHelper
+class SwHelpToolBox: public ToolBox
{
-protected:
- virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) override;
- virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) override;
-
public:
SwHelpToolBox(SwNavigationPI* pParent, const ResId &);
virtual ~SwHelpToolBox() override;