From ca7915037c2fedc0d69908a6d2d9ccb67aa02a15 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 10 Oct 2016 15:46:46 +0100 Subject: 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 --- sw/source/uibase/cctrl/popbox.cxx | 13 +------------ sw/source/uibase/inc/popbox.hxx | 6 +----- 2 files changed, 2 insertions(+), 17 deletions(-) (limited to 'sw/source/uibase') 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 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(GetParent())->AcceptDrop( rEvt ); -} - -sal_Int8 SwHelpToolBox::ExecuteDrop( const ExecuteDropEvent& rEvt ) -{ - return static_cast(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; -- cgit v1.2.3