From d7a84ce8406096b455d81f50cd50ca2e877adc06 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Tue, 10 Mar 2015 09:07:06 +0200
Subject: 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
---
 chart2/source/controller/dialogs/DataBrowser.cxx                | 2 +-
 chart2/source/controller/dialogs/dlg_ChartType.cxx              | 2 +-
 chart2/source/controller/dialogs/dlg_DataEditor.cxx             | 2 +-
 chart2/source/controller/dialogs/dlg_DataSource.cxx             | 2 +-
 chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx        | 2 +-
 chart2/source/controller/dialogs/dlg_ObjectProperties.cxx       | 2 +-
 chart2/source/controller/dialogs/dlg_View3D.cxx                 | 2 +-
 chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx      | 2 +-
 chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx        | 2 +-
 chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx    | 2 +-
 chart2/source/controller/dialogs/tp_AxisLabel.cxx               | 2 +-
 chart2/source/controller/dialogs/tp_AxisPositions.cxx           | 2 +-
 chart2/source/controller/dialogs/tp_ChartType.cxx               | 6 +++---
 chart2/source/controller/dialogs/tp_DataSource.cxx              | 2 +-
 chart2/source/controller/dialogs/tp_LegendPosition.cxx          | 2 +-
 chart2/source/controller/dialogs/tp_PointGeometry.cxx           | 2 +-
 chart2/source/controller/dialogs/tp_PolarOptions.cxx            | 2 +-
 chart2/source/controller/dialogs/tp_RangeChooser.cxx            | 2 +-
 chart2/source/controller/dialogs/tp_Scale.cxx                   | 2 +-
 chart2/source/controller/dialogs/tp_SeriesToAxis.cxx            | 2 +-
 chart2/source/controller/dialogs/tp_TitleRotation.cxx           | 2 +-
 chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx | 2 +-
 chart2/source/controller/main/ChartWindow.cxx                   | 2 +-
 23 files changed, 25 insertions(+), 25 deletions(-)

(limited to 'chart2')

diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index 54f13e2b53b6..f8915938da4b 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -468,7 +468,7 @@ DataBrowser::DataBrowser( vcl::Window* pParent, WinBits nStyle, bool bLiveUpdate
 
 DataBrowser::~DataBrowser()
 {
-    dispose();
+    disposeOnce();
 }
 
 void DataBrowser::dispose()
diff --git a/chart2/source/controller/dialogs/dlg_ChartType.cxx b/chart2/source/controller/dialogs/dlg_ChartType.cxx
index 0da5875bb645..57a05801248f 100644
--- a/chart2/source/controller/dialogs/dlg_ChartType.cxx
+++ b/chart2/source/controller/dialogs/dlg_ChartType.cxx
@@ -55,7 +55,7 @@ ChartTypeDialog::ChartTypeDialog( vcl::Window* pParent
 
 ChartTypeDialog::~ChartTypeDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void ChartTypeDialog::dispose()
diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
index 5230792f51f2..118d6f7e385c 100644
--- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
@@ -95,7 +95,7 @@ DataEditor::DataEditor(vcl::Window* pParent,
 
 DataEditor::~DataEditor()
 {
-    dispose();
+    disposeOnce();
 }
 
 void DataEditor::dispose()
diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx
index cdd34e1aa5a2..e2854874c7f1 100644
--- a/chart2/source/controller/dialogs/dlg_DataSource.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx
@@ -159,7 +159,7 @@ DataSourceDialog::DataSourceDialog(vcl::Window * pParent,
 
 DataSourceDialog::~DataSourceDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void DataSourceDialog::dispose()
diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
index 670979af96ee..4ef50442f07c 100644
--- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
@@ -83,7 +83,7 @@ SchAxisDlg::SchAxisDlg(vcl::Window* pWindow,
 
 SchAxisDlg::~SchAxisDlg()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SchAxisDlg::dispose()
diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index 0a563e2a0c31..92c6cb668f56 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -481,7 +481,7 @@ SchAttribTabDlg::SchAttribTabDlg(vcl::Window* pParent,
 
 SchAttribTabDlg::~SchAttribTabDlg()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SchAttribTabDlg::dispose()
diff --git a/chart2/source/controller/dialogs/dlg_View3D.cxx b/chart2/source/controller/dialogs/dlg_View3D.cxx
index b3e97fb69f74..13b5605b396f 100644
--- a/chart2/source/controller/dialogs/dlg_View3D.cxx
+++ b/chart2/source/controller/dialogs/dlg_View3D.cxx
@@ -66,7 +66,7 @@ View3DDialog::View3DDialog(vcl::Window* pParent, const uno::Reference< frame::XM
 
 View3DDialog::~View3DDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void View3DDialog::dispose()
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
index d25e226fb19d..7c866eed86b5 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
@@ -122,7 +122,7 @@ ThreeD_SceneAppearance_TabPage::ThreeD_SceneAppearance_TabPage(
 
 ThreeD_SceneAppearance_TabPage::~ThreeD_SceneAppearance_TabPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void ThreeD_SceneAppearance_TabPage::dispose()
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
index b1f4dba975b1..e3988f975ebf 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
@@ -149,7 +149,7 @@ ThreeD_SceneGeometry_TabPage::ThreeD_SceneGeometry_TabPage( vcl::Window* pWindow
 
 ThreeD_SceneGeometry_TabPage::~ThreeD_SceneGeometry_TabPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void ThreeD_SceneGeometry_TabPage::dispose()
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
index a4683a5b5cdb..6f3805f7d8da 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
@@ -294,7 +294,7 @@ ThreeD_SceneIllumination_TabPage::ThreeD_SceneIllumination_TabPage( vcl::Window*
 
 ThreeD_SceneIllumination_TabPage::~ThreeD_SceneIllumination_TabPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void ThreeD_SceneIllumination_TabPage::dispose()
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
index 06d810b47815..7b9baeda8cd0 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
@@ -72,7 +72,7 @@ SchAxisLabelTabPage::SchAxisLabelTabPage( vcl::Window* pParent, const SfxItemSet
 
 SchAxisLabelTabPage::~SchAxisLabelTabPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SchAxisLabelTabPage::dispose()
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
index 0d33af228b69..1807af72523b 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
@@ -86,7 +86,7 @@ AxisPositionsTabPage::AxisPositionsTabPage(vcl::Window* pWindow,const SfxItemSet
 
 AxisPositionsTabPage::~AxisPositionsTabPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void AxisPositionsTabPage::dispose()
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index 7618ef79adb0..296fb6d30ca6 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -313,7 +313,7 @@ class SplinePropertiesDialog : public ModalDialog
 {
 public:
     SplinePropertiesDialog( vcl::Window* pParent );
-    virtual ~SplinePropertiesDialog() { dispose(); }
+    virtual ~SplinePropertiesDialog() { disposeOnce(); }
     virtual void dispose() SAL_OVERRIDE;
 
     void fillControls( const ChartTypeParameter& rParameter );
@@ -406,7 +406,7 @@ class SteppedPropertiesDialog : public ModalDialog
 {
 public:
     SteppedPropertiesDialog( vcl::Window* pParent );
-    virtual ~SteppedPropertiesDialog() { dispose(); }
+    virtual ~SteppedPropertiesDialog() { disposeOnce(); }
     virtual void dispose() SAL_OVERRIDE;
 
     void fillControls( const ChartTypeParameter& rParameter );
@@ -786,7 +786,7 @@ ChartTypeTabPage::ChartTypeTabPage(vcl::Window* pParent
 
 ChartTypeTabPage::~ChartTypeTabPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void ChartTypeTabPage::dispose()
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index f59465a4460c..954245a633ef 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -275,7 +275,7 @@ DataSourceTabPage::DataSourceTabPage(
 
 DataSourceTabPage::~DataSourceTabPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void DataSourceTabPage::dispose()
diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.cxx b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
index 31aef92a297f..36df83799907 100644
--- a/chart2/source/controller/dialogs/tp_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
@@ -43,7 +43,7 @@ SchLegendPosTabPage::SchLegendPosTabPage(vcl::Window* pWindow, const SfxItemSet&
 
 SchLegendPosTabPage::~SchLegendPosTabPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SchLegendPosTabPage::dispose()
diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.cxx b/chart2/source/controller/dialogs/tp_PointGeometry.cxx
index dc8e84c9606e..dac67a67569e 100644
--- a/chart2/source/controller/dialogs/tp_PointGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_PointGeometry.cxx
@@ -39,7 +39,7 @@ SchLayoutTabPage::SchLayoutTabPage(vcl::Window* pWindow,const SfxItemSet& rInAtt
 
 SchLayoutTabPage::~SchLayoutTabPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SchLayoutTabPage::dispose()
diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.cxx b/chart2/source/controller/dialogs/tp_PolarOptions.cxx
index 00fc6fe96a62..394c95311daa 100644
--- a/chart2/source/controller/dialogs/tp_PolarOptions.cxx
+++ b/chart2/source/controller/dialogs/tp_PolarOptions.cxx
@@ -46,7 +46,7 @@ PolarOptionsTabPage::PolarOptionsTabPage( vcl::Window* pWindow,const SfxItemSet&
 
 PolarOptionsTabPage::~PolarOptionsTabPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void PolarOptionsTabPage::dispose()
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
index 700c3e04556f..81b7d2c284f3 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
@@ -124,7 +124,7 @@ RangeChooserTabPage::RangeChooserTabPage( vcl::Window* pParent
 
 RangeChooserTabPage::~RangeChooserTabPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void RangeChooserTabPage::dispose()
diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx
index 9db6bda24daf..3803d5989c85 100644
--- a/chart2/source/controller/dialogs/tp_Scale.cxx
+++ b/chart2/source/controller/dialogs/tp_Scale.cxx
@@ -124,7 +124,7 @@ ScaleTabPage::ScaleTabPage(vcl::Window* pWindow,const SfxItemSet& rInAttrs) :
 
 ScaleTabPage::~ScaleTabPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void ScaleTabPage::dispose()
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
index 0a5b50485d71..350aad56289e 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
@@ -65,7 +65,7 @@ SchOptionTabPage::SchOptionTabPage(vcl::Window* pWindow,const SfxItemSet& rInAtt
 
 SchOptionTabPage::~SchOptionTabPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SchOptionTabPage::dispose()
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
index c69eb46a482b..47c89665a8ad 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
@@ -57,7 +57,7 @@ SchAlignmentTabPage::SchAlignmentTabPage(vcl::Window* pWindow,
 
 SchAlignmentTabPage::~SchAlignmentTabPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SchAlignmentTabPage::dispose()
diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
index 23986e1f2690..8c40e6d43512 100644
--- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
+++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
@@ -59,7 +59,7 @@ TitlesAndObjectsTabPage::TitlesAndObjectsTabPage( svt::OWizardMachine* pParent
 
 TitlesAndObjectsTabPage::~TitlesAndObjectsTabPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void TitlesAndObjectsTabPage::dispose()
diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx
index ff544bda43b8..743745c8747b 100644
--- a/chart2/source/controller/main/ChartWindow.cxx
+++ b/chart2/source/controller/main/ChartWindow.cxx
@@ -72,7 +72,7 @@ ChartWindow::ChartWindow( ChartController* pController, vcl::Window* pParent, Wi
 
 ChartWindow::~ChartWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void ChartWindow::dispose()
-- 
cgit