vclwidget: only call dispose() once

by using a new utility method in vcl::Window
This means that we don't have to make all our dispose
methods safe to call more than once.

Change-Id: I2110c7de4a86c70fdc97dd8fd318c86b56865374

8 files changed, 9 insertions, 9 deletions

diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx
index bcf3890c9190..9d15fa38ee41 100644
--- a/reportdesign/source/ui/report/DesignView.cxx
+++ b/reportdesign/source/ui/report/DesignView.cxx
@@ -62,7 +62,7 @@ class OTaskWindow : public vcl::Window
     VclPtr<PropBrw> m_pPropWin;
 public:
     OTaskWindow(vcl::Window* _pParent) : Window(_pParent),m_pPropWin(NULL){}
-    virtual ~OTaskWindow() { dispose(); }
+    virtual ~OTaskWindow() { disposeOnce(); }
     virtual void dispose() SAL_OVERRIDE { m_pPropWin.clear(); vcl::Window::dispose(); }
 
     inline void setPropertyBrowser(PropBrw* _pPropWin)
@@ -127,7 +127,7 @@ ODesignView::ODesignView(   vcl::Window* pParent,
 
 ODesignView::~ODesignView()
 {
-    dispose();
+    disposeOnce();
 }
 
 void ODesignView::dispose()
diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx
index b4716cb0052b..22a1d986e98d 100644
--- a/reportdesign/source/ui/report/ReportSection.cxx
+++ b/reportdesign/source/ui/report/ReportSection.cxx
@@ -111,7 +111,7 @@ OReportSection::OReportSection(OSectionWindow* _pParent,const uno::Reference< re
 
 OReportSection::~OReportSection()
 {
-    dispose();
+    disposeOnce();
 }
 
 void OReportSection::dispose()
diff --git a/reportdesign/source/ui/report/ReportWindow.cxx b/reportdesign/source/ui/report/ReportWindow.cxx
index 10b69e75c3e8..25097bf5446a 100644
--- a/reportdesign/source/ui/report/ReportWindow.cxx
+++ b/reportdesign/source/ui/report/ReportWindow.cxx
@@ -85,7 +85,7 @@ OReportWindow::OReportWindow(OScrollWindowHelper* _pParent,ODesignView* _pView)
 
 OReportWindow::~OReportWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void OReportWindow::dispose()
diff --git a/reportdesign/source/ui/report/ScrollHelper.cxx b/reportdesign/source/ui/report/ScrollHelper.cxx
index 6641ad23a705..7185223871bf 100644
--- a/reportdesign/source/ui/report/ScrollHelper.cxx
+++ b/reportdesign/source/ui/report/ScrollHelper.cxx
@@ -69,7 +69,7 @@ OScrollWindowHelper::OScrollWindowHelper( ODesignView* _pDesignView)
 
 OScrollWindowHelper::~OScrollWindowHelper()
 {
-    dispose();
+    disposeOnce();
 }
 
 void OScrollWindowHelper::dispose()
diff --git a/reportdesign/source/ui/report/SectionWindow.cxx b/reportdesign/source/ui/report/SectionWindow.cxx
index 8edd7466b6d1..37a22873d296 100644
--- a/reportdesign/source/ui/report/SectionWindow.cxx
+++ b/reportdesign/source/ui/report/SectionWindow.cxx
@@ -100,7 +100,7 @@ OSectionWindow::OSectionWindow( OViewsWindow* _pParent,const uno::Reference< rep
 
 OSectionWindow::~OSectionWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void OSectionWindow::dispose()
diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx
index 1ada64e1677d..06ae171a2baf 100644
--- a/reportdesign/source/ui/report/StartMarker.cxx
+++ b/reportdesign/source/ui/report/StartMarker.cxx
@@ -80,7 +80,7 @@ OStartMarker::OStartMarker(OSectionWindow* _pParent,const OUString& _sColorEntry
 
 OStartMarker::~OStartMarker()
 {
-    dispose();
+    disposeOnce();
 }
 
 void OStartMarker::dispose()
diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx
index 9ca2c79e134e..b8e159fd9c97 100644
--- a/reportdesign/source/ui/report/ViewsWindow.cxx
+++ b/reportdesign/source/ui/report/ViewsWindow.cxx
@@ -185,7 +185,7 @@ OViewsWindow::OViewsWindow( OReportWindow* _pReportWindow)
 
 OViewsWindow::~OViewsWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void OViewsWindow::dispose()
diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx
index ef019a79ce33..426c612c9e94 100644
--- a/reportdesign/source/ui/report/propbrw.cxx
+++ b/reportdesign/source/ui/report/propbrw.cxx
@@ -185,7 +185,7 @@ PropBrw::PropBrw(const Reference< XComponentContext >& _xORB, vcl::Window* pPare
 
 PropBrw::~PropBrw()
 {
-    dispose();
+    disposeOnce();
 }
 
 void PropBrw::dispose()