diff options
Diffstat (limited to 'sw/source/ui')
77 files changed, 139 insertions, 134 deletions
diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx index 9db5c7da2d0d..d0dea5ffafbc 100644 --- a/sw/source/ui/chrdlg/break.cxx +++ b/sw/source/ui/chrdlg/break.cxx @@ -175,7 +175,7 @@ SwBreakDlg::SwBreakDlg( vcl::Window *pParent, SwWrtShell &rS ) SwBreakDlg::~SwBreakDlg() { - dispose(); + disposeOnce(); } void SwBreakDlg::dispose() diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx index e19be029b52c..a1836d60ea0c 100644 --- a/sw/source/ui/chrdlg/chardlg.cxx +++ b/sw/source/ui/chrdlg/chardlg.cxx @@ -185,7 +185,7 @@ SwCharURLPage::SwCharURLPage(vcl::Window* pParent, const SfxItemSet& rCoreSet) SwCharURLPage::~SwCharURLPage() { - dispose(); + disposeOnce(); } void SwCharURLPage::dispose() diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index 6390f463db6e..d5157f7aa07e 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -203,7 +203,7 @@ static void calcFontHeightAnyAscent( OutputDevice* _pWin, vcl::Font& _rFont, lon SwDropCapsPict::~SwDropCapsPict() { - dispose(); + disposeOnce(); } void SwDropCapsPict::dispose() @@ -576,7 +576,7 @@ SwDropCapsPage::SwDropCapsPage(vcl::Window *pParent, const SfxItemSet &rSet) SwDropCapsPage::~SwDropCapsPage() { - dispose(); + disposeOnce(); } void SwDropCapsPage::dispose() diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx index 04e923cc4d2d..e16fa6dd5b08 100644 --- a/sw/source/ui/chrdlg/numpara.cxx +++ b/sw/source/ui/chrdlg/numpara.cxx @@ -101,7 +101,7 @@ SwParagraphNumTabPage::SwParagraphNumTabPage(vcl::Window* pParent, const SfxItem SwParagraphNumTabPage::~SwParagraphNumTabPage() { - dispose(); + disposeOnce(); } void SwParagraphNumTabPage::dispose() diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx index f279d5493897..779495230504 100644 --- a/sw/source/ui/chrdlg/swuiccoll.cxx +++ b/sw/source/ui/chrdlg/swuiccoll.cxx @@ -124,7 +124,7 @@ SwCondCollPage::SwCondCollPage(vcl::Window *pParent, const SfxItemSet &rSet) SwCondCollPage::~SwCondCollPage() { - dispose(); + disposeOnce(); } void SwCondCollPage::dispose() diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx index c902ed7acc02..86f0a4d61d7a 100644 --- a/sw/source/ui/config/mailconfigpage.cxx +++ b/sw/source/ui/config/mailconfigpage.cxx @@ -138,7 +138,7 @@ SwMailConfigPage::SwMailConfigPage( vcl::Window* pParent, const SfxItemSet& rSet SwMailConfigPage::~SwMailConfigPage() { - dispose(); + disposeOnce(); } void SwMailConfigPage::dispose() @@ -259,7 +259,7 @@ SwTestAccountSettingsDialog::SwTestAccountSettingsDialog(SwMailConfigPage* pPare SwTestAccountSettingsDialog::~SwTestAccountSettingsDialog() { - dispose(); + disposeOnce(); } void SwTestAccountSettingsDialog::dispose() @@ -452,7 +452,7 @@ SwAuthenticationSettingsDialog::SwAuthenticationSettingsDialog( SwAuthenticationSettingsDialog::~SwAuthenticationSettingsDialog() { - dispose(); + disposeOnce(); } void SwAuthenticationSettingsDialog::dispose() diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx index b90215015468..1342d5859389 100644 --- a/sw/source/ui/config/optcomp.cxx +++ b/sw/source/ui/config/optcomp.cxx @@ -128,7 +128,7 @@ SwCompatibilityOptPage::SwCompatibilityOptPage(vcl::Window* pParent, const SfxIt SwCompatibilityOptPage::~SwCompatibilityOptPage() { - dispose(); + disposeOnce(); } void SwCompatibilityOptPage::dispose() diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index d0c8d8a67707..090f4963c91e 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -127,7 +127,7 @@ SwLoadOptPage::SwLoadOptPage(vcl::Window* pParent, const SfxItemSet& rSet) SwLoadOptPage::~SwLoadOptPage() { - dispose(); + disposeOnce(); } void SwLoadOptPage::dispose() @@ -541,7 +541,7 @@ SwCaptionOptPage::SwCaptionOptPage( vcl::Window* pParent, const SfxItemSet& rSet SwCaptionOptPage::~SwCaptionOptPage() { - dispose(); + disposeOnce(); } void SwCaptionOptPage::dispose() diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 5acc585686cf..ee6a85be58e1 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -156,7 +156,7 @@ SwContentOptPage::SwContentOptPage( vcl::Window* pParent, SwContentOptPage::~SwContentOptPage() { - dispose(); + disposeOnce(); } void SwContentOptPage::dispose() @@ -380,7 +380,7 @@ SwAddPrinterTabPage::SwAddPrinterTabPage(vcl::Window* pParent, SwAddPrinterTabPage::~SwAddPrinterTabPage() { - dispose(); + disposeOnce(); } void SwAddPrinterTabPage::dispose() @@ -629,7 +629,7 @@ SwStdFontTabPage::SwStdFontTabPage( vcl::Window* pParent, SwStdFontTabPage::~SwStdFontTabPage() { - dispose(); + disposeOnce(); } void SwStdFontTabPage::dispose() @@ -1157,7 +1157,7 @@ SwTableOptionsTabPage::SwTableOptionsTabPage( vcl::Window* pParent, const SfxIte SwTableOptionsTabPage::~SwTableOptionsTabPage() { - dispose(); + disposeOnce(); } void SwTableOptionsTabPage::dispose() @@ -1413,7 +1413,7 @@ SwShdwCrsrOptionsTabPage::SwShdwCrsrOptionsTabPage( vcl::Window* pParent, SwShdwCrsrOptionsTabPage::~SwShdwCrsrOptionsTabPage() { - dispose(); + disposeOnce(); } void SwShdwCrsrOptionsTabPage::dispose() @@ -1851,7 +1851,7 @@ SwRedlineOptionsTabPage::SwRedlineOptionsTabPage( vcl::Window* pParent, SwRedlineOptionsTabPage::~SwRedlineOptionsTabPage() { - dispose(); + disposeOnce(); } void SwRedlineOptionsTabPage::dispose() @@ -2370,7 +2370,7 @@ SwCompareOptionsTabPage::SwCompareOptionsTabPage( vcl::Window* pParent, const S SwCompareOptionsTabPage::~SwCompareOptionsTabPage() { - dispose(); + disposeOnce(); } void SwCompareOptionsTabPage::dispose() @@ -2520,7 +2520,7 @@ SwTestTabPage::SwTestTabPage(vcl::Window* pParent, const SfxItemSet& rCoreSet) SwTestTabPage::~SwTestTabPage() { - dispose(); + disposeOnce(); } void SwTestTabPage::dispose() diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx index 388c6d3be39b..427ba9563e03 100644 --- a/sw/source/ui/dbui/addresslistdialog.cxx +++ b/sw/source/ui/dbui/addresslistdialog.cxx @@ -265,7 +265,7 @@ SwAddressListDialog::SwAddressListDialog(SwMailMergeAddressBlockPage* pParent) SwAddressListDialog::~SwAddressListDialog() { - dispose(); + disposeOnce(); } void SwAddressListDialog::dispose() diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx index fb86a0eef99a..d0a84b3d09cc 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.cxx +++ b/sw/source/ui/dbui/createaddresslistdialog.cxx @@ -114,7 +114,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwAddressControlImpl(v SwAddressControl_Impl::~SwAddressControl_Impl() { - dispose(); + disposeOnce(); } void SwAddressControl_Impl::dispose() @@ -490,7 +490,7 @@ SwCreateAddressListDialog::SwCreateAddressListDialog( SwCreateAddressListDialog::~SwCreateAddressListDialog() { - dispose(); + disposeOnce(); } void SwCreateAddressListDialog::dispose() @@ -765,7 +765,7 @@ SwFindEntryDialog::SwFindEntryDialog(SwCreateAddressListDialog* pParent) SwFindEntryDialog::~SwFindEntryDialog() { - dispose(); + disposeOnce(); } void SwFindEntryDialog::dispose() diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.cxx b/sw/source/ui/dbui/customizeaddresslistdialog.cxx index 5db3c7c13238..5ea06651f1bb 100644 --- a/sw/source/ui/dbui/customizeaddresslistdialog.cxx +++ b/sw/source/ui/dbui/customizeaddresslistdialog.cxx @@ -60,7 +60,7 @@ SwCustomizeAddressListDialog::SwCustomizeAddressListDialog( SwCustomizeAddressListDialog::~SwCustomizeAddressListDialog() { - dispose(); + disposeOnce(); } void SwCustomizeAddressListDialog::dispose() @@ -197,7 +197,7 @@ SwAddRenameEntryDialog::SwAddRenameEntryDialog( SwAddRenameEntryDialog::~SwAddRenameEntryDialog() { - dispose(); + disposeOnce(); } void SwAddRenameEntryDialog::dispose() diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx index 4c8da211625c..64ee14a97e94 100644 --- a/sw/source/ui/dbui/dbinsdlg.cxx +++ b/sw/source/ui/dbui/dbinsdlg.cxx @@ -412,7 +412,7 @@ SwInsertDBColAutoPilot::SwInsertDBColAutoPilot( SwView& rView, SwInsertDBColAutoPilot::~SwInsertDBColAutoPilot() { - dispose(); + disposeOnce(); } void SwInsertDBColAutoPilot::dispose() diff --git a/sw/source/ui/dbui/dbtablepreviewdialog.cxx b/sw/source/ui/dbui/dbtablepreviewdialog.cxx index d62f410a56b6..fd9e2eb34f5c 100644 --- a/sw/source/ui/dbui/dbtablepreviewdialog.cxx +++ b/sw/source/ui/dbui/dbtablepreviewdialog.cxx @@ -81,7 +81,7 @@ SwDBTablePreviewDialog::SwDBTablePreviewDialog(vcl::Window* pParent, uno::Sequen SwDBTablePreviewDialog::~SwDBTablePreviewDialog() { - dispose(); + disposeOnce(); } void SwDBTablePreviewDialog::dispose() diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index 73476fd633cd..257ee386eeac 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -95,7 +95,7 @@ SwMailMergeAddressBlockPage::SwMailMergeAddressBlockPage( SwMailMergeWizard* _pP SwMailMergeAddressBlockPage::~SwMailMergeAddressBlockPage() { - dispose(); + disposeOnce(); } void SwMailMergeAddressBlockPage::dispose() @@ -356,7 +356,7 @@ SwSelectAddressBlockDialog::SwSelectAddressBlockDialog( SwSelectAddressBlockDialog::~SwSelectAddressBlockDialog() { - dispose(); + disposeOnce(); } void SwSelectAddressBlockDialog::dispose() @@ -573,7 +573,7 @@ SwCustomizeAddressBlockDialog::SwCustomizeAddressBlockDialog( SwCustomizeAddressBlockDialog::~SwCustomizeAddressBlockDialog() { - dispose(); + disposeOnce(); } void SwCustomizeAddressBlockDialog::dispose() @@ -984,7 +984,7 @@ void SwAssignFieldsControl::Init(SwMailMergeConfigItem& rConfigItem) SwAssignFieldsControl::~SwAssignFieldsControl() { - dispose(); + disposeOnce(); } void SwAssignFieldsControl::dispose() @@ -1209,7 +1209,7 @@ SwAssignFieldsDialog::SwAssignFieldsDialog( SwAssignFieldsDialog::~SwAssignFieldsDialog() { - dispose(); + disposeOnce(); } void SwAssignFieldsDialog::dispose() @@ -1273,7 +1273,7 @@ DDListBox::DDListBox(vcl::Window* pParent, WinBits nStyle) DDListBox::~DDListBox() { - dispose(); + disposeOnce(); } void DDListBox::dispose() @@ -1329,7 +1329,7 @@ AddressMultiLineEdit::AddressMultiLineEdit(vcl::Window* pParent, WinBits nBits) AddressMultiLineEdit::~AddressMultiLineEdit() { - dispose(); + disposeOnce(); } void AddressMultiLineEdit::dispose() diff --git a/sw/source/ui/dbui/mmdocselectpage.cxx b/sw/source/ui/dbui/mmdocselectpage.cxx index fff60188bdd3..61a45467b825 100644 --- a/sw/source/ui/dbui/mmdocselectpage.cxx +++ b/sw/source/ui/dbui/mmdocselectpage.cxx @@ -92,7 +92,7 @@ SwMailMergeDocSelectPage::SwMailMergeDocSelectPage(SwMailMergeWizard* pParent) SwMailMergeDocSelectPage::~SwMailMergeDocSelectPage() { - dispose(); + disposeOnce(); } void SwMailMergeDocSelectPage::dispose() diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx index 15aa60b137cb..15800991ffd9 100644 --- a/sw/source/ui/dbui/mmgreetingspage.cxx +++ b/sw/source/ui/dbui/mmgreetingspage.cxx @@ -292,7 +292,7 @@ SwMailMergeGreetingsPage::SwMailMergeGreetingsPage(SwMailMergeWizard* _pParent) SwMailMergeGreetingsPage::~SwMailMergeGreetingsPage() { - dispose(); + disposeOnce(); } void SwMailMergeGreetingsPage::dispose() @@ -484,7 +484,7 @@ SwMailBodyDialog::SwMailBodyDialog(vcl::Window* pParent, SwMailMergeWizard* _pWi SwMailBodyDialog::~SwMailBodyDialog() { - dispose(); + disposeOnce(); } void SwMailBodyDialog::dispose() diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx index c02333126595..e00f986e5ef0 100644 --- a/sw/source/ui/dbui/mmlayoutpage.cxx +++ b/sw/source/ui/dbui/mmlayoutpage.cxx @@ -155,7 +155,7 @@ SwMailMergeLayoutPage::SwMailMergeLayoutPage( SwMailMergeWizard* _pParent) : SwMailMergeLayoutPage::~SwMailMergeLayoutPage() { - dispose(); + disposeOnce(); } void SwMailMergeLayoutPage::dispose() diff --git a/sw/source/ui/dbui/mmmergepage.cxx b/sw/source/ui/dbui/mmmergepage.cxx index f2e416933d8f..98233636a574 100644 --- a/sw/source/ui/dbui/mmmergepage.cxx +++ b/sw/source/ui/dbui/mmmergepage.cxx @@ -52,7 +52,7 @@ SwMailMergeMergePage::SwMailMergeMergePage(SwMailMergeWizard* _pParent) SwMailMergeMergePage::~SwMailMergeMergePage() { - dispose(); + disposeOnce(); } void SwMailMergeMergePage::dispose() diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx index 1de413396689..00cdcef4e8d3 100644 --- a/sw/source/ui/dbui/mmoutputpage.cxx +++ b/sw/source/ui/dbui/mmoutputpage.cxx @@ -205,7 +205,7 @@ public: get(m_pCCED, "cc"); get(m_pBCCED, "bcc"); } - virtual ~SwCopyToDialog() { dispose(); } + virtual ~SwCopyToDialog() { disposeOnce(); } virtual void dispose() SAL_OVERRIDE { m_pCCED.clear(); @@ -307,7 +307,7 @@ SwMailMergeOutputPage::SwMailMergeOutputPage(SwMailMergeWizard* _pParent) SwMailMergeOutputPage::~SwMailMergeOutputPage() { - dispose(); + disposeOnce(); } void SwMailMergeOutputPage::dispose() diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx index 9ce000b6c072..f7d8ab3c7a48 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.cxx +++ b/sw/source/ui/dbui/mmoutputtypepage.cxx @@ -50,7 +50,7 @@ SwMailMergeOutputTypePage::SwMailMergeOutputTypePage(SwMailMergeWizard* pParent) SwMailMergeOutputTypePage::~SwMailMergeOutputTypePage() { - dispose(); + disposeOnce(); } void SwMailMergeOutputTypePage::dispose() @@ -227,7 +227,7 @@ class SwSendWarningBox_Impl : public MessageDialog VclPtr<VclMultiLineEdit> m_pDetailED; public: SwSendWarningBox_Impl(vcl::Window* pParent, const OUString& rDetails); - virtual ~SwSendWarningBox_Impl() { dispose(); } + virtual ~SwSendWarningBox_Impl() { disposeOnce(); } virtual void dispose() SAL_OVERRIDE { m_pDetailED.clear(); @@ -305,7 +305,7 @@ SwSendMailDialog::SwSendMailDialog(vcl::Window *pParent, SwMailMergeConfigItem& SwSendMailDialog::~SwSendMailDialog() { - dispose(); + disposeOnce(); } void SwSendMailDialog::dispose() diff --git a/sw/source/ui/dbui/mmpreparemergepage.cxx b/sw/source/ui/dbui/mmpreparemergepage.cxx index d768c8842c95..702b26b156b1 100644 --- a/sw/source/ui/dbui/mmpreparemergepage.cxx +++ b/sw/source/ui/dbui/mmpreparemergepage.cxx @@ -60,7 +60,7 @@ SwMailMergePrepareMergePage::SwMailMergePrepareMergePage( SwMailMergeWizard* _pP SwMailMergePrepareMergePage::~SwMailMergePrepareMergePage() { - dispose(); + disposeOnce(); } void SwMailMergePrepareMergePage::dispose() diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx index eb992058b7e4..309ccb8669d2 100644 --- a/sw/source/ui/dbui/selectdbtabledialog.cxx +++ b/sw/source/ui/dbui/selectdbtabledialog.cxx @@ -147,7 +147,7 @@ SwSelectDBTableDialog::SwSelectDBTableDialog(vcl::Window* pParent, SwSelectDBTableDialog::~SwSelectDBTableDialog() { - dispose(); + disposeOnce(); } void SwSelectDBTableDialog::dispose() diff --git a/sw/source/ui/dialog/abstract.cxx b/sw/source/ui/dialog/abstract.cxx index 192da3c1db61..a5de42b69a6c 100644 --- a/sw/source/ui/dialog/abstract.cxx +++ b/sw/source/ui/dialog/abstract.cxx @@ -33,7 +33,7 @@ SwInsertAbstractDlg::SwInsertAbstractDlg(vcl::Window* pParent) SwInsertAbstractDlg::~SwInsertAbstractDlg() { - dispose(); + disposeOnce(); } void SwInsertAbstractDlg::dispose() diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx index 6960908454c5..d1b64723f7a3 100644 --- a/sw/source/ui/dialog/ascfldlg.cxx +++ b/sw/source/ui/dialog/ascfldlg.cxx @@ -242,7 +242,7 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( vcl::Window* pParent, SwDocShell& rDocSh, SwAsciiFilterDlg::~SwAsciiFilterDlg() { - dispose(); + disposeOnce(); } void SwAsciiFilterDlg::dispose() diff --git a/sw/source/ui/dialog/docstdlg.cxx b/sw/source/ui/dialog/docstdlg.cxx index 9e7612165935..5277c4930760 100644 --- a/sw/source/ui/dialog/docstdlg.cxx +++ b/sw/source/ui/dialog/docstdlg.cxx @@ -75,7 +75,7 @@ SwDocStatPage::SwDocStatPage(vcl::Window *pParent, const SfxItemSet &rSet) SwDocStatPage::~SwDocStatPage() { - dispose(); + disposeOnce(); } void SwDocStatPage::dispose() diff --git a/sw/source/ui/dialog/swmessdialog.cxx b/sw/source/ui/dialog/swmessdialog.cxx index a93e12a1de40..79aba4459af6 100644 --- a/sw/source/ui/dialog/swmessdialog.cxx +++ b/sw/source/ui/dialog/swmessdialog.cxx @@ -32,7 +32,7 @@ SwMessageAndEditDialog::SwMessageAndEditDialog(vcl::Window* pParent, const OUStr SwMessageAndEditDialog::~SwMessageAndEditDialog() { - dispose(); + disposeOnce(); } void SwMessageAndEditDialog::dispose() diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 6896f5c9b457..8d97a7acd0c5 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -516,7 +516,7 @@ sal_uInt16 SwEditRegionDlg::FindArrPos(const SwSectionFmt* pFmt ) SwEditRegionDlg::~SwEditRegionDlg( ) { - dispose(); + disposeOnce(); } void SwEditRegionDlg::dispose() @@ -1561,7 +1561,7 @@ SwInsertSectionTabPage::SwInsertSectionTabPage( SwInsertSectionTabPage::~SwInsertSectionTabPage() { - dispose(); + disposeOnce(); } void SwInsertSectionTabPage::dispose() @@ -1886,7 +1886,7 @@ SwSectionFtnEndTabPage::SwSectionFtnEndTabPage( vcl::Window *pParent, SwSectionFtnEndTabPage::~SwSectionFtnEndTabPage() { - dispose(); + disposeOnce(); } void SwSectionFtnEndTabPage::dispose() @@ -2173,7 +2173,7 @@ SwSectionIndentTabPage::SwSectionIndentTabPage(vcl::Window *pParent, const SfxIt SwSectionIndentTabPage::~SwSectionIndentTabPage() { - dispose(); + disposeOnce(); } void SwSectionIndentTabPage::dispose() diff --git a/sw/source/ui/dialog/wordcountdialog.cxx b/sw/source/ui/dialog/wordcountdialog.cxx index 8f0ff7daaefa..471309e2e92b 100644 --- a/sw/source/ui/dialog/wordcountdialog.cxx +++ b/sw/source/ui/dialog/wordcountdialog.cxx @@ -46,7 +46,7 @@ IMPL_LINK_NOARG(SwWordCountFloatDlg, CloseHdl) SwWordCountFloatDlg::~SwWordCountFloatDlg() { - dispose(); + disposeOnce(); } void SwWordCountFloatDlg::dispose() diff --git a/sw/source/ui/dochdl/selglos.cxx b/sw/source/ui/dochdl/selglos.cxx index 5809ab2c5667..2cde14cea56d 100644 --- a/sw/source/ui/dochdl/selglos.cxx +++ b/sw/source/ui/dochdl/selglos.cxx @@ -37,7 +37,7 @@ SwSelGlossaryDlg::SwSelGlossaryDlg(vcl::Window * pParent, const OUString &rShort SwSelGlossaryDlg::~SwSelGlossaryDlg() { - dispose(); + disposeOnce(); } void SwSelGlossaryDlg::dispose() diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx index 943aa0b3c298..518d1de4272c 100644 --- a/sw/source/ui/envelp/envfmt.cxx +++ b/sw/source/ui/envelp/envfmt.cxx @@ -199,7 +199,7 @@ SwEnvFmtPage::SwEnvFmtPage(vcl::Window* pParent, const SfxItemSet& rSet) SwEnvFmtPage::~SwEnvFmtPage() { - dispose(); + disposeOnce(); } void SwEnvFmtPage::dispose() diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx index b0df406c14d0..356630732526 100644 --- a/sw/source/ui/envelp/envlop1.cxx +++ b/sw/source/ui/envelp/envlop1.cxx @@ -153,7 +153,7 @@ SwEnvDlg::SwEnvDlg(vcl::Window* pParent, const SfxItemSet& rSet, SwEnvDlg::~SwEnvDlg() { - dispose(); + disposeOnce(); } void SwEnvDlg::dispose() @@ -235,7 +235,7 @@ SwEnvPage::SwEnvPage(vcl::Window* pParent, const SfxItemSet& rSet) SwEnvPage::~SwEnvPage() { - dispose(); + disposeOnce(); } void SwEnvPage::dispose() diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx index 02c99db21905..79f353bf19c4 100644 --- a/sw/source/ui/envelp/envprt.cxx +++ b/sw/source/ui/envelp/envprt.cxx @@ -69,7 +69,7 @@ SwEnvPrtPage::SwEnvPrtPage(vcl::Window* pParent, const SfxItemSet& rSet) SwEnvPrtPage::~SwEnvPrtPage() { - dispose(); + disposeOnce(); } void SwEnvPrtPage::dispose() diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index c91582b3a92c..9883e9a99b14 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -170,7 +170,7 @@ SwLabDlg::SwLabDlg(vcl::Window* pParent, const SfxItemSet& rSet, SwLabDlg::~SwLabDlg() { - dispose(); + disposeOnce(); } void SwLabDlg::dispose() @@ -295,7 +295,7 @@ SwLabPage::SwLabPage(vcl::Window* pParent, const SfxItemSet& rSet) SwLabPage::~SwLabPage() { - dispose(); + disposeOnce(); } void SwLabPage::dispose() @@ -616,7 +616,7 @@ SwVisitingCardPage::SwVisitingCardPage(vcl::Window* pParent, const SfxItemSet& r SwVisitingCardPage::~SwVisitingCardPage() { - dispose(); + disposeOnce(); } void SwVisitingCardPage::dispose() @@ -768,7 +768,7 @@ SwPrivateDataPage::SwPrivateDataPage(vcl::Window* pParent, const SfxItemSet& rSe SwPrivateDataPage::~SwPrivateDataPage() { - dispose(); + disposeOnce(); } void SwPrivateDataPage::dispose() @@ -884,7 +884,7 @@ SwBusinessDataPage::SwBusinessDataPage(vcl::Window* pParent, const SfxItemSet& r SwBusinessDataPage::~SwBusinessDataPage() { - dispose(); + disposeOnce(); } void SwBusinessDataPage::dispose() diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx index 0b2a826bfedf..5e526acaec33 100644 --- a/sw/source/ui/envelp/labfmt.cxx +++ b/sw/source/ui/envelp/labfmt.cxx @@ -353,7 +353,7 @@ SwLabFmtPage::SwLabFmtPage(vcl::Window* pParent, const SfxItemSet& rSet) SwLabFmtPage::~SwLabFmtPage() { - dispose(); + disposeOnce(); } void SwLabFmtPage::dispose() @@ -623,7 +623,7 @@ SwSaveLabelDlg::SwSaveLabelDlg(SwLabFmtPage* pParent, SwLabRec& rRec) SwSaveLabelDlg::~SwSaveLabelDlg() { - dispose(); + disposeOnce(); } void SwSaveLabelDlg::dispose() diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx index c52b88f07885..f7c304c946fe 100644 --- a/sw/source/ui/envelp/labprt.cxx +++ b/sw/source/ui/envelp/labprt.cxx @@ -62,7 +62,7 @@ SwLabPrtPage::SwLabPrtPage(vcl::Window* pParent, const SfxItemSet& rSet) SwLabPrtPage::~SwLabPrtPage() { - dispose(); + disposeOnce(); } void SwLabPrtPage::dispose() diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index e7f9173940cc..bab81b74d716 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -389,7 +389,7 @@ SwMailMergeDlg::SwMailMergeDlg(vcl::Window* pParent, SwWrtShell& rShell, SwMailMergeDlg::~SwMailMergeDlg() { - dispose(); + disposeOnce(); } void SwMailMergeDlg::dispose() @@ -673,7 +673,7 @@ SwMailMergeCreateFromDlg::SwMailMergeCreateFromDlg(vcl::Window* pParent) SwMailMergeCreateFromDlg::~SwMailMergeCreateFromDlg() { - dispose(); + disposeOnce(); } void SwMailMergeCreateFromDlg::dispose() @@ -691,7 +691,7 @@ SwMailMergeFieldConnectionsDlg::SwMailMergeFieldConnectionsDlg(vcl::Window* pPar SwMailMergeFieldConnectionsDlg::~SwMailMergeFieldConnectionsDlg() { - dispose(); + disposeOnce(); } void SwMailMergeFieldConnectionsDlg::dispose() diff --git a/sw/source/ui/fldui/DropDownFieldDialog.cxx b/sw/source/ui/fldui/DropDownFieldDialog.cxx index 13453cadb517..12ebb825233a 100644 --- a/sw/source/ui/fldui/DropDownFieldDialog.cxx +++ b/sw/source/ui/fldui/DropDownFieldDialog.cxx @@ -73,7 +73,7 @@ sw::DropDownFieldDialog::DropDownFieldDialog(vcl::Window *pParent, SwWrtShell &r sw::DropDownFieldDialog::~DropDownFieldDialog() { - dispose(); + disposeOnce(); } void sw::DropDownFieldDialog::dispose() diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx index 224f56b9184e..b94c049dd59f 100644 --- a/sw/source/ui/fldui/changedb.cxx +++ b/sw/source/ui/fldui/changedb.cxx @@ -164,7 +164,7 @@ SvTreeListEntry* SwChangeDBDlg::Insert(const OUString& rDBName) // destroy dialog SwChangeDBDlg::~SwChangeDBDlg() { - dispose(); + disposeOnce(); } void SwChangeDBDlg::dispose() diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx index 5faa704ee43c..a05a7f23f7bc 100644 --- a/sw/source/ui/fldui/flddb.cxx +++ b/sw/source/ui/fldui/flddb.cxx @@ -74,7 +74,7 @@ SwFldDBPage::SwFldDBPage(vcl::Window* pParent, const SfxItemSet& rCoreSet) SwFldDBPage::~SwFldDBPage() { - dispose(); + disposeOnce(); } void SwFldDBPage::dispose() diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index 58a9fd04a051..d5d41f3c9496 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -89,7 +89,7 @@ SwFldDokInfPage::SwFldDokInfPage(vcl::Window* pParent, const SfxItemSet& rCoreSe SwFldDokInfPage::~SwFldDokInfPage() { - dispose(); + disposeOnce(); } void SwFldDokInfPage::dispose() diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx index 18df09e769c6..274414181dab 100644 --- a/sw/source/ui/fldui/flddok.cxx +++ b/sw/source/ui/fldui/flddok.cxx @@ -80,7 +80,7 @@ SwFldDokPage::SwFldDokPage(vcl::Window* pParent, const SfxItemSet& rCoreSet ) SwFldDokPage::~SwFldDokPage() { - dispose(); + disposeOnce(); } void SwFldDokPage::dispose() diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx index f936b66cff47..2bcc08d16209 100644 --- a/sw/source/ui/fldui/fldedt.cxx +++ b/sw/source/ui/fldui/fldedt.cxx @@ -214,7 +214,7 @@ SfxTabPage* SwFldEditDlg::CreatePage(sal_uInt16 nGroup) SwFldEditDlg::~SwFldEditDlg() { - dispose(); + disposeOnce(); } void SwFldEditDlg::dispose() diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx index 944512b429d8..07d0fdda56eb 100644 --- a/sw/source/ui/fldui/fldfunc.cxx +++ b/sw/source/ui/fldui/fldfunc.cxx @@ -91,7 +91,7 @@ SwFldFuncPage::SwFldFuncPage(vcl::Window* pParent, const SfxItemSet& rCoreSet) SwFldFuncPage::~SwFldFuncPage() { - dispose(); + disposeOnce(); } void SwFldFuncPage::dispose() diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index 4bb357ea51f0..527e44c0bd74 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -107,7 +107,7 @@ SwFldRefPage::SwFldRefPage(vcl::Window* pParent, const SfxItemSet& rCoreSet ) SwFldRefPage::~SwFldRefPage() { - dispose(); + disposeOnce(); } void SwFldRefPage::dispose() diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index 9452d9847eac..1163e0ac5b43 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -87,7 +87,7 @@ SwFldVarPage::SwFldVarPage(vcl::Window* pParent, const SfxItemSet& rCoreSet ) SwFldVarPage::~SwFldVarPage() { - dispose(); + disposeOnce(); } void SwFldVarPage::dispose() diff --git a/sw/source/ui/fldui/inpdlg.cxx b/sw/source/ui/fldui/inpdlg.cxx index 38226fa20b53..1da4ca51f107 100644 --- a/sw/source/ui/fldui/inpdlg.cxx +++ b/sw/source/ui/fldui/inpdlg.cxx @@ -108,7 +108,7 @@ SwFldInputDlg::SwFldInputDlg( vcl::Window *pParent, SwWrtShell &rS, SwFldInputDlg::~SwFldInputDlg() { - dispose(); + disposeOnce(); } void SwFldInputDlg::dispose() diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx index a265ff895ddf..7df369a9526c 100644 --- a/sw/source/ui/fldui/javaedit.cxx +++ b/sw/source/ui/fldui/javaedit.cxx @@ -88,7 +88,7 @@ SwJavaEditDialog::SwJavaEditDialog(vcl::Window* pParent, SwWrtShell* pWrtSh) : SwJavaEditDialog::~SwJavaEditDialog() { - dispose(); + disposeOnce(); } void SwJavaEditDialog::dispose() diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index 7a8e03665d1a..4f14a5e79ef7 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -214,7 +214,7 @@ SwColumnDlg::SwColumnDlg(vcl::Window* pParent, SwWrtShell& rSh) SwColumnDlg::~SwColumnDlg() { - dispose(); + disposeOnce(); } void SwColumnDlg::dispose() @@ -549,7 +549,7 @@ SwColumnPage::SwColumnPage(vcl::Window *pParent, const SfxItemSet &rSet) SwColumnPage::~SwColumnPage() { - dispose(); + disposeOnce(); } void SwColumnPage::dispose() diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx index 82d350bddb20..e3c3f9eeb4ff 100644 --- a/sw/source/ui/frmdlg/cption.cxx +++ b/sw/source/ui/frmdlg/cption.cxx @@ -412,7 +412,7 @@ void SwCaptionDialog::DrawSample() SwCaptionDialog::~SwCaptionDialog() { - dispose(); + disposeOnce(); } void SwCaptionDialog::dispose() @@ -476,7 +476,7 @@ SwSequenceOptionDialog::SwSequenceOptionDialog( vcl::Window *pParent, SwView &rV SwSequenceOptionDialog::~SwSequenceOptionDialog() { - dispose(); + disposeOnce(); } void SwSequenceOptionDialog::dispose() diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 34254ac6b705..f5ca75f20e77 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -714,7 +714,7 @@ SwFrmPage::SwFrmPage(vcl::Window *pParent, const SfxItemSet &rSet) SwFrmPage::~SwFrmPage() { - dispose(); + disposeOnce(); } void SwFrmPage::dispose() @@ -2403,7 +2403,7 @@ SwGrfExtPage::SwGrfExtPage(vcl::Window *pParent, const SfxItemSet &rSet) SwGrfExtPage::~SwGrfExtPage() { - dispose(); + disposeOnce(); } void SwGrfExtPage::dispose() @@ -2756,7 +2756,7 @@ SwFrmURLPage::SwFrmURLPage( vcl::Window *pParent, const SfxItemSet &rSet ) : SwFrmURLPage::~SwFrmURLPage() { - dispose(); + disposeOnce(); } void SwFrmURLPage::dispose() @@ -2910,7 +2910,7 @@ SwFrmAddPage::SwFrmAddPage(vcl::Window *pParent, const SfxItemSet &rSet) SwFrmAddPage::~SwFrmAddPage() { - dispose(); + disposeOnce(); } void SwFrmAddPage::dispose() diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx index df3c5c76e676..56ab5d9d0d3d 100644 --- a/sw/source/ui/frmdlg/wrap.cxx +++ b/sw/source/ui/frmdlg/wrap.cxx @@ -133,7 +133,7 @@ SwWrapTabPage::SwWrapTabPage(vcl::Window *pParent, const SfxItemSet &rSet) SwWrapTabPage::~SwWrapTabPage() { - dispose(); + disposeOnce(); } void SwWrapTabPage::dispose() diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 784cfc0e383e..76dccb98d8e7 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -322,7 +322,7 @@ SwMultiTOXTabDialog::SwMultiTOXTabDialog(vcl::Window* pParent, const SfxItemSet& SwMultiTOXTabDialog::~SwMultiTOXTabDialog() { - dispose(); + disposeOnce(); } void SwMultiTOXTabDialog::dispose() @@ -718,7 +718,7 @@ SwAddStylesDlg_Impl::SwAddStylesDlg_Impl(vcl::Window* pParent, SwAddStylesDlg_Impl::~SwAddStylesDlg_Impl() { - dispose(); + disposeOnce(); } void SwAddStylesDlg_Impl::dispose() @@ -902,7 +902,7 @@ SwTOXSelectTabPage::SwTOXSelectTabPage(vcl::Window* pParent, const SfxItemSet& r SwTOXSelectTabPage::~SwTOXSelectTabPage() { - dispose(); + disposeOnce(); } void SwTOXSelectTabPage::dispose() @@ -1538,7 +1538,7 @@ public: m_pParent( pTokenWin ) { } - virtual ~SwTOXEdit() { dispose(); } + virtual ~SwTOXEdit() { disposeOnce(); } virtual void dispose() SAL_OVERRIDE { m_pParent.clear(); Edit::dispose(); } virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; @@ -1625,8 +1625,13 @@ public: m_pParent(pTokenWin) { } +<<<<<<< HEAD virtual ~SwTOXButton() { dispose(); } virtual void dispose() SAL_OVERRIDE { m_pParent.clear(); PushButton::dispose(); } +======= + virtual ~SwTOXButton() { disposeOnce(); } + virtual void dispose() SAL_OVERRIDE { m_pParent.disposeAndClear(); PushButton::dispose(); } +>>>>>>> 82c89a6... vclwidget: only call dispose() once virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; @@ -1749,7 +1754,7 @@ SwIdxTreeListBox::SwIdxTreeListBox(vcl::Window* pPar, WinBits nStyle) SwIdxTreeListBox::~SwIdxTreeListBox() { - dispose(); + disposeOnce(); } void SwIdxTreeListBox::dispose() @@ -1959,7 +1964,7 @@ SwTOXEntryTabPage::SwTOXEntryTabPage(vcl::Window* pParent, const SfxItemSet& rAt SwTOXEntryTabPage::~SwTOXEntryTabPage() { - dispose(); + disposeOnce(); } void SwTOXEntryTabPage::dispose() @@ -2760,7 +2765,7 @@ void SwTokenWindow::setAllocation(const Size &rAllocation) SwTokenWindow::~SwTokenWindow() { - dispose(); + disposeOnce(); } void SwTokenWindow::dispose() @@ -3652,7 +3657,7 @@ SwTOXStylesTabPage::SwTOXStylesTabPage(vcl::Window* pParent, const SfxItemSet& r SwTOXStylesTabPage::~SwTOXStylesTabPage() { - dispose(); + disposeOnce(); } void SwTOXStylesTabPage::dispose() @@ -3913,7 +3918,7 @@ SwEntryBrowseBox::SwEntryBrowseBox(vcl::Window* pParent, VclBuilderContainer* pB SwEntryBrowseBox::~SwEntryBrowseBox() { - dispose(); + disposeOnce(); } void SwEntryBrowseBox::dispose() @@ -4212,7 +4217,7 @@ SwAutoMarkDlg_Impl::SwAutoMarkDlg_Impl(vcl::Window* pParent, const OUString& rAu SwAutoMarkDlg_Impl::~SwAutoMarkDlg_Impl() { - dispose(); + disposeOnce(); } void SwAutoMarkDlg_Impl::dispose() diff --git a/sw/source/ui/index/multmrk.cxx b/sw/source/ui/index/multmrk.cxx index 5d1dfa03fbee..51cffaccac1b 100644 --- a/sw/source/ui/index/multmrk.cxx +++ b/sw/source/ui/index/multmrk.cxx @@ -63,7 +63,7 @@ void SwMultiTOXMarkDlg::Apply() SwMultiTOXMarkDlg::~SwMultiTOXMarkDlg() { - dispose(); + disposeOnce(); } void SwMultiTOXMarkDlg::dispose() diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index 653ba8bd8465..5c42b0d2c461 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -565,7 +565,7 @@ class SwNewUserIdxDlg : public ModalDialog m_pOKPB->Enable(false); m_pNameED->GrabFocus(); } - virtual ~SwNewUserIdxDlg() { dispose(); } + virtual ~SwNewUserIdxDlg() { disposeOnce(); } virtual void dispose() SAL_OVERRIDE { m_pOKPB.clear(); @@ -1527,7 +1527,7 @@ SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(vcl::Window* pParent, SwCreateAuthEntryDlg_Impl::~SwCreateAuthEntryDlg_Impl() { - dispose(); + disposeOnce(); } void SwCreateAuthEntryDlg_Impl::dispose() diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx index 13bc3e733168..5eaf63a98ddb 100644 --- a/sw/source/ui/misc/bookmark.cxx +++ b/sw/source/ui/misc/bookmark.cxx @@ -147,7 +147,7 @@ SwInsertBookmarkDlg::SwInsertBookmarkDlg( vcl::Window *pParent, SwWrtShell &rS, SwInsertBookmarkDlg::~SwInsertBookmarkDlg() { - dispose(); + disposeOnce(); } void SwInsertBookmarkDlg::dispose() diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx index 49bd6c9e0624..73fb01038128 100644 --- a/sw/source/ui/misc/docfnote.cxx +++ b/sw/source/ui/misc/docfnote.cxx @@ -119,7 +119,7 @@ SwEndNoteOptionPage::SwEndNoteOptionPage(vcl::Window *pParent, bool bEN, SwEndNoteOptionPage::~SwEndNoteOptionPage() { - dispose(); + disposeOnce(); } void SwEndNoteOptionPage::dispose() diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx index 26b2b9407202..d5baec16a62d 100644 --- a/sw/source/ui/misc/glosbib.cxx +++ b/sw/source/ui/misc/glosbib.cxx @@ -112,7 +112,7 @@ SwGlossaryGroupDlg::SwGlossaryGroupDlg(vcl::Window * pParent, SwGlossaryGroupDlg::~SwGlossaryGroupDlg() { - dispose(); + disposeOnce(); } void SwGlossaryGroupDlg::dispose() diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index 42f0b992a54c..bcc826ec51fa 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -160,7 +160,7 @@ SwNewGlosNameDlg::SwNewGlosNameDlg(vcl::Window* pParent, SwNewGlosNameDlg::~SwNewGlosNameDlg() { - dispose(); + disposeOnce(); } void SwNewGlosNameDlg::dispose() @@ -249,7 +249,7 @@ SwGlossaryDlg::SwGlossaryDlg(SfxViewFrame* pViewFrame, SwGlossaryDlg::~SwGlossaryDlg() { - dispose(); + disposeOnce(); } void SwGlossaryDlg::dispose() diff --git a/sw/source/ui/misc/insfnote.cxx b/sw/source/ui/misc/insfnote.cxx index 023db178128d..0824f3de8fd3 100644 --- a/sw/source/ui/misc/insfnote.cxx +++ b/sw/source/ui/misc/insfnote.cxx @@ -204,7 +204,7 @@ SwInsFootNoteDlg::SwInsFootNoteDlg(vcl::Window *pParent, SwWrtShell &rShell, boo SwInsFootNoteDlg::~SwInsFootNoteDlg() { - dispose(); + disposeOnce(); } void SwInsFootNoteDlg::dispose() diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx index ee634066417d..b14903c9e170 100644 --- a/sw/source/ui/misc/linenum.cxx +++ b/sw/source/ui/misc/linenum.cxx @@ -169,7 +169,7 @@ SwLineNumberingDlg::SwLineNumberingDlg(SwView *pVw) SwLineNumberingDlg::~SwLineNumberingDlg() { - dispose(); + disposeOnce(); } void SwLineNumberingDlg::dispose() diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index 69d7d24f605e..5fd96981c7b8 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -163,7 +163,7 @@ SwNumPositionTabPage::SwNumPositionTabPage(vcl::Window* pParent, SwNumPositionTabPage::~SwNumPositionTabPage() { - dispose(); + disposeOnce(); } void SwNumPositionTabPage::dispose() diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index c4216d09eab1..9d6d290341e6 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -79,7 +79,7 @@ public: SwNumNamesDlg::~SwNumNamesDlg() { - dispose(); + disposeOnce(); } void SwNumNamesDlg::dispose() @@ -209,7 +209,7 @@ SwOutlineTabDialog::SwOutlineTabDialog(vcl::Window* pParent, const SfxItemSet* p SwOutlineTabDialog::~SwOutlineTabDialog() { - dispose(); + disposeOnce(); } void SwOutlineTabDialog::dispose() @@ -762,7 +762,7 @@ IMPL_LINK_NOARG(SwOutlineSettingsTabPage, CharFmtHdl) SwOutlineSettingsTabPage::~SwOutlineSettingsTabPage() { - dispose(); + disposeOnce(); } void SwOutlineSettingsTabPage::dispose() diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx index cd75060e3e82..8f1551cecc7e 100644 --- a/sw/source/ui/misc/pgfnote.cxx +++ b/sw/source/ui/misc/pgfnote.cxx @@ -135,7 +135,7 @@ SwFootNotePage::SwFootNotePage(vcl::Window *pParent, const SfxItemSet &rSet) SwFootNotePage::~SwFootNotePage() { - dispose(); + disposeOnce(); } void SwFootNotePage::dispose() diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx index 0ff7f97a51ac..df7cbcd2a4ed 100644 --- a/sw/source/ui/misc/pggrid.cxx +++ b/sw/source/ui/misc/pggrid.cxx @@ -151,7 +151,7 @@ SwTextGridPage::SwTextGridPage(vcl::Window *pParent, const SfxItemSet &rSet) : SwTextGridPage::~SwTextGridPage() { - dispose(); + disposeOnce(); } void SwTextGridPage::dispose() diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx index 1b947836bced..03789e013085 100644 --- a/sw/source/ui/misc/srtdlg.cxx +++ b/sw/source/ui/misc/srtdlg.cxx @@ -250,7 +250,7 @@ SwSortDlg::SwSortDlg(vcl::Window* pParent, SwWrtShell &rShell) SwSortDlg::~SwSortDlg() { - dispose(); + disposeOnce(); } void SwSortDlg::dispose() diff --git a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx index cb8a89e92eba..252e264f4b58 100644 --- a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx +++ b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx @@ -55,7 +55,7 @@ SwModalRedlineAcceptDlg::SwModalRedlineAcceptDlg(vcl::Window *pParent) SwModalRedlineAcceptDlg::~SwModalRedlineAcceptDlg() { - dispose(); + disposeOnce(); } void SwModalRedlineAcceptDlg::dispose() diff --git a/sw/source/ui/misc/titlepage.cxx b/sw/source/ui/misc/titlepage.cxx index da0a0d42e712..5f888f3f7497 100644 --- a/sw/source/ui/misc/titlepage.cxx +++ b/sw/source/ui/misc/titlepage.cxx @@ -270,7 +270,7 @@ IMPL_LINK_NOARG(SwTitlePageDlg, StartPageHdl) SwTitlePageDlg::~SwTitlePageDlg() { - dispose(); + disposeOnce(); } void SwTitlePageDlg::dispose() diff --git a/sw/source/ui/table/colwd.cxx b/sw/source/ui/table/colwd.cxx index b7a212bf6891..50ffa471b6f3 100644 --- a/sw/source/ui/table/colwd.cxx +++ b/sw/source/ui/table/colwd.cxx @@ -68,7 +68,7 @@ SwTableWidthDlg::SwTableWidthDlg(vcl::Window *pParent, SwTableFUNC &rTableFnc ) SwTableWidthDlg::~SwTableWidthDlg() { - dispose(); + disposeOnce(); } void SwTableWidthDlg::dispose() diff --git a/sw/source/ui/table/convert.cxx b/sw/source/ui/table/convert.cxx index 907b6cdc8d39..63fb7aa83277 100644 --- a/sw/source/ui/table/convert.cxx +++ b/sw/source/ui/table/convert.cxx @@ -174,7 +174,7 @@ SwConvertTableDlg::SwConvertTableDlg( SwView& rView, bool bToTable ) SwConvertTableDlg:: ~SwConvertTableDlg() { - dispose(); + disposeOnce(); } void SwConvertTableDlg::dispose() diff --git a/sw/source/ui/table/instable.cxx b/sw/source/ui/table/instable.cxx index d4f9d3a23dfb..e67319432c11 100644 --- a/sw/source/ui/table/instable.cxx +++ b/sw/source/ui/table/instable.cxx @@ -137,7 +137,7 @@ IMPL_LINK_NOARG(SwInsTableDlg, OKHdl) SwInsTableDlg::~SwInsTableDlg() { - dispose(); + disposeOnce(); } void SwInsTableDlg::dispose() diff --git a/sw/source/ui/table/mergetbl.cxx b/sw/source/ui/table/mergetbl.cxx index 6e687b7658ce..1206a8b04842 100644 --- a/sw/source/ui/table/mergetbl.cxx +++ b/sw/source/ui/table/mergetbl.cxx @@ -30,7 +30,7 @@ SwMergeTblDlg::SwMergeTblDlg( vcl::Window *pParent, bool& rWithPrev ) SwMergeTblDlg::~SwMergeTblDlg() { - dispose(); + disposeOnce(); } void SwMergeTblDlg::dispose() diff --git a/sw/source/ui/table/rowht.cxx b/sw/source/ui/table/rowht.cxx index 70cc897d4280..6c8bdb49b0c0 100644 --- a/sw/source/ui/table/rowht.cxx +++ b/sw/source/ui/table/rowht.cxx @@ -77,7 +77,7 @@ SwTableHeightDlg::SwTableHeightDlg(vcl::Window *pParent, SwWrtShell &rS) SwTableHeightDlg::~SwTableHeightDlg() { - dispose(); + disposeOnce(); } void SwTableHeightDlg::dispose() diff --git a/sw/source/ui/table/splittbl.cxx b/sw/source/ui/table/splittbl.cxx index 7fab28173baf..c1d00489c519 100644 --- a/sw/source/ui/table/splittbl.cxx +++ b/sw/source/ui/table/splittbl.cxx @@ -35,7 +35,7 @@ SwSplitTblDlg::SwSplitTblDlg( vcl::Window *pParent, SwWrtShell &rSh ) SwSplitTblDlg::~SwSplitTblDlg() { - dispose(); + disposeOnce(); } void SwSplitTblDlg::dispose() diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index b3d529ce14a8..23103b1b195f 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -107,7 +107,7 @@ SwFormatTablePage::SwFormatTablePage(vcl::Window* pParent, const SfxItemSet& rSe SwFormatTablePage::~SwFormatTablePage() { - dispose(); + disposeOnce(); } void SwFormatTablePage::dispose() @@ -777,7 +777,7 @@ SwTableColumnPage::SwTableColumnPage(vcl::Window* pParent, const SfxItemSet& rSe SwTableColumnPage::~SwTableColumnPage() { - dispose(); + disposeOnce(); } void SwTableColumnPage::dispose() @@ -1352,7 +1352,7 @@ SwTextFlowPage::SwTextFlowPage(vcl::Window* pParent, const SfxItemSet& rSet) SwTextFlowPage::~SwTextFlowPage() { - dispose(); + disposeOnce(); } void SwTextFlowPage::dispose() diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx index 7ddf9351d0d7..49f7f58c2b6a 100644 --- a/sw/source/ui/table/tautofmt.cxx +++ b/sw/source/ui/table/tautofmt.cxx @@ -132,7 +132,7 @@ OUString SwStringInputDlg::GetInputString() const SwStringInputDlg::~SwStringInputDlg() { - dispose(); + disposeOnce(); } void SwStringInputDlg::dispose() @@ -183,7 +183,7 @@ SwAutoFormatDlg::SwAutoFormatDlg( vcl::Window* pParent, SwWrtShell* pWrtShell, SwAutoFormatDlg::~SwAutoFormatDlg() { - dispose(); + disposeOnce(); } void SwAutoFormatDlg::dispose() @@ -565,7 +565,7 @@ void AutoFmtPreview::DetectRTL(SwWrtShell* pWrtShell) AutoFmtPreview::~AutoFmtPreview() { - dispose(); + disposeOnce(); } void AutoFmtPreview::dispose() diff --git a/sw/source/ui/utlui/swrenamexnameddlg.cxx b/sw/source/ui/utlui/swrenamexnameddlg.cxx index 34aae676751f..f2ebdb3a6df5 100644 --- a/sw/source/ui/utlui/swrenamexnameddlg.cxx +++ b/sw/source/ui/utlui/swrenamexnameddlg.cxx @@ -76,7 +76,7 @@ SwRenameXNamedDlg::SwRenameXNamedDlg( vcl::Window* pWin, SwRenameXNamedDlg::~SwRenameXNamedDlg() { - dispose(); + disposeOnce(); } void SwRenameXNamedDlg::dispose() |