From 80c874dc87ad3018df6e6f0edb7cca174f75db37 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Fri, 3 Jun 2016 17:15:20 +0200
Subject: 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>
---
 dbaccess/source/ui/app/AppIconControl.cxx |  1 +
 dbaccess/source/ui/browser/sbagrid.cxx    | 11 +++++++++++
 dbaccess/source/ui/inc/sbagrid.hxx        |  3 ++-
 3 files changed, 14 insertions(+), 1 deletion(-)

(limited to 'dbaccess/source')

diff --git a/dbaccess/source/ui/app/AppIconControl.cxx b/dbaccess/source/ui/app/AppIconControl.cxx
index 1298cc987893..14d623485f52 100644
--- a/dbaccess/source/ui/app/AppIconControl.cxx
+++ b/dbaccess/source/ui/app/AppIconControl.cxx
@@ -77,6 +77,7 @@ void OApplicationIconControl::dispose()
             pEntry->SetUserData(nullptr);
         }
     }
+    DropTargetHelper::dispose();
     SvtIconChoiceCtrl::dispose();
 }
 
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index 1ae5e20af098..226eaaea6c2c 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -562,6 +562,17 @@ SbaGridHeader::SbaGridHeader(BrowseBox* pParent, WinBits nWinBits)
 {
 }
 
+SbaGridHeader::~SbaGridHeader()
+{
+    disposeOnce();
+}
+
+void SbaGridHeader::dispose()
+{
+    DragSourceHelper::dispose();
+    FmGridHeader::dispose();
+}
+
 void SbaGridHeader::StartDrag( sal_Int8 _nAction, const Point& _rPosPixel )
 {
     SolarMutexGuard aGuard;
diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx
index 5565311196aa..1972692121b5 100644
--- a/dbaccess/source/ui/inc/sbagrid.hxx
+++ b/dbaccess/source/ui/inc/sbagrid.hxx
@@ -170,7 +170,8 @@ namespace dbaui
     {
     public:
         SbaGridHeader(BrowseBox* pParent, WinBits nWinBits = WB_STDHEADERBAR | WB_DRAG);
-
+        virtual void dispose() override;
+        virtual ~SbaGridHeader();
     protected:
 
         // FmGridHeader overridables
-- 
cgit