summaryrefslogtreecommitdiff
path: root/extensions/source/dbpilots
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-03-10 09:07:06 +0200
committerMichael Meeks <michael.meeks@collabora.com>2015-04-10 10:55:36 +0100
commitd7a84ce8406096b455d81f50cd50ca2e877adc06 (patch)
treeb1dd2b5a4860cf2c9664e2ff3087b8dbb9db7576 /extensions/source/dbpilots
parentc0a802b59e1edddeb0b621e15137f5058299efd7 (diff)
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
Diffstat (limited to 'extensions/source/dbpilots')
-rw-r--r--extensions/source/dbpilots/commonpagesdbp.cxx6
-rw-r--r--extensions/source/dbpilots/controlwizard.cxx2
-rw-r--r--extensions/source/dbpilots/gridwizard.cxx2
-rw-r--r--extensions/source/dbpilots/groupboxwiz.cxx8
-rw-r--r--extensions/source/dbpilots/listcombowizard.cxx6
5 files changed, 12 insertions, 12 deletions
diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx
index 6416a234d748..5c730601a17c 100644
--- a/extensions/source/dbpilots/commonpagesdbp.cxx
+++ b/extensions/source/dbpilots/commonpagesdbp.cxx
@@ -79,7 +79,7 @@ namespace dbp
OTableSelectionPage::~OTableSelectionPage()
{
- dispose();
+ disposeOnce();
}
void OTableSelectionPage::dispose()
@@ -398,7 +398,7 @@ namespace dbp
OMaybeListSelectionPage::~OMaybeListSelectionPage()
{
- dispose();
+ disposeOnce();
}
void OMaybeListSelectionPage::dispose()
@@ -481,7 +481,7 @@ namespace dbp
ODBFieldPage::~ODBFieldPage()
{
- dispose();
+ disposeOnce();
}
void ODBFieldPage::dispose()
diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx
index da84b94502d1..9128bbbf4589 100644
--- a/extensions/source/dbpilots/controlwizard.cxx
+++ b/extensions/source/dbpilots/controlwizard.cxx
@@ -86,7 +86,7 @@ namespace dbp
OControlWizardPage::~OControlWizardPage()
{
- dispose();
+ disposeOnce();
}
void OControlWizardPage::dispose()
diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx
index aadc8f86536d..8332ed05d72b 100644
--- a/extensions/source/dbpilots/gridwizard.cxx
+++ b/extensions/source/dbpilots/gridwizard.cxx
@@ -320,7 +320,7 @@ namespace dbp
OGridFieldsSelection::~OGridFieldsSelection()
{
- dispose();
+ disposeOnce();
}
void OGridFieldsSelection::dispose()
diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx
index 1c5ac976dcbd..0eb66b743d2e 100644
--- a/extensions/source/dbpilots/groupboxwiz.cxx
+++ b/extensions/source/dbpilots/groupboxwiz.cxx
@@ -214,7 +214,7 @@ namespace dbp
ORadioSelectionPage::~ORadioSelectionPage()
{
- dispose();
+ disposeOnce();
}
void ORadioSelectionPage::dispose()
@@ -356,7 +356,7 @@ namespace dbp
ODefaultFieldSelectionPage::~ODefaultFieldSelectionPage()
{
- dispose();
+ disposeOnce();
}
void ODefaultFieldSelectionPage::dispose()
@@ -415,7 +415,7 @@ namespace dbp
OOptionValuesPage::~OOptionValuesPage()
{
- dispose();
+ disposeOnce();
}
void OOptionValuesPage::dispose()
@@ -524,7 +524,7 @@ namespace dbp
OFinalizeGBWPage::~OFinalizeGBWPage()
{
- dispose();
+ disposeOnce();
}
void OFinalizeGBWPage::dispose()
diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx
index 473a3862b0de..155e1b25a729 100644
--- a/extensions/source/dbpilots/listcombowizard.cxx
+++ b/extensions/source/dbpilots/listcombowizard.cxx
@@ -287,7 +287,7 @@ namespace dbp
OContentTableSelection::~OContentTableSelection()
{
- dispose();
+ disposeOnce();
}
void OContentTableSelection::dispose()
@@ -381,7 +381,7 @@ namespace dbp
OContentFieldSelection::~OContentFieldSelection()
{
- dispose();
+ disposeOnce();
}
void OContentFieldSelection::dispose()
@@ -463,7 +463,7 @@ namespace dbp
OLinkFieldsPage::~OLinkFieldsPage()
{
- dispose();
+ disposeOnce();
}
void OLinkFieldsPage::dispose()