diff options
| author | Noel Grandin <noel@peralex.com> | 2016-06-03 17:15:20 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-06-08 06:40:25 +0000 |
| commit | 80c874dc87ad3018df6e6f0edb7cca174f75db37 (patch) | |
| tree | fa119fc641f9708332a0d931533684bab07c9e87 /sc | |
| parent | 7fb70ff650ce3a1e4a39bd1b936f511d6be8986c (diff) | |
remove "object is disposed" warning in OBroadcastHelperVar::removeListener
doesn't add anything of value.
Change-Id: Ie2dea7c43570640284771c992d0072ab61de425e
Reviewed-on: https://gerrit.libreoffice.org/25871
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/app/inputwin.cxx | 1 | ||||
| -rw-r--r-- | sc/source/ui/inc/tabcont.hxx | 1 | ||||
| -rw-r--r-- | sc/source/ui/view/tabcont.cxx | 8 |
3 files changed, 10 insertions, 0 deletions
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 904c4651af9a..e7d4d96b7d90 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -1440,6 +1440,7 @@ void ScTextWnd::dispose() delete pEditEngine; pEditEngine = nullptr; + DragSourceHelper::dispose(); ScTextWndBase::dispose(); } diff --git a/sc/source/ui/inc/tabcont.hxx b/sc/source/ui/inc/tabcont.hxx index 31503b49eaf3..e6f2df06318d 100644 --- a/sc/source/ui/inc/tabcont.hxx +++ b/sc/source/ui/inc/tabcont.hxx @@ -64,6 +64,7 @@ protected: public: ScTabControl( vcl::Window* pParent, ScViewData* pData ); + virtual void dispose() override; virtual ~ScTabControl(); using TabBar::StartDrag; diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx index 8f8eb13eb036..56ef3b602b26 100644 --- a/sc/source/ui/view/tabcont.cxx +++ b/sc/source/ui/view/tabcont.cxx @@ -111,6 +111,14 @@ IMPL_LINK_TYPED(ScTabControl, ShowPageList, const CommandEvent &, rEvent, void) ScTabControl::~ScTabControl() { + disposeOnce(); +} + +void ScTabControl::dispose() +{ + DragSourceHelper::dispose(); + DropTargetHelper::dispose(); + TabBar::dispose(); } sal_uInt16 ScTabControl::GetMaxId() const |