diff options
Diffstat (limited to 'dbaccess/source')
73 files changed, 104 insertions, 104 deletions
diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.cxx b/dbaccess/source/ext/macromigration/macromigrationpages.cxx index 2e822197ae2a..65f033b84c4e 100644 --- a/dbaccess/source/ext/macromigration/macromigrationpages.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationpages.cxx @@ -69,7 +69,7 @@ namespace dbmm PreparationPage::~PreparationPage() { - dispose(); + disposeOnce(); } void PreparationPage::dispose() @@ -106,7 +106,7 @@ namespace dbmm SaveDBDocPage::~SaveDBDocPage() { - dispose(); + disposeOnce(); } void SaveDBDocPage::dispose() @@ -196,7 +196,7 @@ namespace dbmm ProgressPage::~ProgressPage() { - dispose(); + disposeOnce(); } void ProgressPage::dispose() @@ -293,7 +293,7 @@ namespace dbmm ResultPage::~ResultPage() { - dispose(); + disposeOnce(); } void ResultPage::dispose() diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index 4e090e9c7245..5c0189f5d561 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -226,7 +226,7 @@ OAppDetailPageHelper::OAppDetailPageHelper(vcl::Window* _pParent,OAppBorderWindo OAppDetailPageHelper::~OAppDetailPageHelper() { - dispose(); + disposeOnce(); } void OAppDetailPageHelper::dispose() diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx index d68b8a31263f..2d511553620a 100644 --- a/dbaccess/source/ui/app/AppDetailView.cxx +++ b/dbaccess/source/ui/app/AppDetailView.cxx @@ -364,7 +364,7 @@ OTasksWindow::OTasksWindow(vcl::Window* _pParent,OApplicationDetailView* _pDetai OTasksWindow::~OTasksWindow() { - dispose(); + disposeOnce(); } void OTasksWindow::dispose() @@ -566,7 +566,7 @@ OApplicationDetailView::OApplicationDetailView(OAppBorderWindow& _rParent,Previe OApplicationDetailView::~OApplicationDetailView() { - dispose(); + disposeOnce(); } void OApplicationDetailView::dispose() diff --git a/dbaccess/source/ui/app/AppIconControl.cxx b/dbaccess/source/ui/app/AppIconControl.cxx index 0345aead2326..a4b7d02bb944 100644 --- a/dbaccess/source/ui/app/AppIconControl.cxx +++ b/dbaccess/source/ui/app/AppIconControl.cxx @@ -62,7 +62,7 @@ OApplicationIconControl::OApplicationIconControl(vcl::Window* _pParent) OApplicationIconControl::~OApplicationIconControl() { - dispose(); + disposeOnce(); } void OApplicationIconControl::dispose() diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx b/dbaccess/source/ui/app/AppSwapWindow.cxx index 90b9b4d23017..8a337c6dc5d7 100644 --- a/dbaccess/source/ui/app/AppSwapWindow.cxx +++ b/dbaccess/source/ui/app/AppSwapWindow.cxx @@ -53,7 +53,7 @@ OApplicationSwapWindow::OApplicationSwapWindow( vcl::Window* _pParent, OAppBorde OApplicationSwapWindow::~OApplicationSwapWindow() { - dispose(); + disposeOnce(); } void OApplicationSwapWindow::dispose() diff --git a/dbaccess/source/ui/app/AppTitleWindow.cxx b/dbaccess/source/ui/app/AppTitleWindow.cxx index c6686f2e6034..d347023e2855 100644 --- a/dbaccess/source/ui/app/AppTitleWindow.cxx +++ b/dbaccess/source/ui/app/AppTitleWindow.cxx @@ -47,7 +47,7 @@ OTitleWindow::OTitleWindow(vcl::Window* _pParent,sal_uInt16 _nTitleId,WinBits _n OTitleWindow::~OTitleWindow() { - dispose(); + disposeOnce(); } void OTitleWindow::dispose() diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx index a9382f4b1e88..356b2eb31d36 100644 --- a/dbaccess/source/ui/app/AppView.cxx +++ b/dbaccess/source/ui/app/AppView.cxx @@ -86,7 +86,7 @@ OAppBorderWindow::OAppBorderWindow(OApplicationView* _pParent,PreviewMode _ePrev OAppBorderWindow::~OAppBorderWindow() { - dispose(); + disposeOnce(); } void OAppBorderWindow::dispose() @@ -208,7 +208,7 @@ OApplicationView::OApplicationView( vcl::Window* pParent OApplicationView::~OApplicationView() { - dispose(); + disposeOnce(); } void OApplicationView::dispose() diff --git a/dbaccess/source/ui/browser/brwview.cxx b/dbaccess/source/ui/browser/brwview.cxx index 92ee3e21ef95..07db06618208 100644 --- a/dbaccess/source/ui/browser/brwview.cxx +++ b/dbaccess/source/ui/browser/brwview.cxx @@ -117,7 +117,7 @@ void UnoDataBrowserView::Construct(const Reference< ::com::sun::star::awt::XCont UnoDataBrowserView::~UnoDataBrowserView() { - dispose(); + disposeOnce(); } void UnoDataBrowserView::dispose() diff --git a/dbaccess/source/ui/browser/dataview.cxx b/dbaccess/source/ui/browser/dataview.cxx index 5e617a1e19d8..0e8f397a6cc0 100644 --- a/dbaccess/source/ui/browser/dataview.cxx +++ b/dbaccess/source/ui/browser/dataview.cxx @@ -78,7 +78,7 @@ namespace dbaui ODataView::~ODataView() { - dispose(); + disposeOnce(); } void ODataView::dispose() diff --git a/dbaccess/source/ui/browser/dbtreeview.cxx b/dbaccess/source/ui/browser/dbtreeview.cxx index d80dc3d0b09f..ad337c8f573b 100644 --- a/dbaccess/source/ui/browser/dbtreeview.cxx +++ b/dbaccess/source/ui/browser/dbtreeview.cxx @@ -46,7 +46,7 @@ DBTreeView::DBTreeView( vcl::Window* pParent, WinBits nBits) DBTreeView::~DBTreeView() { - dispose(); + disposeOnce(); } void DBTreeView::dispose() diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index 77492e6ee3f7..9b9d8c8d86ac 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -717,7 +717,7 @@ SbaGridControl::SbaGridControl(Reference< XComponentContext > _rM, SbaGridControl::~SbaGridControl() { - dispose(); + disposeOnce(); } void SbaGridControl::dispose() diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index 9de7ee291de9..02110126c844 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -159,7 +159,7 @@ void OFieldDescControl::Contruct() OFieldDescControl::~OFieldDescControl() { - dispose(); + disposeOnce(); } void OFieldDescControl::dispose() diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx index 77ac1b685c39..79ea40ca8fd4 100644 --- a/dbaccess/source/ui/control/TableGrantCtrl.cxx +++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx @@ -71,7 +71,7 @@ OTableGrantControl::OTableGrantControl( vcl::Window* pParent, WinBits nBits) OTableGrantControl::~OTableGrantControl() { - dispose(); + disposeOnce(); } void OTableGrantControl::dispose() diff --git a/dbaccess/source/ui/control/VertSplitView.cxx b/dbaccess/source/ui/control/VertSplitView.cxx index 3201f5e28f7a..5644fbbaf4bf 100644 --- a/dbaccess/source/ui/control/VertSplitView.cxx +++ b/dbaccess/source/ui/control/VertSplitView.cxx @@ -39,7 +39,7 @@ OSplitterView::OSplitterView(vcl::Window* _pParent,bool _bVertical) : Window(_pP OSplitterView::~OSplitterView() { - dispose(); + disposeOnce(); } void OSplitterView::dispose() diff --git a/dbaccess/source/ui/control/curledit.cxx b/dbaccess/source/ui/control/curledit.cxx index 4fd8c0236e91..56197ff4f006 100644 --- a/dbaccess/source/ui/control/curledit.cxx +++ b/dbaccess/source/ui/control/curledit.cxx @@ -40,7 +40,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeConnectionURLEdit(vcl: OConnectionURLEdit::~OConnectionURLEdit() { - dispose(); + disposeOnce(); } void OConnectionURLEdit::dispose() diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index 8aee7006cc66..b0398b8d1950 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -84,7 +84,7 @@ void DBTreeListBox::init() DBTreeListBox::~DBTreeListBox() { - dispose(); + disposeOnce(); } void DBTreeListBox::dispose() diff --git a/dbaccess/source/ui/control/marktree.cxx b/dbaccess/source/ui/control/marktree.cxx index fe88aa1880b5..ddd50aa66e58 100644 --- a/dbaccess/source/ui/control/marktree.cxx +++ b/dbaccess/source/ui/control/marktree.cxx @@ -37,7 +37,7 @@ OMarkableTreeListBox::OMarkableTreeListBox( vcl::Window* pParent, WinBits nWinSt OMarkableTreeListBox::~OMarkableTreeListBox() { - dispose(); + disposeOnce(); } void OMarkableTreeListBox::dispose() diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx index 9d2c870a6aad..9048294db7c3 100644 --- a/dbaccess/source/ui/control/sqledit.cxx +++ b/dbaccess/source/ui/control/sqledit.cxx @@ -105,7 +105,7 @@ OSqlEdit::OSqlEdit( OQueryTextView* pParent, WinBits nWinStyle ) : OSqlEdit::~OSqlEdit() { - dispose(); + disposeOnce(); } void OSqlEdit::dispose() diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx index ed6408696e1d..d174133cb1ae 100644 --- a/dbaccess/source/ui/dlg/CollectionView.cxx +++ b/dbaccess/source/ui/dlg/CollectionView.cxx @@ -93,7 +93,7 @@ OCollectionView::OCollectionView( vcl::Window * pParent OCollectionView::~OCollectionView() { - dispose(); + disposeOnce(); } void OCollectionView::dispose() diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx index 2f2e8f385ae8..4c65ae511e2a 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx @@ -109,7 +109,7 @@ namespace dbaui OConnectionHelper::~OConnectionHelper() { - dispose(); + disposeOnce(); } void OConnectionHelper::dispose() diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx index 1a2a7be36d28..d9aafa2ef3f6 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx @@ -111,7 +111,7 @@ namespace dbaui OConnectionTabPage::~OConnectionTabPage() { - dispose(); + disposeOnce(); } void OConnectionTabPage::dispose() diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx index 0d9dd54eeb9e..4199794039fd 100644 --- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx @@ -121,7 +121,7 @@ namespace dbaui OConnectionTabPageSetup::~OConnectionTabPageSetup() { - dispose(); + disposeOnce(); } void OConnectionTabPageSetup::dispose() diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx index 57356b64e58a..ab31641d718f 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx @@ -76,7 +76,7 @@ using namespace ::com::sun::star; OTextConnectionPageSetup::~OTextConnectionPageSetup() { - dispose(); + disposeOnce(); } void OTextConnectionPageSetup::dispose() @@ -158,7 +158,7 @@ using namespace ::com::sun::star; OLDAPConnectionPageSetup::~OLDAPConnectionPageSetup() { - dispose(); + disposeOnce(); } void OLDAPConnectionPageSetup::dispose() @@ -261,7 +261,7 @@ using namespace ::com::sun::star; OMySQLIntroPageSetup::~OMySQLIntroPageSetup() { - dispose(); + disposeOnce(); } void OMySQLIntroPageSetup::dispose() @@ -334,7 +334,7 @@ using namespace ::com::sun::star; MySQLNativeSetupPage::~MySQLNativeSetupPage() { - dispose(); + disposeOnce(); } void MySQLNativeSetupPage::dispose() @@ -433,7 +433,7 @@ using namespace ::com::sun::star; OGeneralSpecialJDBCConnectionPageSetup::~OGeneralSpecialJDBCConnectionPageSetup() { - dispose(); + disposeOnce(); } void OGeneralSpecialJDBCConnectionPageSetup::dispose() @@ -597,7 +597,7 @@ using namespace ::com::sun::star; OJDBCConnectionPageSetup::~OJDBCConnectionPageSetup() { - dispose(); + disposeOnce(); } void OJDBCConnectionPageSetup::dispose() @@ -715,7 +715,7 @@ using namespace ::com::sun::star; OSpreadSheetConnectionPageSetup::~OSpreadSheetConnectionPageSetup() { - dispose(); + disposeOnce(); } void OSpreadSheetConnectionPageSetup::dispose() @@ -770,7 +770,7 @@ using namespace ::com::sun::star; OAuthentificationPageSetup::~OAuthentificationPageSetup() { - dispose(); + disposeOnce(); } void OAuthentificationPageSetup::dispose() @@ -850,7 +850,7 @@ using namespace ::com::sun::star; OFinalDBPageSetup::~OFinalDBPageSetup() { - dispose(); + disposeOnce(); } void OFinalDBPageSetup::dispose() diff --git a/dbaccess/source/ui/dlg/QueryPropertiesDialog.cxx b/dbaccess/source/ui/dlg/QueryPropertiesDialog.cxx index 716c895161a9..7182276a6224 100644 --- a/dbaccess/source/ui/dlg/QueryPropertiesDialog.cxx +++ b/dbaccess/source/ui/dlg/QueryPropertiesDialog.cxx @@ -30,7 +30,7 @@ QueryPropertiesDialog::QueryPropertiesDialog( QueryPropertiesDialog::~QueryPropertiesDialog() { - dispose(); + disposeOnce(); } void QueryPropertiesDialog::dispose() diff --git a/dbaccess/source/ui/dlg/RelationDlg.cxx b/dbaccess/source/ui/dlg/RelationDlg.cxx index 9a27bd7270a9..50913994c298 100644 --- a/dbaccess/source/ui/dlg/RelationDlg.cxx +++ b/dbaccess/source/ui/dlg/RelationDlg.cxx @@ -90,7 +90,7 @@ ORelationDialog::ORelationDialog( OJoinTableView* pParent, ORelationDialog::~ORelationDialog() { - dispose(); + disposeOnce(); } void ORelationDialog::dispose() diff --git a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx index 149486427a74..6957d26a20a3 100644 --- a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx +++ b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx @@ -61,7 +61,7 @@ OTableSubscriptionDialog::OTableSubscriptionDialog(vcl::Window* pParent OTableSubscriptionDialog::~OTableSubscriptionDialog() { - dispose(); + disposeOnce(); } void OTableSubscriptionDialog::dispose() diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx index cc2079dcfac3..5c8b4b3551aa 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx @@ -153,7 +153,7 @@ namespace dbaui OTextConnectionHelper::~OTextConnectionHelper() { - dispose(); + disposeOnce(); } void OTextConnectionHelper::dispose() diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx index 23621cc7931c..bd282d763e41 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.cxx +++ b/dbaccess/source/ui/dlg/UserAdmin.cxx @@ -62,7 +62,7 @@ class OPasswordDialog : public ModalDialog public: OPasswordDialog( vcl::Window* pParent,const OUString& _sUserName); - virtual ~OPasswordDialog() { dispose(); } + virtual ~OPasswordDialog() { disposeOnce(); } virtual void dispose() SAL_OVERRIDE { m_pUser.clear(); @@ -141,7 +141,7 @@ OUserAdmin::OUserAdmin(vcl::Window* pParent,const SfxItemSet& _rAttrSet) OUserAdmin::~OUserAdmin() { - dispose(); + disposeOnce(); } void OUserAdmin::dispose() diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx b/dbaccess/source/ui/dlg/UserAdminDlg.cxx index fbfa3b5cb366..57f8c8ec2673 100644 --- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx +++ b/dbaccess/source/ui/dlg/UserAdminDlg.cxx @@ -73,7 +73,7 @@ namespace dbaui OUserAdminDlg::~OUserAdminDlg() { - dispose(); + disposeOnce(); } void OUserAdminDlg::dispose() diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx index 08e7be864ad4..a4ff866067d7 100644 --- a/dbaccess/source/ui/dlg/admincontrols.cxx +++ b/dbaccess/source/ui/dlg/admincontrols.cxx @@ -170,7 +170,7 @@ namespace dbaui MySQLNativeSettings::~MySQLNativeSettings() { - dispose(); + disposeOnce(); } void MySQLNativeSettings::dispose() diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx index 27d83e58522c..1b42d45ffcd1 100644 --- a/dbaccess/source/ui/dlg/adtabdlg.cxx +++ b/dbaccess/source/ui/dlg/adtabdlg.cxx @@ -362,7 +362,7 @@ OAddTableDlg::OAddTableDlg( vcl::Window* pParent, IAddTableDialogContext& _rCont OAddTableDlg::~OAddTableDlg() { - dispose(); + disposeOnce(); } void OAddTableDlg::dispose() diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx index 859decf8f89b..2a4d7049c0f0 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.cxx +++ b/dbaccess/source/ui/dlg/advancedsettings.cxx @@ -134,7 +134,7 @@ namespace dbaui SpecialSettingsPage::~SpecialSettingsPage() { - dispose(); + disposeOnce(); } void SpecialSettingsPage::dispose() @@ -343,7 +343,7 @@ namespace dbaui GeneratedValuesPage::~GeneratedValuesPage() { - dispose(); + disposeOnce(); } void GeneratedValuesPage::dispose() @@ -444,7 +444,7 @@ namespace dbaui AdvancedSettingsDialog::~AdvancedSettingsDialog() { - dispose(); + disposeOnce(); } void AdvancedSettingsDialog::dispose() diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx index a49694507280..a68a19b16fba 100644 --- a/dbaccess/source/ui/dlg/dbadmin.cxx +++ b/dbaccess/source/ui/dlg/dbadmin.cxx @@ -66,7 +66,7 @@ ODbAdminDialog::ODbAdminDialog(vcl::Window* _pParent ODbAdminDialog::~ODbAdminDialog() { - dispose(); + disposeOnce(); } void ODbAdminDialog::dispose() diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx index 223f5a167cb4..f767f4ea31e9 100644 --- a/dbaccess/source/ui/dlg/dbfindex.cxx +++ b/dbaccess/source/ui/dlg/dbfindex.cxx @@ -78,7 +78,7 @@ ODbaseIndexDialog::ODbaseIndexDialog(vcl::Window * pParent, const OUString& aDat ODbaseIndexDialog::~ODbaseIndexDialog() { - dispose(); + disposeOnce(); } void ODbaseIndexDialog::dispose() diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx index 346128c37469..a4f0eca4fb67 100644 --- a/dbaccess/source/ui/dlg/dbwiz.cxx +++ b/dbaccess/source/ui/dlg/dbwiz.cxx @@ -102,7 +102,7 @@ ODbTypeWizDialog::ODbTypeWizDialog(vcl::Window* _pParent ODbTypeWizDialog::~ODbTypeWizDialog() { - dispose(); + disposeOnce(); } void ODbTypeWizDialog::dispose() diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index b255353d5592..07c74186ec33 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -264,7 +264,7 @@ OUString ODbTypeWizDialogSetup::getStateDisplayName( WizardState _nState ) const ODbTypeWizDialogSetup::~ODbTypeWizDialogSetup() { - dispose(); + disposeOnce(); } void ODbTypeWizDialogSetup::dispose() diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx index 21d386dab769..206a1cdfa06a 100644 --- a/dbaccess/source/ui/dlg/detailpages.cxx +++ b/dbaccess/source/ui/dlg/detailpages.cxx @@ -97,7 +97,7 @@ namespace dbaui OCommonBehaviourTabPage::~OCommonBehaviourTabPage() { - dispose(); + disposeOnce(); } void OCommonBehaviourTabPage::dispose() @@ -195,7 +195,7 @@ namespace dbaui ODbaseDetailsPage::~ODbaseDetailsPage() { - dispose(); + disposeOnce(); } void ODbaseDetailsPage::dispose() @@ -283,7 +283,7 @@ namespace dbaui OOdbcDetailsPage::~OOdbcDetailsPage() { - dispose(); + disposeOnce(); } void OOdbcDetailsPage::dispose() @@ -332,7 +332,7 @@ namespace dbaui OUserDriverDetailsPage::~OUserDriverDetailsPage() { - dispose(); + disposeOnce(); } void OUserDriverDetailsPage::dispose() @@ -454,7 +454,7 @@ namespace dbaui OGeneralSpecialJDBCDetailsPage::~OGeneralSpecialJDBCDetailsPage() { - dispose(); + disposeOnce(); } void OGeneralSpecialJDBCDetailsPage::dispose() @@ -573,7 +573,7 @@ namespace dbaui MySQLNativePage::~MySQLNativePage() { - dispose(); + disposeOnce(); } void MySQLNativePage::dispose() @@ -679,7 +679,7 @@ namespace dbaui OLDAPDetailsPage::~OLDAPDetailsPage() { - dispose(); + disposeOnce(); } void OLDAPDetailsPage::dispose() @@ -757,7 +757,7 @@ namespace dbaui OTextDetailsPage::~OTextDetailsPage() { - dispose(); + disposeOnce(); } void OTextDetailsPage::dispose() diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx index 1f001bd83d6f..32c9270e248b 100644 --- a/dbaccess/source/ui/dlg/directsql.cxx +++ b/dbaccess/source/ui/dlg/directsql.cxx @@ -76,7 +76,7 @@ namespace dbaui DirectSQLDialog::~DirectSQLDialog() { - dispose(); + disposeOnce(); } void DirectSQLDialog::dispose() diff --git a/dbaccess/source/ui/dlg/dlgattr.cxx b/dbaccess/source/ui/dlg/dlgattr.cxx index 6d09dcbb6cd8..1ca5043be4bb 100644 --- a/dbaccess/source/ui/dlg/dlgattr.cxx +++ b/dbaccess/source/ui/dlg/dlgattr.cxx @@ -52,7 +52,7 @@ SbaSbAttrDlg::SbaSbAttrDlg(vcl::Window* pParent, const SfxItemSet* pCellAttrs, SbaSbAttrDlg::~SbaSbAttrDlg() { - dispose(); + disposeOnce(); } void SbaSbAttrDlg::dispose() diff --git a/dbaccess/source/ui/dlg/dlgsave.cxx b/dbaccess/source/ui/dlg/dlgsave.cxx index 6daba84892ba..46bbbacf63c7 100644 --- a/dbaccess/source/ui/dlg/dlgsave.cxx +++ b/dbaccess/source/ui/dlg/dlgsave.cxx @@ -285,7 +285,7 @@ OSaveAsDlg::OSaveAsDlg( vcl::Window * pParent, OSaveAsDlg::~OSaveAsDlg() { - dispose(); + disposeOnce(); } void OSaveAsDlg::dispose() diff --git a/dbaccess/source/ui/dlg/dlgsize.cxx b/dbaccess/source/ui/dlg/dlgsize.cxx index b3e337527479..6c254a494e84 100644 --- a/dbaccess/source/ui/dlg/dlgsize.cxx +++ b/dbaccess/source/ui/dlg/dlgsize.cxx @@ -53,7 +53,7 @@ DlgSize::DlgSize( vcl::Window* pParent, sal_Int32 nVal, bool bRow, sal_Int32 _nA DlgSize::~DlgSize() { - dispose(); + disposeOnce(); } void DlgSize::dispose() diff --git a/dbaccess/source/ui/dlg/dsselect.cxx b/dbaccess/source/ui/dlg/dsselect.cxx index 739504d6d8a3..950903da5ccd 100644 --- a/dbaccess/source/ui/dlg/dsselect.cxx +++ b/dbaccess/source/ui/dlg/dsselect.cxx @@ -72,7 +72,7 @@ ODatasourceSelectDialog::ODatasourceSelectDialog(vcl::Window* _pParent, const St ODatasourceSelectDialog::~ODatasourceSelectDialog() { - dispose(); + disposeOnce(); } void ODatasourceSelectDialog::dispose() diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx index 323b30200582..2451eac37c32 100644 --- a/dbaccess/source/ui/dlg/generalpage.cxx +++ b/dbaccess/source/ui/dlg/generalpage.cxx @@ -76,7 +76,7 @@ namespace dbaui OGeneralPage::~OGeneralPage() { - dispose(); + disposeOnce(); } void OGeneralPage::dispose() @@ -547,7 +547,7 @@ namespace dbaui OGeneralPageWizard::~OGeneralPageWizard() { - dispose(); + disposeOnce(); } void OGeneralPageWizard::dispose() diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx index c534142793ce..dc2c7dd93ce0 100644 --- a/dbaccess/source/ui/dlg/indexdialog.cxx +++ b/dbaccess/source/ui/dlg/indexdialog.cxx @@ -311,7 +311,7 @@ namespace dbaui DbaIndexDialog::~DbaIndexDialog( ) { - dispose(); + disposeOnce(); } void DbaIndexDialog::dispose() diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx index 36d39547f117..f99b65e30296 100644 --- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx +++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx @@ -110,7 +110,7 @@ namespace dbaui IndexFieldsControl::~IndexFieldsControl() { - dispose(); + disposeOnce(); } void IndexFieldsControl::dispose() diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx index 6e5c5aab9303..c0425048091a 100644 --- a/dbaccess/source/ui/dlg/paramdialog.cxx +++ b/dbaccess/source/ui/dlg/paramdialog.cxx @@ -113,7 +113,7 @@ namespace dbaui OParameterDialog::~OParameterDialog() { - dispose(); + disposeOnce(); } void OParameterDialog::dispose() diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx index 9f5ef85afd6c..a86bd6326e66 100644 --- a/dbaccess/source/ui/dlg/queryfilter.cxx +++ b/dbaccess/source/ui/dlg/queryfilter.cxx @@ -192,7 +192,7 @@ DlgFilterCrit::DlgFilterCrit(vcl::Window * pParent, DlgFilterCrit::~DlgFilterCrit() { - dispose(); + disposeOnce(); } void DlgFilterCrit::dispose() diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx index 5d7314f7dec6..410598b5663e 100644 --- a/dbaccess/source/ui/dlg/queryorder.cxx +++ b/dbaccess/source/ui/dlg/queryorder.cxx @@ -127,7 +127,7 @@ DlgOrderCrit::DlgOrderCrit(vcl::Window * pParent, DlgOrderCrit::~DlgOrderCrit() { - dispose(); + disposeOnce(); } void DlgOrderCrit::dispose() diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx index f4cbea70981b..49377e7a1019 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.cxx +++ b/dbaccess/source/ui/dlg/sqlmessage.cxx @@ -302,7 +302,7 @@ class OExceptionChainDialog : public ModalDialog public: OExceptionChainDialog( vcl::Window* pParent, const ExceptionDisplayChain& _rExceptions ); - virtual ~OExceptionChainDialog() { dispose(); } + virtual ~OExceptionChainDialog() { disposeOnce(); } virtual void dispose() SAL_OVERRIDE { m_pExceptionList.clear(); @@ -699,7 +699,7 @@ OSQLMessageBox::OSQLMessageBox( vcl::Window* _pParent, const OUString& _rTitle, OSQLMessageBox::~OSQLMessageBox() { - dispose(); + disposeOnce(); } void OSQLMessageBox::dispose() diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index 7e452f143fa6..7ee4607f3d7b 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -99,7 +99,7 @@ namespace dbaui OTableSubscriptionPage::~OTableSubscriptionPage() { - dispose(); + disposeOnce(); } void OTableSubscriptionPage::dispose() diff --git a/dbaccess/source/ui/dlg/textconnectionsettings.cxx b/dbaccess/source/ui/dlg/textconnectionsettings.cxx index 3a5583a3d046..77c515e672ca 100644 --- a/dbaccess/source/ui/dlg/textconnectionsettings.cxx +++ b/dbaccess/source/ui/dlg/textconnectionsettings.cxx @@ -41,7 +41,7 @@ namespace dbaui TextConnectionSettingsDialog::~TextConnectionSettingsDialog() { - dispose(); + disposeOnce(); } void TextConnectionSettingsDialog::dispose() diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx index 4b5aac2950b4..9d7c72ddb6b2 100644 --- a/dbaccess/source/ui/misc/WCPage.cxx +++ b/dbaccess/source/ui/misc/WCPage.cxx @@ -105,7 +105,7 @@ OCopyTable::OCopyTable(vcl::Window * pParent) OCopyTable::~OCopyTable() { - dispose(); + disposeOnce(); } void OCopyTable::dispose() diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx index f3d4a2dce93d..d9ca01bf3565 100644 --- a/dbaccess/source/ui/misc/WColumnSelect.cxx +++ b/dbaccess/source/ui/misc/WColumnSelect.cxx @@ -52,7 +52,7 @@ OWizardPage::OWizardPage(vcl::Window* pParent, const OString& rID, const OUStrin OWizardPage::~OWizardPage() { - dispose(); + disposeOnce(); } void OWizardPage::dispose() @@ -92,7 +92,7 @@ OWizColumnSelect::OWizColumnSelect( vcl::Window* pParent) OWizColumnSelect::~OWizColumnSelect() { - dispose(); + disposeOnce(); } void OWizColumnSelect::dispose() diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx index 68b5b59a391c..19db7a2561ad 100644 --- a/dbaccess/source/ui/misc/WCopyTable.cxx +++ b/dbaccess/source/ui/misc/WCopyTable.cxx @@ -686,7 +686,7 @@ void OCopyTableWizard::construct() OCopyTableWizard::~OCopyTableWizard() { - dispose(); + disposeOnce(); } void OCopyTableWizard::dispose() diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx index 2707ed7ff09f..46c7634dd976 100644 --- a/dbaccess/source/ui/misc/WNameMatch.cxx +++ b/dbaccess/source/ui/misc/WNameMatch.cxx @@ -74,7 +74,7 @@ OWizNameMatching::OWizNameMatching( vcl::Window* pParent) OWizNameMatching::~OWizNameMatching() { - dispose(); + disposeOnce(); } void OWizNameMatching::dispose() diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx index bcc5386136bf..cf9bc118dca5 100644 --- a/dbaccess/source/ui/misc/WTypeSelect.cxx +++ b/dbaccess/source/ui/misc/WTypeSelect.cxx @@ -50,7 +50,7 @@ OWizTypeSelectControl::OWizTypeSelectControl(vcl::Window* pParent, vcl::Window* OWizTypeSelectControl::~OWizTypeSelectControl() { - dispose(); + disposeOnce(); } void OWizTypeSelectControl::dispose() @@ -260,7 +260,7 @@ OWizTypeSelect::OWizTypeSelect( vcl::Window* pParent, SvStream* _pStream ) OWizTypeSelect::~OWizTypeSelect() { - dispose(); + disposeOnce(); } void OWizTypeSelect::dispose() @@ -363,7 +363,7 @@ IMPL_LINK( OWizTypeSelect, ButtonClickHdl, Button *, /*pButton*/ ) OWizTypeSelectList::~OWizTypeSelectList() { - dispose(); + disposeOnce(); } void OWizTypeSelectList::dispose() diff --git a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx index af7ef4ec89a0..cb5d413bfed4 100644 --- a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx +++ b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx @@ -180,7 +180,7 @@ namespace dbaui } OTableConnection::~OTableConnection() { - dispose(); + disposeOnce(); } void OTableConnection::dispose() { diff --git a/dbaccess/source/ui/querydesign/JoinDesignView.cxx b/dbaccess/source/ui/querydesign/JoinDesignView.cxx index d9c0734c8483..673bcc7697e2 100644 --- a/dbaccess/source/ui/querydesign/JoinDesignView.cxx +++ b/dbaccess/source/ui/querydesign/JoinDesignView.cxx @@ -61,7 +61,7 @@ OJoinDesignView::OJoinDesignView(vcl::Window* _pParent, OJoinController& _rContr OJoinDesignView::~OJoinDesignView() { - dispose(); + disposeOnce(); } void OJoinDesignView::dispose() diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index 70adb519d022..ca539c8e76b8 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -89,7 +89,7 @@ OScrollWindowHelper::OScrollWindowHelper( vcl::Window* pParent) : Window( pParen OScrollWindowHelper::~OScrollWindowHelper() { - dispose(); + disposeOnce(); } void OScrollWindowHelper::dispose() @@ -181,7 +181,7 @@ OJoinTableView::OJoinTableView( vcl::Window* pParent, OJoinDesignView* pView ) OJoinTableView::~OJoinTableView() { - dispose(); + disposeOnce(); } void OJoinTableView::dispose() diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index 378afe667f74..eb0016249e3d 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -2517,7 +2517,7 @@ OQueryDesignView::OQueryDesignView( OQueryContainerWindow* _pParent, OQueryDesignView::~OQueryDesignView() { - dispose(); + disposeOnce(); } void OQueryDesignView::dispose() diff --git a/dbaccess/source/ui/querydesign/QueryTextView.cxx b/dbaccess/source/ui/querydesign/QueryTextView.cxx index 06f619e34892..cb86ac7cd3c0 100644 --- a/dbaccess/source/ui/querydesign/QueryTextView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTextView.cxx @@ -52,7 +52,7 @@ OQueryTextView::OQueryTextView(OQueryContainerWindow* _pParent) OQueryTextView::~OQueryTextView() { - dispose(); + disposeOnce(); } void OQueryTextView::dispose() diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 368f5c4738fb..275afd30c9e3 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -153,7 +153,7 @@ OSelectionBrowseBox::OSelectionBrowseBox( vcl::Window* pParent ) OSelectionBrowseBox::~OSelectionBrowseBox() { - dispose(); + disposeOnce(); } void OSelectionBrowseBox::dispose() @@ -250,7 +250,7 @@ namespace virtual void Select() SAL_OVERRIDE; public: OSelectionBrwBoxHeader(OSelectionBrowseBox* pParent); - virtual ~OSelectionBrwBoxHeader() { dispose(); } + virtual ~OSelectionBrwBoxHeader() { disposeOnce(); } virtual void dispose() SAL_OVERRIDE { m_pBrowseBox.clear(); ::svt::EditBrowserHeader::dispose(); } }; OSelectionBrwBoxHeader::OSelectionBrwBoxHeader(OSelectionBrowseBox* pParent) diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx index e194989f7096..7e60b20d9236 100644 --- a/dbaccess/source/ui/querydesign/TableWindow.cxx +++ b/dbaccess/source/ui/querydesign/TableWindow.cxx @@ -99,7 +99,7 @@ OTableWindow::OTableWindow( vcl::Window* pParent, const TTableWindowData::value_ OTableWindow::~OTableWindow() { - dispose(); + disposeOnce(); } void OTableWindow::dispose() diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx index 9e71cdc6776b..2453bd292f67 100644 --- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx @@ -68,7 +68,7 @@ void OTableWindowListBox::dragFinished( ) OTableWindowListBox::~OTableWindowListBox() { - dispose(); + disposeOnce(); } void OTableWindowListBox::dispose() diff --git a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx index 8f7b9b8258a7..a0fba532d142 100644 --- a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx @@ -55,7 +55,7 @@ OTableWindowTitle::OTableWindowTitle( OTableWindow* pParent ) : OTableWindowTitle::~OTableWindowTitle() { - dispose(); + disposeOnce(); } void OTableWindowTitle::dispose() diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx index 06255d09d584..28f1c2d5ce18 100644 --- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx +++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx @@ -56,7 +56,7 @@ namespace dbaui } OQueryContainerWindow::~OQueryContainerWindow() { - dispose(); + disposeOnce(); } void OQueryContainerWindow::dispose() { diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx b/dbaccess/source/ui/querydesign/querydlg.cxx index b6c6bd651378..798fcaef3d80 100644 --- a/dbaccess/source/ui/querydesign/querydlg.cxx +++ b/dbaccess/source/ui/querydesign/querydlg.cxx @@ -139,7 +139,7 @@ DlgQryJoin::DlgQryJoin( OQueryTableView * pParent, DlgQryJoin::~DlgQryJoin() { - dispose(); + disposeOnce(); } void DlgQryJoin::dispose() diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx index d7820ad68b7a..75b0c7919147 100644 --- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx @@ -73,7 +73,7 @@ ORelationTableView::ORelationTableView( vcl::Window* pParent, ORelationDesignVie ORelationTableView::~ORelationTableView() { - dispose(); + disposeOnce(); } void ORelationTableView::dispose() diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx index b4899e7b25dd..4d7e83dbc5e2 100644 --- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx +++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx @@ -38,7 +38,7 @@ OFieldDescGenWin::OFieldDescGenWin( vcl::Window* pParent, OTableDesignHelpBar* p OFieldDescGenWin::~OFieldDescGenWin() { - dispose(); + disposeOnce(); } void OFieldDescGenWin::dispose() diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index a02b527573c5..00773e4c5c3d 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -253,7 +253,7 @@ void OTableEditorCtrl::ClearModified() OTableEditorCtrl::~OTableEditorCtrl() { - dispose(); + disposeOnce(); } void OTableEditorCtrl::dispose() diff --git a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx index 80594e62fc2a..7916d6dc7881 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx @@ -38,7 +38,7 @@ OTableDesignHelpBar::OTableDesignHelpBar( vcl::Window* pParent ) : OTableDesignHelpBar::~OTableDesignHelpBar() { - dispose(); + disposeOnce(); } void OTableDesignHelpBar::dispose() diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx index 065d8dd51b1d..fd64b0fc6344 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx @@ -62,7 +62,7 @@ OTableBorderWindow::OTableBorderWindow(vcl::Window* pParent) : Window(pParent,WB OTableBorderWindow::~OTableBorderWindow() { - dispose(); + disposeOnce(); } void OTableBorderWindow::dispose() @@ -189,7 +189,7 @@ OTableDesignView::OTableDesignView( vcl::Window* pParent, OTableDesignView::~OTableDesignView() { - dispose(); + disposeOnce(); } void OTableDesignView::dispose() diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx index 54ae89660466..58b1d313c5c4 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx +++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx @@ -66,7 +66,7 @@ OTableFieldDescWin::OTableFieldDescWin( vcl::Window* pParent) OTableFieldDescWin::~OTableFieldDescWin() { - dispose(); + disposeOnce(); } void OTableFieldDescWin::dispose() |