summaryrefslogtreecommitdiff
path: root/sw/source/ui/config
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 /sw/source/ui/config
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 'sw/source/ui/config')
-rw-r--r--sw/source/ui/config/mailconfigpage.cxx6
-rw-r--r--sw/source/ui/config/optcomp.cxx2
-rw-r--r--sw/source/ui/config/optload.cxx4
-rw-r--r--sw/source/ui/config/optpage.cxx16
4 files changed, 14 insertions, 14 deletions
diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx
index c902ed7acc02..86f0a4d61d7a 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -138,7 +138,7 @@ SwMailConfigPage::SwMailConfigPage( vcl::Window* pParent, const SfxItemSet& rSet
SwMailConfigPage::~SwMailConfigPage()
{
- dispose();
+ disposeOnce();
}
void SwMailConfigPage::dispose()
@@ -259,7 +259,7 @@ SwTestAccountSettingsDialog::SwTestAccountSettingsDialog(SwMailConfigPage* pPare
SwTestAccountSettingsDialog::~SwTestAccountSettingsDialog()
{
- dispose();
+ disposeOnce();
}
void SwTestAccountSettingsDialog::dispose()
@@ -452,7 +452,7 @@ SwAuthenticationSettingsDialog::SwAuthenticationSettingsDialog(
SwAuthenticationSettingsDialog::~SwAuthenticationSettingsDialog()
{
- dispose();
+ disposeOnce();
}
void SwAuthenticationSettingsDialog::dispose()
diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx
index b90215015468..1342d5859389 100644
--- a/sw/source/ui/config/optcomp.cxx
+++ b/sw/source/ui/config/optcomp.cxx
@@ -128,7 +128,7 @@ SwCompatibilityOptPage::SwCompatibilityOptPage(vcl::Window* pParent, const SfxIt
SwCompatibilityOptPage::~SwCompatibilityOptPage()
{
- dispose();
+ disposeOnce();
}
void SwCompatibilityOptPage::dispose()
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index d0c8d8a67707..090f4963c91e 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -127,7 +127,7 @@ SwLoadOptPage::SwLoadOptPage(vcl::Window* pParent, const SfxItemSet& rSet)
SwLoadOptPage::~SwLoadOptPage()
{
- dispose();
+ disposeOnce();
}
void SwLoadOptPage::dispose()
@@ -541,7 +541,7 @@ SwCaptionOptPage::SwCaptionOptPage( vcl::Window* pParent, const SfxItemSet& rSet
SwCaptionOptPage::~SwCaptionOptPage()
{
- dispose();
+ disposeOnce();
}
void SwCaptionOptPage::dispose()
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 5acc585686cf..ee6a85be58e1 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -156,7 +156,7 @@ SwContentOptPage::SwContentOptPage( vcl::Window* pParent,
SwContentOptPage::~SwContentOptPage()
{
- dispose();
+ disposeOnce();
}
void SwContentOptPage::dispose()
@@ -380,7 +380,7 @@ SwAddPrinterTabPage::SwAddPrinterTabPage(vcl::Window* pParent,
SwAddPrinterTabPage::~SwAddPrinterTabPage()
{
- dispose();
+ disposeOnce();
}
void SwAddPrinterTabPage::dispose()
@@ -629,7 +629,7 @@ SwStdFontTabPage::SwStdFontTabPage( vcl::Window* pParent,
SwStdFontTabPage::~SwStdFontTabPage()
{
- dispose();
+ disposeOnce();
}
void SwStdFontTabPage::dispose()
@@ -1157,7 +1157,7 @@ SwTableOptionsTabPage::SwTableOptionsTabPage( vcl::Window* pParent, const SfxIte
SwTableOptionsTabPage::~SwTableOptionsTabPage()
{
- dispose();
+ disposeOnce();
}
void SwTableOptionsTabPage::dispose()
@@ -1413,7 +1413,7 @@ SwShdwCrsrOptionsTabPage::SwShdwCrsrOptionsTabPage( vcl::Window* pParent,
SwShdwCrsrOptionsTabPage::~SwShdwCrsrOptionsTabPage()
{
- dispose();
+ disposeOnce();
}
void SwShdwCrsrOptionsTabPage::dispose()
@@ -1851,7 +1851,7 @@ SwRedlineOptionsTabPage::SwRedlineOptionsTabPage( vcl::Window* pParent,
SwRedlineOptionsTabPage::~SwRedlineOptionsTabPage()
{
- dispose();
+ disposeOnce();
}
void SwRedlineOptionsTabPage::dispose()
@@ -2370,7 +2370,7 @@ SwCompareOptionsTabPage::SwCompareOptionsTabPage( vcl::Window* pParent, const S
SwCompareOptionsTabPage::~SwCompareOptionsTabPage()
{
- dispose();
+ disposeOnce();
}
void SwCompareOptionsTabPage::dispose()
@@ -2520,7 +2520,7 @@ SwTestTabPage::SwTestTabPage(vcl::Window* pParent, const SfxItemSet& rCoreSet)
SwTestTabPage::~SwTestTabPage()
{
- dispose();
+ disposeOnce();
}
void SwTestTabPage::dispose()