diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-04-29 09:51:26 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-04-30 09:42:57 +0200 |
| commit | 23e99c75ee5e3b8d15e041cefab0e99e384442bd (patch) | |
| tree | 9af69a4fe0e264f092be0275d05444f0cd999098 /starmath | |
| parent | ce5702d3c27e2a9de253ee29e02c7f494ba2a2b8 (diff) | |
drop DropTargetHelper from SmEditWindow
dnd into its child always worked while the inheritence from
DropTargetHelper began in
commit daf3e2909104fcb4c0a36d6e1fd6f44e1b61c980
Author: jp <jp@openoffice.org>
Date: Thu Jul 5 09:58:51 2001 +0000
Changes for TFD636
but always returned DND_ACTION_NONE for the parent window
Change-Id: Ida1ae0f8e68ba04452ed952c4eca3ac66f240132
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114847
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'starmath')
| -rw-r--r-- | starmath/inc/edit.hxx | 5 | ||||
| -rw-r--r-- | starmath/source/edit.cxx | 12 |
2 files changed, 1 insertions, 16 deletions
diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx index c89c23bd599e..536885794c06 100644 --- a/starmath/inc/edit.hxx +++ b/starmath/inc/edit.hxx @@ -83,7 +83,7 @@ public: void StartCursorMove(); }; -class SmEditWindow final : public InterimItemWindow, public DropTargetHelper +class SmEditWindow final : public InterimItemWindow { SmCmdBoxWindow& rCmdBox; std::unique_ptr<weld::ScrolledWindow> mxScrolledWindow; @@ -93,9 +93,6 @@ class SmEditWindow final : public InterimItemWindow, public DropTargetHelper virtual void ApplySettings(vcl::RenderContext&) override; virtual void DataChanged(const DataChangedEvent&) override; - virtual sal_Int8 AcceptDrop(const AcceptDropEvent& rEvt) override; - virtual sal_Int8 ExecuteDrop(const ExecuteDropEvent& rEvt) override; - DECL_LINK(ScrollHdl, weld::ScrolledWindow&, void); void CreateEditView(); diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx index 26359d774682..ae9b6b7c61da 100644 --- a/starmath/source/edit.cxx +++ b/starmath/source/edit.cxx @@ -123,7 +123,6 @@ void SmEditTextWindow::SetDrawingArea(weld::DrawingArea* pDrawingArea) SmEditWindow::SmEditWindow(SmCmdBoxWindow &rMyCmdBoxWin) : InterimItemWindow(&rMyCmdBoxWin, "modules/smath/ui/editwindow.ui", "EditWindow") - , DropTargetHelper(this) , rCmdBox(rMyCmdBoxWin) , mxScrolledWindow(m_xBuilder->weld_scrolled_window("scrolledwindow", true)) { @@ -158,7 +157,6 @@ void SmEditWindow::dispose() mxScrolledWindow.reset(); - DropTargetHelper::dispose(); InterimItemWindow::dispose(); } @@ -733,16 +731,6 @@ static bool HasMark(const OUString& rText) return rText.indexOf("<?>") != -1; } -sal_Int8 SmEditWindow::AcceptDrop( const AcceptDropEvent& /*rEvt*/ ) -{ - return DND_ACTION_NONE; -} - -sal_Int8 SmEditWindow::ExecuteDrop( const ExecuteDropEvent& /*rEvt*/ ) -{ - return DND_ACTION_NONE; -} - ESelection SmEditWindow::GetSelection() const { if (mxTextControl) |