summaryrefslogtreecommitdiff
path: root/uui/source
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 /uui/source
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 'uui/source')
-rw-r--r--uui/source/authfallbackdlg.cxx2
-rw-r--r--uui/source/fltdlg.cxx2
-rw-r--r--uui/source/logindlg.cxx2
-rw-r--r--uui/source/masterpasscrtdlg.cxx2
-rw-r--r--uui/source/masterpassworddlg.cxx2
-rw-r--r--uui/source/nameclashdlg.cxx2
-rw-r--r--uui/source/passworddlg.cxx2
-rw-r--r--uui/source/secmacrowarnings.cxx2
-rw-r--r--uui/source/unknownauthdlg.cxx2
9 files changed, 9 insertions, 9 deletions
diff --git a/uui/source/authfallbackdlg.cxx b/uui/source/authfallbackdlg.cxx
index 0f568fc1d0fa..58362cb24494 100644
--- a/uui/source/authfallbackdlg.cxx
+++ b/uui/source/authfallbackdlg.cxx
@@ -34,7 +34,7 @@ AuthFallbackDlg::AuthFallbackDlg(Window* pParent, const OUString& instructions,
AuthFallbackDlg::~AuthFallbackDlg()
{
- dispose();
+ disposeOnce();
}
void AuthFallbackDlg::dispose()
diff --git a/uui/source/fltdlg.cxx b/uui/source/fltdlg.cxx
index ca0ef809abac..1bd824bf1934 100644
--- a/uui/source/fltdlg.cxx
+++ b/uui/source/fltdlg.cxx
@@ -59,7 +59,7 @@ FilterDialog::FilterDialog( vcl::Window* pParentWindow )
FilterDialog::~FilterDialog()
{
- dispose();
+ disposeOnce();
}
void FilterDialog::dispose()
diff --git a/uui/source/logindlg.cxx b/uui/source/logindlg.cxx
index facfdf63d12e..ca44729e15f0 100644
--- a/uui/source/logindlg.cxx
+++ b/uui/source/logindlg.cxx
@@ -38,7 +38,7 @@ using namespace com::sun::star;
LoginDialog::~LoginDialog()
{
- dispose();
+ disposeOnce();
}
void LoginDialog::dispose()
diff --git a/uui/source/masterpasscrtdlg.cxx b/uui/source/masterpasscrtdlg.cxx
index 95289017d55d..91f918673e14 100644
--- a/uui/source/masterpasscrtdlg.cxx
+++ b/uui/source/masterpasscrtdlg.cxx
@@ -65,7 +65,7 @@ MasterPasswordCreateDialog::MasterPasswordCreateDialog(vcl::Window* pParent, Res
MasterPasswordCreateDialog::~MasterPasswordCreateDialog()
{
- dispose();
+ disposeOnce();
}
void MasterPasswordCreateDialog::dispose()
diff --git a/uui/source/masterpassworddlg.cxx b/uui/source/masterpassworddlg.cxx
index 7a10b3044a82..98dfad1dc61a 100644
--- a/uui/source/masterpassworddlg.cxx
+++ b/uui/source/masterpassworddlg.cxx
@@ -58,7 +58,7 @@ MasterPasswordDialog::MasterPasswordDialog
MasterPasswordDialog::~MasterPasswordDialog()
{
- dispose();
+ disposeOnce();
}
void MasterPasswordDialog::dispose()
diff --git a/uui/source/nameclashdlg.cxx b/uui/source/nameclashdlg.cxx
index 4329dd68660d..032e6e7f2ecd 100644
--- a/uui/source/nameclashdlg.cxx
+++ b/uui/source/nameclashdlg.cxx
@@ -96,7 +96,7 @@ NameClashDialog::NameClashDialog( vcl::Window* pParent, ResMgr* pResMgr,
NameClashDialog::~NameClashDialog()
{
- dispose();
+ disposeOnce();
}
void NameClashDialog::dispose()
diff --git a/uui/source/passworddlg.cxx b/uui/source/passworddlg.cxx
index c0872bc30342..c855226e5037 100644
--- a/uui/source/passworddlg.cxx
+++ b/uui/source/passworddlg.cxx
@@ -84,7 +84,7 @@ PasswordDialog::PasswordDialog(vcl::Window* _pParent,
PasswordDialog::~PasswordDialog()
{
- dispose();
+ disposeOnce();
}
void PasswordDialog::dispose()
diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx
index bde5dc287e4c..cb32f762299b 100644
--- a/uui/source/secmacrowarnings.cxx
+++ b/uui/source/secmacrowarnings.cxx
@@ -89,7 +89,7 @@ MacroWarning::MacroWarning( vcl::Window* _pParent, bool _bWithSignatures, ResMgr
MacroWarning::~MacroWarning()
{
- dispose();
+ disposeOnce();
}
void MacroWarning::dispose()
diff --git a/uui/source/unknownauthdlg.cxx b/uui/source/unknownauthdlg.cxx
index 8a30bd54b44d..731882ccc45b 100644
--- a/uui/source/unknownauthdlg.cxx
+++ b/uui/source/unknownauthdlg.cxx
@@ -77,7 +77,7 @@ UnknownAuthDialog::UnknownAuthDialog(vcl::Window* pParent,
UnknownAuthDialog::~UnknownAuthDialog()
{
- dispose();
+ disposeOnce();
}
void UnknownAuthDialog::dispose()