diff options
Diffstat (limited to 'sc/source/ui')
110 files changed, 155 insertions, 141 deletions
diff --git a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx index 16f30171c5de..6a7467d16fb7 100644 --- a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx @@ -118,7 +118,7 @@ ScAnalysisOfVarianceDialog::ScAnalysisOfVarianceDialog( ScAnalysisOfVarianceDialog::~ScAnalysisOfVarianceDialog() { - dispose(); + disposeOnce(); } void ScAnalysisOfVarianceDialog::dispose() diff --git a/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx b/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx index 5980b04e402f..9acf9ed6f1d7 100644 --- a/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx @@ -38,7 +38,7 @@ ScExponentialSmoothingDialog::ScExponentialSmoothingDialog( ScExponentialSmoothingDialog::~ScExponentialSmoothingDialog() { - dispose(); + disposeOnce(); } void ScExponentialSmoothingDialog::dispose() diff --git a/sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx b/sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx index 780434d640f0..8514dfc1342b 100644 --- a/sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx @@ -38,7 +38,7 @@ ScMovingAverageDialog::ScMovingAverageDialog( ScMovingAverageDialog::~ScMovingAverageDialog() { - dispose(); + disposeOnce(); } void ScMovingAverageDialog::dispose() diff --git a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx index 8bc496bfdd0a..5583760ba2e2 100644 --- a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx @@ -83,7 +83,7 @@ ScRandomNumberGeneratorDialog::ScRandomNumberGeneratorDialog( ScRandomNumberGeneratorDialog::~ScRandomNumberGeneratorDialog() { - dispose(); + disposeOnce(); } void ScRandomNumberGeneratorDialog::dispose() diff --git a/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx b/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx index 4d1e7a51a97a..f985adb04648 100644 --- a/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx @@ -62,7 +62,7 @@ ScSamplingDialog::ScSamplingDialog( ScSamplingDialog::~ScSamplingDialog() { - dispose(); + disposeOnce(); } void ScSamplingDialog::dispose() diff --git a/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx b/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx index a7993647c64f..8e2fa67a455c 100644 --- a/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx @@ -88,7 +88,7 @@ ScStatisticsInputOutputDialog::ScStatisticsInputOutputDialog( ScStatisticsInputOutputDialog::~ScStatisticsInputOutputDialog() { - dispose(); + disposeOnce(); } void ScStatisticsInputOutputDialog::dispose() diff --git a/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx b/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx index 9edd0253415a..8dc5ade17d61 100644 --- a/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx @@ -66,7 +66,7 @@ ScStatisticsTwoVariableDialog::ScStatisticsTwoVariableDialog( ScStatisticsTwoVariableDialog::~ScStatisticsTwoVariableDialog() { - dispose(); + disposeOnce(); } void ScStatisticsTwoVariableDialog::dispose() diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index f04a482c7dfc..c7c2ba771175 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -259,7 +259,7 @@ ScInputWindow::ScInputWindow( vcl::Window* pParent, SfxBindings* pBind ) : ScInputWindow::~ScInputWindow() { - dispose(); + disposeOnce(); } void ScInputWindow::dispose() @@ -932,7 +932,7 @@ ScInputBarGroup::ScInputBarGroup(vcl::Window* pParent, ScTabViewShell* pViewSh) ScInputBarGroup::~ScInputBarGroup() { - dispose(); + disposeOnce(); } void ScInputBarGroup::dispose() @@ -1499,7 +1499,7 @@ ScTextWnd::ScTextWnd( vcl::Window* pParent, ScTabViewShell* pViewSh ) ScTextWnd::~ScTextWnd() { - dispose(); + disposeOnce(); } void ScTextWnd::dispose() @@ -2096,7 +2096,7 @@ ScPosWnd::ScPosWnd( vcl::Window* pParent ) : ScPosWnd::~ScPosWnd() { - dispose(); + disposeOnce(); } void ScPosWnd::dispose() diff --git a/sc/source/ui/attrdlg/tabpages.cxx b/sc/source/ui/attrdlg/tabpages.cxx index 90453a87656f..83590dc9a338 100644 --- a/sc/source/ui/attrdlg/tabpages.cxx +++ b/sc/source/ui/attrdlg/tabpages.cxx @@ -61,7 +61,7 @@ ScTabPageProtection::ScTabPageProtection(vcl::Window* pParent, const SfxItemSet& ScTabPageProtection::~ScTabPageProtection() { - dispose(); + disposeOnce(); } void ScTabPageProtection::dispose() diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index 80c513f1a0ae..c350bd724857 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -97,7 +97,7 @@ ScMenuFloatingWindow::ScMenuFloatingWindow(vcl::Window* pParent, ScDocument* pDo ScMenuFloatingWindow::~ScMenuFloatingWindow() { - dispose(); + disposeOnce(); } void ScMenuFloatingWindow::dispose() @@ -857,7 +857,7 @@ ScCheckListMenuWindow::CancelButton::CancelButton(ScCheckListMenuWindow* pParent ScCheckListMenuWindow::CancelButton::~CancelButton() { - dispose(); + disposeOnce(); } void ScCheckListMenuWindow::CancelButton::dispose() @@ -908,7 +908,7 @@ ScCheckListMenuWindow::ScCheckListMenuWindow(vcl::Window* pParent, ScDocument* p ScCheckListMenuWindow::~ScCheckListMenuWindow() { - dispose(); + disposeOnce(); } void ScCheckListMenuWindow::dispose() diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx index 3b8cf87e3232..3b525ed59e01 100644 --- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx +++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx @@ -233,7 +233,7 @@ ScZoomSliderWnd::ScZoomSliderWnd( vcl::Window* pParent, const ::com::sun::star:: ScZoomSliderWnd::~ScZoomSliderWnd() { - dispose(); + disposeOnce(); } void ScZoomSliderWnd::dispose() diff --git a/sc/source/ui/condformat/colorformat.cxx b/sc/source/ui/condformat/colorformat.cxx index daaa3bda0d68..e59a6e2d8554 100644 --- a/sc/source/ui/condformat/colorformat.cxx +++ b/sc/source/ui/condformat/colorformat.cxx @@ -125,7 +125,7 @@ ScDataBarSettingsDlg::ScDataBarSettingsDlg(vcl::Window* pWindow, const ScDataBar ScDataBarSettingsDlg::~ScDataBarSettingsDlg() { - dispose(); + disposeOnce(); } void ScDataBarSettingsDlg::dispose() diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx index f058aabe7295..b43d19ccbbe7 100644 --- a/sc/source/ui/condformat/condformatdlg.cxx +++ b/sc/source/ui/condformat/condformatdlg.cxx @@ -49,7 +49,7 @@ ScCondFormatList::ScCondFormatList(vcl::Window* pParent, WinBits nStyle) ScCondFormatList::~ScCondFormatList() { - dispose(); + disposeOnce(); } void ScCondFormatList::dispose() @@ -447,7 +447,7 @@ ScCondFormatDlg::ScCondFormatDlg(vcl::Window* pParent, ScDocument* pDoc, ScCondFormatDlg::~ScCondFormatDlg() { - dispose(); + disposeOnce(); } void ScCondFormatDlg::dispose() diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index 2b18941bfeb5..49db670935a0 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -63,7 +63,7 @@ ScCondFrmtEntry::ScCondFrmtEntry(vcl::Window* pParent, ScDocument* pDoc, const S ScCondFrmtEntry::~ScCondFrmtEntry() { - dispose(); + disposeOnce(); } void ScCondFrmtEntry::dispose() @@ -246,7 +246,7 @@ ScConditionFrmtEntry::ScConditionFrmtEntry( vcl::Window* pParent, ScDocument* pD ScConditionFrmtEntry::~ScConditionFrmtEntry() { - dispose(); + disposeOnce(); } void ScConditionFrmtEntry::dispose() @@ -616,7 +616,7 @@ ScFormulaFrmtEntry::ScFormulaFrmtEntry( vcl::Window* pParent, ScDocument* pDoc, ScFormulaFrmtEntry::~ScFormulaFrmtEntry() { - dispose(); + disposeOnce(); } void ScFormulaFrmtEntry::dispose() @@ -812,7 +812,7 @@ ScColorScale2FrmtEntry::ScColorScale2FrmtEntry( vcl::Window* pParent, ScDocument ScColorScale2FrmtEntry::~ScColorScale2FrmtEntry() { - dispose(); + disposeOnce(); } void ScColorScale2FrmtEntry::dispose() @@ -990,7 +990,7 @@ ScColorScale3FrmtEntry::ScColorScale3FrmtEntry( vcl::Window* pParent, ScDocument ScColorScale3FrmtEntry::~ScColorScale3FrmtEntry() { - dispose(); + disposeOnce(); } void ScColorScale3FrmtEntry::dispose() @@ -1228,7 +1228,7 @@ ScDataBarFrmtEntry::ScDataBarFrmtEntry( vcl::Window* pParent, ScDocument* pDoc, ScDataBarFrmtEntry::~ScDataBarFrmtEntry() { - dispose(); + disposeOnce(); } void ScDataBarFrmtEntry::dispose() @@ -1364,7 +1364,7 @@ ScDateFrmtEntry::ScDateFrmtEntry( vcl::Window* pParent, ScDocument* pDoc, const ScDateFrmtEntry::~ScDateFrmtEntry() { - dispose(); + disposeOnce(); } void ScDateFrmtEntry::dispose() @@ -1503,7 +1503,7 @@ ScIconSetFrmtDataEntry::ScIconSetFrmtDataEntry( vcl::Window* pParent, ScIconSetT ScIconSetFrmtDataEntry::~ScIconSetFrmtDataEntry() { - dispose(); + disposeOnce(); } void ScIconSetFrmtDataEntry::dispose() @@ -1590,7 +1590,7 @@ ScIconSetFrmtEntry::ScIconSetFrmtEntry( vcl::Window* pParent, ScDocument* pDoc, ScIconSetFrmtEntry::~ScIconSetFrmtEntry() { - dispose(); + disposeOnce(); } void ScIconSetFrmtEntry::dispose() diff --git a/sc/source/ui/condformat/condformatmgr.cxx b/sc/source/ui/condformat/condformatmgr.cxx index de5749adac73..b3491b75c115 100644 --- a/sc/source/ui/condformat/condformatmgr.cxx +++ b/sc/source/ui/condformat/condformatmgr.cxx @@ -133,7 +133,7 @@ ScCondFormatManagerDlg::ScCondFormatManagerDlg(vcl::Window* pParent, ScDocument* ScCondFormatManagerDlg::~ScCondFormatManagerDlg() { - dispose(); + disposeOnce(); } void ScCondFormatManagerDlg::dispose() diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx b/sc/source/ui/dbgui/PivotLayoutDialog.cxx index 4c1a1d0799c4..6858d5df706e 100644 --- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx +++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx @@ -185,7 +185,7 @@ ScPivotLayoutDialog::ScPivotLayoutDialog( ScPivotLayoutDialog::~ScPivotLayoutDialog() { - dispose(); + disposeOnce(); } void ScPivotLayoutDialog::dispose() diff --git a/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx b/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx index 34b5fc826b3d..cb97b43dbf0b 100644 --- a/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx +++ b/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx @@ -29,7 +29,7 @@ ScPivotLayoutTreeListBase::ScPivotLayoutTreeListBase(vcl::Window* pParent, WinBi ScPivotLayoutTreeListBase::~ScPivotLayoutTreeListBase() { - dispose(); + disposeOnce(); } void ScPivotLayoutTreeListBase::dispose() diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx index 48a187543050..1b84ae626154 100644 --- a/sc/source/ui/dbgui/consdlg.cxx +++ b/sc/source/ui/dbgui/consdlg.cxx @@ -105,7 +105,7 @@ ScConsolidateDlg::ScConsolidateDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::W ScConsolidateDlg::~ScConsolidateDlg() { - dispose(); + disposeOnce(); } void ScConsolidateDlg::dispose() diff --git a/sc/source/ui/dbgui/csvcontrol.cxx b/sc/source/ui/dbgui/csvcontrol.cxx index 49855777c9c0..72a437720e3e 100644 --- a/sc/source/ui/dbgui/csvcontrol.cxx +++ b/sc/source/ui/dbgui/csvcontrol.cxx @@ -74,7 +74,7 @@ ScCsvControl::ScCsvControl( vcl::Window* pParent, const ScCsvLayoutData& rData, ScCsvControl::~ScCsvControl() { - dispose(); + disposeOnce(); } void ScCsvControl::dispose() diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx index 03ad25d90668..eb23e5d0c742 100644 --- a/sc/source/ui/dbgui/csvgrid.cxx +++ b/sc/source/ui/dbgui/csvgrid.cxx @@ -85,7 +85,7 @@ ScCsvGrid::ScCsvGrid( ScCsvControl& rParent ) : ScCsvGrid::~ScCsvGrid() { - dispose(); + disposeOnce(); } void ScCsvGrid::dispose() diff --git a/sc/source/ui/dbgui/csvruler.cxx b/sc/source/ui/dbgui/csvruler.cxx index 1d2187fb8441..b464c874c9ad 100644 --- a/sc/source/ui/dbgui/csvruler.cxx +++ b/sc/source/ui/dbgui/csvruler.cxx @@ -101,7 +101,7 @@ ScCsvRuler::ScCsvRuler( ScCsvControl& rParent ) : ScCsvRuler::~ScCsvRuler() { - dispose(); + disposeOnce(); } void ScCsvRuler::dispose() diff --git a/sc/source/ui/dbgui/csvtablebox.cxx b/sc/source/ui/dbgui/csvtablebox.cxx index c44b33170ae4..37fc651d9743 100644 --- a/sc/source/ui/dbgui/csvtablebox.cxx +++ b/sc/source/ui/dbgui/csvtablebox.cxx @@ -56,7 +56,7 @@ ScCsvTableBox::ScCsvTableBox( vcl::Window* pParent, WinBits nBits ) : ScCsvTableBox::~ScCsvTableBox() { - dispose(); + disposeOnce(); } void ScCsvTableBox::dispose() diff --git a/sc/source/ui/dbgui/dapidata.cxx b/sc/source/ui/dbgui/dapidata.cxx index 5b8674d03166..dd39bf05d290 100644 --- a/sc/source/ui/dbgui/dapidata.cxx +++ b/sc/source/ui/dbgui/dapidata.cxx @@ -84,7 +84,7 @@ ScDataPilotDatabaseDlg::ScDataPilotDatabaseDlg( vcl::Window* pParent ) : ScDataPilotDatabaseDlg::~ScDataPilotDatabaseDlg() { - dispose(); + disposeOnce(); } void ScDataPilotDatabaseDlg::dispose() diff --git a/sc/source/ui/dbgui/dapitype.cxx b/sc/source/ui/dbgui/dapitype.cxx index d2869f35ef53..35407ade36b8 100644 --- a/sc/source/ui/dbgui/dapitype.cxx +++ b/sc/source/ui/dbgui/dapitype.cxx @@ -53,7 +53,7 @@ ScDataPilotSourceTypeDlg::ScDataPilotSourceTypeDlg(vcl::Window* pParent, bool bE ScDataPilotSourceTypeDlg::~ScDataPilotSourceTypeDlg() { - dispose(); + disposeOnce(); } void ScDataPilotSourceTypeDlg::dispose() @@ -126,7 +126,7 @@ ScDataPilotServiceDlg::ScDataPilotServiceDlg( vcl::Window* pParent, ScDataPilotServiceDlg::~ScDataPilotServiceDlg() { - dispose(); + disposeOnce(); } void ScDataPilotServiceDlg::dispose() diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx index f78153e4df05..3883e23b31b9 100644 --- a/sc/source/ui/dbgui/dbnamdlg.cxx +++ b/sc/source/ui/dbgui/dbnamdlg.cxx @@ -158,7 +158,7 @@ ScDbNameDlg::ScDbNameDlg(SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pPar ScDbNameDlg::~ScDbNameDlg() { - dispose(); + disposeOnce(); } void ScDbNameDlg::dispose() diff --git a/sc/source/ui/dbgui/dpgroupdlg.cxx b/sc/source/ui/dbgui/dpgroupdlg.cxx index e584ef6e2b1a..7bbb0fd80985 100644 --- a/sc/source/ui/dbgui/dpgroupdlg.cxx +++ b/sc/source/ui/dbgui/dpgroupdlg.cxx @@ -175,7 +175,7 @@ ScDPNumGroupDlg::ScDPNumGroupDlg( vcl::Window* pParent, const ScDPNumGroupInfo& ScDPNumGroupDlg::~ScDPNumGroupDlg() { - dispose(); + disposeOnce(); } void ScDPNumGroupDlg::dispose() @@ -279,7 +279,7 @@ ScDPDateGroupDlg::ScDPDateGroupDlg( vcl::Window* pParent, ScDPDateGroupDlg::~ScDPDateGroupDlg() { - dispose(); + disposeOnce(); } void ScDPDateGroupDlg::dispose() diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx index 3ef4c4fb9289..e3584d570015 100644 --- a/sc/source/ui/dbgui/filtdlg.cxx +++ b/sc/source/ui/dbgui/filtdlg.cxx @@ -160,7 +160,7 @@ ScFilterDlg::ScFilterDlg(SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pPar ScFilterDlg::~ScFilterDlg() { - dispose(); + disposeOnce(); } void ScFilterDlg::dispose() diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx index eb5ade6386e3..18f2072731e2 100644 --- a/sc/source/ui/dbgui/pfiltdlg.cxx +++ b/sc/source/ui/dbgui/pfiltdlg.cxx @@ -83,7 +83,7 @@ ScPivotFilterDlg::ScPivotFilterDlg(vcl::Window* pParent, const SfxItemSet& rArgS ScPivotFilterDlg::~ScPivotFilterDlg() { - dispose(); + disposeOnce(); } void ScPivotFilterDlg::dispose() diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx index a5059863edd2..55a4fd42e119 100644 --- a/sc/source/ui/dbgui/pvfundlg.cxx +++ b/sc/source/ui/dbgui/pvfundlg.cxx @@ -216,7 +216,7 @@ ScDPFunctionDlg::ScDPFunctionDlg( ScDPFunctionDlg::~ScDPFunctionDlg() { - dispose(); + disposeOnce(); } void ScDPFunctionDlg::dispose() @@ -452,7 +452,7 @@ ScDPSubtotalDlg::ScDPSubtotalDlg( vcl::Window* pParent, ScDPObject& rDPObj, ScDPSubtotalDlg::~ScDPSubtotalDlg() { - dispose(); + disposeOnce(); } void ScDPSubtotalDlg::dispose() @@ -584,7 +584,7 @@ ScDPSubtotalOptDlg::ScDPSubtotalOptDlg( vcl::Window* pParent, ScDPObject& rDPObj ScDPSubtotalOptDlg::~ScDPSubtotalOptDlg() { - dispose(); + disposeOnce(); } void ScDPSubtotalOptDlg::dispose() @@ -866,7 +866,7 @@ ScDPShowDetailDlg::ScDPShowDetailDlg( vcl::Window* pParent, ScDPObject& rDPObj, ScDPShowDetailDlg::~ScDPShowDetailDlg() { - dispose(); + disposeOnce(); } void ScDPShowDetailDlg::dispose() diff --git a/sc/source/ui/dbgui/scendlg.cxx b/sc/source/ui/dbgui/scendlg.cxx index c2d65c547ca4..bbe8b6c4e5e5 100644 --- a/sc/source/ui/dbgui/scendlg.cxx +++ b/sc/source/ui/dbgui/scendlg.cxx @@ -110,7 +110,7 @@ ScNewScenarioDlg::ScNewScenarioDlg( vcl::Window* pParent, const OUString& rName, ScNewScenarioDlg::~ScNewScenarioDlg() { - dispose(); + disposeOnce(); } void ScNewScenarioDlg::dispose() diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx index 3a6428a19288..1ac8ca860e35 100644 --- a/sc/source/ui/dbgui/scuiasciiopt.cxx +++ b/sc/source/ui/dbgui/scuiasciiopt.cxx @@ -464,7 +464,7 @@ ScImportAsciiDlg::ScImportAsciiDlg( vcl::Window* pParent, const OUString& aDatNa ScImportAsciiDlg::~ScImportAsciiDlg() { - dispose(); + disposeOnce(); } void ScImportAsciiDlg::dispose() diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx b/sc/source/ui/dbgui/scuiimoptdlg.cxx index bcc2eb97254c..9a7c59c39d36 100644 --- a/sc/source/ui/dbgui/scuiimoptdlg.cxx +++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx @@ -240,7 +240,7 @@ ScImportOptionsDlg::ScImportOptionsDlg( ScImportOptionsDlg::~ScImportOptionsDlg() { - dispose(); + disposeOnce(); } void ScImportOptionsDlg::dispose() diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx index a78b6deab598..028963d76556 100644 --- a/sc/source/ui/dbgui/sfiltdlg.cxx +++ b/sc/source/ui/dbgui/sfiltdlg.cxx @@ -97,7 +97,7 @@ ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, vc ScSpecialFilterDlg::~ScSpecialFilterDlg() { - dispose(); + disposeOnce(); } void ScSpecialFilterDlg::dispose() diff --git a/sc/source/ui/dbgui/sortdlg.cxx b/sc/source/ui/dbgui/sortdlg.cxx index 0934193d4e12..4702a0615c0a 100644 --- a/sc/source/ui/dbgui/sortdlg.cxx +++ b/sc/source/ui/dbgui/sortdlg.cxx @@ -52,7 +52,7 @@ ScSortWarningDlg::ScSortWarningDlg(vcl::Window* pParent, ScSortWarningDlg::~ScSortWarningDlg() { - dispose(); + disposeOnce(); } void ScSortWarningDlg::dispose() diff --git a/sc/source/ui/dbgui/subtdlg.cxx b/sc/source/ui/dbgui/subtdlg.cxx index b34356d0bd21..45132c0b02ff 100644 --- a/sc/source/ui/dbgui/subtdlg.cxx +++ b/sc/source/ui/dbgui/subtdlg.cxx @@ -38,7 +38,7 @@ ScSubTotalDlg::ScSubTotalDlg(vcl::Window* pParent, const SfxItemSet* pArgSet) ScSubTotalDlg::~ScSubTotalDlg() { - dispose(); + disposeOnce(); } void ScSubTotalDlg::dispose() diff --git a/sc/source/ui/dbgui/textimportoptions.cxx b/sc/source/ui/dbgui/textimportoptions.cxx index a90a35d183b7..6ec64bf36506 100644 --- a/sc/source/ui/dbgui/textimportoptions.cxx +++ b/sc/source/ui/dbgui/textimportoptions.cxx @@ -38,7 +38,7 @@ ScTextImportOptionsDlg::ScTextImportOptionsDlg(vcl::Window* pParent) ScTextImportOptionsDlg::~ScTextImportOptionsDlg() { - dispose(); + disposeOnce(); } void ScTextImportOptionsDlg::dispose() diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index ed215928eead..30ce19c1ab29 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -95,7 +95,7 @@ ScTabPageSortFields::ScTabPageSortFields(vcl::Window* pParent, ScTabPageSortFields::~ScTabPageSortFields() { - dispose(); + disposeOnce(); } void ScTabPageSortFields::dispose() @@ -523,7 +523,7 @@ ScTabPageSortOptions::ScTabPageSortOptions( vcl::Window* pParent, ScTabPageSortOptions::~ScTabPageSortOptions() { - dispose(); + disposeOnce(); } void ScTabPageSortOptions::dispose() diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx index a7f010b9a7f1..cc8c5608a82f 100644 --- a/sc/source/ui/dbgui/tpsubt.cxx +++ b/sc/source/ui/dbgui/tpsubt.cxx @@ -67,7 +67,7 @@ ScTpSubTotalGroup::ScTpSubTotalGroup( vcl::Window* pParent, ScTpSubTotalGroup::~ScTpSubTotalGroup() { - dispose(); + disposeOnce(); } void ScTpSubTotalGroup::dispose() @@ -451,7 +451,7 @@ ScTpSubTotalOptions::ScTpSubTotalOptions( vcl::Window* pParent, ScTpSubTotalOptions::~ScTpSubTotalOptions() { - dispose(); + disposeOnce(); } void ScTpSubTotalOptions::dispose() diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index 27dd263e7ef7..7336e07edc79 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -170,7 +170,7 @@ void ScTPValidationValue::RefInputDonePostHdl() ScTPValidationValue::ScRefButtonEx::~ScRefButtonEx() { - dispose(); + disposeOnce(); } void ScTPValidationValue::ScRefButtonEx::dispose() @@ -359,7 +359,7 @@ ScTPValidationValue::ScTPValidationValue( vcl::Window* pParent, const SfxItemSet ScTPValidationValue::~ScTPValidationValue() { - dispose(); + disposeOnce(); } void ScTPValidationValue::dispose() @@ -687,7 +687,7 @@ ScTPValidationHelp::ScTPValidationHelp( vcl::Window* pParent, ScTPValidationHelp::~ScTPValidationHelp() { - dispose(); + disposeOnce(); } void ScTPValidationHelp::dispose() @@ -760,7 +760,7 @@ ScTPValidationError::ScTPValidationError( vcl::Window* pParent, ScTPValidationError::~ScTPValidationError() { - dispose(); + disposeOnce(); } void ScTPValidationError::dispose() diff --git a/sc/source/ui/dialogs/searchresults.cxx b/sc/source/ui/dialogs/searchresults.cxx index 218f3258110f..7dd4ce661bbb 100644 --- a/sc/source/ui/dialogs/searchresults.cxx +++ b/sc/source/ui/dialogs/searchresults.cxx @@ -41,7 +41,7 @@ SearchResultsDlg::SearchResultsDlg( SfxBindings* _pBindings, vcl::Window* pParen SearchResultsDlg::~SearchResultsDlg() { - dispose(); + disposeOnce(); } void SearchResultsDlg::dispose() diff --git a/sc/source/ui/docshell/tpstat.cxx b/sc/source/ui/docshell/tpstat.cxx index 096c20843b4c..94e2d6cb9f5f 100644 --- a/sc/source/ui/docshell/tpstat.cxx +++ b/sc/source/ui/docshell/tpstat.cxx @@ -56,7 +56,7 @@ ScDocStatPage::ScDocStatPage( vcl::Window *pParent, const SfxItemSet& rSet ) ScDocStatPage::~ScDocStatPage() { - dispose(); + disposeOnce(); } void ScDocStatPage::dispose() diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx index 099b2d31a5fc..a6766cb24165 100644 --- a/sc/source/ui/formdlg/dwfunctr.cxx +++ b/sc/source/ui/formdlg/dwfunctr.cxx @@ -169,7 +169,7 @@ ScFunctionDockWin::ScFunctionDockWin( SfxBindings* pBindingsP, ScFunctionDockWin::~ScFunctionDockWin() { - dispose(); + disposeOnce(); } void ScFunctionDockWin::dispose() diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx index 8867fadb585a..e9f160fb13f8 100644 --- a/sc/source/ui/formdlg/formula.cxx +++ b/sc/source/ui/formdlg/formula.cxx @@ -241,7 +241,7 @@ void ScFormulaDlg::fill() ScFormulaDlg::~ScFormulaDlg() { - dispose(); + disposeOnce(); } void ScFormulaDlg::dispose() diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx index 739fd356aed2..080ddb4bef95 100644 --- a/sc/source/ui/inc/checklistmenu.hxx +++ b/sc/source/ui/inc/checklistmenu.hxx @@ -197,7 +197,7 @@ class ScCheckListBox : public SvTreeListBox public: ScCheckListBox( vcl::Window* pParent, WinBits nWinStyle = 0 ); - virtual ~ScCheckListBox() { dispose(); } + virtual ~ScCheckListBox() { disposeOnce(); } virtual void dispose() SAL_OVERRIDE { delete mpCheckButton; SvTreeListBox::dispose(); } void Init(); void CheckEntry( const OUString& sName, SvTreeListEntry* pParent, bool bCheck = true ); diff --git a/sc/source/ui/inc/corodlg.hxx b/sc/source/ui/inc/corodlg.hxx index 6f6ebd4ce325..dbc8dcc34f4f 100644 --- a/sc/source/ui/inc/corodlg.hxx +++ b/sc/source/ui/inc/corodlg.hxx @@ -37,7 +37,7 @@ public: m_pBtnCol->Check(bCol); m_pBtnRow->Check(bRow); } - virtual ~ScColRowLabelDlg() { dispose(); } + virtual ~ScColRowLabelDlg() { disposeOnce(); } virtual void dispose() SAL_OVERRIDE { m_pBtnRow.clear(); diff --git a/sc/source/ui/inc/namemgrtable.hxx b/sc/source/ui/inc/namemgrtable.hxx index f50b7bd8a47e..f87e3dd99519 100644 --- a/sc/source/ui/inc/namemgrtable.hxx +++ b/sc/source/ui/inc/namemgrtable.hxx @@ -66,6 +66,7 @@ private: public: ScRangeManagerTable( SvSimpleTableContainer& rParent, boost::ptr_map<OUString, ScRangeName>& aTabRangeNames, const ScAddress& rPos ); virtual ~ScRangeManagerTable(); + virtual void dispose() SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx index cd6a5ae41845..5fe4179be497 100644 --- a/sc/source/ui/inc/validate.hxx +++ b/sc/source/ui/inc/validate.hxx @@ -188,7 +188,7 @@ class ScValidationDlg public: explicit ScValidationDlg( vcl::Window* pParent, const SfxItemSet* pArgSet, ScTabViewShell * pTabViewSh, SfxBindings *pB = NULL ); - virtual ~ScValidationDlg() { dispose(); } + virtual ~ScValidationDlg() { disposeOnce(); } virtual void dispose() SAL_OVERRIDE { if( m_bOwnRefHdlr ) diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx index 7c0b4f3c8f92..f420316503de 100644 --- a/sc/source/ui/miscdlgs/acredlin.cxx +++ b/sc/source/ui/miscdlgs/acredlin.cxx @@ -154,7 +154,7 @@ ScAcceptChgDlg::ScAcceptChgDlg(SfxBindings* pB, SfxChildWindow* pCW, vcl::Window ScAcceptChgDlg::~ScAcceptChgDlg() { - dispose(); + disposeOnce(); } void ScAcceptChgDlg::dispose() diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx index 5d2899e8870a..63c729b95791 100644 --- a/sc/source/ui/miscdlgs/autofmt.cxx +++ b/sc/source/ui/miscdlgs/autofmt.cxx @@ -90,7 +90,7 @@ void ScAutoFmtPreview::Resize() ScAutoFmtPreview::~ScAutoFmtPreview() { - dispose(); + disposeOnce(); } void ScAutoFmtPreview::dispose() diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx index 0229df886fd6..d75dea976e84 100644 --- a/sc/source/ui/miscdlgs/conflictsdlg.cxx +++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx @@ -442,7 +442,7 @@ ScConflictsDlg::ScConflictsDlg( vcl::Window* pParent, ScViewData* pViewData, ScD ScConflictsDlg::~ScConflictsDlg() { - dispose(); + disposeOnce(); } void ScConflictsDlg::dispose() diff --git a/sc/source/ui/miscdlgs/crdlg.cxx b/sc/source/ui/miscdlgs/crdlg.cxx index 643ffdcc44dc..497a76ecfa8a 100644 --- a/sc/source/ui/miscdlgs/crdlg.cxx +++ b/sc/source/ui/miscdlgs/crdlg.cxx @@ -46,7 +46,7 @@ ScColOrRowDlg::ScColOrRowDlg(vcl::Window* pParent, const OUString& rStrTitle, ScColOrRowDlg::~ScColOrRowDlg() { - dispose(); + disposeOnce(); } void ScColOrRowDlg::dispose() diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx index 8560a881933d..c2195145d446 100644 --- a/sc/source/ui/miscdlgs/crnrdlg.cxx +++ b/sc/source/ui/miscdlgs/crnrdlg.cxx @@ -74,7 +74,7 @@ ScColRowNameRangesDlg::ScColRowNameRangesDlg( SfxBindings* pB, ScColRowNameRangesDlg::~ScColRowNameRangesDlg() { - dispose(); + disposeOnce(); } void ScColRowNameRangesDlg::dispose() diff --git a/sc/source/ui/miscdlgs/datafdlg.cxx b/sc/source/ui/miscdlgs/datafdlg.cxx index 0c884952599c..fc996c9396e3 100644 --- a/sc/source/ui/miscdlgs/datafdlg.cxx +++ b/sc/source/ui/miscdlgs/datafdlg.cxx @@ -204,7 +204,7 @@ ScDataFormDlg::ScDataFormDlg(vcl::Window* pParent, ScTabViewShell* pTabViewShell ScDataFormDlg::~ScDataFormDlg() { - dispose(); + disposeOnce(); } void ScDataFormDlg::dispose() diff --git a/sc/source/ui/miscdlgs/datastreamdlg.cxx b/sc/source/ui/miscdlgs/datastreamdlg.cxx index fac0e655e6eb..7f6c826a46de 100644 --- a/sc/source/ui/miscdlgs/datastreamdlg.cxx +++ b/sc/source/ui/miscdlgs/datastreamdlg.cxx @@ -54,7 +54,7 @@ DataStreamDlg::DataStreamDlg(ScDocShell *pDocShell, vcl::Window* pParent) DataStreamDlg::~DataStreamDlg() { - dispose(); + disposeOnce(); } void DataStreamDlg::dispose() diff --git a/sc/source/ui/miscdlgs/delcldlg.cxx b/sc/source/ui/miscdlgs/delcldlg.cxx index a838bfc0cdd1..a618d802909f 100644 --- a/sc/source/ui/miscdlgs/delcldlg.cxx +++ b/sc/source/ui/miscdlgs/delcldlg.cxx @@ -59,7 +59,7 @@ ScDeleteCellDlg::ScDeleteCellDlg(vcl::Window* pParent, bool bDisallowCellMove) ScDeleteCellDlg::~ScDeleteCellDlg() { - dispose(); + disposeOnce(); } void ScDeleteCellDlg::dispose() diff --git a/sc/source/ui/miscdlgs/delcodlg.cxx b/sc/source/ui/miscdlgs/delcodlg.cxx index 10e92b78d2e7..911af874bcbb 100644 --- a/sc/source/ui/miscdlgs/delcodlg.cxx +++ b/sc/source/ui/miscdlgs/delcodlg.cxx @@ -73,7 +73,7 @@ ScDeleteContentsDlg::ScDeleteContentsDlg( vcl::Window* pParent, ScDeleteContentsDlg::~ScDeleteContentsDlg() { - dispose(); + disposeOnce(); } void ScDeleteContentsDlg::dispose() diff --git a/sc/source/ui/miscdlgs/filldlg.cxx b/sc/source/ui/miscdlgs/filldlg.cxx index 6709c2ded025..4a0113d85e7d 100644 --- a/sc/source/ui/miscdlgs/filldlg.cxx +++ b/sc/source/ui/miscdlgs/filldlg.cxx @@ -76,7 +76,7 @@ ScFillSeriesDlg::ScFillSeriesDlg( vcl::Window* pParent, ScFillSeriesDlg::~ScFillSeriesDlg() { - dispose(); + disposeOnce(); } void ScFillSeriesDlg::dispose() diff --git a/sc/source/ui/miscdlgs/groupdlg.cxx b/sc/source/ui/miscdlgs/groupdlg.cxx index 255e116a1739..0b85da75efd6 100644 --- a/sc/source/ui/miscdlgs/groupdlg.cxx +++ b/sc/source/ui/miscdlgs/groupdlg.cxx @@ -44,7 +44,7 @@ ScGroupDlg::ScGroupDlg(vcl::Window* pParent, bool bUngroup, bool bRows) ScGroupDlg::~ScGroupDlg() { - dispose(); + disposeOnce(); } void ScGroupDlg::dispose() diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx index abe3d1df74e4..4c5fc95c232a 100644 --- a/sc/source/ui/miscdlgs/highred.cxx +++ b/sc/source/ui/miscdlgs/highred.cxx @@ -69,7 +69,7 @@ ScHighlightChgDlg::ScHighlightChgDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl: ScHighlightChgDlg::~ScHighlightChgDlg() { - dispose(); + disposeOnce(); } void ScHighlightChgDlg::dispose() diff --git a/sc/source/ui/miscdlgs/inscldlg.cxx b/sc/source/ui/miscdlgs/inscldlg.cxx index 264b9f53df71..001d0778f931 100644 --- a/sc/source/ui/miscdlgs/inscldlg.cxx +++ b/sc/source/ui/miscdlgs/inscldlg.cxx @@ -60,7 +60,7 @@ ScInsertCellDlg::ScInsertCellDlg( vcl::Window* pParent,bool bDisallowCellMove) : ScInsertCellDlg::~ScInsertCellDlg() { - dispose(); + disposeOnce(); } void ScInsertCellDlg::dispose() diff --git a/sc/source/ui/miscdlgs/inscodlg.cxx b/sc/source/ui/miscdlgs/inscodlg.cxx index 0a4c8580d002..6d7d1ce1249e 100644 --- a/sc/source/ui/miscdlgs/inscodlg.cxx +++ b/sc/source/ui/miscdlgs/inscodlg.cxx @@ -361,7 +361,7 @@ IMPL_LINK_NOARG(ScInsertContentsDlg, LinkBtnHdl) ScInsertContentsDlg::~ScInsertContentsDlg() { - dispose(); + disposeOnce(); } void ScInsertContentsDlg::dispose() diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx index 328db1ce4685..27825d3198a9 100644 --- a/sc/source/ui/miscdlgs/instbdlg.cxx +++ b/sc/source/ui/miscdlgs/instbdlg.cxx @@ -64,7 +64,7 @@ ScInsertTableDlg::ScInsertTableDlg( vcl::Window* pParent, ScViewData& rData, SCT ScInsertTableDlg::~ScInsertTableDlg() { - dispose(); + disposeOnce(); } void ScInsertTableDlg::dispose() diff --git a/sc/source/ui/miscdlgs/lbseldlg.cxx b/sc/source/ui/miscdlgs/lbseldlg.cxx index f7347c2112e6..2528212d3776 100644 --- a/sc/source/ui/miscdlgs/lbseldlg.cxx +++ b/sc/source/ui/miscdlgs/lbseldlg.cxx @@ -43,7 +43,7 @@ ScSelEntryDlg::ScSelEntryDlg(vcl::Window* pParent, const std::vector<OUString> ScSelEntryDlg::~ScSelEntryDlg() { - dispose(); + disposeOnce(); } void ScSelEntryDlg::dispose() diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx index f163e03b634e..51402b17cffb 100644 --- a/sc/source/ui/miscdlgs/linkarea.cxx +++ b/sc/source/ui/miscdlgs/linkarea.cxx @@ -62,7 +62,7 @@ ScLinkedAreaDlg::ScLinkedAreaDlg(vcl::Window* pParent) ScLinkedAreaDlg::~ScLinkedAreaDlg() { - dispose(); + disposeOnce(); } void ScLinkedAreaDlg::dispose() diff --git a/sc/source/ui/miscdlgs/mtrindlg.cxx b/sc/source/ui/miscdlgs/mtrindlg.cxx index 67379acee7e5..ce23d3797014 100644 --- a/sc/source/ui/miscdlgs/mtrindlg.cxx +++ b/sc/source/ui/miscdlgs/mtrindlg.cxx @@ -60,7 +60,7 @@ ScMetricInputDlg::ScMetricInputDlg( vcl::Window* pParent, ScMetricInputDlg::~ScMetricInputDlg() { - dispose(); + disposeOnce(); } void ScMetricInputDlg::dispose() diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx index 62fc9530ea67..995aa7267e49 100644 --- a/sc/source/ui/miscdlgs/mvtabdlg.cxx +++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx @@ -65,7 +65,7 @@ ScMoveTableDlg::ScMoveTableDlg(vcl::Window* pParent, const OUString& rDefault) ScMoveTableDlg::~ScMoveTableDlg() { - dispose(); + disposeOnce(); } void ScMoveTableDlg::dispose() diff --git a/sc/source/ui/miscdlgs/namecrea.cxx b/sc/source/ui/miscdlgs/namecrea.cxx index 7becdb521a03..1db6193a5c0b 100644 --- a/sc/source/ui/miscdlgs/namecrea.cxx +++ b/sc/source/ui/miscdlgs/namecrea.cxx @@ -37,7 +37,7 @@ ScNameCreateDlg::ScNameCreateDlg( vcl::Window * pParent, sal_uInt16 nFlags ) ScNameCreateDlg::~ScNameCreateDlg() { - dispose(); + disposeOnce(); } void ScNameCreateDlg::dispose() diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx index 067fd2d9017f..6b9d27217772 100644 --- a/sc/source/ui/miscdlgs/optsolver.cxx +++ b/sc/source/ui/miscdlgs/optsolver.cxx @@ -55,7 +55,7 @@ ScSolverProgressDialog::ScSolverProgressDialog(vcl::Window* pParent) ScSolverProgressDialog::~ScSolverProgressDialog() { - dispose(); + disposeOnce(); } void ScSolverProgressDialog::dispose() @@ -86,7 +86,7 @@ ScSolverNoSolutionDialog::ScSolverNoSolutionDialog( vcl::Window* pParent, const ScSolverNoSolutionDialog::~ScSolverNoSolutionDialog() { - dispose(); + disposeOnce(); } void ScSolverNoSolutionDialog::dispose() @@ -109,7 +109,7 @@ ScSolverSuccessDialog::ScSolverSuccessDialog( vcl::Window* pParent, const OUStri ScSolverSuccessDialog::~ScSolverSuccessDialog() { - dispose(); + disposeOnce(); } void ScSolverSuccessDialog::dispose() @@ -303,7 +303,7 @@ ScOptSolverDlg::ScOptSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Windo ScOptSolverDlg::~ScOptSolverDlg() { - dispose(); + disposeOnce(); } void ScOptSolverDlg::dispose() diff --git a/sc/source/ui/miscdlgs/protectiondlg.cxx b/sc/source/ui/miscdlgs/protectiondlg.cxx index 96f0c40947e4..cf552f41f0e7 100644 --- a/sc/source/ui/miscdlgs/protectiondlg.cxx +++ b/sc/source/ui/miscdlgs/protectiondlg.cxx @@ -50,7 +50,7 @@ ScTableProtectionDlg::ScTableProtectionDlg(vcl::Window* pParent) ScTableProtectionDlg::~ScTableProtectionDlg() { - dispose(); + disposeOnce(); } void ScTableProtectionDlg::dispose() diff --git a/sc/source/ui/miscdlgs/retypepassdlg.cxx b/sc/source/ui/miscdlgs/retypepassdlg.cxx index b968cb174698..84d58ff87dbe 100644 --- a/sc/source/ui/miscdlgs/retypepassdlg.cxx +++ b/sc/source/ui/miscdlgs/retypepassdlg.cxx @@ -54,7 +54,7 @@ ScRetypePassDlg::ScRetypePassDlg(vcl::Window* pParent) : ScRetypePassDlg::~ScRetypePassDlg() { - dispose(); + disposeOnce(); } void ScRetypePassDlg::dispose() @@ -333,7 +333,7 @@ ScRetypePassInputDlg::ScRetypePassInputDlg(vcl::Window* pParent, ScPassHashProte ScRetypePassInputDlg::~ScRetypePassInputDlg() { - dispose(); + disposeOnce(); } void ScRetypePassInputDlg::dispose() diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx index 0f05a5bf6bbf..9907628ca006 100644 --- a/sc/source/ui/miscdlgs/scuiautofmt.cxx +++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx @@ -90,7 +90,7 @@ ScAutoFormatDlg::ScAutoFormatDlg(vcl::Window* pParent, ScAutoFormatDlg::~ScAutoFormatDlg() { - dispose(); + disposeOnce(); } void ScAutoFormatDlg::dispose() diff --git a/sc/source/ui/miscdlgs/sharedocdlg.cxx b/sc/source/ui/miscdlgs/sharedocdlg.cxx index 4a2fd3ab248c..ac80d100bd03 100644 --- a/sc/source/ui/miscdlgs/sharedocdlg.cxx +++ b/sc/source/ui/miscdlgs/sharedocdlg.cxx @@ -108,7 +108,7 @@ ScShareDocumentDlg::ScShareDocumentDlg( vcl::Window* pParent, ScViewData* pViewD ScShareDocumentDlg::~ScShareDocumentDlg() { - dispose(); + disposeOnce(); } void ScShareDocumentDlg::dispose() diff --git a/sc/source/ui/miscdlgs/shtabdlg.cxx b/sc/source/ui/miscdlgs/shtabdlg.cxx index e9410599f02a..7898fc904488 100644 --- a/sc/source/ui/miscdlgs/shtabdlg.cxx +++ b/sc/source/ui/miscdlgs/shtabdlg.cxx @@ -39,7 +39,7 @@ ScShowTabDlg::ScShowTabDlg(vcl::Window* pParent) ScShowTabDlg::~ScShowTabDlg() { - dispose(); + disposeOnce(); } void ScShowTabDlg::dispose() diff --git a/sc/source/ui/miscdlgs/simpref.cxx b/sc/source/ui/miscdlgs/simpref.cxx index e6f27a94caa2..866bb129af9d 100644 --- a/sc/source/ui/miscdlgs/simpref.cxx +++ b/sc/source/ui/miscdlgs/simpref.cxx @@ -59,7 +59,7 @@ ScSimpleRefDlg::ScSimpleRefDlg(SfxBindings* pB, SfxChildWindow* pCW, vcl::Window ScSimpleRefDlg::~ScSimpleRefDlg() { - dispose(); + disposeOnce(); } void ScSimpleRefDlg::dispose() diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx index c3514c54b2d0..c419a8a76d2a 100644 --- a/sc/source/ui/miscdlgs/solveroptions.cxx +++ b/sc/source/ui/miscdlgs/solveroptions.cxx @@ -159,7 +159,7 @@ ScSolverOptionsDialog::ScSolverOptionsDialog( vcl::Window* pParent, ScSolverOptionsDialog::~ScSolverOptionsDialog() { - dispose(); + disposeOnce(); } void ScSolverOptionsDialog::dispose() @@ -399,7 +399,7 @@ ScSolverIntegerDialog::ScSolverIntegerDialog(vcl::Window * pParent) ScSolverIntegerDialog::~ScSolverIntegerDialog() { - dispose(); + disposeOnce(); } void ScSolverIntegerDialog::dispose() @@ -439,7 +439,7 @@ ScSolverValueDialog::ScSolverValueDialog( vcl::Window * pParent ) ScSolverValueDialog::~ScSolverValueDialog() { - dispose(); + disposeOnce(); } void ScSolverValueDialog::dispose() diff --git a/sc/source/ui/miscdlgs/solvrdlg.cxx b/sc/source/ui/miscdlgs/solvrdlg.cxx index b841c26fa5a0..45f6f453b83b 100644 --- a/sc/source/ui/miscdlgs/solvrdlg.cxx +++ b/sc/source/ui/miscdlgs/solvrdlg.cxx @@ -73,7 +73,7 @@ ScSolverDlg::ScSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pPa ScSolverDlg::~ScSolverDlg() { - dispose(); + disposeOnce(); } void ScSolverDlg::dispose() diff --git a/sc/source/ui/miscdlgs/strindlg.cxx b/sc/source/ui/miscdlgs/strindlg.cxx index a2f1b36a9edf..482ca29aed33 100644 --- a/sc/source/ui/miscdlgs/strindlg.cxx +++ b/sc/source/ui/miscdlgs/strindlg.cxx @@ -41,7 +41,7 @@ ScStringInputDlg::ScStringInputDlg( vcl::Window* pParent, ScStringInputDlg::~ScStringInputDlg() { - dispose(); + disposeOnce(); } void ScStringInputDlg::dispose() diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx index 710c5c67540f..db1714b98757 100644 --- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx +++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx @@ -61,7 +61,7 @@ ScTabBgColorDlg::ScTabBgColorDlg(vcl::Window* pParent, const OUString& rTitle, ScTabBgColorDlg::~ScTabBgColorDlg() { - dispose(); + disposeOnce(); } void ScTabBgColorDlg::dispose() @@ -149,7 +149,7 @@ ScTabBgColorDlg::ScTabBgColorValueSet::ScTabBgColorValueSet(vcl::Window* pParent ScTabBgColorDlg::ScTabBgColorValueSet::~ScTabBgColorValueSet() { - dispose(); + disposeOnce(); } void ScTabBgColorDlg::ScTabBgColorValueSet::dispose() diff --git a/sc/source/ui/miscdlgs/tabopdlg.cxx b/sc/source/ui/miscdlgs/tabopdlg.cxx index 9b49e34ef7f0..d4f8c17ece4a 100644 --- a/sc/source/ui/miscdlgs/tabopdlg.cxx +++ b/sc/source/ui/miscdlgs/tabopdlg.cxx @@ -76,7 +76,7 @@ ScTabOpDlg::ScTabOpDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pPare ScTabOpDlg::~ScTabOpDlg() { - dispose(); + disposeOnce(); } void ScTabOpDlg::dispose() diff --git a/sc/source/ui/namedlg/namedefdlg.cxx b/sc/source/ui/namedlg/namedefdlg.cxx index 42ab80231db8..0f80368c5377 100644 --- a/sc/source/ui/namedlg/namedefdlg.cxx +++ b/sc/source/ui/namedlg/namedefdlg.cxx @@ -95,7 +95,7 @@ ScNameDefDlg::ScNameDefDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* p ScNameDefDlg::~ScNameDefDlg() { - dispose(); + disposeOnce(); } void ScNameDefDlg::dispose() diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx index 71a3e38dbf5b..f5a105302363 100644 --- a/sc/source/ui/namedlg/namedlg.cxx +++ b/sc/source/ui/namedlg/namedlg.cxx @@ -102,7 +102,7 @@ ScNameDlg::ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent ScNameDlg::~ScNameDlg() { - dispose(); + disposeOnce(); } void ScNameDlg::dispose() diff --git a/sc/source/ui/namedlg/namemgrtable.cxx b/sc/source/ui/namedlg/namemgrtable.cxx index 1f37f67291e4..715e3da107d4 100644 --- a/sc/source/ui/namedlg/namemgrtable.cxx +++ b/sc/source/ui/namedlg/namemgrtable.cxx @@ -105,7 +105,13 @@ void ScRangeManagerTable::setColWidths() ScRangeManagerTable::~ScRangeManagerTable() { + disposeOnce(); +} + +void ScRangeManagerTable::dispose() +{ Clear(); + SvSimpleTable::dispose(); } void ScRangeManagerTable::setInitListener( InitListener* pListener ) diff --git a/sc/source/ui/namedlg/namepast.cxx b/sc/source/ui/namedlg/namepast.cxx index 13cef6ac18b9..01e97cc8278f 100644 --- a/sc/source/ui/namedlg/namepast.cxx +++ b/sc/source/ui/namedlg/namepast.cxx @@ -65,7 +65,7 @@ ScNamePasteDlg::ScNamePasteDlg( vcl::Window * pParent, ScDocShell* pShell, bool ScNamePasteDlg::~ScNamePasteDlg() { - dispose(); + disposeOnce(); } void ScNamePasteDlg::dispose() diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index fd69e7a76aca..867d41cb43d5 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -142,7 +142,7 @@ ScContentTree::ScContentTree( vcl::Window* pParent, const ResId& rResId ) : ScContentTree::~ScContentTree() { - dispose(); + disposeOnce(); } void ScContentTree::dispose() diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index 8861741e6118..7c1ea4db5cf9 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -679,7 +679,7 @@ ScNavigatorDlg::ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, vcl ScNavigatorDlg::~ScNavigatorDlg() { - dispose(); + disposeOnce(); } void ScNavigatorDlg::dispose() diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx index c9fb51fc619e..0ff6af496c4f 100644 --- a/sc/source/ui/navipi/scenwnd.cxx +++ b/sc/source/ui/navipi/scenwnd.cxx @@ -226,7 +226,7 @@ ScScenarioWindow::ScScenarioWindow( vcl::Window* pParent, const OUString& aQH_Li ScScenarioWindow::~ScScenarioWindow() { - dispose(); + disposeOnce(); } void ScScenarioWindow::dispose() diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx index a5b4d1d84472..621e54d6f278 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.cxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx @@ -111,7 +111,7 @@ ScCalcOptionsDialog::ScCalcOptionsDialog(vcl::Window* pParent, const ScCalcConfi ScCalcOptionsDialog::~ScCalcOptionsDialog() { - dispose(); + disposeOnce(); } void ScCalcOptionsDialog::dispose() diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx index f38124ccab53..0716fea539bd 100644 --- a/sc/source/ui/optdlg/opredlin.cxx +++ b/sc/source/ui/optdlg/opredlin.cxx @@ -57,7 +57,7 @@ ScRedlineOptionsTabPage::ScRedlineOptionsTabPage( vcl::Window* pParent, ScRedlineOptionsTabPage::~ScRedlineOptionsTabPage() { - dispose(); + disposeOnce(); } void ScRedlineOptionsTabPage::dispose() diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx index cd1195068cbf..eb203b209a5c 100644 --- a/sc/source/ui/optdlg/tpcalc.cxx +++ b/sc/source/ui/optdlg/tpcalc.cxx @@ -66,7 +66,7 @@ ScTpCalcOptions::ScTpCalcOptions(vcl::Window* pParent, const SfxItemSet& rCoreAt ScTpCalcOptions::~ScTpCalcOptions() { - dispose(); + disposeOnce(); } void ScTpCalcOptions::dispose() diff --git a/sc/source/ui/optdlg/tpcompatibility.cxx b/sc/source/ui/optdlg/tpcompatibility.cxx index bb81ab2fa257..42c090231faf 100644 --- a/sc/source/ui/optdlg/tpcompatibility.cxx +++ b/sc/source/ui/optdlg/tpcompatibility.cxx @@ -23,7 +23,7 @@ ScTpCompatOptions::ScTpCompatOptions(vcl::Window *pParent, const SfxItemSet &rCo ScTpCompatOptions::~ScTpCompatOptions() { - dispose(); + disposeOnce(); } void ScTpCompatOptions::dispose() diff --git a/sc/source/ui/optdlg/tpdefaults.cxx b/sc/source/ui/optdlg/tpdefaults.cxx index bb3bea8d8ec7..e2b35389fe99 100644 --- a/sc/source/ui/optdlg/tpdefaults.cxx +++ b/sc/source/ui/optdlg/tpdefaults.cxx @@ -30,7 +30,7 @@ ScTpDefaultsOptions::ScTpDefaultsOptions(vcl::Window *pParent, const SfxItemSet ScTpDefaultsOptions::~ScTpDefaultsOptions() { - dispose(); + disposeOnce(); } void ScTpDefaultsOptions::dispose() diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx index 2f3afe61c4d9..1209cae78b93 100644 --- a/sc/source/ui/optdlg/tpformula.cxx +++ b/sc/source/ui/optdlg/tpformula.cxx @@ -81,7 +81,7 @@ ScTpFormulaOptions::ScTpFormulaOptions(vcl::Window* pParent, const SfxItemSet& r ScTpFormulaOptions::~ScTpFormulaOptions() { - dispose(); + disposeOnce(); } void ScTpFormulaOptions::dispose() diff --git a/sc/source/ui/optdlg/tpprint.cxx b/sc/source/ui/optdlg/tpprint.cxx index 67fe07ee76e4..1370a0e97b7e 100644 --- a/sc/source/ui/optdlg/tpprint.cxx +++ b/sc/source/ui/optdlg/tpprint.cxx @@ -41,7 +41,7 @@ ScTpPrintOptions::ScTpPrintOptions( vcl::Window* pParent, ScTpPrintOptions::~ScTpPrintOptions() { - dispose(); + disposeOnce(); } void ScTpPrintOptions::dispose() diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx index 4e3a9902f43d..04ff83184baa 100644 --- a/sc/source/ui/optdlg/tpusrlst.cxx +++ b/sc/source/ui/optdlg/tpusrlst.cxx @@ -84,7 +84,7 @@ ScTpUserLists::ScTpUserLists( vcl::Window* pParent, ScTpUserLists::~ScTpUserLists() { - dispose(); + disposeOnce(); } void ScTpUserLists::dispose() diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx index 40571f21a553..f8aa0e9679bd 100644 --- a/sc/source/ui/optdlg/tpview.cxx +++ b/sc/source/ui/optdlg/tpview.cxx @@ -95,7 +95,7 @@ ScTpContentOptions::ScTpContentOptions( vcl::Window* pParent, ScTpContentOptions::~ScTpContentOptions() { - dispose(); + disposeOnce(); } void ScTpContentOptions::dispose() @@ -433,7 +433,7 @@ ScTpLayoutOptions::ScTpLayoutOptions( vcl::Window* pParent, ScTpLayoutOptions::~ScTpLayoutOptions() { - dispose(); + disposeOnce(); } void ScTpLayoutOptions::dispose() diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx index 9f778e347556..1985e09eb118 100644 --- a/sc/source/ui/pagedlg/areasdlg.cxx +++ b/sc/source/ui/pagedlg/areasdlg.cxx @@ -136,7 +136,7 @@ ScPrintAreasDlg::ScPrintAreasDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Win ScPrintAreasDlg::~ScPrintAreasDlg() { - dispose(); + disposeOnce(); } void ScPrintAreasDlg::dispose() diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx index bb7cfdab367f..7fece05b511c 100644 --- a/sc/source/ui/pagedlg/scuitphfedit.cxx +++ b/sc/source/ui/pagedlg/scuitphfedit.cxx @@ -152,7 +152,7 @@ IMPL_LINK( ScHFEditPage, ObjectSelectHdl, ScEditWindow*, pEdit ) ScHFEditPage::~ScHFEditPage() { - dispose(); + disposeOnce(); } void ScHFEditPage::dispose() diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx index 3f2bc306f3a2..dc525dab52f7 100644 --- a/sc/source/ui/pagedlg/tphf.cxx +++ b/sc/source/ui/pagedlg/tphf.cxx @@ -78,7 +78,7 @@ ScHFPage::ScHFPage( vcl::Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSe ScHFPage::~ScHFPage() { - dispose(); + disposeOnce(); } void ScHFPage::dispose() diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx index 7b842edb257e..87eded513c08 100644 --- a/sc/source/ui/pagedlg/tphfedit.cxx +++ b/sc/source/ui/pagedlg/tphfedit.cxx @@ -118,7 +118,7 @@ void ScEditWindow::Resize() ScEditWindow::~ScEditWindow() { - dispose(); + disposeOnce(); } void ScEditWindow::dispose() diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx index 80663da3924d..95baa7d57003 100644 --- a/sc/source/ui/pagedlg/tptable.cxx +++ b/sc/source/ui/pagedlg/tptable.cxx @@ -125,7 +125,7 @@ void ScTablePage::ShowImage() ScTablePage::~ScTablePage() { - dispose(); + disposeOnce(); } void ScTablePage::dispose() diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx index 2cacee3f97f5..7bd1fbfd9f84 100644 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx +++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx @@ -68,7 +68,7 @@ AlignmentPropertyPanel::AlignmentPropertyPanel( AlignmentPropertyPanel::~AlignmentPropertyPanel() { - dispose(); + disposeOnce(); } void AlignmentPropertyPanel::dispose() diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx index b79e4fb5c5d8..2ca87de0e1e3 100644 --- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx +++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx @@ -142,7 +142,7 @@ CellAppearancePropertyPanel::CellAppearancePropertyPanel( CellAppearancePropertyPanel::~CellAppearancePropertyPanel() { - dispose(); + disposeOnce(); } void CellAppearancePropertyPanel::dispose() diff --git a/sc/source/ui/sidebar/CellBorderStyleControl.cxx b/sc/source/ui/sidebar/CellBorderStyleControl.cxx index 72bd59eae8bc..9b981096dfee 100644 --- a/sc/source/ui/sidebar/CellBorderStyleControl.cxx +++ b/sc/source/ui/sidebar/CellBorderStyleControl.cxx @@ -58,7 +58,7 @@ CellBorderStyleControl::CellBorderStyleControl(vcl::Window* pParent, CellAppeara CellBorderStyleControl::~CellBorderStyleControl(void) { - dispose(); + disposeOnce(); } void CellBorderStyleControl::dispose() diff --git a/sc/source/ui/sidebar/CellLineStyleControl.cxx b/sc/source/ui/sidebar/CellLineStyleControl.cxx index 187cbed1111d..818616275ae6 100644 --- a/sc/source/ui/sidebar/CellLineStyleControl.cxx +++ b/sc/source/ui/sidebar/CellLineStyleControl.cxx @@ -46,7 +46,7 @@ CellLineStyleControl::CellLineStyleControl(vcl::Window* pParent, CellAppearanceP CellLineStyleControl::~CellLineStyleControl() { - dispose(); + disposeOnce(); } void CellLineStyleControl::dispose() diff --git a/sc/source/ui/sidebar/CellLineStyleValueSet.cxx b/sc/source/ui/sidebar/CellLineStyleValueSet.cxx index d928903d2041..5ba64bdbced3 100644 --- a/sc/source/ui/sidebar/CellLineStyleValueSet.cxx +++ b/sc/source/ui/sidebar/CellLineStyleValueSet.cxx @@ -34,7 +34,7 @@ CellLineStyleValueSet::CellLineStyleValueSet( vcl::Window* pParent, const ResId& CellLineStyleValueSet::~CellLineStyleValueSet() { - dispose(); + disposeOnce(); } void CellLineStyleValueSet::dispose() diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx index ba600e2f2f29..fb70ac68a834 100644 --- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx +++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx @@ -70,7 +70,7 @@ NumberFormatPropertyPanel::NumberFormatPropertyPanel( NumberFormatPropertyPanel::~NumberFormatPropertyPanel() { - dispose(); + disposeOnce(); } void NumberFormatPropertyPanel::dispose() diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 783c3adbc783..41ec52f28861 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -259,7 +259,7 @@ ScFilterListBox::ScFilterListBox( vcl::Window* pParent, ScGridWindow* pGrid, ScFilterListBox::~ScFilterListBox() { - dispose(); + disposeOnce(); } void ScFilterListBox::dispose() @@ -345,6 +345,7 @@ class ScFilterFloatingWindow : public FloatingWindow public: ScFilterFloatingWindow( vcl::Window* pParent, WinBits nStyle = WB_STDFLOATWIN ); virtual ~ScFilterFloatingWindow(); + virtual void dispose() SAL_OVERRIDE; // required for System FloatingWindows that will not process KeyInput by themselves virtual vcl::Window* GetPreferredKeyInputWindow() SAL_OVERRIDE; }; @@ -355,7 +356,13 @@ ScFilterFloatingWindow::ScFilterFloatingWindow( vcl::Window* pParent, WinBits nS ScFilterFloatingWindow::~ScFilterFloatingWindow() { + disposeOnce(); +} + +void ScFilterFloatingWindow::dispose() +{ EndPopupMode(); + FloatingWindow::dispose(); } vcl::Window* ScFilterFloatingWindow::GetPreferredKeyInputWindow() @@ -530,7 +537,7 @@ ScGridWindow::ScGridWindow( vcl::Window* pParent, ScViewData* pData, ScSplitPos ScGridWindow::~ScGridWindow() { - dispose(); + disposeOnce(); } void ScGridWindow::dispose() diff --git a/sc/source/ui/view/olinewin.cxx b/sc/source/ui/view/olinewin.cxx index 18a137598ebf..5e5f46dfc892 100644 --- a/sc/source/ui/view/olinewin.cxx +++ b/sc/source/ui/view/olinewin.cxx @@ -71,7 +71,7 @@ ScOutlineWindow::ScOutlineWindow( vcl::Window* pParent, ScOutlineMode eMode, ScV ScOutlineWindow::~ScOutlineWindow() { - dispose(); + disposeOnce(); } void ScOutlineWindow::dispose() diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx index 15da7750e594..3267fb8a6296 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.cxx @@ -143,7 +143,7 @@ ScPreview::ScPreview( vcl::Window* pParent, ScDocShell* pDocSh, ScPreviewShell* ScPreview::~ScPreview() { - dispose(); + disposeOnce(); } void ScPreview::dispose() diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx b/sc/source/ui/xmlsource/xmlsourcedlg.cxx index ef260874086b..0224565d322c 100644 --- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx +++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx @@ -117,7 +117,7 @@ ScXMLSourceDlg::ScXMLSourceDlg( ScXMLSourceDlg::~ScXMLSourceDlg() { - dispose(); + disposeOnce(); } void ScXMLSourceDlg::dispose() |