diff options
Diffstat (limited to 'cui/source')
193 files changed, 4427 insertions, 1699 deletions
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index a65e56568cdb..82e314ed58bf 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -672,6 +672,17 @@ void SfxAccCfgTabListBox_Impl::InitEntry(SvTreeListEntry* pEntry, SvTabListBox::InitEntry(pEntry, rText, rImage1, rImage2, eButtonKind); } +SfxAccCfgTabListBox_Impl::~SfxAccCfgTabListBox_Impl() +{ + dispose(); +} + +void SfxAccCfgTabListBox_Impl::dispose() +{ + m_pAccelConfigPage.clear(); + SvTabListBox::dispose(); +} + /** select the entry, which match the current key input ... excepting keys, which are used for the dialog itself. */ @@ -830,6 +841,18 @@ void SfxAcceleratorConfigPage::dispose() delete m_pFileDlg; m_pFileDlg = NULL; + m_pEntriesBox.clear(); + m_pOfficeButton.clear(); + m_pModuleButton.clear(); + m_pChangeButton.clear(); + m_pRemoveButton.clear(); + m_pGroupLBox.clear(); + m_pFunctionBox.clear(); + m_pKeyBox.clear(); + m_pLoadButton.clear(); + m_pSaveButton.clear(); + m_pResetButton.clear(); + SfxTabPage::dispose(); } diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 8fc2b26db078..3d0462fb7300 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -1395,6 +1395,17 @@ SvxMenuEntriesListBox::SvxMenuEntriesListBox(vcl::Window* pParent, SvxConfigPage SV_DRAGDROP_APP_DROP); } +SvxMenuEntriesListBox::~SvxMenuEntriesListBox() +{ + dispose(); +} + +void SvxMenuEntriesListBox::dispose() +{ + pPage.clear(); + SvTreeListBox::dispose(); +} + // drag and drop support DragDropMode SvxMenuEntriesListBox::NotifyStartDrag( TransferDataContainer& aTransferDataContainer, SvTreeListEntry* pEntry ) @@ -1542,6 +1553,32 @@ SvxConfigPage::SvxConfigPage(vcl::Window *pParent, const SfxItemSet& rSet) m_pDescriptionField->EnableCursor( false ); } +SvxConfigPage::~SvxConfigPage() +{ + dispose(); +} + +void SvxConfigPage::dispose() +{ + m_pTopLevel.clear(); + m_pTopLevelLabel.clear(); + m_pTopLevelListBox.clear(); + m_pNewTopLevelButton.clear(); + m_pModifyTopLevelButton.clear(); + m_pContents.clear(); + m_pContentsLabel.clear(); + m_pEntries.clear(); + m_pContentsListBox.clear(); + m_pAddCommandsButton.clear(); + m_pModifyCommandButton.clear(); + m_pMoveUpButton.clear(); + m_pMoveDownButton.clear(); + m_pSaveInListBox.clear(); + m_pDescriptionField.clear(); + m_pSelectorDlg.clear(); + SfxTabPage::dispose(); +} + void SvxConfigPage::Reset( const SfxItemSet* ) { // If we haven't initialised our XMultiServiceFactory reference @@ -2206,6 +2243,11 @@ SvxMenuConfigPage::SvxMenuConfigPage(vcl::Window *pParent, const SfxItemSet& rSe LINK( this, SvxMenuConfigPage, EntrySelectHdl ) ); } +SvxMenuConfigPage::~SvxMenuConfigPage() +{ + dispose(); +} + // Populates the Menu combo box void SvxMenuConfigPage::Init() { @@ -2219,11 +2261,6 @@ void SvxMenuConfigPage::Init() m_pTopLevelListBox->GetSelectHdl().Call(this); } -SvxMenuConfigPage::~SvxMenuConfigPage() -{ - dispose(); -} - void SvxMenuConfigPage::dispose() { for ( sal_uInt16 i = 0 ; i < m_pSaveInListBox->GetEntryCount(); ++i ) @@ -2235,11 +2272,8 @@ void SvxMenuConfigPage::dispose() } m_pSaveInListBox->Clear(); - delete m_pSelectorDlg; - m_pSelectorDlg = NULL; - delete m_pContentsListBox; - m_pContentsListBox = NULL; - + m_pSelectorDlg.clear(); + m_pContentsListBox.clear(); SvxConfigPage::dispose(); } @@ -2547,7 +2581,7 @@ IMPL_LINK( SvxMenuConfigPage, AddCommandsHdl, Button *, pButton ) { (void)pButton; - if ( m_pSelectorDlg == NULL ) + if ( m_pSelectorDlg == nullptr ) { // Create Script Selector which also shows builtin commands m_pSelectorDlg = new SvxScriptSelectorDialog( this, true, m_xFrame ); @@ -2660,6 +2694,21 @@ SvxMainMenuOrganizerDialog::SvxMainMenuOrganizerDialog( LINK( this, SvxMainMenuOrganizerDialog, MoveHdl) ); } +SvxMainMenuOrganizerDialog::~SvxMainMenuOrganizerDialog() +{ + dispose(); +} + +void SvxMainMenuOrganizerDialog::dispose() +{ + m_pMenuBox.clear(); + m_pMenuNameEdit.clear(); + m_pMenuListBox.clear(); + m_pMoveUpButton.clear(); + m_pMoveDownButton.clear(); + ModalDialog::dispose(); +} + IMPL_LINK(SvxMainMenuOrganizerDialog, ModifyHdl, Edit*, pEdit) { (void)pEdit; @@ -2931,12 +2980,8 @@ void SvxToolbarConfigPage::dispose() } m_pSaveInListBox->Clear(); - delete m_pSelectorDlg; - m_pSelectorDlg = NULL; - - delete m_pContentsListBox; - m_pContentsListBox = NULL; - + m_pSelectorDlg.clear(); + m_pContentsListBox.clear(); SvxConfigPage::dispose(); } @@ -4457,7 +4502,7 @@ IMPL_LINK( SvxToolbarConfigPage, AddCommandsHdl, Button *, pButton ) { (void)pButton; - if ( m_pSelectorDlg == NULL ) + if ( m_pSelectorDlg == nullptr ) { // Create Script Selector which shows slot commands m_pSelectorDlg = new SvxScriptSelectorDialog( this, true, m_xFrame ); @@ -4537,6 +4582,7 @@ void SvxToolbarEntriesListBox::dispose() delete m_pButtonData; m_pButtonData = NULL; + pPage.clear(); SvxMenuEntriesListBox::dispose(); } @@ -4688,7 +4734,7 @@ TriState SvxToolbarEntriesListBox::NotifyCopying( if ( !m_bIsInternalDrag ) { // if the target is NULL then add function to the start of the list - static_cast<SvxToolbarConfigPage*>(pPage)->AddFunction( pTarget, pTarget == NULL ); + static_cast<SvxToolbarConfigPage*>(pPage.get())->AddFunction( pTarget, pTarget == NULL ); // Instant Apply changes to UI SvxConfigEntry* pToolbar = pPage->GetTopLevelSelection(); @@ -4720,6 +4766,20 @@ SvxNewToolbarDialog::SvxNewToolbarDialog(vcl::Window* pWindow, const OUString& r m_pEdtName->SetModifyHdl(LINK(this, SvxNewToolbarDialog, ModifyHdl)); } +SvxNewToolbarDialog::~SvxNewToolbarDialog() +{ + dispose(); +} + +void SvxNewToolbarDialog::dispose() +{ + m_pEdtName.clear(); + m_pBtnOK.clear(); + m_pSaveInListBox.clear(); + ModalDialog::dispose(); +} + + IMPL_LINK(SvxNewToolbarDialog, ModifyHdl, Edit*, pEdit) { (void)pEdit; @@ -4940,9 +5000,12 @@ void SvxIconSelectorDialog::dispose() if ( xi != NULL ) xi->release(); } - pTbSymbol = NULL; } + pTbSymbol.clear(); + pFtNote.clear(); + pBtnImport.clear(); + pBtnDelete.clear(); ModalDialog::dispose(); } @@ -5388,4 +5451,16 @@ SvxIconChangeDialog::SvxIconChangeDialog( pLineEditDescription->SetText(aMessage); } +SvxIconChangeDialog::~SvxIconChangeDialog() +{ + dispose(); +} + +void SvxIconChangeDialog::dispose() +{ + pFImageInfo.clear(); + pLineEditDescription.clear(); + ModalDialog::dispose(); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx index 373f3b924421..0f399fda43f5 100644 --- a/cui/source/customize/cfgutil.cxx +++ b/cui/source/customize/cfgutil.cxx @@ -435,6 +435,7 @@ SfxConfigGroupListBox::~SfxConfigGroupListBox() void SfxConfigGroupListBox::dispose() { ClearAll(); + pFunctionListBox.clear(); SvTreeListBox::dispose(); } diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx index 79453fc1848d..3ab1816f37d5 100644 --- a/cui/source/customize/eventdlg.cxx +++ b/cui/source/customize/eventdlg.cxx @@ -118,6 +118,7 @@ void SvxEventConfigPage::dispose() pE->SetUserData((void*)0); pE = SvTreeListBox::NextSibling( pE ); } + m_pSaveInListBox.clear(); _SvxMacroTabPage::dispose(); } diff --git a/cui/source/customize/eventdlg.hxx b/cui/source/customize/eventdlg.hxx index 56ea3c41ddab..385df86d1bbb 100644 --- a/cui/source/customize/eventdlg.hxx +++ b/cui/source/customize/eventdlg.hxx @@ -29,7 +29,7 @@ class SvxEventConfigPage : public _SvxMacroTabPage { - ListBox* m_pSaveInListBox; + VclPtr<ListBox> m_pSaveInListBox; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > m_xAppEvents; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > m_xDocumentEvents; diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index 13ae5f461a00..656a2414ddd1 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -888,6 +888,18 @@ AssignComponentDialog::AssignComponentDialog( vcl::Window * pParent, const OUStr mpMethodEdit->SetText( aMethodName, Selection( 0, SELECTION_MAX ) ); } +AssignComponentDialog::~AssignComponentDialog() +{ + dispose(); +} + +void AssignComponentDialog::dispose() +{ + mpMethodEdit.clear(); + mpOKButton.clear(); + ModalDialog::dispose(); +} + IMPL_LINK( SvxMacroAssignSingleTabDialog, OKHdl_Impl, Button *, pButton ) { (void)pButton; //unused diff --git a/cui/source/customize/macropg_impl.hxx b/cui/source/customize/macropg_impl.hxx index 6ec8709a971e..d99a9712e1ff 100644 --- a/cui/source/customize/macropg_impl.hxx +++ b/cui/source/customize/macropg_impl.hxx @@ -25,14 +25,14 @@ class _SvxMacroTabPage_Impl public: _SvxMacroTabPage_Impl( const SfxItemSet& rAttrSet ); - PushButton* pAssignPB; - PushButton* pAssignComponentPB; - PushButton* pDeletePB; + VclPtr<PushButton> pAssignPB; + VclPtr<PushButton> pAssignComponentPB; + VclPtr<PushButton> pDeletePB; Image aMacroImg; Image aComponentImg; OUString sStrEvent; OUString sAssignedMacro; - MacroEventListBox* pEventLB; + VclPtr<MacroEventListBox> pEventLB; bool bReadOnly; bool bIDEDialogMode; }; @@ -40,8 +40,8 @@ public: class AssignComponentDialog : public ModalDialog { private: - Edit* mpMethodEdit; - OKButton* mpOKButton; + VclPtr<Edit> mpMethodEdit; + VclPtr<OKButton> mpOKButton; OUString maURL; @@ -49,6 +49,8 @@ private: public: AssignComponentDialog( vcl::Window * pParent, const OUString& rURL ); + virtual ~AssignComponentDialog(); + virtual void dispose() SAL_OVERRIDE; OUString getURL( void ) const { return maURL; } diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx index 5d0ffe6a9209..3aefef32d24b 100644 --- a/cui/source/customize/selector.cxx +++ b/cui/source/customize/selector.cxx @@ -239,6 +239,7 @@ SvxConfigGroupListBox::~SvxConfigGroupListBox() void SvxConfigGroupListBox::dispose() { ClearAll(); + pFunctionListBox.clear(); SvTreeListBox::dispose(); } @@ -918,6 +919,22 @@ SvxScriptSelectorDialog::SvxScriptSelectorDialog( UpdateUI(); } +SvxScriptSelectorDialog::~SvxScriptSelectorDialog() +{ + dispose(); +} + +void SvxScriptSelectorDialog::dispose() +{ + m_pDialogDescription.clear(); + m_pCategories.clear(); + m_pCommands.clear(); + m_pOKButton.clear(); + m_pCancelButton.clear(); + m_pDescriptionText.clear(); + ModelessDialog::dispose(); +} + IMPL_LINK( SvxScriptSelectorDialog, SelectHdl, Control*, pCtrl ) { if (pCtrl == m_pCategories) diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index 5c81f1c02206..ac8aca049c02 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -261,6 +261,26 @@ void SpellDialog::dispose() delete pImpl; pImpl = NULL; } + m_pLanguageFT.clear(); + m_pLanguageLB.clear(); + m_pExplainFT.clear(); + m_pExplainLink.clear(); + m_pNotInDictFT.clear(); + m_pSentenceED.clear(); + m_pSuggestionFT.clear(); + m_pSuggestionLB.clear(); + m_pIgnorePB.clear(); + m_pIgnoreAllPB.clear(); + m_pIgnoreRulePB.clear(); + m_pAddToDictPB.clear(); + m_pAddToDictMB.clear(); + m_pChangePB.clear(); + m_pChangeAllPB.clear(); + m_pAutoCorrPB.clear(); + m_pCheckGrammarCB.clear(); + m_pOptionsPB.clear(); + m_pUndoPB.clear(); + m_pClosePB.clear(); SfxModelessDialog::dispose(); } diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index 867c8ce281e6..f146e698e49f 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -98,6 +98,23 @@ AboutDialog::AboutDialog(vcl::Window* pParent) get<PushButton>("close")->GrabFocus(); } +AboutDialog::~AboutDialog() +{ + dispose(); +} + +void AboutDialog::dispose() +{ + m_pVersion.clear(); + m_pDescriptionText.clear(); + m_pCopyrightText.clear(); + m_pLogoImage.clear(); + m_pLogoReplacement.clear(); + m_pCreditsButton.clear(); + m_pWebsiteButton.clear(); + SfxModalDialog::dispose(); +} + IMPL_LINK( AboutDialog, HandleClick, PushButton*, pButton ) { OUString sURL = ""; diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index 7edff10bf399..ad1f3e0d8f81 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -973,6 +973,8 @@ class ColorPickerDialog : public ModalDialog { public: ColorPickerDialog( vcl::Window* pParent, sal_Int32 nColor, sal_Int16 nMode ); + virtual ~ColorPickerDialog() { dispose(); } + virtual void dispose() SAL_OVERRIDE; void update_color( sal_uInt16 n = UPDATE_ALL ); @@ -992,35 +994,35 @@ private: double mdCyan, mdMagenta, mdYellow, mdKey; private: - ColorFieldControl* mpColorField; - ColorSliderControl* mpColorSlider; - ColorPreviewControl* mpColorPreview; - ColorPreviewControl* mpColorPrevious; + VclPtr<ColorFieldControl> mpColorField; + VclPtr<ColorSliderControl> mpColorSlider; + VclPtr<ColorPreviewControl> mpColorPreview; + VclPtr<ColorPreviewControl> mpColorPrevious; - FixedImage* mpFISliderLeft; - FixedImage* mpFISliderRight; + VclPtr<FixedImage> mpFISliderLeft; + VclPtr<FixedImage> mpFISliderRight; Image maSliderImage; - RadioButton* mpRBRed; - RadioButton* mpRBGreen; - RadioButton* mpRBBlue; - RadioButton* mpRBHue; - RadioButton* mpRBSaturation; - RadioButton* mpRBBrightness; - - MetricField* mpMFRed; - MetricField* mpMFGreen; - MetricField* mpMFBlue; - HexColorControl* mpEDHex; - - MetricField* mpMFHue; - MetricField* mpMFSaturation; - MetricField* mpMFBrightness; - - MetricField* mpMFCyan; - MetricField* mpMFMagenta; - MetricField* mpMFYellow; - MetricField* mpMFKey; + VclPtr<RadioButton> mpRBRed; + VclPtr<RadioButton> mpRBGreen; + VclPtr<RadioButton> mpRBBlue; + VclPtr<RadioButton> mpRBHue; + VclPtr<RadioButton> mpRBSaturation; + VclPtr<RadioButton> mpRBBrightness; + + VclPtr<MetricField> mpMFRed; + VclPtr<MetricField> mpMFGreen; + VclPtr<MetricField> mpMFBlue; + VclPtr<HexColorControl> mpEDHex; + + VclPtr<MetricField> mpMFHue; + VclPtr<MetricField> mpMFSaturation; + VclPtr<MetricField> mpMFBrightness; + + VclPtr<MetricField> mpMFCyan; + VclPtr<MetricField> mpMFMagenta; + VclPtr<MetricField> mpMFYellow; + VclPtr<MetricField> mpMFKey; }; ColorPickerDialog::ColorPickerDialog( vcl::Window* pParent, sal_Int32 nColor, sal_Int16 nMode ) @@ -1126,6 +1128,34 @@ ColorPickerDialog::ColorPickerDialog( vcl::Window* pParent, sal_Int32 nColor, sa update_color(); } +void ColorPickerDialog::dispose() +{ + mpColorField.clear(); + mpColorSlider.clear(); + mpColorPreview.clear(); + mpColorPrevious.clear(); + mpFISliderLeft.clear(); + mpFISliderRight.clear(); + mpRBRed.clear(); + mpRBGreen.clear(); + mpRBBlue.clear(); + mpRBHue.clear(); + mpRBSaturation.clear(); + mpRBBrightness.clear(); + mpMFRed.clear(); + mpMFGreen.clear(); + mpMFBlue.clear(); + mpEDHex.clear(); + mpMFHue.clear(); + mpMFSaturation.clear(); + mpMFBrightness.clear(); + mpMFCyan.clear(); + mpMFMagenta.clear(); + mpMFYellow.clear(); + mpMFKey.clear(); + ModalDialog::dispose(); +} + static int toInt( double dValue, double dRange ) { return static_cast< int >( std::floor((dValue * dRange) + 0.5 ) ); diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index e992ab28d064..44f03fed1481 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -100,6 +100,25 @@ SvxCharacterMap::SvxCharacterMap( vcl::Window* pParent, bool bOne_, const SfxIte CreateOutputItemSet( pSet ? *pSet->GetPool() : SfxGetpApp()->GetPool() ); } +SvxCharacterMap::~SvxCharacterMap() +{ + dispose(); +} + +void SvxCharacterMap::dispose() +{ + m_pShowSet.clear(); + m_pShowText.clear(); + m_pOKBtn.clear(); + m_pFontText.clear(); + m_pFontLB.clear(); + m_pSubsetText.clear(); + m_pSubsetLB.clear(); + m_pSymbolText.clear(); + m_pShowChar.clear(); + m_pCharCodeText.clear(); + SfxModalDialog::dispose(); +} void SvxCharacterMap::SetChar( sal_UCS4 c ) diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index c8bbf0abab69..7e3a767a3bdd 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -176,6 +176,34 @@ void FmSearchDialog::dispose() delete m_pSearchEngine; m_pSearchEngine = NULL; + m_prbSearchForText.clear(); + m_prbSearchForNull.clear(); + m_prbSearchForNotNull.clear(); + m_pcmbSearchText.clear(); + m_pftForm.clear(); + m_plbForm.clear(); + m_prbAllFields.clear(); + m_prbSingleField.clear(); + m_plbField.clear(); + m_pftPosition.clear(); + m_plbPosition.clear(); + m_pcbUseFormat.clear(); + m_pcbCase.clear(); + m_pcbBackwards.clear(); + m_pcbStartOver.clear(); + m_pcbWildCard.clear(); + m_pcbRegular.clear(); + m_pcbApprox.clear(); + m_ppbApproxSettings.clear(); + m_pHalfFullFormsCJK.clear(); + m_pSoundsLikeCJK.clear(); + m_pSoundsLikeCJKSettings.clear(); + m_pftRecord.clear(); + m_pftHint.clear(); + m_pbSearchAgain.clear(); + m_pbClose.clear(); + m_pPreSearchFocus.clear(); + ModalDialog::dispose(); } @@ -609,7 +637,7 @@ void FmSearchDialog::EnableSearchUI(bool bEnable) m_pPreSearchFocus->GrabFocus(); if ( WINDOW_EDIT == m_pPreSearchFocus->GetType() ) { - Edit* pEdit = static_cast< Edit* >( m_pPreSearchFocus ); + Edit* pEdit = static_cast< Edit* >( m_pPreSearchFocus.get() ); pEdit->SetSelection( Selection( 0, pEdit->GetText().getLength() ) ); } } diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index ac330ae95173..87e8a6ae6921 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -215,6 +215,19 @@ SearchProgress::SearchProgress( vcl::Window* pParent, const INetURLObject& rStar m_pBtnCancel->SetClickHdl( LINK( this, SearchProgress, ClickCancelBtn ) ); } +SearchProgress::~SearchProgress() +{ + dispose(); +} + +void SearchProgress::dispose() +{ + m_pFtSearchDir.clear(); + m_pFtSearchType.clear(); + m_pBtnCancel.clear(); + parent_.clear(); + ModalDialog::dispose(); +} void SearchProgress::Terminate() @@ -260,7 +273,7 @@ void SearchProgress::StartExecuteModal( const Link& rEndDialogHdl ) { assert(!maSearchThread.is()); maSearchThread = new SearchThread( - this, static_cast< TPGalleryThemeProperties * >(parent_), startUrl_); + this, static_cast< TPGalleryThemeProperties * >(parent_.get()), startUrl_); maSearchThread->launch(); ModalDialog::StartExecuteModal( rEndDialogHdl ); } @@ -345,6 +358,19 @@ TakeProgress::TakeProgress(vcl::Window* pWindow) m_pBtnCancel->SetClickHdl( LINK( this, TakeProgress, ClickCancelBtn ) ); } +TakeProgress::~TakeProgress() +{ + dispose(); +} + +void TakeProgress::dispose() +{ + m_pFtTakeFile.clear(); + m_pBtnCancel.clear(); + window_.clear(); + ModalDialog::dispose(); +} + void TakeProgress::Terminate() { if (maTakeThread.is()) @@ -425,7 +451,7 @@ void TakeProgress::StartExecuteModal( const Link& rEndDialogHdl ) { assert(!maTakeThread.is()); maTakeThread = new TakeThread( - this, static_cast< TPGalleryThemeProperties * >(window_), maTakenList); + this, static_cast< TPGalleryThemeProperties * >(window_.get()), maTakenList); maTakeThread->launch(); ModalDialog::StartExecuteModal( rEndDialogHdl ); } @@ -443,6 +469,18 @@ ActualizeProgress::ActualizeProgress(vcl::Window* pWindow, GalleryTheme* pThm) m_pBtnCancel->SetClickHdl( LINK( this, ActualizeProgress, ClickCancelBtn ) ); } +ActualizeProgress::~ActualizeProgress() +{ + dispose(); +} + +void ActualizeProgress::dispose() +{ + m_pFtActualizeFile.clear(); + m_pBtnCancel.clear(); + ModalDialog::dispose(); +} + short ActualizeProgress::Execute() { short nRet; @@ -511,6 +549,17 @@ TitleDialog::TitleDialog(vcl::Window* pParent, const OUString& rOldTitle) m_pEdit->GrabFocus(); } +TitleDialog::~TitleDialog() +{ + dispose(); +} + +void TitleDialog::dispose() +{ + m_pEdit.clear(); + ModalDialog::dispose(); +} + // - GalleryIdDialog - @@ -532,7 +581,17 @@ GalleryIdDialog::GalleryIdDialog( vcl::Window* pParent, GalleryTheme* _pThm ) m_pBtnOk->SetClickHdl( LINK( this, GalleryIdDialog, ClickOkHdl ) ); } +GalleryIdDialog::~GalleryIdDialog() +{ + dispose(); +} +void GalleryIdDialog::dispose() +{ + m_pBtnOk.clear(); + m_pLbResName.clear(); + ModalDialog::dispose(); +} IMPL_LINK_NOARG(GalleryIdDialog, ClickOkHdl) { @@ -616,6 +675,22 @@ TPGalleryThemeGeneral::TPGalleryThemeGeneral(vcl::Window* pParent, const SfxItem get(m_pFtMSShowChangeDate, "modified"); } +TPGalleryThemeGeneral::~TPGalleryThemeGeneral() +{ + dispose(); +} + +void TPGalleryThemeGeneral::dispose() +{ + m_pFiMSImage.clear(); + m_pEdtMSName.clear(); + m_pFtMSShowType.clear(); + m_pFtMSShowPath.clear(); + m_pFtMSShowContent.clear(); + m_pFtMSShowChangeDate.clear(); + SfxTabPage::dispose(); +} + void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData ) { pData = _pData; @@ -769,6 +844,13 @@ void TPGalleryThemeProperties::dispose() } aFilterEntryList.clear(); + m_pCbbFileType.clear(); + m_pLbxFound.clear(); + m_pBtnSearch.clear(); + m_pBtnTake.clear(); + m_pBtnTakeAll.clear(); + m_pCbxPreview.clear(); + m_pWndPreview.clear(); SfxTabPage::dispose(); } diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx index 9eb47497865e..6fd0cf74a4c7 100644 --- a/cui/source/dialogs/cuigrfflt.cxx +++ b/cui/source/dialogs/cuigrfflt.cxx @@ -153,6 +153,16 @@ GraphicFilterDialog::GraphicFilterDialog(vcl::Window* pParent, mpPreview->init(&rGraphic, maModifyHdl); } +GraphicFilterDialog::~GraphicFilterDialog() +{ + dispose(); +} + +void GraphicFilterDialog::dispose() +{ + mpPreview.clear(); + ModalDialog::dispose(); +} IMPL_LINK_NOARG(GraphicFilterDialog, ImplPreviewTimeoutHdl) @@ -204,7 +214,18 @@ GraphicFilterMosaic::GraphicFilterMosaic( vcl::Window* pParent, const Graphic& r mpMtrWidth->GrabFocus(); } +GraphicFilterMosaic::~GraphicFilterMosaic() +{ + dispose(); +} +void GraphicFilterMosaic::dispose() +{ + mpMtrWidth.clear(); + mpMtrHeight.clear(); + mpCbxEdges.clear(); + GraphicFilterDialog::dispose(); +} Graphic GraphicFilterMosaic::GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) @@ -257,6 +278,16 @@ GraphicFilterSmooth::GraphicFilterSmooth( vcl::Window* pParent, const Graphic& r mpMtrRadius->GrabFocus(); } +GraphicFilterSmooth::~GraphicFilterSmooth() +{ + dispose(); +} + +void GraphicFilterSmooth::dispose() +{ + mpMtrRadius.clear(); + GraphicFilterDialog::dispose(); +} Graphic GraphicFilterSmooth::GetFilteredGraphic( const Graphic& rGraphic, double /*fScaleX*/, double /*fScaleY*/ ) @@ -305,6 +336,17 @@ GraphicFilterSolarize::GraphicFilterSolarize( vcl::Window* pParent, const Graphi mpCbxInvert->SetToggleHdl( GetModifyHdl() ); } +GraphicFilterSolarize::~GraphicFilterSolarize() +{ + dispose(); +} + +void GraphicFilterSolarize::dispose() +{ + mpMtrThreshold.clear(); + mpCbxInvert.clear(); + GraphicFilterDialog::dispose(); +} Graphic GraphicFilterSolarize::GetFilteredGraphic( const Graphic& rGraphic, @@ -356,6 +398,16 @@ GraphicFilterSepia::GraphicFilterSepia( vcl::Window* pParent, const Graphic& rGr mpMtrSepia->SetModifyHdl( GetModifyHdl() ); } +GraphicFilterSepia::~GraphicFilterSepia() +{ + dispose(); +} + +void GraphicFilterSepia::dispose() +{ + mpMtrSepia.clear(); + GraphicFilterDialog::dispose(); +} Graphic GraphicFilterSepia::GetFilteredGraphic( const Graphic& rGraphic, @@ -399,6 +451,16 @@ GraphicFilterPoster::GraphicFilterPoster(vcl::Window* pParent, const Graphic& rG mpNumPoster->SetModifyHdl( GetModifyHdl() ); } +GraphicFilterPoster::~GraphicFilterPoster() +{ + dispose(); +} + +void GraphicFilterPoster::dispose() +{ + mpNumPoster.clear(); + GraphicFilterDialog::dispose(); +} Graphic GraphicFilterPoster::GetFilteredGraphic( const Graphic& rGraphic, @@ -462,6 +524,16 @@ GraphicFilterEmboss::GraphicFilterEmboss(vcl::Window* pParent, mpCtlLight->GrabFocus(); } +GraphicFilterEmboss::~GraphicFilterEmboss() +{ + dispose(); +} + +void GraphicFilterEmboss::dispose() +{ + mpCtlLight.clear(); + GraphicFilterDialog::dispose(); +} Graphic GraphicFilterEmboss::GetFilteredGraphic( const Graphic& rGraphic, diff --git a/cui/source/dialogs/cuiimapwnd.cxx b/cui/source/dialogs/cuiimapwnd.cxx index 118da3fc5c50..d86558bccdba 100644 --- a/cui/source/dialogs/cuiimapwnd.cxx +++ b/cui/source/dialogs/cuiimapwnd.cxx @@ -73,4 +73,19 @@ URLDlg::URLDlg( vcl::Window* pWindow, const OUString& rURL, const OUString& rAlt m_pCbbTargets->SetText( rTarget ); } +URLDlg::~URLDlg() +{ + dispose(); +} + +void URLDlg::dispose() +{ + m_pEdtURL.clear(); + m_pCbbTargets.clear(); + m_pEdtName.clear(); + m_pEdtAlternativeText.clear(); + m_pEdtDescription.clear(); + ModalDialog::dispose(); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/cuitbxform.cxx b/cui/source/dialogs/cuitbxform.cxx index 46ae5b5e78d6..1670025e3195 100644 --- a/cui/source/dialogs/cuitbxform.cxx +++ b/cui/source/dialogs/cuitbxform.cxx @@ -41,4 +41,15 @@ FmInputRecordNoDialog::FmInputRecordNoDialog(vcl::Window * pParent) m_pRecordNo->SetDecimalDigits(0); } +FmInputRecordNoDialog::~FmInputRecordNoDialog() +{ + dispose(); +} + +void FmInputRecordNoDialog::dispose() +{ + m_pRecordNo.clear(); + ModalDialog::dispose(); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx index 4a49494243d1..3aa778fac86f 100644 --- a/cui/source/dialogs/dlgname.cxx +++ b/cui/source/dialogs/dlgname.cxx @@ -45,6 +45,19 @@ SvxNameDialog::SvxNameDialog( vcl::Window* pWindow, const OUString& rName, const pEdtName->SetModifyHdl(LINK(this, SvxNameDialog, ModifyHdl)); } +SvxNameDialog::~SvxNameDialog() +{ + dispose(); +} + +void SvxNameDialog::dispose() +{ + pFtDescription.clear(); + pEdtName.clear(); + pBtnOK.clear(); + ModalDialog::dispose(); +} + IMPL_LINK_NOARG(SvxNameDialog, ModifyHdl) { if(aCheckNameHdl.IsSet()) @@ -73,6 +86,19 @@ SvxObjectNameDialog::SvxObjectNameDialog( pEdtName->SetModifyHdl(LINK(this, SvxObjectNameDialog, ModifyHdl)); } +SvxObjectNameDialog::~SvxObjectNameDialog() +{ + dispose(); +} + +void SvxObjectNameDialog::dispose() +{ + pEdtName.clear(); + pBtnOK.clear(); + ModalDialog::dispose(); +} + + IMPL_LINK_NOARG(SvxObjectNameDialog, ModifyHdl) { if(aCheckNameHdl.IsSet()) @@ -105,6 +131,17 @@ SvxObjectTitleDescDialog::SvxObjectTitleDescDialog( pEdtTitle->SetSelection(Selection(SELECTION_MIN, SELECTION_MAX)); } +SvxObjectTitleDescDialog::~SvxObjectTitleDescDialog() +{ + dispose(); +} + +void SvxObjectTitleDescDialog::dispose() +{ + pEdtTitle.clear(); + pEdtDescription.clear(); + ModalDialog::dispose(); +} /************************************************************************* @@ -145,6 +182,10 @@ void SvxMessDialog::dispose() { delete pImage; pImage = NULL; + pFtDescription.clear(); + pBtn1.clear(); + pBtn2.clear(); + pFtImage.clear(); ModalDialog::dispose(); } diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index 6d8e10123d7f..273bffaa70f9 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -605,6 +605,35 @@ namespace svx m_pSuggestions->SetHelpIds(); } + HangulHanjaConversionDialog::~HangulHanjaConversionDialog() + { + dispose(); + } + + void HangulHanjaConversionDialog::dispose() + { + m_pFind.clear(); + m_pIgnore.clear(); + m_pIgnoreAll.clear(); + m_pReplace.clear(); + m_pReplaceAll.clear(); + m_pOptions.clear(); + m_pSuggestions.clear(); + m_pSimpleConversion.clear(); + m_pHangulBracketed.clear(); + m_pHanjaBracketed.clear(); + m_pWordInput.clear(); + m_pOriginalWord.clear(); + m_pHanjaAbove.clear(); + m_pHanjaBelow.clear(); + m_pHangulAbove.clear(); + m_pHangulBelow.clear(); + m_pHangulOnly.clear(); + m_pHanjaOnly.clear(); + m_pReplaceByChar.clear(); + m_pIgnoreNonPrimary.clear(); + ModalDialog::dispose(); + } void HangulHanjaConversionDialog::FillSuggestions( const ::com::sun::star::uno::Sequence< OUString >& _rSuggestions ) { @@ -1139,17 +1168,28 @@ namespace svx void HangulHanjaOptionsDialog::dispose() { - SvTreeListEntry* pEntry = m_pDictsLB->First(); - while( pEntry ) + if (m_pDictsLB) { - delete static_cast<OUString const *>(pEntry->GetUserData()); - pEntry->SetUserData(NULL); - pEntry = m_pDictsLB->Next( pEntry ); + SvTreeListEntry* pEntry = m_pDictsLB->First(); + while( pEntry ) + { + delete static_cast<OUString const *>(pEntry->GetUserData()); + pEntry->SetUserData( NULL ); + pEntry = m_pDictsLB->Next( pEntry ); + } } delete m_pCheckButtonData; m_pCheckButtonData = NULL; + m_pDictsLB.clear(); + m_pIgnorepostCB.clear(); + m_pShowrecentlyfirstCB.clear(); + m_pAutoreplaceuniqueCB.clear(); + m_pNewPB.clear(); + m_pEditPB.clear(); + m_pDeletePB.clear(); + m_pOkPB.clear(); ModalDialog::dispose(); } @@ -1197,6 +1237,18 @@ namespace svx m_pDictNameED->SetModifyHdl( LINK( this, HangulHanjaNewDictDialog, ModifyHdl ) ); } + HangulHanjaNewDictDialog::~HangulHanjaNewDictDialog() + { + dispose(); + } + + void HangulHanjaNewDictDialog::dispose() + { + m_pDictNameED.clear(); + m_pOkBtn.clear(); + ModalDialog::dispose(); + } + bool HangulHanjaNewDictDialog::GetName( OUString& _rRetName ) const { if( m_bEntered ) @@ -1372,6 +1424,19 @@ namespace svx { } + SuggestionEdit::~SuggestionEdit() + { + dispose(); + } + + void SuggestionEdit::dispose() + { + m_pPrev.clear(); + m_pNext.clear(); + m_pScrollBar.clear(); + Edit::dispose(); + } + bool SuggestionEdit::PreNotify( NotifyEvent& rNEvt ) { bool nHandled = false; @@ -1787,6 +1852,15 @@ namespace svx { delete m_pSuggestions; m_pSuggestions = NULL; + m_aBookLB.clear(); + m_aOriginalLB.clear(); + m_aEdit1.clear(); + m_aEdit2.clear(); + m_aEdit3.clear(); + m_aEdit4.clear(); + m_aScrollSB.clear(); + m_aNewPB.clear(); + m_aDeletePB.clear(); ModalDialog::dispose(); } diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx index ad1e7fafc64b..a02ff7d2eccd 100644 --- a/cui/source/dialogs/hldocntp.cxx +++ b/cui/source/dialogs/hldocntp.cxx @@ -140,6 +140,11 @@ void SvxHyperlinkNewDocTp::dispose() delete static_cast<DocumentTypeData*>(m_pLbDocTypes->GetEntryData ( n )); m_pLbDocTypes = NULL; } + m_pRbtEditNow.clear(); + m_pRbtEditLater.clear(); + m_pCbbPath.clear(); + m_pBtCreate.clear(); + m_pLbDocTypes.clear(); SvxHyperlinkTabPageBase::dispose(); } diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx index 2e45746d7684..0a3f26922171 100644 --- a/cui/source/dialogs/hldoctp.cxx +++ b/cui/source/dialogs/hldoctp.cxx @@ -71,6 +71,21 @@ SvxHyperlinkDocTp::SvxHyperlinkDocTp ( vcl::Window *pParent, IconChoiceDialog* p maTimer.SetTimeoutHdl ( LINK ( this, SvxHyperlinkDocTp, TimeoutHdl_Impl ) ); } +SvxHyperlinkDocTp::~SvxHyperlinkDocTp() +{ + dispose(); +} + +void SvxHyperlinkDocTp::dispose() +{ + m_pCbbPath.clear(); + m_pBtFileopen.clear(); + m_pEdTarget.clear(); + m_pFtFullURL.clear(); + m_pBtBrowse.clear(); + SvxHyperlinkTabPageBase::dispose(); +} + /************************************************************************* |* |* Fill all dialog-controls except controls in groupbox "more..." diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx index 73ea0ddc6220..61760d772156 100644 --- a/cui/source/dialogs/hlinettp.cxx +++ b/cui/source/dialogs/hlinettp.cxx @@ -81,6 +81,25 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( vcl::Window *pParent, maTimer.SetTimeoutHdl ( LINK ( this, SvxHyperlinkInternetTp, TimeoutHdl_Impl ) ); } +SvxHyperlinkInternetTp::~SvxHyperlinkInternetTp() +{ + dispose(); +} + +void SvxHyperlinkInternetTp::dispose() +{ + m_pRbtLinktypInternet.clear(); + m_pRbtLinktypFTP.clear(); + m_pCbbTarget.clear(); + m_pBtBrowse.clear(); + m_pFtLogin.clear(); + m_pEdLogin.clear(); + m_pFtPassword.clear(); + m_pEdPassword.clear(); + m_pCbAnonymous.clear(); + SvxHyperlinkTabPageBase::dispose(); +} + /************************************************************************* |* |* Fill the all dialog-controls except controls in groupbox "more..." @@ -397,7 +416,7 @@ IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ClickBrowseHdl_Impl) SfxBoolItem aBrowse( SID_BROWSE, true ); const SfxPoolItem *ppItems[] = { &aName, &aNewView, &aSilent, &aReadOnly, &aRefererItem, &aBrowse, NULL }; - static_cast<SvxHpLinkDlg*>(mpDialog)->GetBindings()->Execute( SID_OPENDOC, ppItems, 0, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD ); + static_cast<SvxHpLinkDlg*>(mpDialog.get())->GetBindings()->Execute( SID_OPENDOC, ppItems, 0, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD ); return 0L; } diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx index d110b292a73d..6e1da44b6fe4 100644 --- a/cui/source/dialogs/hlmailtp.cxx +++ b/cui/source/dialogs/hlmailtp.cxx @@ -66,6 +66,20 @@ SvxHyperlinkMailTp::SvxHyperlinkMailTp ( vcl::Window *pParent, IconChoiceDialog* m_pBtAdrBook->Hide(); } +SvxHyperlinkMailTp::~SvxHyperlinkMailTp() +{ + dispose(); +} + +void SvxHyperlinkMailTp::dispose() +{ + m_pCbbReceiver.clear(); + m_pBtAdrBook.clear(); + m_pFtSubject.clear(); + m_pEdSubject.clear(); + SvxHyperlinkTabPageBase::dispose(); +} + /************************************************************************* |* |* Fill the all dialog-controls except controls in groupbox "more..." diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index 02058c78c0ed..bfe9c67a1d60 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/cui/source/dialogs/hlmarkwn.cxx @@ -72,6 +72,17 @@ SvxHlmarkTreeLBox::SvxHlmarkTreeLBox(vcl::Window* pParent, WinBits nStyle) SetNodeDefaultImages(); } +SvxHlmarkTreeLBox::~SvxHlmarkTreeLBox() +{ + dispose(); +} + +void SvxHlmarkTreeLBox::dispose() +{ + mpParentWnd.clear(); + SvTreeListBox::dispose(); +} + extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxHlmarkTreeLBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = WB_TABSTOP; @@ -156,6 +167,10 @@ SvxHlinkDlgMarkWnd::~SvxHlinkDlgMarkWnd() void SvxHlinkDlgMarkWnd::dispose() { ClearTree(); + mpBtApply.clear(); + mpBtClose.clear(); + mpLbTree.clear(); + mpParent.clear(); ModalDialog::dispose(); } diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index 804442321f1d..7bc162e4c3f8 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -114,9 +114,13 @@ void SvxHyperlinkTabPageBase::dispose() { maTimer.Stop(); - delete mpMarkWnd; - mpMarkWnd = NULL; - + mpCbbFrame.clear(); + mpLbForm.clear(); + mpEdIndication.clear(); + mpEdText.clear(); + mpBtScript.clear(); + mpDialog.clear(); + mpMarkWnd.clear(); IconChoicePage::dispose(); } @@ -291,13 +295,13 @@ void SvxHyperlinkTabPageBase::SetInitFocus() // Ask dialog whether the curretn doc is a HTML-doc bool SvxHyperlinkTabPageBase::IsHTMLDoc() const { - return static_cast<SvxHpLinkDlg*>(mpDialog)->IsHTMLDoc(); + return static_cast<SvxHpLinkDlg*>(mpDialog.get())->IsHTMLDoc(); } // retrieve dispatcher SfxDispatcher* SvxHyperlinkTabPageBase::GetDispatcher() const { - return static_cast<SvxHpLinkDlg*>(mpDialog)->GetDispatcher(); + return static_cast<SvxHpLinkDlg*>(mpDialog.get())->GetDispatcher(); } // Click on imagebutton : Script diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx index af6d29876456..8c4ea99822f4 100644 --- a/cui/source/dialogs/hyphen.cxx +++ b/cui/source/dialogs/hyphen.cxx @@ -512,6 +512,24 @@ SvxHyphenWordDialog::SvxHyphenWordDialog( Enable( false ); } +SvxHyphenWordDialog::~SvxHyphenWordDialog() +{ + dispose(); +} + +void SvxHyphenWordDialog::dispose() +{ + m_pWordEdit.clear(); + m_pLeftBtn.clear(); + m_pRightBtn.clear(); + m_pOkBtn.clear(); + m_pContBtn.clear(); + m_pDelBtn.clear(); + m_pHyphAll.clear(); + m_pCloseBtn.clear(); + SfxModalDialog::dispose(); +} + void SvxHyphenWordDialog::SetWindowTitle( LanguageType nLang ) { diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index 0a1c70e7d70b..712d78fa969f 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -52,6 +52,16 @@ IconChoicePage::IconChoicePage( vcl::Window *pParent, const OString& rID, } +IconChoicePage::~IconChoicePage() +{ + dispose(); +} + +void IconChoicePage::dispose() +{ + pDialog.clear(); + TabPage::dispose(); +} /********************************************************************** | @@ -246,7 +256,6 @@ void IconChoiceDialog::dispose() SvxIconChoiceCtrlEntry* pEntry = m_pIconCtrl->GetEntry ( i ); delete static_cast<sal_uInt16*>(pEntry->GetUserData()); } - m_pIconCtrl = NULL; } delete pRanges; @@ -254,6 +263,13 @@ void IconChoiceDialog::dispose() delete pOutSet; pOutSet = NULL; + m_pIconCtrl.clear(); + m_pOKBtn.clear(); + m_pApplyBtn.clear(); + m_pCancelBtn.clear(); + m_pHelpBtn.clear(); + m_pResetBtn.clear(); + m_pTabContainer.clear(); ModalDialog::dispose(); } @@ -540,7 +556,7 @@ bool IconChoiceDialog::DeActivatePageImpl () for ( size_t i = 0, nCount = maPageList.size(); i < nCount; ++i ) { IconChoicePageData* pObj = maPageList[ i ]; - if ( pObj->pPage != pPage ) + if ( pObj->pPage.get() != pPage ) pObj->bRefresh = true; else pObj->bRefresh = false; diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index 4131c40c5c8a..db3bf1fef153 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -191,6 +191,24 @@ SvInsertOleDlg::SvInsertOleDlg RadioHdl( NULL ); } +SvInsertOleDlg::~SvInsertOleDlg() +{ + dispose(); +} + +void SvInsertOleDlg::dispose() +{ + m_pRbNewObject.clear(); + m_pRbObjectFromfile.clear(); + m_pObjectTypeFrame.clear(); + m_pLbObjecttype.clear(); + m_pFileFrame.clear(); + m_pEdFilepath.clear(); + m_pBtnFilepath.clear(); + m_pCbFilelink.clear(); + InsertObjectDialog_Impl::dispose(); +} + short SvInsertOleDlg::Execute() { short nRet = RET_OK; @@ -402,6 +420,9 @@ void SvInsertPlugInDialog::dispose() { delete m_pURL; m_pURL = NULL; + m_pEdFileurl.clear(); + m_pBtnFileurl.clear(); + m_pEdPluginsOptions.clear(); InsertObjectDialog_Impl::dispose(); } @@ -494,6 +515,30 @@ SfxInsertFloatingFrameDialog::SfxInsertFloatingFrameDialog( vcl::Window *pParent Init(); } +SfxInsertFloatingFrameDialog::~SfxInsertFloatingFrameDialog() +{ + dispose(); +} + +void SfxInsertFloatingFrameDialog::dispose() +{ + m_pEDName.clear(); + m_pEDURL.clear(); + m_pBTOpen.clear(); + m_pRBScrollingOn.clear(); + m_pRBScrollingOff.clear(); + m_pRBScrollingAuto.clear(); + m_pRBFrameBorderOn.clear(); + m_pRBFrameBorderOff.clear(); + m_pFTMarginWidth.clear(); + m_pNMMarginWidth.clear(); + m_pCBMarginWidthDefault.clear(); + m_pFTMarginHeight.clear(); + m_pNMMarginHeight.clear(); + m_pCBMarginHeightDefault.clear(); + InsertObjectDialog_Impl::dispose(); +} + void SfxInsertFloatingFrameDialog::Init() { get(m_pEDName, "edname"); diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx index c3c167cca62d..75e85733940b 100644 --- a/cui/source/dialogs/insrc.cxx +++ b/cui/source/dialogs/insrc.cxx @@ -45,6 +45,19 @@ SvxInsRowColDlg::SvxInsRowColDlg(vcl::Window* pParent, bool bCol, const OString& SetHelpId( sHelpId ); } +SvxInsRowColDlg::~SvxInsRowColDlg() +{ + dispose(); +} + +void SvxInsRowColDlg::dispose() +{ + m_pCountEdit.clear(); + m_pBeforeBtn.clear(); + m_pAfterBtn.clear(); + ModalDialog::dispose(); +} + short SvxInsRowColDlg::Execute(void) { return ModalDialog::Execute(); diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx index 95c348d0a364..68a9c19b375b 100644 --- a/cui/source/dialogs/linkdlg.cxx +++ b/cui/source/dialogs/linkdlg.cxx @@ -143,6 +143,26 @@ SvBaseLinksDlg::SvBaseLinksDlg( vcl::Window * pParent, LinkManager* pMgr, bool b SetManager( pMgr ); } +SvBaseLinksDlg::~SvBaseLinksDlg() +{ + dispose(); +} + +void SvBaseLinksDlg::dispose() +{ + m_pTbLinks.clear(); + m_pFtFullFileName.clear(); + m_pFtFullSourceName.clear(); + m_pFtFullTypeName.clear(); + m_pRbAutomatic.clear(); + m_pRbManual.clear(); + m_pPbUpdateNow.clear(); + m_pPbOpenSource.clear(); + m_pPbChangeSource.clear(); + m_pPbBreakLink.clear(); + ModalDialog::dispose(); +} + /************************************************************************* |* SvBaseLinksDlg::Handler() *************************************************************************/ diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx index ebb8fcdca031..9cbbef5f2160 100644 --- a/cui/source/dialogs/multipat.cxx +++ b/cui/source/dialogs/multipat.cxx @@ -229,16 +229,19 @@ SvxMultiPathDialog::~SvxMultiPathDialog() void SvxMultiPathDialog::dispose() { - sal_uInt16 nPos = (sal_uInt16)m_pRadioLB->GetEntryCount(); - while ( nPos-- ) + if (m_pRadioLB) { - SvTreeListEntry* pEntry = m_pRadioLB->GetEntry( nPos ); - delete static_cast<OUString*>(pEntry->GetUserData()); + sal_uInt16 nPos = (sal_uInt16)m_pRadioLB->GetEntryCount(); + while ( nPos-- ) + { + SvTreeListEntry* pEntry = m_pRadioLB->GetEntry( nPos ); + delete static_cast<OUString*>(pEntry->GetUserData()); + } } - delete m_pRadioLB; - m_pRadioLB = NULL; - + m_pRadioLB.clear(); + m_pAddBtn.clear(); + m_pDelBtn.clear(); ModalDialog::dispose(); } @@ -254,8 +257,10 @@ void SvxPathSelectDialog::dispose() sal_uInt16 nPos = m_pPathLB->GetEntryCount(); while ( nPos-- ) delete static_cast<OUString*>(m_pPathLB->GetEntryData(nPos)); - m_pPathLB = NULL; } + m_pPathLB.clear(); + m_pAddBtn.clear(); + m_pDelBtn.clear(); ModalDialog::dispose(); } diff --git a/cui/source/dialogs/newtabledlg.cxx b/cui/source/dialogs/newtabledlg.cxx index ab9058c0c975..3c2cba513fef 100644 --- a/cui/source/dialogs/newtabledlg.cxx +++ b/cui/source/dialogs/newtabledlg.cxx @@ -28,6 +28,18 @@ SvxNewTableDialog::SvxNewTableDialog( vcl::Window* pParent ) get(mpNumColumns, "columns"); } +SvxNewTableDialog::~SvxNewTableDialog() +{ + dispose(); +} + +void SvxNewTableDialog::dispose() +{ + mpNumColumns.clear(); + mpNumRows.clear(); + ModalDialog::dispose(); +} + short SvxNewTableDialog::Execute(void) { return ModalDialog::Execute(); diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx index ccba00009552..ad4e26bfc711 100644 --- a/cui/source/dialogs/passwdomdlg.cxx +++ b/cui/source/dialogs/passwdomdlg.cxx @@ -31,15 +31,15 @@ struct PasswordToOpenModifyDialog_Impl { - PasswordToOpenModifyDialog * m_pParent; - - Edit* m_pPasswdToOpenED; - Edit* m_pReenterPasswdToOpenED; - VclExpander* m_pOptionsExpander; - OKButton* m_pOk; - CheckBox* m_pOpenReadonlyCB; - Edit* m_pPasswdToModifyED; - Edit* m_pReenterPasswdToModifyED; + VclPtr<PasswordToOpenModifyDialog> m_pParent; + + VclPtr<Edit> m_pPasswdToOpenED; + VclPtr<Edit> m_pReenterPasswdToOpenED; + VclPtr<VclExpander> m_pOptionsExpander; + VclPtr<OKButton> m_pOk; + VclPtr<CheckBox> m_pOpenReadonlyCB; + VclPtr<Edit> m_pPasswdToModifyED; + VclPtr<Edit> m_pReenterPasswdToModifyED; OUString m_aOneMismatch; OUString m_aTwoMismatch; diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx index 90610557f6fb..f7ae8397c63b 100644 --- a/cui/source/dialogs/pastedlg.cxx +++ b/cui/source/dialogs/pastedlg.cxx @@ -52,6 +52,19 @@ SvPasteObjectDialog::SvPasteObjectDialog( vcl::Window* pParent ) ObjectLB().SetDoubleClickHdl( LINK( this, SvPasteObjectDialog, DoubleClickHdl ) ); } +SvPasteObjectDialog::~SvPasteObjectDialog() +{ + dispose(); +} + +void SvPasteObjectDialog::dispose() +{ + m_pFtObjectSource.clear(); + m_pLbInsertList.clear(); + m_pOKButton.clear(); + ModalDialog::dispose(); +} + void SvPasteObjectDialog::SelectObject() { if (m_pLbInsertList->GetEntryCount()) diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx index 86d0e5812f32..175d889a1e71 100644 --- a/cui/source/dialogs/postdlg.cxx +++ b/cui/source/dialogs/postdlg.cxx @@ -131,6 +131,13 @@ void SvxPostItDialog::dispose() { delete pOutSet; pOutSet = 0; + m_pLastEditFT.clear(); + m_pEditED.clear(); + m_pInsertAuthor.clear(); + m_pAuthorBtn.clear(); + m_pOKBtn.clear(); + m_pPrevBtn.clear(); + m_pNextBtn.clear(); SfxModalDialog::dispose(); } diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index 4013f71e6925..a5db7a283c0b 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -443,6 +443,17 @@ CuiInputDialog::CuiInputDialog(vcl::Window * pParent, sal_uInt16 nMode ) } } +CuiInputDialog::~CuiInputDialog() +{ + dispose(); +} + +void CuiInputDialog::dispose() +{ + m_pEdit.clear(); + ModalDialog::dispose(); +} + // ScriptOrgDialog ------------------------------------------------------------ @@ -500,6 +511,13 @@ void SvxScriptOrgDialog::dispose() { // clear the SelectHdl so that it isn't called during the dtor m_pScriptsBox->SetSelectHdl( Link() ); + m_pScriptsBox.clear(); + m_pRunButton.clear(); + m_pCloseButton.clear(); + m_pCreateButton.clear(); + m_pEditButton.clear(); + m_pRenameButton.clear(); + m_pDelButton.clear(); SfxModalDialog::dispose(); }; diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx index 94e286ecd92d..a58c9417bffa 100644 --- a/cui/source/dialogs/showcols.cxx +++ b/cui/source/dialogs/showcols.cxx @@ -39,6 +39,17 @@ FmShowColsDialog::FmShowColsDialog(vcl::Window* pParent) m_pOK->SetClickHdl( LINK( this, FmShowColsDialog, OnClickedOk ) ); } +FmShowColsDialog::~FmShowColsDialog() +{ + dispose(); +} + +void FmShowColsDialog::dispose() +{ + m_pList.clear(); + m_pOK.clear(); + ModalDialog::dispose(); +} IMPL_LINK_NOARG(FmShowColsDialog, OnClickedOk) { diff --git a/cui/source/dialogs/splitcelldlg.cxx b/cui/source/dialogs/splitcelldlg.cxx index edce7998effe..171ea3a1bdc9 100644 --- a/cui/source/dialogs/splitcelldlg.cxx +++ b/cui/source/dialogs/splitcelldlg.cxx @@ -53,6 +53,20 @@ SvxSplitTableDlg::SvxSplitTableDlg( vcl::Window *pParent, bool bIsTableVertical, } } +SvxSplitTableDlg::~SvxSplitTableDlg() +{ + dispose(); +} + +void SvxSplitTableDlg::dispose() +{ + m_pCountEdit.clear(); + m_pHorzBox.clear(); + m_pVertBox.clear(); + m_pPropCB.clear(); + SvxStandardDialog::dispose(); +} + IMPL_LINK( SvxSplitTableDlg, ClickHdl, Button *, pButton ) { const bool bIsVert = pButton == m_pVertBox ; diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx index bb797e3d4dd8..4d1541347c71 100644 --- a/cui/source/dialogs/srchxtra.cxx +++ b/cui/source/dialogs/srchxtra.cxx @@ -178,6 +178,17 @@ SvxSearchAttributeDialog::SvxSearchAttributeDialog(vcl::Window* pParent, m_pAttrLB->SelectEntryPos( 0 ); } +SvxSearchAttributeDialog::~SvxSearchAttributeDialog() +{ + dispose(); +} + +void SvxSearchAttributeDialog::dispose() +{ + m_pAttrLB.clear(); + m_pOKBtn.clear(); + ModalDialog::dispose(); +} IMPL_LINK_NOARG(SvxSearchAttributeDialog, OKHdl) @@ -248,4 +259,18 @@ SvxSearchSimilarityDialog::SvxSearchSimilarityDialog m_pRelaxBox->Check( bRelax ); } +SvxSearchSimilarityDialog::~SvxSearchSimilarityDialog() +{ + dispose(); +} + +void SvxSearchSimilarityDialog::dispose() +{ + m_pOtherFld.clear(); + m_pLongerFld.clear(); + m_pShorterFld.clear(); + m_pRelaxBox.clear(); + ModalDialog::dispose(); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index c0afe2a2c430..8a47ac55a292 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -66,6 +66,17 @@ LookUpComboBox::LookUpComboBox(vcl::Window *pParent) EnableAutocomplete( false ); } +LookUpComboBox::~LookUpComboBox() +{ + dispose(); +} + +void LookUpComboBox::dispose() +{ + m_pDialog.clear(); + ComboBox::dispose(); +} + extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeLookUpComboBox(vcl::Window *pParent, VclBuilder::stringmap &) { return new LookUpComboBox(pParent); @@ -96,6 +107,18 @@ ReplaceEdit::ReplaceEdit(vcl::Window *pParent) { } +ReplaceEdit::~ReplaceEdit() +{ + dispose(); +} + +void ReplaceEdit::dispose() +{ + m_pBtn.clear(); + Edit::dispose(); +} + + extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeReplaceEdit(vcl::Window *pParent, VclBuilder::stringmap &) { return new ReplaceEdit(pParent); @@ -176,6 +199,7 @@ ThesaurusAlternativesCtrl::~ThesaurusAlternativesCtrl() void ThesaurusAlternativesCtrl::dispose() { ClearExtraData(); + m_pDialog.clear(); SvxCheckListBox::dispose(); } @@ -514,6 +538,21 @@ SvxThesaurusDialog::SvxThesaurusDialog( Enable( false ); } +SvxThesaurusDialog::~SvxThesaurusDialog() +{ + dispose(); +} + +void SvxThesaurusDialog::dispose() +{ + m_pLeftBtn.clear(); + m_pWordCB.clear(); + m_pAlternativesCT.clear(); + m_pReplaceEdit.clear(); + m_pLangLB.clear(); + SvxStandardDialog::dispose(); +} + IMPL_LINK( SvxThesaurusDialog, ReplaceBtnHdl_Impl, Button *, EMPTYARG /*pBtn*/ ) { EndDialog(RET_OK); diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx index 190a0619b7d7..451de5506da4 100644 --- a/cui/source/dialogs/zoom.cxx +++ b/cui/source/dialogs/zoom.cxx @@ -297,6 +297,19 @@ void SvxZoomDialog::dispose() { delete pOutSet; pOutSet = 0; + m_pOptimalBtn.clear(); + m_pWholePageBtn.clear(); + m_pPageWidthBtn.clear(); + m_p100Btn.clear(); + m_pUserBtn.clear(); + m_pUserEdit.clear(); + m_pViewFrame.clear(); + m_pAutomaticBtn.clear(); + m_pSingleBtn.clear(); + m_pColumnsBtn.clear(); + m_pColumnsEdit.clear(); + m_pBookModeChk.clear(); + m_pOKBtn.clear(); SfxModalDialog::dispose(); } diff --git a/cui/source/factory/cuiexp.cxx b/cui/source/factory/cuiexp.cxx index 8bb9d51ef1f6..754d8b47a092 100644 --- a/cui/source/factory/cuiexp.cxx +++ b/cui/source/factory/cuiexp.cxx @@ -17,6 +17,35 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include "sfx2/basedlgs.hxx" +#include "cuigaldlg.hxx" +#include "hlmarkwn.hxx" +#include "srchxtra.hxx" +#include "cuisrchdlg.hxx" +#include "transfrm.hxx" +#include "labdlg.hxx" +#include "cuitbxform.hxx" +#include "optdict.hxx" +#include "dlgname.hxx" +#include "cuiimapwnd.hxx" +#include "multipat.hxx" +#include "cuifmsearch.hxx" +#include "cuigrfflt.hxx" +#include "cuitabarea.hxx" +#include "insdlg.hxx" +#include "pastedlg.hxx" +#include "linkdlg.hxx" +#include "postdlg.hxx" +#include "passwdomdlg.hxx" +#include "cuihyperdlg.hxx" +#include "selector.hxx" +#include "SpellDialog.hxx" +#include "zoom.hxx" +#include "showcols.hxx" +#include "hyphen.hxx" +#include "thesdlg.hxx" +#include "hangulhanjadlg.hxx" +#include "dstribut.hxx" #include "dlgfact.hxx" #include "sal/types.h" diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index f2f368ad4dc1..4043f8c5f9ad 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -107,7 +107,6 @@ IMPL_ABSTDLG_BASE(AbstractThesaurusDialog_Impl) AbstractSvxZoomDialog_Impl::~AbstractSvxZoomDialog_Impl() \ { - delete pDlg; } short AbstractSvxZoomDialog_Impl::Execute() { @@ -154,7 +153,6 @@ IMPL_ABSTDLG_BASE(AbstractPasswordToOpenModifyDialog_Impl); // virtual VclAbstractDialog2_Impl::~VclAbstractDialog2_Impl() { - delete m_pDlg; } // virtual diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index ffb15778c5e1..d356bbab2181 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -61,7 +61,7 @@ class HangulHanjaConversionDialog; using namespace svx; #define DECL_ABSTDLG_BASE(Class,DialogClass) \ - DialogClass* pDlg; \ + VclPtr<DialogClass> pDlg; \ public: \ Class( DialogClass* p) \ : pDlg(p) \ @@ -72,7 +72,6 @@ public: \ #define IMPL_ABSTDLG_BASE(Class) \ Class::~Class() \ { \ - delete pDlg; \ } \ short Class::Execute() \ { \ @@ -81,7 +80,7 @@ short Class::Execute() \ class VclAbstractDialog2_Impl : public VclAbstractDialog2 { - Dialog* m_pDlg; + VclPtr<Dialog> m_pDlg; Link m_aEndDlgHdl; public: VclAbstractDialog2_Impl( Dialog* p ) : m_pDlg( p ) {} diff --git a/cui/source/inc/ControlFocusHelper.hxx b/cui/source/inc/ControlFocusHelper.hxx index b984838fa09c..6530f3cf6740 100644 --- a/cui/source/inc/ControlFocusHelper.hxx +++ b/cui/source/inc/ControlFocusHelper.hxx @@ -26,11 +26,13 @@ class SvxControlFocusHelper : public Control { private: - Control* m_pFocusCtrl; + VclPtr<Control> m_pFocusCtrl; public: SvxControlFocusHelper( vcl::Window* pParent, const ResId& rId ) : Control( pParent, rId ), m_pFocusCtrl( NULL ) {} + virtual ~SvxControlFocusHelper(); + virtual void dispose() SAL_OVERRIDE; void SetFocusControl( Control* pCtrl ) { m_pFocusCtrl = pCtrl; } diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx index e24334bd14b6..411df36dd123 100644 --- a/cui/source/inc/SpellDialog.hxx +++ b/cui/source/inc/SpellDialog.hxx @@ -124,33 +124,33 @@ class SpellDialog : public SfxModelessDialog friend class SentenceEditWindow_Impl; private: - FixedText* m_pLanguageFT; - SvxLanguageBox* m_pLanguageLB; + VclPtr<FixedText> m_pLanguageFT; + VclPtr<SvxLanguageBox> m_pLanguageLB; - FixedText* m_pExplainFT; - FixedHyperlink* m_pExplainLink; + VclPtr<FixedText> m_pExplainFT; + VclPtr<FixedHyperlink> m_pExplainLink; - FixedText* m_pNotInDictFT; - SentenceEditWindow_Impl* m_pSentenceED; + VclPtr<FixedText> m_pNotInDictFT; + VclPtr<SentenceEditWindow_Impl> m_pSentenceED; - FixedText* m_pSuggestionFT; - ListBox* m_pSuggestionLB; + VclPtr<FixedText> m_pSuggestionFT; + VclPtr<ListBox> m_pSuggestionLB; - PushButton* m_pIgnorePB; - PushButton* m_pIgnoreAllPB; - PushButton* m_pIgnoreRulePB; - PushButton* m_pAddToDictPB; - MenuButton* m_pAddToDictMB; + VclPtr<PushButton> m_pIgnorePB; + VclPtr<PushButton> m_pIgnoreAllPB; + VclPtr<PushButton> m_pIgnoreRulePB; + VclPtr<PushButton> m_pAddToDictPB; + VclPtr<MenuButton> m_pAddToDictMB; - PushButton* m_pChangePB; - PushButton* m_pChangeAllPB; - PushButton* m_pAutoCorrPB; + VclPtr<PushButton> m_pChangePB; + VclPtr<PushButton> m_pChangeAllPB; + VclPtr<PushButton> m_pAutoCorrPB; - CheckBox* m_pCheckGrammarCB; + VclPtr<CheckBox> m_pCheckGrammarCB; - PushButton* m_pOptionsPB; - PushButton* m_pUndoPB; - CloseButton* m_pClosePB; + VclPtr<PushButton> m_pOptionsPB; + VclPtr<PushButton> m_pUndoPB; + VclPtr<CloseButton> m_pClosePB; OUString m_sResumeST; OUString m_sIgnoreOnceST; diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx index 132ab541702e..82cfac00ee18 100644 --- a/cui/source/inc/about.hxx +++ b/cui/source/inc/about.hxx @@ -34,13 +34,13 @@ private: BitmapEx aBackgroundBitmap; BitmapEx aLogoBitmap; - VclMultiLineEdit* m_pVersion; - FixedText* m_pDescriptionText; - FixedText* m_pCopyrightText; - FixedImage* m_pLogoImage; - FixedText* m_pLogoReplacement; - PushButton* m_pCreditsButton; - PushButton* m_pWebsiteButton; + VclPtr<VclMultiLineEdit> m_pVersion; + VclPtr<FixedText> m_pDescriptionText; + VclPtr<FixedText> m_pCopyrightText; + VclPtr<FixedImage> m_pLogoImage; + VclPtr<FixedText> m_pLogoReplacement; + VclPtr<PushButton> m_pCreditsButton; + VclPtr<PushButton> m_pWebsiteButton; OUString m_aVersionTextStr; OUString m_aVendorTextStr; @@ -66,6 +66,8 @@ protected: public: AboutDialog(vcl::Window* pParent); + virtual ~AboutDialog(); + virtual void dispose() SAL_OVERRIDE; DECL_LINK( HandleClick, PushButton* ); }; diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx index dc156cc914c6..6c487cabc80f 100644 --- a/cui/source/inc/acccfg.hxx +++ b/cui/source/inc/acccfg.hxx @@ -53,7 +53,7 @@ class SfxStringItem; class SfxAccCfgTabListBox_Impl : public SvTabListBox { - SfxAcceleratorConfigPage* m_pAccelConfigPage; + VclPtr<SfxAcceleratorConfigPage> m_pAccelConfigPage; void KeyInput( const KeyEvent &rKEvt ) SAL_OVERRIDE; @@ -67,6 +67,8 @@ public: , m_pAccelConfigPage(NULL) { } + virtual ~SfxAccCfgTabListBox_Impl(); + virtual void dispose() SAL_OVERRIDE; void SetAccelConfigPage(SfxAcceleratorConfigPage* pAccelConfigPage) { @@ -118,17 +120,17 @@ private: const SfxStringItem* m_pFontItem; sfx2::FileDialogHelper* m_pFileDlg; - SfxAccCfgTabListBox_Impl* m_pEntriesBox; - RadioButton* m_pOfficeButton; - RadioButton* m_pModuleButton; - PushButton* m_pChangeButton; - PushButton* m_pRemoveButton; - SfxConfigGroupListBox* m_pGroupLBox; - SfxConfigFunctionListBox* m_pFunctionBox; - SvTreeListBox* m_pKeyBox; - PushButton* m_pLoadButton; - PushButton* m_pSaveButton; - PushButton* m_pResetButton; + VclPtr<SfxAccCfgTabListBox_Impl> m_pEntriesBox; + VclPtr<RadioButton> m_pOfficeButton; + VclPtr<RadioButton> m_pModuleButton; + VclPtr<PushButton> m_pChangeButton; + VclPtr<PushButton> m_pRemoveButton; + VclPtr<SfxConfigGroupListBox> m_pGroupLBox; + VclPtr<SfxConfigFunctionListBox> m_pFunctionBox; + VclPtr<SvTreeListBox> m_pKeyBox; + VclPtr<PushButton> m_pLoadButton; + VclPtr<PushButton> m_pSaveButton; + VclPtr<PushButton> m_pResetButton; OUString aLoadAccelConfigStr; OUString aSaveAccelConfigStr; OUString aFilterAllStr; diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx index 3f56d128e87b..0be6bc61d698 100644 --- a/cui/source/inc/align.hxx +++ b/cui/source/inc/align.hxx @@ -79,36 +79,36 @@ private: DECL_LINK( UpdateEnableHdl, void* ); private: - ListBox* m_pLbHorAlign; - FixedText* m_pFtIndent; - MetricField* m_pEdIndent; - FixedText* m_pFtVerAlign; - ListBox* m_pLbVerAlign; - - DialControl* m_pCtrlDial; - FixedText* m_pFtRotate; - NumericField* m_pNfRotate; - FixedText* m_pFtRefEdge; - ValueSet* m_pVsRefEdge; - TriStateBox* m_pCbStacked; - TriStateBox* m_pCbAsianMode; + VclPtr<ListBox> m_pLbHorAlign; + VclPtr<FixedText> m_pFtIndent; + VclPtr<MetricField> m_pEdIndent; + VclPtr<FixedText> m_pFtVerAlign; + VclPtr<ListBox> m_pLbVerAlign; + + VclPtr<DialControl> m_pCtrlDial; + VclPtr<FixedText> m_pFtRotate; + VclPtr<NumericField> m_pNfRotate; + VclPtr<FixedText> m_pFtRefEdge; + VclPtr<ValueSet> m_pVsRefEdge; + VclPtr<TriStateBox> m_pCbStacked; + VclPtr<TriStateBox> m_pCbAsianMode; OrientationHelper* m_pOrientHlp; - VclHBox* m_pBoxDirection; - TriStateBox* m_pBtnWrap; - TriStateBox* m_pBtnHyphen; - TriStateBox* m_pBtnShrink; - FrameDirListBox* m_pLbFrameDir; + VclPtr<VclHBox> m_pBoxDirection; + VclPtr<TriStateBox> m_pBtnWrap; + VclPtr<TriStateBox> m_pBtnHyphen; + VclPtr<TriStateBox> m_pBtnShrink; + VclPtr<FrameDirListBox> m_pLbFrameDir; // hidden labels/string - FixedText* m_pFtBotLock; - FixedText* m_pFtTopLock; - FixedText* m_pFtCelLock; - FixedText* m_pFtABCD; - - VclContainer* m_pAlignmentFrame; - VclContainer* m_pOrientFrame; - VclContainer* m_pPropertiesFrame; + VclPtr<FixedText> m_pFtBotLock; + VclPtr<FixedText> m_pFtTopLock; + VclPtr<FixedText> m_pFtCelLock; + VclPtr<FixedText> m_pFtABCD; + + VclPtr<VclContainer> m_pAlignmentFrame; + VclPtr<VclContainer> m_pOrientFrame; + VclPtr<VclContainer> m_pPropertiesFrame; }; diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index 17e2bb64b66f..bed9ffc9b533 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -43,8 +43,8 @@ namespace editeng { class SortedAutoCompleteStrings; } class OfaAutoCorrDlg : public SfxTabDialog { - VclContainer* m_pLanguageBox; - SvxLanguageBox* m_pLanguageLB; + VclPtr<VclContainer> m_pLanguageBox; + VclPtr<SvxLanguageBox> m_pLanguageLB; sal_uInt16 m_nReplacePageId; sal_uInt16 m_nExceptionsPageId; @@ -53,6 +53,8 @@ class OfaAutoCorrDlg : public SfxTabDialog public: OfaAutoCorrDlg(vcl::Window* pParent, const SfxItemSet *pSet); + virtual ~OfaAutoCorrDlg(); + virtual void dispose() SAL_OVERRIDE; void EnableLanguage(bool bEnable); }; @@ -94,7 +96,7 @@ class OfaAutocorrOptionsPage : public SfxTabPage using TabPage::ActivatePage; private: - SvxCheckListBox *m_pCheckLB; + VclPtr<SvxCheckListBox> m_pCheckLB; OUString m_sInput; OUString m_sDoubleCaps; @@ -107,6 +109,8 @@ private: public: OfaAutocorrOptionsPage(vcl::Window* pParent, const SfxItemSet& rSet); + virtual ~OfaAutocorrOptionsPage(); + virtual void dispose() SAL_OVERRIDE; static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); @@ -123,8 +127,8 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage { using TabPage::ActivatePage; - OfaACorrCheckListBox* m_pCheckLB; - PushButton* m_pEditPB; + VclPtr<OfaACorrCheckListBox> m_pCheckLB; + VclPtr<PushButton> m_pEditPB; OUString sDeleteEmptyPara; OUString sUseReplaceTbl; @@ -225,12 +229,12 @@ private: StringChangeTable aChangesTable; - CheckBox* m_pTextOnlyCB; - AutoCorrEdit* m_pShortED; - AutoCorrEdit* m_pReplaceED; - SvTabListBox* m_pReplaceTLB; - PushButton* m_pNewReplacePB; - PushButton* m_pDeleteReplacePB; + VclPtr<CheckBox> m_pTextOnlyCB; + VclPtr<AutoCorrEdit> m_pShortED; + VclPtr<AutoCorrEdit> m_pReplaceED; + VclPtr<SvTabListBox> m_pReplaceTLB; + VclPtr<PushButton> m_pNewReplacePB; + VclPtr<PushButton> m_pDeleteReplacePB; OUString sModify; OUString sNew; @@ -291,17 +295,17 @@ class OfaAutocorrExceptPage : public SfxTabPage using TabPage::DeactivatePage; private: - AutoCorrEdit* m_pAbbrevED; - ListBox* m_pAbbrevLB; - PushButton* m_pNewAbbrevPB; - PushButton* m_pDelAbbrevPB; - CheckBox* m_pAutoAbbrevCB; - - AutoCorrEdit* m_pDoubleCapsED; - ListBox* m_pDoubleCapsLB; - PushButton* m_pNewDoublePB; - PushButton* m_pDelDoublePB; - CheckBox* m_pAutoCapsCB; + VclPtr<AutoCorrEdit> m_pAbbrevED; + VclPtr<ListBox> m_pAbbrevLB; + VclPtr<PushButton> m_pNewAbbrevPB; + VclPtr<PushButton> m_pDelAbbrevPB; + VclPtr<CheckBox> m_pAutoAbbrevCB; + + VclPtr<AutoCorrEdit> m_pDoubleCapsED; + VclPtr<ListBox> m_pDoubleCapsLB; + VclPtr<PushButton> m_pNewDoublePB; + VclPtr<PushButton> m_pDelDoublePB; + VclPtr<CheckBox> m_pAutoCapsCB; StringsTable aStringsTable; CollatorWrapper* pCompareClass; @@ -338,29 +342,29 @@ class OfaQuoteTabPage : public SfxTabPage private: /// For anything but writer - SvxCheckListBox* m_pCheckLB; + VclPtr<SvxCheckListBox> m_pCheckLB; /// Just for writer - OfaACorrCheckListBox* m_pSwCheckLB; + VclPtr<OfaACorrCheckListBox> m_pSwCheckLB; OUString sNonBrkSpace; OUString sOrdinal; SvLBoxButtonData* pCheckButtonData; - CheckBox* m_pSingleTypoCB; - PushButton* m_pSglStartQuotePB; - FixedText* m_pSglStartExFT; - PushButton* m_pSglEndQuotePB; - FixedText* m_pSglEndExFT; - PushButton* m_pSglStandardPB; + VclPtr<CheckBox> m_pSingleTypoCB; + VclPtr<PushButton> m_pSglStartQuotePB; + VclPtr<FixedText> m_pSglStartExFT; + VclPtr<PushButton> m_pSglEndQuotePB; + VclPtr<FixedText> m_pSglEndExFT; + VclPtr<PushButton> m_pSglStandardPB; - CheckBox* m_pDoubleTypoCB; - PushButton* m_pDblStartQuotePB; - FixedText* m_pDblStartExFT; - PushButton* m_pDblEndQuotePB; - FixedText* m_pDblEndExFT; - PushButton* m_pDblStandardPB; + VclPtr<CheckBox> m_pDoubleTypoCB; + VclPtr<PushButton> m_pDblStartQuotePB; + VclPtr<FixedText> m_pDblStartExFT; + VclPtr<PushButton> m_pDblEndQuotePB; + VclPtr<FixedText> m_pDblEndExFT; + VclPtr<PushButton> m_pDblStandardPB; OUString m_sStartQuoteDlg; OUString m_sEndQuoteDlg; @@ -401,31 +405,33 @@ class OfaAutoCompleteTabPage : public SfxTabPage public: class AutoCompleteMultiListBox : public MultiListBox { - OfaAutoCompleteTabPage* m_pPage; + VclPtr<OfaAutoCompleteTabPage> m_pPage; public: AutoCompleteMultiListBox(vcl::Window *pParent, WinBits nBits) : MultiListBox(pParent, nBits) , m_pPage(NULL) { } + virtual ~AutoCompleteMultiListBox(); + virtual void dispose() SAL_OVERRIDE; void SetPage(OfaAutoCompleteTabPage *pPage) { m_pPage = pPage; } virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; }; private: using TabPage::ActivatePage; - CheckBox* m_pCBActiv; ///<Enable word completion - CheckBox* m_pCBAppendSpace;///<Append space - CheckBox* m_pCBAsTip; ///<Show as tip - - CheckBox* m_pCBCollect;///<Collect words - CheckBox* m_pCBRemoveList;///<...save the list for later use... - - ListBox* m_pDCBExpandKey; - NumericField* m_pNFMinWordlen; - NumericField* m_pNFMaxEntries; - AutoCompleteMultiListBox* m_pLBEntries; - PushButton* m_pPBEntries; + VclPtr<CheckBox> m_pCBActiv; ///<Enable word completion + VclPtr<CheckBox> m_pCBAppendSpace;///<Append space + VclPtr<CheckBox> m_pCBAsTip; ///<Show as tip + + VclPtr<CheckBox> m_pCBCollect;///<Collect words + VclPtr<CheckBox> m_pCBRemoveList;///<...save the list for later use... + + VclPtr<ListBox> m_pDCBExpandKey; + VclPtr<NumericField> m_pNFMinWordlen; + VclPtr<NumericField> m_pNFMaxEntries; + VclPtr<AutoCompleteMultiListBox> m_pLBEntries; + VclPtr<PushButton> m_pPBEntries; editeng::SortedAutoCompleteStrings* m_pAutoCompleteList; sal_uInt16 m_nAutoCmpltListCnt; @@ -434,6 +440,8 @@ private: OfaAutoCompleteTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); public: + virtual ~OfaAutoCompleteTabPage(); + virtual void dispose() SAL_OVERRIDE; static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); @@ -458,9 +466,9 @@ class OfaSmartTagOptionsTabPage : public SfxTabPage private: // controls - CheckBox* m_pMainCB; - SvxCheckListBox* m_pSmartTagTypesLB; - PushButton* m_pPropertiesPB; + VclPtr<CheckBox> m_pMainCB; + VclPtr<SvxCheckListBox> m_pSmartTagTypesLB; + VclPtr<PushButton> m_pPropertiesPB; /// construction via Create() OfaSmartTagOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); @@ -498,6 +506,8 @@ private: DECL_LINK(SelectHdl, void *); public: + virtual ~OfaSmartTagOptionsTabPage(); + virtual void dispose() SAL_OVERRIDE; static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx index 9a0b126e3d8c..57142af5ebf0 100644 --- a/cui/source/inc/backgrnd.hxx +++ b/cui/source/inc/backgrnd.hxx @@ -73,39 +73,39 @@ private: virtual ~SvxBackgroundTabPage(); virtual void dispose() SAL_OVERRIDE; - VclContainer* m_pAsGrid; - FixedText* m_pSelectTxt; - ListBox* m_pLbSelect; - FixedText* m_pTblDesc; - ListBox* m_pTblLBox; - ListBox* m_pParaLBox; + VclPtr<VclContainer> m_pAsGrid; + VclPtr<FixedText> m_pSelectTxt; + VclPtr<ListBox> m_pLbSelect; + VclPtr<FixedText> m_pTblDesc; + VclPtr<ListBox> m_pTblLBox; + VclPtr<ListBox> m_pParaLBox; - VclFrame* m_pBackGroundColorFrame; - SvxColorValueSet* m_pBackgroundColorSet; - BackgroundPreviewImpl* m_pPreviewWin1; + VclPtr<VclFrame> m_pBackGroundColorFrame; + VclPtr<SvxColorValueSet> m_pBackgroundColorSet; + VclPtr<BackgroundPreviewImpl> m_pPreviewWin1; - FixedText* m_pColTransFT;///<color transparency - MetricField* m_pColTransMF; - CheckBox* m_pBtnPreview; + VclPtr<FixedText> m_pColTransFT;///<color transparency + VclPtr<MetricField> m_pColTransMF; + VclPtr<CheckBox> m_pBtnPreview; // Background Bitmap ---------------------------------- - VclContainer* m_pBitmapContainer; - VclContainer* m_pFileFrame; - PushButton* m_pBtnBrowse; - CheckBox* m_pBtnLink; - FixedText* m_pFtUnlinked; - FixedText* m_pFtFile; - - VclContainer* m_pTypeFrame; - RadioButton* m_pBtnPosition; - RadioButton* m_pBtnArea; - RadioButton* m_pBtnTile; - SvxRectCtl* m_pWndPosition; - - VclContainer* m_pGraphTransFrame;///<transparency of graphics - MetricField* m_pGraphTransMF; - - BackgroundPreviewImpl* m_pPreviewWin2; + VclPtr<VclContainer> m_pBitmapContainer; + VclPtr<VclContainer> m_pFileFrame; + VclPtr<PushButton> m_pBtnBrowse; + VclPtr<CheckBox> m_pBtnLink; + VclPtr<FixedText> m_pFtUnlinked; + VclPtr<FixedText> m_pFtFile; + + VclPtr<VclContainer> m_pTypeFrame; + VclPtr<RadioButton> m_pBtnPosition; + VclPtr<RadioButton> m_pBtnArea; + VclPtr<RadioButton> m_pBtnTile; + VclPtr<SvxRectCtl> m_pWndPosition; + + VclPtr<VclContainer> m_pGraphTransFrame;///<transparency of graphics + VclPtr<MetricField> m_pGraphTransMF; + + VclPtr<BackgroundPreviewImpl> m_pPreviewWin2; // DDListBox for Writer ------------------------------- diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx index b05df65dd9f9..ff4b48ab3c7b 100644 --- a/cui/source/inc/border.hxx +++ b/cui/source/inc/border.hxx @@ -45,6 +45,8 @@ class SvxBorderTabPage : public SfxTabPage static const sal_uInt16 pRanges[]; public: + virtual ~SvxBorderTabPage(); + virtual void dispose() SAL_OVERRIDE; static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); static const sal_uInt16* GetRanges() { return pRanges; } @@ -63,37 +65,37 @@ private: SvxBorderTabPage( vcl::Window* pParent, const SfxItemSet& rCoreAttrs ); // Controls - ValueSet* m_pWndPresets; - FixedText* m_pUserDefFT; - svx::FrameSelector* m_pFrameSel; - - LineListBox* m_pLbLineStyle; - ColorListBox* m_pLbLineColor; - MetricField* m_pLineWidthMF; - - VclContainer* m_pSpacingFrame; - FixedText* m_pLeftFT; - MetricField* m_pLeftMF; - FixedText* m_pRightFT; - MetricField* m_pRightMF; - FixedText* m_pTopFT; - MetricField* m_pTopMF; - FixedText* m_pBottomFT; - MetricField* m_pBottomMF; - CheckBox* m_pSynchronizeCB; - - VclContainer* m_pShadowFrame; - ValueSet* m_pWndShadows; - FixedText* m_pFtShadowSize; - MetricField* m_pEdShadowSize; - FixedText* m_pFtShadowColor; - ColorListBox* m_pLbShadowColor; - - - VclContainer* m_pPropertiesFrame;///< properties - "Merge with next paragraph" in Writer - CheckBox* m_pMergeWithNextCB; + VclPtr<ValueSet> m_pWndPresets; + VclPtr<FixedText> m_pUserDefFT; + VclPtr<svx::FrameSelector> m_pFrameSel; + + VclPtr<LineListBox> m_pLbLineStyle; + VclPtr<ColorListBox> m_pLbLineColor; + VclPtr<MetricField> m_pLineWidthMF; + + VclPtr<VclContainer> m_pSpacingFrame; + VclPtr<FixedText> m_pLeftFT; + VclPtr<MetricField> m_pLeftMF; + VclPtr<FixedText> m_pRightFT; + VclPtr<MetricField> m_pRightMF; + VclPtr<FixedText> m_pTopFT; + VclPtr<MetricField> m_pTopMF; + VclPtr<FixedText> m_pBottomFT; + VclPtr<MetricField> m_pBottomMF; + VclPtr<CheckBox> m_pSynchronizeCB; + + VclPtr<VclContainer> m_pShadowFrame; + VclPtr<ValueSet> m_pWndShadows; + VclPtr<FixedText> m_pFtShadowSize; + VclPtr<MetricField> m_pEdShadowSize; + VclPtr<FixedText> m_pFtShadowColor; + VclPtr<ColorListBox> m_pLbShadowColor; + + + VclPtr<VclContainer> m_pPropertiesFrame;///< properties - "Merge with next paragraph" in Writer + VclPtr<CheckBox> m_pMergeWithNextCB; // #i29550# - CheckBox* m_pMergeAdjacentBordersCB; + VclPtr<CheckBox> m_pMergeAdjacentBordersCB; ImageList aShadowImgLstH; ImageList aShadowImgLst; @@ -113,8 +115,8 @@ private: std::set<sal_Int16> maUsedBorderStyles; // Handler - DECL_LINK( SelStyleHdl_Impl, ListBox* pLb ); - DECL_LINK( SelColHdl_Impl, ListBox* pLb ); + DECL_LINK( SelStyleHdl_Impl, ListBox* ); + DECL_LINK( SelColHdl_Impl, ListBox* ); DECL_LINK( SelPreHdl_Impl, void* ); DECL_LINK( SelSdwHdl_Impl, void* ); DECL_LINK( LinesChanged_Impl, void* ); diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index fd9ef1a858f1..759b1406d3e6 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -315,13 +315,15 @@ public: class SvxMenuEntriesListBox : public SvTreeListBox { private: - SvxConfigPage* pPage; + VclPtr<SvxConfigPage> pPage; protected: bool m_bIsInternalDrag; public: SvxMenuEntriesListBox(vcl::Window*, SvxConfigPage*); + virtual ~SvxMenuEntriesListBox(); + virtual void dispose() SAL_OVERRIDE; virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; @@ -358,30 +360,30 @@ protected: // the top section of the tab page where top level menus and toolbars // are displayed in a listbox - VclFrame* m_pTopLevel; - FixedText* m_pTopLevelLabel; - ListBox* m_pTopLevelListBox; - PushButton* m_pNewTopLevelButton; - MenuButton* m_pModifyTopLevelButton; + VclPtr<VclFrame> m_pTopLevel; + VclPtr<FixedText> m_pTopLevelLabel; + VclPtr<ListBox> m_pTopLevelListBox; + VclPtr<PushButton> m_pNewTopLevelButton; + VclPtr<MenuButton> m_pModifyTopLevelButton; // the contents section where the contents of the selected // menu or toolbar are displayed - VclFrame* m_pContents; - FixedText* m_pContentsLabel; - VclContainer* m_pEntries; - SvTreeListBox* m_pContentsListBox; + VclPtr<VclFrame> m_pContents; + VclPtr<FixedText> m_pContentsLabel; + VclPtr<VclContainer> m_pEntries; + VclPtr<SvTreeListBox> m_pContentsListBox; - PushButton* m_pAddCommandsButton; - MenuButton* m_pModifyCommandButton; + VclPtr<PushButton> m_pAddCommandsButton; + VclPtr<MenuButton> m_pModifyCommandButton; - PushButton* m_pMoveUpButton; - PushButton* m_pMoveDownButton; + VclPtr<PushButton> m_pMoveUpButton; + VclPtr<PushButton> m_pMoveDownButton; - ListBox* m_pSaveInListBox; + VclPtr<ListBox> m_pSaveInListBox; - VclMultiLineEdit* m_pDescriptionField; + VclPtr<VclMultiLineEdit> m_pDescriptionField; - SvxScriptSelectorDialog* m_pSelectorDlg; + VclPtr<SvxScriptSelectorDialog> m_pSelectorDlg; /// the ResourceURL to select when opening the dialog OUString m_aURLToSelect; @@ -409,7 +411,7 @@ protected: SvTreeListEntry* pTarget = NULL, bool bFront = false ); - void AddSubMenusToUI( const OUString& rBaseTitle, + void AddSubMenusToUI( const OUString& rBaseTitle, SvxConfigEntry* pParentData ); SvTreeListEntry* InsertEntryIntoUI ( SvxConfigEntry* pNewEntryData, @@ -422,6 +424,9 @@ protected: public: + virtual ~SvxConfigPage(); + virtual void dispose() SAL_OVERRIDE; + static bool CanConfig( const OUString& rModuleId ); SaveInData* GetSaveInData() { return pCurrentSaveInData; } @@ -495,11 +500,11 @@ public: class SvxMainMenuOrganizerDialog : public ModalDialog { - VclContainer* m_pMenuBox; - Edit* m_pMenuNameEdit; - SvTreeListBox* m_pMenuListBox; - PushButton* m_pMoveUpButton; - PushButton* m_pMoveDownButton; + VclPtr<VclContainer> m_pMenuBox; + VclPtr<Edit> m_pMenuNameEdit; + VclPtr<SvTreeListBox> m_pMenuListBox; + VclPtr<PushButton> m_pMoveUpButton; + VclPtr<PushButton> m_pMoveDownButton; SvxEntries* mpEntries; SvTreeListEntry* pNewMenuEntry; @@ -515,6 +520,8 @@ public: SvxMainMenuOrganizerDialog ( vcl::Window*, SvxEntries*, SvxConfigEntry*, bool bCreateMenu = false ); + virtual ~SvxMainMenuOrganizerDialog(); + virtual void dispose() SAL_OVERRIDE; SvxEntries* GetEntries() { return mpEntries;} void SetEntries( SvxEntries* ); @@ -526,7 +533,7 @@ class SvxToolbarEntriesListBox : public SvxMenuEntriesListBox Size m_aCheckBoxImageSizePixel; Link m_aChangedListener; SvLBoxButtonData* m_pButtonData; - SvxConfigPage* pPage; + VclPtr<SvxConfigPage> pPage; void ChangeVisibility( SvTreeListEntry* pEntry ); @@ -662,8 +669,8 @@ public: class SvxNewToolbarDialog : public ModalDialog { private: - Edit* m_pEdtName; - OKButton* m_pBtnOK; + VclPtr<Edit> m_pEdtName; + VclPtr<OKButton> m_pBtnOK; Link aCheckNameHdl; @@ -671,8 +678,10 @@ private: public: SvxNewToolbarDialog(vcl::Window* pWindow, const OUString& rName); + virtual ~SvxNewToolbarDialog(); + virtual void dispose() SAL_OVERRIDE; - ListBox* m_pSaveInListBox; + VclPtr<ListBox> m_pSaveInListBox; OUString GetName() { @@ -702,10 +711,10 @@ struct SvxIconSelectorToolBoxItem class SvxIconSelectorDialog : public ModalDialog { private: - ToolBox* pTbSymbol; - FixedText* pFtNote; - PushButton* pBtnImport; - PushButton* pBtnDelete; + VclPtr<ToolBox> pTbSymbol; + VclPtr<FixedText> pFtNote; + VclPtr<PushButton> pBtnImport; + VclPtr<PushButton> pBtnDelete; Size aTbSize; sal_uInt16 m_nNextId; @@ -770,10 +779,12 @@ public: class SvxIconChangeDialog : public ModalDialog { private: - FixedImage* pFImageInfo; - VclMultiLineEdit* pLineEditDescription; + VclPtr<FixedImage> pFImageInfo; + VclPtr<VclMultiLineEdit> pLineEditDescription; public: SvxIconChangeDialog(vcl::Window *pWindow, const OUString& aMessage); + virtual ~SvxIconChangeDialog(); + virtual void dispose() SAL_OVERRIDE; }; #endif // INCLUDED_CUI_SOURCE_INC_CFG_HXX diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx index e4e557d5912d..984e8e9e4c80 100644 --- a/cui/source/inc/cfgutil.hxx +++ b/cui/source/inc/cfgutil.hxx @@ -128,7 +128,7 @@ struct SvxConfigGroupBoxResource_Impl; class SfxConfigGroupListBox : public SvTreeListBox { SvxConfigGroupBoxResource_Impl* pImp; - SfxConfigFunctionListBox* pFunctionListBox; + VclPtr<SfxConfigFunctionListBox> pFunctionListBox; SfxGroupInfoArr_Impl aArr; OUString m_sModuleLongName; diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index da60c36ab965..f1075a93dfd7 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -47,7 +47,7 @@ class FontList; class SvxCharBasePage : public SfxTabPage { protected: - SvxFontPrevWindow* m_pPreviewWin; + VclPtr<SvxFontPrevWindow> m_pPreviewWin; bool m_bPreviewBackgroundToCharacter; @@ -61,6 +61,9 @@ protected: inline SvxFont& GetPreviewCTLFont(); public: + virtual ~SvxCharBasePage(); + virtual void dispose() SAL_OVERRIDE; + using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; @@ -77,38 +80,38 @@ class SvxCharNamePage : public SvxCharBasePage private: static const sal_uInt16 pNameRanges[]; - VclContainer* m_pWestFrame; - FixedText* m_pWestFontNameFT; - FontNameBox* m_pWestFontNameLB; - FixedText* m_pWestFontStyleFT; - FontStyleBox* m_pWestFontStyleLB; - FixedText* m_pWestFontSizeFT; - FontSizeBox* m_pWestFontSizeLB; - FixedText* m_pWestFontLanguageFT; - SvxLanguageComboBox* m_pWestFontLanguageLB; - FixedText* m_pWestFontTypeFT; - - VclContainer* m_pEastFrame; - FixedText* m_pEastFontNameFT; - FontNameBox* m_pEastFontNameLB; - FixedText* m_pEastFontStyleFT; - FontStyleBox* m_pEastFontStyleLB; - FixedText* m_pEastFontSizeFT; - FontSizeBox* m_pEastFontSizeLB; - FixedText* m_pEastFontLanguageFT; - SvxLanguageBox* m_pEastFontLanguageLB; - FixedText* m_pEastFontTypeFT; - - VclContainer* m_pCTLFrame; - FixedText* m_pCTLFontNameFT; - FontNameBox* m_pCTLFontNameLB; - FixedText* m_pCTLFontStyleFT; - FontStyleBox* m_pCTLFontStyleLB; - FixedText* m_pCTLFontSizeFT; - FontSizeBox* m_pCTLFontSizeLB; - FixedText* m_pCTLFontLanguageFT; - SvxLanguageBox* m_pCTLFontLanguageLB; - FixedText* m_pCTLFontTypeFT; + VclPtr<VclContainer> m_pWestFrame; + VclPtr<FixedText> m_pWestFontNameFT; + VclPtr<FontNameBox> m_pWestFontNameLB; + VclPtr<FixedText> m_pWestFontStyleFT; + VclPtr<FontStyleBox> m_pWestFontStyleLB; + VclPtr<FixedText> m_pWestFontSizeFT; + VclPtr<FontSizeBox> m_pWestFontSizeLB; + VclPtr<FixedText> m_pWestFontLanguageFT; + VclPtr<SvxLanguageComboBox> m_pWestFontLanguageLB; + VclPtr<FixedText> m_pWestFontTypeFT; + + VclPtr<VclContainer> m_pEastFrame; + VclPtr<FixedText> m_pEastFontNameFT; + VclPtr<FontNameBox> m_pEastFontNameLB; + VclPtr<FixedText> m_pEastFontStyleFT; + VclPtr<FontStyleBox> m_pEastFontStyleLB; + VclPtr<FixedText> m_pEastFontSizeFT; + VclPtr<FontSizeBox> m_pEastFontSizeLB; + VclPtr<FixedText> m_pEastFontLanguageFT; + VclPtr<SvxLanguageBox> m_pEastFontLanguageLB; + VclPtr<FixedText> m_pEastFontTypeFT; + + VclPtr<VclContainer> m_pCTLFrame; + VclPtr<FixedText> m_pCTLFontNameFT; + VclPtr<FontNameBox> m_pCTLFontNameLB; + VclPtr<FixedText> m_pCTLFontStyleFT; + VclPtr<FontStyleBox> m_pCTLFontStyleLB; + VclPtr<FixedText> m_pCTLFontSizeFT; + VclPtr<FontSizeBox> m_pCTLFontSizeLB; + VclPtr<FixedText> m_pCTLFontLanguageFT; + VclPtr<SvxLanguageBox> m_pCTLFontLanguageLB; + VclPtr<FixedText> m_pCTLFontTypeFT; SvxCharNamePage_Impl* m_pImpl; @@ -175,37 +178,37 @@ class SvxCharEffectsPage : public SvxCharBasePage private: static const sal_uInt16 pEffectsRanges[]; - FixedText* m_pFontColorFT; - ColorListBox* m_pFontColorLB; + VclPtr<FixedText> m_pFontColorFT; + VclPtr<ColorListBox> m_pFontColorLB; - FixedText* m_pEffectsFT; - ListBox* m_pEffectsLB; + VclPtr<FixedText> m_pEffectsFT; + VclPtr<ListBox> m_pEffectsLB; - FixedText* m_pReliefFT; - ListBox* m_pReliefLB; + VclPtr<FixedText> m_pReliefFT; + VclPtr<ListBox> m_pReliefLB; - TriStateBox* m_pOutlineBtn; - TriStateBox* m_pShadowBtn; - TriStateBox* m_pBlinkingBtn; - TriStateBox* m_pHiddenBtn; + VclPtr<TriStateBox> m_pOutlineBtn; + VclPtr<TriStateBox> m_pShadowBtn; + VclPtr<TriStateBox> m_pBlinkingBtn; + VclPtr<TriStateBox> m_pHiddenBtn; - ListBox* m_pOverlineLB; - FixedText* m_pOverlineColorFT; - ColorListBox* m_pOverlineColorLB; + VclPtr<ListBox> m_pOverlineLB; + VclPtr<FixedText> m_pOverlineColorFT; + VclPtr<ColorListBox> m_pOverlineColorLB; - ListBox* m_pStrikeoutLB; + VclPtr<ListBox> m_pStrikeoutLB; - ListBox* m_pUnderlineLB; - FixedText* m_pUnderlineColorFT; - ColorListBox* m_pUnderlineColorLB; + VclPtr<ListBox> m_pUnderlineLB; + VclPtr<FixedText> m_pUnderlineColorFT; + VclPtr<ColorListBox> m_pUnderlineColorLB; - CheckBox* m_pIndividualWordsBtn; + VclPtr<CheckBox> m_pIndividualWordsBtn; - FixedText* m_pEmphasisFT; - ListBox* m_pEmphasisLB; + VclPtr<FixedText> m_pEmphasisFT; + VclPtr<ListBox> m_pEmphasisLB; - FixedText* m_pPositionFT; - ListBox* m_pPositionLB; + VclPtr<FixedText> m_pPositionFT; + VclPtr<ListBox> m_pPositionLB; sal_uInt16 m_nHtmlMode; @@ -226,8 +229,10 @@ private: DECL_LINK( ColorBoxSelectHdl_Impl, ColorListBox* ); public: - using SfxTabPage::DeactivatePage; + virtual ~SvxCharEffectsPage(); + virtual void dispose() SAL_OVERRIDE; + using SfxTabPage::DeactivatePage; virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; public: @@ -252,30 +257,30 @@ class SvxCharPositionPage : public SvxCharBasePage static const sal_uInt16 pPositionRanges[]; private: - RadioButton* m_pHighPosBtn; - RadioButton* m_pNormalPosBtn; - RadioButton* m_pLowPosBtn; - FixedText* m_pHighLowFT; - MetricField* m_pHighLowMF; - CheckBox* m_pHighLowRB; - FixedText* m_pFontSizeFT; - MetricField* m_pFontSizeMF; - - VclContainer* m_pRotationContainer; - - FixedText* m_pScalingFT; - FixedText* m_pScalingAndRotationFT; - RadioButton* m_p0degRB; - RadioButton* m_p90degRB; - RadioButton* m_p270degRB; - CheckBox* m_pFitToLineCB; - - MetricField* m_pScaleWidthMF; - - ListBox* m_pKerningLB; - FixedText* m_pKerningFT; - MetricField* m_pKerningMF; - CheckBox* m_pPairKerningBtn; + VclPtr<RadioButton> m_pHighPosBtn; + VclPtr<RadioButton> m_pNormalPosBtn; + VclPtr<RadioButton> m_pLowPosBtn; + VclPtr<FixedText> m_pHighLowFT; + VclPtr<MetricField> m_pHighLowMF; + VclPtr<CheckBox> m_pHighLowRB; + VclPtr<FixedText> m_pFontSizeFT; + VclPtr<MetricField> m_pFontSizeMF; + + VclPtr<VclContainer> m_pRotationContainer; + + VclPtr<FixedText> m_pScalingFT; + VclPtr<FixedText> m_pScalingAndRotationFT; + VclPtr<RadioButton> m_p0degRB; + VclPtr<RadioButton> m_p90degRB; + VclPtr<RadioButton> m_p270degRB; + VclPtr<CheckBox> m_pFitToLineCB; + + VclPtr<MetricField> m_pScaleWidthMF; + + VclPtr<ListBox> m_pKerningLB; + VclPtr<FixedText> m_pKerningFT; + VclPtr<MetricField> m_pKerningMF; + VclPtr<CheckBox> m_pPairKerningBtn; short m_nSuperEsc; short m_nSubEsc; @@ -304,6 +309,9 @@ private: DECL_LINK(ScaleWidthModifyHdl_Impl, void *); public: + virtual ~SvxCharPositionPage(); + virtual void dispose() SAL_OVERRIDE; + using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; @@ -328,10 +336,10 @@ class SvxCharTwoLinesPage : public SvxCharBasePage { private: static const sal_uInt16 pTwoLinesRanges[]; - CheckBox* m_pTwoLinesBtn; - VclContainer* m_pEnclosingFrame; - ListBox* m_pStartBracketLB; - ListBox* m_pEndBracketLB; + VclPtr<CheckBox> m_pTwoLinesBtn; + VclPtr<VclContainer> m_pEnclosingFrame; + VclPtr<ListBox> m_pStartBracketLB; + VclPtr<ListBox> m_pEndBracketLB; sal_uInt16 m_nStartBracketPosition; sal_uInt16 m_nEndBracketPosition; @@ -347,13 +355,15 @@ private: DECL_LINK( CharacterMapHdl_Impl, ListBox* ); public: + virtual ~SvxCharTwoLinesPage(); + virtual void dispose() SAL_OVERRIDE; + using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; -public: static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges() { return pTwoLinesRanges; } diff --git a/cui/source/inc/connect.hxx b/cui/source/inc/connect.hxx index b079eef1c591..aae2744538ce 100644 --- a/cui/source/inc/connect.hxx +++ b/cui/source/inc/connect.hxx @@ -34,21 +34,21 @@ class SvxConnectionPage : public SfxTabPage { private: static const sal_uInt16 pRanges[]; - ListBox* m_pLbType; + VclPtr<ListBox> m_pLbType; - FixedText* m_pFtLine1; - MetricField* m_pMtrFldLine1; - FixedText* m_pFtLine2; - MetricField* m_pMtrFldLine2; - FixedText* m_pFtLine3; - MetricField* m_pMtrFldLine3; + VclPtr<FixedText> m_pFtLine1; + VclPtr<MetricField> m_pMtrFldLine1; + VclPtr<FixedText> m_pFtLine2; + VclPtr<MetricField> m_pMtrFldLine2; + VclPtr<FixedText> m_pFtLine3; + VclPtr<MetricField> m_pMtrFldLine3; - MetricField* m_pMtrFldHorz1; - MetricField* m_pMtrFldVert1; - MetricField* m_pMtrFldHorz2; - MetricField* m_pMtrFldVert2; + VclPtr<MetricField> m_pMtrFldHorz1; + VclPtr<MetricField> m_pMtrFldVert1; + VclPtr<MetricField> m_pMtrFldHorz2; + VclPtr<MetricField> m_pMtrFldVert2; - SvxXConnectionPreview* m_pCtlPreview; + VclPtr<SvxXConnectionPreview> m_pCtlPreview; const SfxItemSet& rOutAttrs; SfxItemSet aAttrSet; @@ -62,6 +62,8 @@ private: public: SvxConnectionPage( vcl::Window* pWindow, const SfxItemSet& rInAttrs ); + virtual ~SvxConnectionPage(); + virtual void dispose() SAL_OVERRIDE; static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pRanges; } diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx index dfe0d989b3af..596d3231443e 100644 --- a/cui/source/inc/cuicharmap.hxx +++ b/cui/source/inc/cuicharmap.hxx @@ -67,16 +67,16 @@ private: void init(); - SvxShowCharSet* m_pShowSet; - Edit* m_pShowText; - PushButton* m_pOKBtn; - FixedText* m_pFontText; - ListBox* m_pFontLB; - FixedText* m_pSubsetText; - ListBox* m_pSubsetLB; - FixedText* m_pSymbolText; - SvxShowText* m_pShowChar; - FixedText* m_pCharCodeText; + VclPtr<SvxShowCharSet> m_pShowSet; + VclPtr<Edit> m_pShowText; + VclPtr<PushButton> m_pOKBtn; + VclPtr<FixedText> m_pFontText; + VclPtr<ListBox> m_pFontLB; + VclPtr<FixedText> m_pSubsetText; + VclPtr<ListBox> m_pSubsetLB; + VclPtr<FixedText> m_pSymbolText; + VclPtr<SvxShowText> m_pShowChar; + VclPtr<FixedText> m_pCharCodeText; vcl::Font aFont; bool bOne; const SubsetMap* pSubsetMap; @@ -93,6 +93,8 @@ private: public: SvxCharacterMap( vcl::Window* pParent, bool bOne=true, const SfxItemSet* pSet=0 ); + virtual ~SvxCharacterMap(); + virtual void dispose() SAL_OVERRIDE; void DisableFontSelection(); diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx index 96dacaf1d5b4..d56c9d5ee2a4 100644 --- a/cui/source/inc/cuifmsearch.hxx +++ b/cui/source/inc/cuifmsearch.hxx @@ -47,36 +47,36 @@ class FmSearchDialog : public ModalDialog friend class FmSearchEngine; // my all Controls - RadioButton *m_prbSearchForText; - RadioButton *m_prbSearchForNull; - RadioButton *m_prbSearchForNotNull; - ComboBox *m_pcmbSearchText; - FixedText *m_pftForm; - ListBox *m_plbForm; - RadioButton *m_prbAllFields; - RadioButton *m_prbSingleField; - ListBox *m_plbField; - FixedText *m_pftPosition; - ListBox *m_plbPosition; - CheckBox *m_pcbUseFormat; - CheckBox *m_pcbCase; - CheckBox *m_pcbBackwards; - CheckBox *m_pcbStartOver; - CheckBox *m_pcbWildCard; - CheckBox *m_pcbRegular; - CheckBox *m_pcbApprox; - PushButton *m_ppbApproxSettings; - CheckBox *m_pHalfFullFormsCJK; - CheckBox *m_pSoundsLikeCJK; - PushButton *m_pSoundsLikeCJKSettings; - FixedText *m_pftRecord; - FixedText *m_pftHint; - PushButton *m_pbSearchAgain; - CancelButton *m_pbClose; + VclPtr<RadioButton> m_prbSearchForText; + VclPtr<RadioButton> m_prbSearchForNull; + VclPtr<RadioButton> m_prbSearchForNotNull; + VclPtr<ComboBox> m_pcmbSearchText; + VclPtr<FixedText> m_pftForm; + VclPtr<ListBox> m_plbForm; + VclPtr<RadioButton> m_prbAllFields; + VclPtr<RadioButton> m_prbSingleField; + VclPtr<ListBox> m_plbField; + VclPtr<FixedText> m_pftPosition; + VclPtr<ListBox> m_plbPosition; + VclPtr<CheckBox> m_pcbUseFormat; + VclPtr<CheckBox> m_pcbCase; + VclPtr<CheckBox> m_pcbBackwards; + VclPtr<CheckBox> m_pcbStartOver; + VclPtr<CheckBox> m_pcbWildCard; + VclPtr<CheckBox> m_pcbRegular; + VclPtr<CheckBox> m_pcbApprox; + VclPtr<PushButton> m_ppbApproxSettings; + VclPtr<CheckBox> m_pHalfFullFormsCJK; + VclPtr<CheckBox> m_pSoundsLikeCJK; + VclPtr<PushButton> m_pSoundsLikeCJKSettings; + VclPtr<FixedText> m_pftRecord; + VclPtr<FixedText> m_pftHint; + VclPtr<PushButton> m_pbSearchAgain; + VclPtr<CancelButton> m_pbClose; OUString m_sSearch; OUString m_sCancel; - vcl::Window* m_pPreSearchFocus; + VclPtr<vcl::Window> m_pPreSearchFocus; Link m_lnkFoundHandler; ///< Handler for "found" Link m_lnkCanceledNotFoundHdl; ///< Handler for Positioning the Cursors diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx index 2c82170ea3a7..e02d6a1b5094 100644 --- a/cui/source/inc/cuigaldlg.hxx +++ b/cui/source/inc/cuigaldlg.hxx @@ -60,8 +60,8 @@ class SearchThread: public salhelper::Thread { private: - SearchProgress* mpProgress; - TPGalleryThemeProperties* mpBrowser; + VclPtr<SearchProgress> mpProgress; + VclPtr<TPGalleryThemeProperties> mpBrowser; INetURLObject maStartURL; void ImplSearch( const INetURLObject& rStartURL, @@ -81,10 +81,10 @@ public: class SearchProgress : public ModalDialog { private: - FixedText* m_pFtSearchDir; - FixedText* m_pFtSearchType; - CancelButton* m_pBtnCancel; - vcl::Window * parent_; + VclPtr<FixedText> m_pFtSearchDir; + VclPtr<FixedText> m_pFtSearchType; + VclPtr<CancelButton> m_pBtnCancel; + VclPtr<vcl::Window> parent_; INetURLObject startUrl_; rtl::Reference< SearchThread > maSearchThread; @@ -93,6 +93,8 @@ private: public: SearchProgress( vcl::Window* pParent, const INetURLObject& rStartURL ); + virtual ~SearchProgress(); + virtual void dispose() SAL_OVERRIDE; DECL_LINK( CleanUpHdl, void* ); @@ -106,8 +108,8 @@ class TakeThread: public salhelper::Thread { private: - TakeProgress* mpProgress; - TPGalleryThemeProperties* mpBrowser; + VclPtr<TakeProgress> mpProgress; + VclPtr<TPGalleryThemeProperties> mpBrowser; TokenList_impl& mrTakenList; virtual ~TakeThread(); @@ -125,9 +127,9 @@ public: class TakeProgress : public ModalDialog { private: - FixedText* m_pFtTakeFile; - CancelButton* m_pBtnCancel; - vcl::Window * window_; + VclPtr<FixedText> m_pFtTakeFile; + VclPtr<CancelButton> m_pBtnCancel; + VclPtr<vcl::Window> window_; rtl::Reference< TakeThread > maTakeThread; TokenList_impl maTakenList; @@ -137,6 +139,8 @@ private: public: TakeProgress( vcl::Window* pWindow ); + virtual ~TakeProgress(); + virtual void dispose() SAL_OVERRIDE; DECL_LINK( CleanUpHdl, void* ); @@ -148,8 +152,8 @@ public: class ActualizeProgress : public ModalDialog { private: - FixedText* m_pFtActualizeFile; - CancelButton* m_pBtnCancel; + VclPtr<FixedText> m_pFtActualizeFile; + VclPtr<CancelButton> m_pBtnCancel; Idle* pIdle; GalleryTheme* pTheme; GalleryProgress aStatusProgress; @@ -160,6 +164,8 @@ private: public: ActualizeProgress( vcl::Window* pWindow, GalleryTheme* pThm ); + virtual ~ActualizeProgress(); + virtual void dispose() SAL_OVERRIDE; virtual short Execute() SAL_OVERRIDE; }; @@ -167,23 +173,27 @@ public: class TitleDialog : public ModalDialog { private: - Edit* m_pEdit; + VclPtr<Edit> m_pEdit; public: TitleDialog(vcl::Window* pParent, const OUString& rOldText); + virtual ~TitleDialog(); + virtual void dispose() SAL_OVERRIDE; OUString GetTitle() const { return m_pEdit->GetText(); } }; class GalleryIdDialog : public ModalDialog { private: - OKButton* m_pBtnOk; - ListBox* m_pLbResName; + VclPtr<OKButton> m_pBtnOk; + VclPtr<ListBox> m_pLbResName; GalleryTheme* pThm; DECL_LINK( ClickOkHdl, void* ); DECL_LINK( ClickResNameHdl, void* ); public: GalleryIdDialog( vcl::Window* pParent, GalleryTheme* pThm ); + virtual ~GalleryIdDialog(); + virtual void dispose() SAL_OVERRIDE; sal_uLong GetId() const { return m_pLbResName->GetSelectEntryPos(); } }; @@ -204,12 +214,12 @@ class TPGalleryThemeGeneral : public SfxTabPage { private: - FixedImage* m_pFiMSImage; - Edit* m_pEdtMSName; - FixedText* m_pFtMSShowType; - FixedText* m_pFtMSShowPath; - FixedText* m_pFtMSShowContent; - FixedText* m_pFtMSShowChangeDate; + VclPtr<FixedImage> m_pFiMSImage; + VclPtr<Edit> m_pEdtMSName; + VclPtr<FixedText> m_pFtMSShowType; + VclPtr<FixedText> m_pFtMSShowPath; + VclPtr<FixedText> m_pFtMSShowContent; + VclPtr<FixedText> m_pFtMSShowChangeDate; ExchangeData* pData; virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE {} @@ -219,6 +229,8 @@ private: public: TPGalleryThemeGeneral( vcl::Window* pParent, const SfxItemSet& rSet ); + virtual ~TPGalleryThemeGeneral(); + virtual void dispose() SAL_OVERRIDE; void SetXChgData( ExchangeData* pData ); const ExchangeData* GetXChgData() const { return pData; } @@ -234,13 +246,13 @@ class TPGalleryThemeProperties : public SfxTabPage friend class TakeProgress; friend class TakeThread; - ComboBox* m_pCbbFileType; - ListBox* m_pLbxFound; - PushButton* m_pBtnSearch; - PushButton* m_pBtnTake; - PushButton* m_pBtnTakeAll; - CheckBox* m_pCbxPreview; - GalleryPreview* m_pWndPreview; + VclPtr<ComboBox> m_pCbbFileType; + VclPtr<ListBox> m_pLbxFound; + VclPtr<PushButton> m_pBtnSearch; + VclPtr<PushButton> m_pBtnTake; + VclPtr<PushButton> m_pBtnTakeAll; + VclPtr<CheckBox> m_pCbxPreview; + VclPtr<GalleryPreview> m_pWndPreview; ExchangeData* pData; StringList aFoundList; diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx index 1fb139375fd7..f43685d65fd2 100644 --- a/cui/source/inc/cuigrfflt.hxx +++ b/cui/source/inc/cuigrfflt.hxx @@ -77,7 +77,7 @@ private: DECL_LINK( ImplModifyHdl, void* p ); protected: - GraphicPreviewWindow* mpPreview; + VclPtr<GraphicPreviewWindow> mpPreview; const Link& GetModifyHdl() const { return maModifyHdl; } const Size& GetGraphicSizePixel() const { return maSizePixel; } @@ -85,6 +85,8 @@ protected: public: GraphicFilterDialog(vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, const Graphic& rGraphic); + virtual ~GraphicFilterDialog(); + virtual void dispose() SAL_OVERRIDE; virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) = 0; }; @@ -97,11 +99,13 @@ public: class GraphicFilterSmooth : public GraphicFilterDialog { private: - NumericField* mpMtrRadius; + VclPtr<NumericField> mpMtrRadius; public: GraphicFilterSmooth( vcl::Window* pParent, const Graphic& rGraphic, double nRadius); + virtual ~GraphicFilterSmooth(); + virtual void dispose() SAL_OVERRIDE; virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE; double GetRadius() const { return mpMtrRadius->GetValue() / 10.0; } @@ -114,14 +118,16 @@ public: class GraphicFilterMosaic : public GraphicFilterDialog { private: - MetricField* mpMtrWidth; - MetricField* mpMtrHeight; - CheckBox* mpCbxEdges; + VclPtr<MetricField> mpMtrWidth; + VclPtr<MetricField> mpMtrHeight; + VclPtr<CheckBox> mpCbxEdges; public: GraphicFilterMosaic(vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, bool bEnhanceEdges); + virtual ~GraphicFilterMosaic(); + virtual void dispose() SAL_OVERRIDE; virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE; long GetTileWidth() const { return static_cast<long>(mpMtrWidth->GetValue()); } @@ -136,13 +142,15 @@ public: class GraphicFilterSolarize : public GraphicFilterDialog { private: - MetricField* mpMtrThreshold; - CheckBox* mpCbxInvert; + VclPtr<MetricField> mpMtrThreshold; + VclPtr<CheckBox> mpCbxInvert; public: GraphicFilterSolarize( vcl::Window* pParent, const Graphic& rGraphic, sal_uInt8 nGreyThreshold, bool bInvert ); + virtual ~GraphicFilterSolarize(); + virtual void dispose() SAL_OVERRIDE; virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE; sal_uInt8 GetGreyThreshold() const { return( (sal_uInt8) FRound( mpMtrThreshold->GetValue() * 2.55 ) ); } @@ -156,10 +164,12 @@ public: class GraphicFilterSepia : public GraphicFilterDialog { private: - MetricField* mpMtrSepia; + VclPtr<MetricField> mpMtrSepia; public: GraphicFilterSepia( vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nSepiaPercent ); + virtual ~GraphicFilterSepia(); + virtual void dispose() SAL_OVERRIDE; virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE; sal_uInt16 GetSepiaPercent() const { @@ -174,10 +184,12 @@ public: class GraphicFilterPoster : public GraphicFilterDialog { private: - NumericField* mpNumPoster; + VclPtr<NumericField> mpNumPoster; public: GraphicFilterPoster( vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nPosterColorCount ); + virtual ~GraphicFilterPoster(); + virtual void dispose() SAL_OVERRIDE; virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE; sal_uInt16 GetPosterColorCount() const { return( (sal_uInt16) mpNumPoster->GetValue() ); } @@ -203,10 +215,12 @@ public: class GraphicFilterEmboss : public GraphicFilterDialog { private: - EmbossControl* mpCtlLight; + VclPtr<EmbossControl> mpCtlLight; public: GraphicFilterEmboss( vcl::Window* pParent, const Graphic& rGraphic, RECT_POINT eLightSource ); + virtual ~GraphicFilterEmboss(); + virtual void dispose() SAL_OVERRIDE; virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE; RECT_POINT GetLightSource() const { return mpCtlLight->GetActualRP(); } diff --git a/cui/source/inc/cuihyperdlg.hxx b/cui/source/inc/cuihyperdlg.hxx index 93de02f161cc..b85633738ddf 100644 --- a/cui/source/inc/cuihyperdlg.hxx +++ b/cui/source/inc/cuihyperdlg.hxx @@ -38,7 +38,7 @@ class SvxHpLinkDlg; class SvxHlinkCtrl : public SfxControllerItem { private : - SvxHpLinkDlg *pParent; + VclPtr<SvxHpLinkDlg> pParent; SfxStatusForwarder aRdOnlyForwarder; diff --git a/cui/source/inc/cuiimapwnd.hxx b/cui/source/inc/cuiimapwnd.hxx index 3266a2a3449c..87c7e546cc6a 100644 --- a/cui/source/inc/cuiimapwnd.hxx +++ b/cui/source/inc/cuiimapwnd.hxx @@ -33,11 +33,11 @@ class URLDlg : public ModalDialog { - Edit* m_pEdtURL; - ComboBox* m_pCbbTargets; - Edit* m_pEdtName; - Edit* m_pEdtAlternativeText; - VclMultiLineEdit* m_pEdtDescription; + VclPtr<Edit> m_pEdtURL; + VclPtr<ComboBox> m_pCbbTargets; + VclPtr<Edit> m_pEdtName; + VclPtr<Edit> m_pEdtAlternativeText; + VclPtr<VclMultiLineEdit> m_pEdtDescription; public: @@ -45,6 +45,8 @@ public: const OUString& rURL, const OUString& rAlternativeText, const OUString& rDescription, const OUString& rTarget, const OUString& rName, TargetList& rTargetList ); + virtual ~URLDlg(); + virtual void dispose() SAL_OVERRIDE; OUString GetURL() const { return m_pEdtURL->GetText(); } OUString GetAltText() const { return m_pEdtAlternativeText->GetText(); } diff --git a/cui/source/inc/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx index 2febcb8d0976..2a4c295d60e4 100644 --- a/cui/source/inc/cuioptgenrl.hxx +++ b/cui/source/inc/cuioptgenrl.hxx @@ -40,7 +40,7 @@ class SvxGeneralTabPage : public SfxTabPage using TabPage::DeactivatePage; private: // the "Use data for document properties" checkbox - CheckBox* m_pUseDataCB; + VclPtr<CheckBox> m_pUseDataCB; // rows struct Row; std::vector<boost::shared_ptr<Row> > vRows; @@ -64,6 +64,8 @@ protected: public: SvxGeneralTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); + virtual ~SvxGeneralTabPage(); + virtual void dispose() SAL_OVERRIDE; static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); diff --git a/cui/source/inc/cuisrchdlg.hxx b/cui/source/inc/cuisrchdlg.hxx index 3dc19f0a1c97..376f9196a2d1 100644 --- a/cui/source/inc/cuisrchdlg.hxx +++ b/cui/source/inc/cuisrchdlg.hxx @@ -37,7 +37,7 @@ class SvxJSearchOptionsPage; class SvxJSearchOptionsDialog : public SfxSingleTabDialog { sal_Int32 nInitialTlFlags; - SvxJSearchOptionsPage *pPage; + VclPtr<SvxJSearchOptionsPage> pPage; SvxJSearchOptionsDialog( const SvxJSearchOptionsDialog & ) SAL_DELETED_FUNCTION; SvxJSearchOptionsDialog & operator == ( const SvxJSearchOptionsDialog & ) SAL_DELETED_FUNCTION; @@ -45,6 +45,8 @@ class SvxJSearchOptionsDialog : public SfxSingleTabDialog public: SvxJSearchOptionsDialog(vcl::Window *pParent, const SfxItemSet& rOptionsSet, sal_Int32 nInitialFlags); + virtual ~SvxJSearchOptionsDialog(); + virtual void dispose() SAL_OVERRIDE; // Window virtual void Activate() SAL_OVERRIDE; diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index c3ebd3048dc3..42e668c31563 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -115,29 +115,29 @@ class SvxTransparenceTabPage : public SvxTabPage sal_uInt16 nDlgType; // main selection - RadioButton* m_pRbtTransOff; - RadioButton* m_pRbtTransLinear; - RadioButton* m_pRbtTransGradient; + VclPtr<RadioButton> m_pRbtTransOff; + VclPtr<RadioButton> m_pRbtTransLinear; + VclPtr<RadioButton> m_pRbtTransGradient; /// linear transparency - MetricField* m_pMtrTransparent; + VclPtr<MetricField> m_pMtrTransparent; // gradient transparency - VclGrid* m_pGridGradient; - ListBox* m_pLbTrgrGradientType; - FixedText* m_pFtTrgrCenterX; - MetricField* m_pMtrTrgrCenterX; - FixedText* m_pFtTrgrCenterY; - MetricField* m_pMtrTrgrCenterY; - FixedText* m_pFtTrgrAngle; - MetricField* m_pMtrTrgrAngle; - MetricField* m_pMtrTrgrBorder; - MetricField* m_pMtrTrgrStartValue; - MetricField* m_pMtrTrgrEndValue; + VclPtr<VclGrid> m_pGridGradient; + VclPtr<ListBox> m_pLbTrgrGradientType; + VclPtr<FixedText> m_pFtTrgrCenterX; + VclPtr<MetricField> m_pMtrTrgrCenterX; + VclPtr<FixedText> m_pFtTrgrCenterY; + VclPtr<MetricField> m_pMtrTrgrCenterY; + VclPtr<FixedText> m_pFtTrgrAngle; + VclPtr<MetricField> m_pMtrTrgrAngle; + VclPtr<MetricField> m_pMtrTrgrBorder; + VclPtr<MetricField> m_pMtrTrgrStartValue; + VclPtr<MetricField> m_pMtrTrgrEndValue; // preview - SvxXRectPreview* m_pCtlBitmapPreview; - SvxXRectPreview* m_pCtlXRectPreview; + VclPtr<SvxXRectPreview> m_pCtlBitmapPreview; + VclPtr<SvxXRectPreview> m_pCtlXRectPreview; bool bBitmap; XOutdevItemPool* pXPool; @@ -160,6 +160,8 @@ class SvxTransparenceTabPage : public SvxTabPage public: SvxTransparenceTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs); + virtual ~SvxTransparenceTabPage(); + virtual void dispose() SAL_OVERRIDE; static SfxTabPage* Create(vcl::Window*, const SfxItemSet*); static const sal_uInt16* GetRanges() { return pTransparenceRanges; } @@ -183,48 +185,48 @@ class SvxAreaTabPage : public SvxTabPage using TabPage::DeactivatePage; static const sal_uInt16 pAreaRanges[]; private: - ListBox* m_pTypeLB; - - VclBox* m_pFillLB; - ColorLB* m_pLbColor; - GradientLB* m_pLbGradient; - HatchingLB* m_pLbHatching; - BitmapLB* m_pLbBitmap; - SvxXRectPreview* m_pCtlBitmapPreview; - - TriStateBox* m_pTsbStepCount; - VclFrame* m_pFlStepCount; - NumericField* m_pNumFldStepCount; - - VclFrame* m_pFlHatchBckgrd; - CheckBox* m_pCbxHatchBckgrd; - ColorLB* m_pLbHatchBckgrdColor; - - VclBox* m_pBxBitmap; - - VclFrame* m_pFlSize; - TriStateBox* m_pTsbOriginal; - TriStateBox* m_pTsbScale; - VclGrid* m_pGridX_Y; - FixedText* m_pFtXSize; - MetricField* m_pMtrFldXSize; - FixedText* m_pFtYSize; - MetricField* m_pMtrFldYSize; - - VclFrame* m_pFlPosition; - SvxRectCtl* m_pCtlPosition; - VclGrid* m_pGridOffset; - MetricField* m_pMtrFldXOffset; - MetricField* m_pMtrFldYOffset; - VclBox* m_pBxTile; - TriStateBox* m_pTsbTile; - TriStateBox* m_pTsbStretch; - VclFrame* m_pFlOffset; - RadioButton* m_pRbtRow; - RadioButton* m_pRbtColumn; - MetricField* m_pMtrFldOffset; - - SvxXRectPreview* m_pCtlXRectPreview; + VclPtr<ListBox> m_pTypeLB; + + VclPtr<VclBox> m_pFillLB; + VclPtr<ColorLB> m_pLbColor; + VclPtr<GradientLB> m_pLbGradient; + VclPtr<HatchingLB> m_pLbHatching; + VclPtr<BitmapLB> m_pLbBitmap; + VclPtr<SvxXRectPreview> m_pCtlBitmapPreview; + + VclPtr<TriStateBox> m_pTsbStepCount; + VclPtr<VclFrame> m_pFlStepCount; + VclPtr<NumericField> m_pNumFldStepCount; + + VclPtr<VclFrame> m_pFlHatchBckgrd; + VclPtr<CheckBox> m_pCbxHatchBckgrd; + VclPtr<ColorLB> m_pLbHatchBckgrdColor; + + VclPtr<VclBox> m_pBxBitmap; + + VclPtr<VclFrame> m_pFlSize; + VclPtr<TriStateBox> m_pTsbOriginal; + VclPtr<TriStateBox> m_pTsbScale; + VclPtr<VclGrid> m_pGridX_Y; + VclPtr<FixedText> m_pFtXSize; + VclPtr<MetricField> m_pMtrFldXSize; + VclPtr<FixedText> m_pFtYSize; + VclPtr<MetricField> m_pMtrFldYSize; + + VclPtr<VclFrame> m_pFlPosition; + VclPtr<SvxRectCtl> m_pCtlPosition; + VclPtr<VclGrid> m_pGridOffset; + VclPtr<MetricField> m_pMtrFldXOffset; + VclPtr<MetricField> m_pMtrFldYOffset; + VclPtr<VclBox> m_pBxTile; + VclPtr<TriStateBox> m_pTsbTile; + VclPtr<TriStateBox> m_pTsbStretch; + VclPtr<VclFrame> m_pFlOffset; + VclPtr<RadioButton> m_pRbtRow; + VclPtr<RadioButton> m_pRbtColumn; + VclPtr<MetricField> m_pMtrFldOffset; + + VclPtr<SvxXRectPreview> m_pCtlXRectPreview; const SfxItemSet& rOutAttrs; RECT_POINT eRP; @@ -264,7 +266,7 @@ private: bool mbDirectGraphicSet; Graphic maDirectGraphic; OUString maDirectName; - PushButton* m_pBtnImport; + VclPtr<PushButton> m_pBtnImport; DECL_LINK(SelectDialogTypeHdl_Impl, void *); DECL_LINK( ModifyColorHdl_Impl, void * ); @@ -288,6 +290,8 @@ private: public: SvxAreaTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); + virtual ~SvxAreaTabPage(); + virtual void dispose() SAL_OVERRIDE; void Construct(); @@ -326,13 +330,13 @@ class SvxShadowTabPage : public SvxTabPage static const sal_uInt16 pShadowRanges[]; private: - TriStateBox* m_pTsbShowShadow; - VclGrid* m_pGridShadow; - SvxRectCtl* m_pCtlPosition; - MetricField* m_pMtrDistance; - ColorLB* m_pLbShadowColor; - MetricField* m_pMtrTransparent; - SvxXShadowPreview* m_pCtlXRectPreview; + VclPtr<TriStateBox> m_pTsbShowShadow; + VclPtr<VclGrid> m_pGridShadow; + VclPtr<SvxRectCtl> m_pCtlPosition; + VclPtr<MetricField> m_pMtrDistance; + VclPtr<ColorLB> m_pLbShadowColor; + VclPtr<MetricField> m_pMtrTransparent; + VclPtr<SvxXShadowPreview> m_pCtlXRectPreview; const SfxItemSet& rOutAttrs; RECT_POINT eRP; @@ -355,6 +359,8 @@ private: public: SvxShadowTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); + virtual ~SvxShadowTabPage(); + virtual void dispose() SAL_OVERRIDE; void Construct(); static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); @@ -383,25 +389,25 @@ class SvxGradientTabPage : public SfxTabPage using TabPage::DeactivatePage; private: - ListBox* m_pLbGradientType; - FixedText* m_pFtCenterX; - MetricField* m_pMtrCenterX; - FixedText* m_pFtCenterY; - MetricField* m_pMtrCenterY; - FixedText* m_pFtAngle; - MetricField* m_pMtrAngle; - MetricField* m_pMtrBorder; - ColorLB* m_pLbColorFrom; - MetricField* m_pMtrColorFrom; - ColorLB* m_pLbColorTo; - MetricField* m_pMtrColorTo; - GradientLB* m_pLbGradients; - SvxXRectPreview* m_pCtlPreview; - PushButton* m_pBtnAdd; - PushButton* m_pBtnModify; - PushButton* m_pBtnDelete; - PushButton* m_pBtnLoad; - PushButton* m_pBtnSave; + VclPtr<ListBox> m_pLbGradientType; + VclPtr<FixedText> m_pFtCenterX; + VclPtr<MetricField> m_pMtrCenterX; + VclPtr<FixedText> m_pFtCenterY; + VclPtr<MetricField> m_pMtrCenterY; + VclPtr<FixedText> m_pFtAngle; + VclPtr<MetricField> m_pMtrAngle; + VclPtr<MetricField> m_pMtrBorder; + VclPtr<ColorLB> m_pLbColorFrom; + VclPtr<MetricField> m_pMtrColorFrom; + VclPtr<ColorLB> m_pLbColorTo; + VclPtr<MetricField> m_pMtrColorTo; + VclPtr<GradientLB> m_pLbGradients; + VclPtr<SvxXRectPreview> m_pCtlPreview; + VclPtr<PushButton> m_pBtnAdd; + VclPtr<PushButton> m_pBtnModify; + VclPtr<PushButton> m_pBtnDelete; + VclPtr<PushButton> m_pBtnLoad; + VclPtr<PushButton> m_pBtnSave; const SfxItemSet& rOutAttrs; @@ -434,6 +440,8 @@ private: public: SvxGradientTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); + virtual ~SvxGradientTabPage(); + virtual void dispose() SAL_OVERRIDE; void Construct(); @@ -465,18 +473,18 @@ class SvxHatchTabPage : public SvxTabPage using TabPage::DeactivatePage; private: - MetricField* m_pMtrDistance; - MetricField* m_pMtrAngle; - SvxRectCtl* m_pCtlAngle; - ListBox* m_pLbLineType; - ColorLB* m_pLbLineColor; - HatchingLB* m_pLbHatchings; - SvxXRectPreview* m_pCtlPreview; - PushButton* m_pBtnAdd; - PushButton* m_pBtnModify; - PushButton* m_pBtnDelete; - PushButton* m_pBtnLoad; - PushButton* m_pBtnSave; + VclPtr<MetricField> m_pMtrDistance; + VclPtr<MetricField> m_pMtrAngle; + VclPtr<SvxRectCtl> m_pCtlAngle; + VclPtr<ListBox> m_pLbLineType; + VclPtr<ColorLB> m_pLbLineColor; + VclPtr<HatchingLB> m_pLbHatchings; + VclPtr<SvxXRectPreview> m_pCtlPreview; + VclPtr<PushButton> m_pBtnAdd; + VclPtr<PushButton> m_pBtnModify; + VclPtr<PushButton> m_pBtnDelete; + VclPtr<PushButton> m_pBtnLoad; + VclPtr<PushButton> m_pBtnSave; const SfxItemSet& rOutAttrs; @@ -510,6 +518,8 @@ private: public: SvxHatchTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); + virtual ~SvxHatchTabPage(); + virtual void dispose() SAL_OVERRIDE; void Construct(); @@ -545,19 +555,19 @@ class SvxBitmapTabPage : public SvxTabPage using TabPage::DeactivatePage; private: - VclBox* m_pBxPixelEditor; - SvxPixelCtl* m_pCtlPixel; - ColorLB* m_pLbColor; - ColorLB* m_pLbBackgroundColor; - FixedText* m_pLbBitmapsHidden; - BitmapLB* m_pLbBitmaps; - SvxXRectPreview* m_pCtlPreview; - PushButton* m_pBtnAdd; - PushButton* m_pBtnModify; - PushButton* m_pBtnImport; - PushButton* m_pBtnDelete; - PushButton* m_pBtnLoad; - PushButton* m_pBtnSave; + VclPtr<VclBox> m_pBxPixelEditor; + VclPtr<SvxPixelCtl> m_pCtlPixel; + VclPtr<ColorLB> m_pLbColor; + VclPtr<ColorLB> m_pLbBackgroundColor; + VclPtr<FixedText> m_pLbBitmapsHidden; + VclPtr<BitmapLB> m_pLbBitmaps; + VclPtr<SvxXRectPreview> m_pCtlPreview; + VclPtr<PushButton> m_pBtnAdd; + VclPtr<PushButton> m_pBtnModify; + VclPtr<PushButton> m_pBtnImport; + VclPtr<PushButton> m_pBtnDelete; + VclPtr<PushButton> m_pBtnLoad; + VclPtr<PushButton> m_pBtnSave; SvxBitmapCtl* m_pBitmapCtl; @@ -642,11 +652,11 @@ class SvxColorTabPage : public SfxTabPage private: XPropertyListType meType; - Window *mpTopDlg; - CheckBox *m_pBoxEmbed; - PushButton *m_pBtnLoad; - PushButton *m_pBtnSave; - FixedText *m_pTableName; + VclPtr<Window> mpTopDlg; + VclPtr<CheckBox> m_pBoxEmbed; + VclPtr<PushButton> m_pBtnLoad; + VclPtr<PushButton> m_pBtnSave; + VclPtr<FixedText> m_pTableName; DECL_LINK( EmbedToggleHdl_Impl, void * ); DECL_LINK( ClickLoadHdl_Impl, void * ); @@ -660,31 +670,31 @@ private: void EnableSave( bool bCanSave ); SvxColorTabPageShadow *pShadow; - Edit* m_pEdtName; - ColorLB* m_pLbColor; + VclPtr<Edit> m_pEdtName; + VclPtr<ColorLB> m_pLbColor; - SvxColorValueSet* m_pValSetColorList; + VclPtr<SvxColorValueSet> m_pValSetColorList; - SvxXRectPreview* m_pCtlPreviewOld; - SvxXRectPreview* m_pCtlPreviewNew; + VclPtr<SvxXRectPreview> m_pCtlPreviewOld; + VclPtr<SvxXRectPreview> m_pCtlPreviewNew; - ListBox* m_pLbColorModel; + VclPtr<ListBox> m_pLbColorModel; - VclContainer* m_pRGB; - NumericField* m_pR; - NumericField* m_pG; - NumericField* m_pB; + VclPtr<VclContainer> m_pRGB; + VclPtr<NumericField> m_pR; + VclPtr<NumericField> m_pG; + VclPtr<NumericField> m_pB; - VclContainer* m_pCMYK; - MetricField* m_pC; - MetricField* m_pY; - MetricField* m_pM; - MetricField* m_pK; + VclPtr<VclContainer> m_pCMYK; + VclPtr<MetricField> m_pC; + VclPtr<MetricField> m_pY; + VclPtr<MetricField> m_pM; + VclPtr<MetricField> m_pK; - PushButton* m_pBtnAdd; - PushButton* m_pBtnModify; - PushButton* m_pBtnWorkOn; - PushButton* m_pBtnDelete; + VclPtr<PushButton> m_pBtnAdd; + VclPtr<PushButton> m_pBtnModify; + VclPtr<PushButton> m_pBtnWorkOn; + VclPtr<PushButton> m_pBtnDelete; const SfxItemSet& rOutAttrs; diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx index ca9f7b718d1a..6f19fb7eed04 100644 --- a/cui/source/inc/cuitabline.hxx +++ b/cui/source/inc/cuitabline.hxx @@ -91,34 +91,34 @@ class SvxLineTabPage : public SvxTabPage using TabPage::DeactivatePage; static const sal_uInt16 pLineRanges[]; private: - VclBox* m_pBoxColor; - LineLB* m_pLbLineStyle; - ColorLB* m_pLbColor; - VclBox* m_pBoxWidth; - MetricField* m_pMtrLineWidth; - VclBox* m_pBoxTransparency; - MetricField* m_pMtrTransparent; - - VclFrame* m_pFlLineEnds; - VclBox* m_pBoxArrowStyles; - LineEndLB* m_pLbStartStyle; - VclBox* m_pBoxStart; - MetricField* m_pMtrStartWidth; - TriStateBox* m_pTsbCenterStart; - VclBox* m_pBoxEnd; - LineEndLB* m_pLbEndStyle; - MetricField* m_pMtrEndWidth; - TriStateBox* m_pTsbCenterEnd; - CheckBox* m_pCbxSynchronize; - SvxXLinePreview* m_pCtlPreview; + VclPtr<VclBox> m_pBoxColor; + VclPtr<LineLB> m_pLbLineStyle; + VclPtr<ColorLB> m_pLbColor; + VclPtr<VclBox> m_pBoxWidth; + VclPtr<MetricField> m_pMtrLineWidth; + VclPtr<VclBox> m_pBoxTransparency; + VclPtr<MetricField> m_pMtrTransparent; + + VclPtr<VclFrame> m_pFlLineEnds; + VclPtr<VclBox> m_pBoxArrowStyles; + VclPtr<LineEndLB> m_pLbStartStyle; + VclPtr<VclBox> m_pBoxStart; + VclPtr<MetricField> m_pMtrStartWidth; + VclPtr<TriStateBox> m_pTsbCenterStart; + VclPtr<VclBox> m_pBoxEnd; + VclPtr<LineEndLB> m_pLbEndStyle; + VclPtr<MetricField> m_pMtrEndWidth; + VclPtr<TriStateBox> m_pTsbCenterEnd; + VclPtr<CheckBox> m_pCbxSynchronize; + VclPtr<SvxXLinePreview> m_pCtlPreview; // #116827# - VclFrame* m_pFLEdgeStyle; - VclGrid* m_pGridEdgeCaps; - ListBox* m_pLBEdgeStyle; + VclPtr<VclFrame> m_pFLEdgeStyle; + VclPtr<VclGrid> m_pGridEdgeCaps; + VclPtr<ListBox> m_pLBEdgeStyle; // LineCaps - ListBox* m_pLBCapStyle; + VclPtr<ListBox> m_pLBCapStyle; //#58425# symbols on a line (e. g. StarChart) -> /** a list of symbols to be shown in menu. Symbol at position SID_ATTR_SYMBOLTYPE is to be shown in preview. @@ -131,12 +131,12 @@ private: long nSymbolType; /// attributes for the shown symbols; only necessary if not equal to line properties SfxItemSet* pSymbolAttr; - VclFrame* m_pFlSymbol; - VclGrid* m_pGridIconSize; - MenuButton* m_pSymbolMB; - MetricField* m_pSymbolWidthMF; - MetricField* m_pSymbolHeightMF; - CheckBox* m_pSymbolRatioCB; + VclPtr<VclFrame> m_pFlSymbol; + VclPtr<VclGrid> m_pGridIconSize; + VclPtr<MenuButton> m_pSymbolMB; + VclPtr<MetricField> m_pSymbolWidthMF; + VclPtr<MetricField> m_pSymbolHeightMF; + VclPtr<CheckBox> m_pSymbolRatioCB; std::vector<OUString> aGrfNames; SvxBmpItemInfoList aGrfBrushItems; bool bLastWidthModified; @@ -246,21 +246,21 @@ class SvxLineDefTabPage : public SfxTabPage using TabPage::ActivatePage; using TabPage::DeactivatePage; private: - LineLB* m_pLbLineStyles; - ListBox* m_pLbType1; - ListBox* m_pLbType2; - NumericField* m_pNumFldNumber1; - NumericField* m_pNumFldNumber2; - MetricField* m_pMtrLength1; - MetricField* m_pMtrLength2; - MetricField* m_pMtrDistance; - CheckBox* m_pCbxSynchronize; - PushButton* m_pBtnAdd; - PushButton* m_pBtnModify; - PushButton* m_pBtnDelete; - PushButton* m_pBtnLoad; - PushButton* m_pBtnSave; - SvxXLinePreview* m_pCtlPreview; + VclPtr<LineLB> m_pLbLineStyles; + VclPtr<ListBox> m_pLbType1; + VclPtr<ListBox> m_pLbType2; + VclPtr<NumericField> m_pNumFldNumber1; + VclPtr<NumericField> m_pNumFldNumber2; + VclPtr<MetricField> m_pMtrLength1; + VclPtr<MetricField> m_pMtrLength2; + VclPtr<MetricField> m_pMtrDistance; + VclPtr<CheckBox> m_pCbxSynchronize; + VclPtr<PushButton> m_pBtnAdd; + VclPtr<PushButton> m_pBtnModify; + VclPtr<PushButton> m_pBtnDelete; + VclPtr<PushButton> m_pBtnLoad; + VclPtr<PushButton> m_pBtnSave; + VclPtr<SvxXLinePreview> m_pCtlPreview; const SfxItemSet& rOutAttrs; XDash aDash; @@ -303,6 +303,8 @@ private: public: SvxLineDefTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); + virtual ~SvxLineDefTabPage(); + virtual void dispose() SAL_OVERRIDE; void Construct(); @@ -333,14 +335,14 @@ class SvxLineEndDefTabPage : public SfxTabPage using TabPage::DeactivatePage; private: - Edit* m_pEdtName; - LineEndLB* m_pLbLineEnds; - PushButton* m_pBtnAdd; - PushButton* m_pBtnModify; - PushButton* m_pBtnDelete; - PushButton* m_pBtnLoad; - PushButton* m_pBtnSave; - SvxXLinePreview* m_pCtlPreview; + VclPtr<Edit> m_pEdtName; + VclPtr<LineEndLB> m_pLbLineEnds; + VclPtr<PushButton> m_pBtnAdd; + VclPtr<PushButton> m_pBtnModify; + VclPtr<PushButton> m_pBtnDelete; + VclPtr<PushButton> m_pBtnLoad; + VclPtr<PushButton> m_pBtnSave; + VclPtr<SvxXLinePreview> m_pCtlPreview; const SfxItemSet& rOutAttrs; const SdrObject* pPolyObj; @@ -372,6 +374,8 @@ private: public: SvxLineEndDefTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); + virtual ~SvxLineEndDefTabPage(); + virtual void dispose() SAL_OVERRIDE; void Construct(); diff --git a/cui/source/inc/cuitbxform.hxx b/cui/source/inc/cuitbxform.hxx index 1f2b34d616db..4ee17070a5f5 100644 --- a/cui/source/inc/cuitbxform.hxx +++ b/cui/source/inc/cuitbxform.hxx @@ -29,10 +29,12 @@ class FmInputRecordNoDialog : public ModalDialog { public: - NumericField* m_pRecordNo; + VclPtr<NumericField> m_pRecordNo; public: FmInputRecordNoDialog(vcl::Window * pParent); + virtual ~FmInputRecordNoDialog(); + virtual void dispose() SAL_OVERRIDE; void SetValue(long dNew) { m_pRecordNo->SetValue(dNew); } long GetValue() const { return static_cast<long>(m_pRecordNo->GetValue()); } diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx index a665aabbf636..fa714753bd14 100644 --- a/cui/source/inc/dbregister.hxx +++ b/cui/source/inc/dbregister.hxx @@ -46,12 +46,12 @@ namespace svx OUString aTypeText; OUString aPathText; - SvSimpleTableContainer* m_pPathCtrl; - PushButton* m_pNew; - PushButton* m_pEdit; - PushButton* m_pDelete; + VclPtr<SvSimpleTableContainer> m_pPathCtrl; + VclPtr<PushButton> m_pNew; + VclPtr<PushButton> m_pEdit; + VclPtr<PushButton> m_pDelete; - ::svx::OptHeaderTabListBox* pPathBox; + VclPtr<::svx::OptHeaderTabListBox> pPathBox; SvTreeListEntry* m_pCurEntry; sal_uLong m_nOldCount; bool m_bModified; diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx index 46c971499c67..8615477f6618 100644 --- a/cui/source/inc/dlgname.hxx +++ b/cui/source/inc/dlgname.hxx @@ -30,9 +30,9 @@ class SvxNameDialog : public ModalDialog { private: - FixedText* pFtDescription; - Edit* pEdtName; - OKButton* pBtnOK; + VclPtr<FixedText> pFtDescription; + VclPtr<Edit> pEdtName; + VclPtr<OKButton> pBtnOK; Link aCheckNameHdl; @@ -40,6 +40,8 @@ private: public: SvxNameDialog( vcl::Window* pWindow, const OUString& rName, const OUString& rDesc ); + virtual ~SvxNameDialog(); + virtual void dispose() SAL_OVERRIDE; void GetName( OUString& rName ){rName = pEdtName->GetText();} @@ -75,10 +77,10 @@ class SvxObjectNameDialog : public ModalDialog { private: // name - Edit* pEdtName; + VclPtr<Edit> pEdtName; // buttons - OKButton* pBtnOK; + VclPtr<OKButton> pBtnOK; // callback link for name uniqueness Link aCheckNameHdl; @@ -88,6 +90,8 @@ private: public: // constructor SvxObjectNameDialog(vcl::Window* pWindow, const OUString& rName); + virtual ~SvxObjectNameDialog(); + virtual void dispose() SAL_OVERRIDE; // data access void GetName(OUString& rName) {rName = pEdtName->GetText(); } @@ -110,15 +114,16 @@ class SvxObjectTitleDescDialog : public ModalDialog { private: // title - Edit* pEdtTitle; + VclPtr<Edit> pEdtTitle; // description - VclMultiLineEdit* pEdtDescription; + VclPtr<VclMultiLineEdit> pEdtDescription; public: // constructor SvxObjectTitleDescDialog(vcl::Window* pWindow, const OUString& rTitle, const OUString& rDesc); - + virtual ~SvxObjectTitleDescDialog(); + virtual void dispose() SAL_OVERRIDE; // data access void GetTitle(OUString& rTitle) {rTitle = pEdtTitle->GetText(); } void GetDescription(OUString& rDescription) {rDescription = pEdtDescription->GetText(); } @@ -128,10 +133,10 @@ public: class SvxMessDialog : public ModalDialog { private: - FixedText* pFtDescription; - PushButton* pBtn1; - PushButton* pBtn2; - FixedImage* pFtImage; + VclPtr<FixedText> pFtDescription; + VclPtr<PushButton> pBtn1; + VclPtr<PushButton> pBtn2; + VclPtr<FixedImage> pFtImage; Image* pImage; DECL_LINK(Button1Hdl, void *); diff --git a/cui/source/inc/dstribut.hxx b/cui/source/inc/dstribut.hxx index e0be5f3dd87e..0d07317c98ec 100644 --- a/cui/source/inc/dstribut.hxx +++ b/cui/source/inc/dstribut.hxx @@ -29,21 +29,23 @@ class SvxDistributePage : public SvxTabPage SvxDistributeHorizontal m_eDistributeHor; SvxDistributeVertical m_eDistributeVer; - RadioButton* m_pBtnHorNone; - RadioButton* m_pBtnHorLeft; - RadioButton* m_pBtnHorCenter; - RadioButton* m_pBtnHorDistance; - RadioButton* m_pBtnHorRight; - RadioButton* m_pBtnVerNone; - RadioButton* m_pBtnVerTop; - RadioButton* m_pBtnVerCenter; - RadioButton* m_pBtnVerDistance; - RadioButton* m_pBtnVerBottom; + VclPtr<RadioButton> m_pBtnHorNone; + VclPtr<RadioButton> m_pBtnHorLeft; + VclPtr<RadioButton> m_pBtnHorCenter; + VclPtr<RadioButton> m_pBtnHorDistance; + VclPtr<RadioButton> m_pBtnHorRight; + VclPtr<RadioButton> m_pBtnVerNone; + VclPtr<RadioButton> m_pBtnVerTop; + VclPtr<RadioButton> m_pBtnVerCenter; + VclPtr<RadioButton> m_pBtnVerDistance; + VclPtr<RadioButton> m_pBtnVerBottom; public: SvxDistributePage(vcl::Window* pWindow, const SfxItemSet& rInAttrs, SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone, SvxDistributeVertical eVer = SvxDistributeVerticalNone); + virtual ~SvxDistributePage(); + virtual void dispose() SAL_OVERRIDE; static SfxTabPage* Create(vcl::Window*, const SfxItemSet&, SvxDistributeHorizontal eHor, SvxDistributeVertical eVer); @@ -57,12 +59,14 @@ public: class SvxDistributeDialog : public SfxSingleTabDialog { - SvxDistributePage* mpPage; + VclPtr<SvxDistributePage> mpPage; public: SvxDistributeDialog(vcl::Window* pParent, const SfxItemSet& rAttr, SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone, SvxDistributeVertical eVer = SvxDistributeVerticalNone); + virtual ~SvxDistributeDialog(); + virtual void dispose() SAL_OVERRIDE; SvxDistributeHorizontal GetDistributeHor() const { return mpPage->GetDistributeHor(); } SvxDistributeVertical GetDistributeVer() const { return mpPage->GetDistributeVer(); } diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx index 39cd21b26538..e52d39c92a01 100644 --- a/cui/source/inc/grfpage.hxx +++ b/cui/source/inc/grfpage.hxx @@ -56,28 +56,28 @@ class SvxGrfCropPage : public SfxTabPage using TabPage::ActivatePage; using TabPage::DeactivatePage; - VclContainer* m_pCropFrame; - RadioButton* m_pZoomConstRB; - RadioButton* m_pSizeConstRB; - MetricField* m_pLeftMF; - MetricField* m_pRightMF; - MetricField* m_pTopMF; - MetricField* m_pBottomMF; - - VclContainer* m_pScaleFrame; - MetricField* m_pWidthZoomMF; - MetricField* m_pHeightZoomMF; - - VclContainer* m_pSizeFrame; - MetricField* m_pWidthMF; - MetricField* m_pHeightMF; - - VclContainer* m_pOrigSizeGrid; - FixedText* m_pOrigSizeFT; - PushButton* m_pOrigSizePB; + VclPtr<VclContainer> m_pCropFrame; + VclPtr<RadioButton> m_pZoomConstRB; + VclPtr<RadioButton> m_pSizeConstRB; + VclPtr<MetricField> m_pLeftMF; + VclPtr<MetricField> m_pRightMF; + VclPtr<MetricField> m_pTopMF; + VclPtr<MetricField> m_pBottomMF; + + VclPtr<VclContainer> m_pScaleFrame; + VclPtr<MetricField> m_pWidthZoomMF; + VclPtr<MetricField> m_pHeightZoomMF; + + VclPtr<VclContainer> m_pSizeFrame; + VclPtr<MetricField> m_pWidthMF; + VclPtr<MetricField> m_pHeightMF; + + VclPtr<VclContainer> m_pOrigSizeGrid; + VclPtr<FixedText> m_pOrigSizeFT; + VclPtr<PushButton> m_pOrigSizePB; // Example - SvxCropExample* m_pExampleWN; + VclPtr<SvxCropExample> m_pExampleWN; Timer aTimer; @@ -85,7 +85,7 @@ class SvxGrfCropPage : public SfxTabPage Size aOrigSize; Size aOrigPixelSize; Size aPageSize; - const MetricField* pLastCropField; + VclPtr<MetricField> pLastCropField; long nOldWidth; long nOldHeight; bool bReset; diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx index 2cfd24d24b60..6018b0fa161a 100644 --- a/cui/source/inc/hangulhanjadlg.hxx +++ b/cui/source/inc/hangulhanjadlg.hxx @@ -104,27 +104,27 @@ namespace svx { private: - PushButton* m_pFind; - PushButton* m_pIgnore; - PushButton* m_pIgnoreAll; - PushButton* m_pReplace; - PushButton* m_pReplaceAll; - PushButton* m_pOptions; - SuggestionDisplay* m_pSuggestions; - RadioButton* m_pSimpleConversion; - RadioButton* m_pHangulBracketed; - RadioButton* m_pHanjaBracketed; - Edit* m_pWordInput; - FixedText* m_pOriginalWord; - RubyRadioButton* m_pHanjaAbove; - RubyRadioButton* m_pHanjaBelow; - RubyRadioButton* m_pHangulAbove; - RubyRadioButton* m_pHangulBelow; - CheckBox* m_pHangulOnly; - CheckBox* m_pHanjaOnly; - CheckBox* m_pReplaceByChar; - - CheckBox* m_pIgnoreNonPrimary; + VclPtr<PushButton> m_pFind; + VclPtr<PushButton> m_pIgnore; + VclPtr<PushButton> m_pIgnoreAll; + VclPtr<PushButton> m_pReplace; + VclPtr<PushButton> m_pReplaceAll; + VclPtr<PushButton> m_pOptions; + VclPtr<SuggestionDisplay> m_pSuggestions; + VclPtr<RadioButton> m_pSimpleConversion; + VclPtr<RadioButton> m_pHangulBracketed; + VclPtr<RadioButton> m_pHanjaBracketed; + VclPtr<Edit> m_pWordInput; + VclPtr<FixedText> m_pOriginalWord; + VclPtr<RubyRadioButton> m_pHanjaAbove; + VclPtr<RubyRadioButton> m_pHanjaBelow; + VclPtr<RubyRadioButton> m_pHangulAbove; + VclPtr<RubyRadioButton> m_pHangulBelow; + VclPtr<CheckBox> m_pHangulOnly; + VclPtr<CheckBox> m_pHanjaOnly; + VclPtr<CheckBox> m_pReplaceByChar; + + VclPtr<CheckBox> m_pIgnoreNonPrimary; /** are we working for a document? This is normally true, but in case the user uses the "find" functionality, we switch to working with what the user entered, which then does not have any relation to @@ -138,6 +138,8 @@ namespace svx HangulHanjaConversionDialog( vcl::Window* _pParent, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryDirection ); + virtual ~HangulHanjaConversionDialog(); + virtual void dispose() SAL_OVERRIDE; public: void SetOptionsChangedHdl( const Link& _rHdl ); @@ -196,14 +198,14 @@ namespace svx class HangulHanjaOptionsDialog : public ModalDialog { private: - SvxCheckListBox* m_pDictsLB; - CheckBox* m_pIgnorepostCB; - CheckBox* m_pShowrecentlyfirstCB; - CheckBox* m_pAutoreplaceuniqueCB; - PushButton* m_pNewPB; - PushButton* m_pEditPB; - PushButton* m_pDeletePB; - OKButton* m_pOkPB; + VclPtr<SvxCheckListBox> m_pDictsLB; + VclPtr<CheckBox> m_pIgnorepostCB; + VclPtr<CheckBox> m_pShowrecentlyfirstCB; + VclPtr<CheckBox> m_pAutoreplaceuniqueCB; + VclPtr<PushButton> m_pNewPB; + VclPtr<PushButton> m_pEditPB; + VclPtr<PushButton> m_pDeletePB; + VclPtr<OKButton> m_pOkPB; SvLBoxButtonData* m_pCheckButtonData; @@ -232,8 +234,8 @@ namespace svx class HangulHanjaNewDictDialog : public ModalDialog { private: - Edit* m_pDictNameED; - OKButton* m_pOkBtn; + VclPtr<Edit> m_pDictNameED; + VclPtr<OKButton> m_pOkBtn; bool m_bEntered; @@ -241,6 +243,8 @@ namespace svx DECL_LINK( ModifyHdl, void* ); public: HangulHanjaNewDictDialog( vcl::Window* _pParent ); + virtual ~HangulHanjaNewDictDialog(); + virtual void dispose() SAL_OVERRIDE; bool GetName( OUString& _rRetName ) const; }; @@ -251,14 +255,16 @@ namespace svx class SuggestionEdit : public Edit { private: - SuggestionEdit* m_pPrev; - SuggestionEdit* m_pNext; - ScrollBar* m_pScrollBar; + VclPtr<SuggestionEdit> m_pPrev; + VclPtr<SuggestionEdit> m_pNext; + VclPtr<ScrollBar> m_pScrollBar; bool ShouldScroll( bool _bUp ) const; void DoJump( bool _bUp ); public: SuggestionEdit( vcl::Window* pParent, WinBits nBits ); + virtual ~SuggestionEdit(); + virtual void dispose() SAL_OVERRIDE; virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; void init( ScrollBar* pScrollBar, SuggestionEdit* pPrev, SuggestionEdit* pNext); }; @@ -274,15 +280,15 @@ namespace svx OUString m_aOriginal; SuggestionList* m_pSuggestions; - ListBox* m_aBookLB; - ComboBox* m_aOriginalLB; - SuggestionEdit* m_aEdit1; - SuggestionEdit* m_aEdit2; - SuggestionEdit* m_aEdit3; - SuggestionEdit* m_aEdit4; - ScrollBar* m_aScrollSB; - PushButton* m_aNewPB; - PushButton* m_aDeletePB; + VclPtr<ListBox> m_aBookLB; + VclPtr<ComboBox> m_aOriginalLB; + VclPtr<SuggestionEdit> m_aEdit1; + VclPtr<SuggestionEdit> m_aEdit2; + VclPtr<SuggestionEdit> m_aEdit3; + VclPtr<SuggestionEdit> m_aEdit4; + VclPtr<ScrollBar> m_aScrollSB; + VclPtr<PushButton> m_aNewPB; + VclPtr<PushButton> m_aDeletePB; sal_uInt16 m_nTopPos; bool m_bModifiedSuggestions; diff --git a/cui/source/inc/hldocntp.hxx b/cui/source/inc/hldocntp.hxx index 186ce6a6fe9a..494b7a28d33a 100644 --- a/cui/source/inc/hldocntp.hxx +++ b/cui/source/inc/hldocntp.hxx @@ -30,11 +30,11 @@ class SvxHyperlinkNewDocTp : public SvxHyperlinkTabPageBase { private: - RadioButton *m_pRbtEditNow; - RadioButton *m_pRbtEditLater; - SvxHyperURLBox *m_pCbbPath; - PushButton *m_pBtCreate; - ListBox *m_pLbDocTypes; + VclPtr<RadioButton> m_pRbtEditNow; + VclPtr<RadioButton> m_pRbtEditLater; + VclPtr<SvxHyperURLBox> m_pCbbPath; + VclPtr<PushButton> m_pBtCreate; + VclPtr<ListBox> m_pLbDocTypes; bool ImplGetURLObject( const OUString& rPath, const OUString& rBase, INetURLObject& aURLObject ) const; void FillDocumentList (); diff --git a/cui/source/inc/hldoctp.hxx b/cui/source/inc/hldoctp.hxx index 108df078dfa6..76dda781969a 100644 --- a/cui/source/inc/hldoctp.hxx +++ b/cui/source/inc/hldoctp.hxx @@ -30,12 +30,12 @@ class SvxHyperlinkDocTp : public SvxHyperlinkTabPageBase { private: - SvxHyperURLBox *m_pCbbPath; - PushButton *m_pBtFileopen; + VclPtr<SvxHyperURLBox> m_pCbbPath; + VclPtr<PushButton> m_pBtFileopen; - Edit *m_pEdTarget; - FixedText *m_pFtFullURL; - PushButton *m_pBtBrowse; + VclPtr<Edit> m_pEdTarget; + VclPtr<FixedText> m_pFtFullURL; + VclPtr<PushButton> m_pBtBrowse; OUString maStrURL; @@ -67,6 +67,8 @@ protected: public: SvxHyperlinkDocTp ( vcl::Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet); + virtual ~SvxHyperlinkDocTp(); + virtual void dispose() SAL_OVERRIDE; static IconChoicePage* Create( vcl::Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ); diff --git a/cui/source/inc/hlinettp.hxx b/cui/source/inc/hlinettp.hxx index bc76625641e4..03b0132c1263 100644 --- a/cui/source/inc/hlinettp.hxx +++ b/cui/source/inc/hlinettp.hxx @@ -32,15 +32,15 @@ class SvxHyperlinkInternetTp : public SvxHyperlinkTabPageBase { private: - RadioButton *m_pRbtLinktypInternet; - RadioButton *m_pRbtLinktypFTP; - SvxHyperURLBox *m_pCbbTarget; - PushButton *m_pBtBrowse; - FixedText *m_pFtLogin; - Edit *m_pEdLogin; - FixedText *m_pFtPassword; - Edit *m_pEdPassword; - CheckBox *m_pCbAnonymous; + VclPtr<RadioButton > m_pRbtLinktypInternet; + VclPtr<RadioButton> m_pRbtLinktypFTP; + VclPtr<SvxHyperURLBox> m_pCbbTarget; + VclPtr<PushButton> m_pBtBrowse; + VclPtr<FixedText> m_pFtLogin; + VclPtr<Edit> m_pEdLogin; + VclPtr<FixedText> m_pFtPassword; + VclPtr<Edit> m_pEdPassword; + VclPtr<CheckBox> m_pCbAnonymous; OUString maStrOldUser; OUString maStrOldPassword; @@ -78,6 +78,8 @@ protected: public: SvxHyperlinkInternetTp ( vcl::Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet); + virtual ~SvxHyperlinkInternetTp(); + virtual void dispose() SAL_OVERRIDE; static IconChoicePage* Create( vcl::Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ); diff --git a/cui/source/inc/hlmailtp.hxx b/cui/source/inc/hlmailtp.hxx index 1687e848156c..5eae01b5851a 100644 --- a/cui/source/inc/hlmailtp.hxx +++ b/cui/source/inc/hlmailtp.hxx @@ -30,10 +30,10 @@ class SvxHyperlinkMailTp : public SvxHyperlinkTabPageBase { private: - SvxHyperURLBox *m_pCbbReceiver; - PushButton *m_pBtAdrBook; - FixedText *m_pFtSubject; - Edit *m_pEdSubject; + VclPtr<SvxHyperURLBox> m_pCbbReceiver; + VclPtr<PushButton> m_pBtAdrBook; + VclPtr<FixedText> m_pFtSubject; + VclPtr<Edit> m_pEdSubject; DECL_LINK (ClickAdrBookHdl_Impl , void * ); ///< Button : Address book DECL_LINK (ModifiedReceiverHdl_Impl, void * ); ///< Combobox "receiver" modified @@ -51,6 +51,8 @@ protected: public: SvxHyperlinkMailTp ( vcl::Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet); + virtual ~SvxHyperlinkMailTp(); + virtual void dispose() SAL_OVERRIDE; static IconChoicePage* Create( vcl::Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ); diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx index e9d8c32dac9c..9591a2a0f640 100644 --- a/cui/source/inc/hlmarkwn.hxx +++ b/cui/source/inc/hlmarkwn.hxx @@ -39,10 +39,12 @@ class SvxHlinkDlgMarkWnd; class SvxHlmarkTreeLBox : public SvTreeListBox { private: - SvxHlinkDlgMarkWnd* mpParentWnd; + VclPtr<SvxHlinkDlgMarkWnd> mpParentWnd; public: SvxHlmarkTreeLBox(vcl::Window* pParent, WinBits nStyle); + virtual ~SvxHlmarkTreeLBox(); + virtual void dispose() SAL_OVERRIDE; void SetParentWnd(SvxHlinkDlgMarkWnd* pParent) { @@ -62,13 +64,13 @@ class SvxHlinkDlgMarkWnd : public ModalDialog //FloatingWindow private: friend class SvxHlmarkTreeLBox; - PushButton* mpBtApply; - PushButton* mpBtClose; - SvxHlmarkTreeLBox* mpLbTree; + VclPtr<PushButton> mpBtApply; + VclPtr<PushButton> mpBtClose; + VclPtr<SvxHlmarkTreeLBox> mpLbTree; bool mbUserMoved; - SvxHyperlinkTabPageBase* mpParent; + VclPtr<SvxHyperlinkTabPageBase> mpParent; OUString maStrLastURL; diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx index 275d28b7afed..d155d6e42de7 100644 --- a/cui/source/inc/hltpbase.hxx +++ b/cui/source/inc/hltpbase.hxx @@ -67,11 +67,11 @@ public: class SvxHyperlinkTabPageBase : public IconChoicePage { private: - ComboBox *mpCbbFrame; - ListBox *mpLbForm; - Edit *mpEdIndication; - Edit *mpEdText; - PushButton *mpBtScript; + VclPtr<ComboBox> mpCbbFrame; + VclPtr<ListBox> mpLbForm; + VclPtr<Edit> mpEdIndication; + VclPtr<Edit> mpEdText; + VclPtr<PushButton> mpBtScript; bool mbIsCloseDisabled; @@ -79,7 +79,7 @@ private: mxDocumentFrame; protected: - vcl::Window* mpDialog; + VclPtr<vcl::Window> mpDialog; bool mbStdControlsInit; @@ -87,7 +87,7 @@ protected: Timer maTimer; - SvxHlinkDlgMarkWnd* mpMarkWnd; + VclPtr<SvxHlinkDlgMarkWnd> mpMarkWnd; void InitStdControls (); void FillStandardDlgFields ( const SvxHyperlinkItem* pHyperlinkItem ); diff --git a/cui/source/inc/hyphen.hxx b/cui/source/inc/hyphen.hxx index 16821011e500..3bf97672b99b 100644 --- a/cui/source/inc/hyphen.hxx +++ b/cui/source/inc/hyphen.hxx @@ -42,14 +42,14 @@ protected: class SvxHyphenWordDialog : public SfxModalDialog { - HyphenEdit* m_pWordEdit; - PushButton* m_pLeftBtn; - PushButton* m_pRightBtn; - PushButton* m_pOkBtn; - PushButton* m_pContBtn; - PushButton* m_pDelBtn; - PushButton* m_pHyphAll; - CloseButton* m_pCloseBtn; + VclPtr<HyphenEdit> m_pWordEdit; + VclPtr<PushButton> m_pLeftBtn; + VclPtr<PushButton> m_pRightBtn; + VclPtr<PushButton> m_pOkBtn; + VclPtr<PushButton> m_pContBtn; + VclPtr<PushButton> m_pDelBtn; + VclPtr<PushButton> m_pHyphAll; + VclPtr<CloseButton> m_pCloseBtn; OUString aLabel; SvxSpellWrapper* pHyphWrapper; css::uno::Reference< css::linguistic2::XHyphenator > xHyphenator; @@ -85,6 +85,8 @@ public: vcl::Window* pParent, css::uno::Reference< css::linguistic2::XHyphenator > &xHyphen, SvxSpellWrapper* pWrapper ); + virtual ~SvxHyphenWordDialog(); + virtual void dispose() SAL_OVERRIDE; void SetWindowTitle( LanguageType nLang ); void SelLeft(); diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx index 21a8d5b1025a..62260e2e9dd2 100644 --- a/cui/source/inc/iconcdlg.hxx +++ b/cui/source/inc/iconcdlg.hxx @@ -49,7 +49,7 @@ struct IconChoicePageData sal_uInt16 nId; CreatePage fnCreatePage; ///< pointer to the factory GetPageRanges fnGetRanges; ///< pointer to the ranges-function - IconChoicePage* pPage; ///< the TabPage itself + VclPtr<IconChoicePage> pPage; ///< the TabPage itself bool bOnDemand; ///< Flag: ItemSet onDemand bool bRefresh; ///< Flag: page has to be newly initialized @@ -73,7 +73,7 @@ private : const SfxItemSet* pSet; OUString aUserString; bool bHasExchangeSupport; - IconChoiceDialog* pDialog; + VclPtr<IconChoiceDialog> pDialog; void SetDialog( IconChoiceDialog* pNew ) { pDialog = pNew; } IconChoiceDialog* GetDialog() const { return pDialog; } @@ -85,10 +85,12 @@ private : protected : IconChoicePage( vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet &rAttrSet ); - sal_uInt16 GetSlot( sal_uInt16 nWhich ) const { return pSet->GetPool()->GetSlotId( nWhich ); } - sal_uInt16 GetWhich( sal_uInt16 nSlot ) const { return pSet->GetPool()->GetWhich( nSlot ); } + sal_uInt16 GetSlot( sal_uInt16 nWhich ) const { return pSet->GetPool()->GetSlotId( nWhich ); } + sal_uInt16 GetWhich( sal_uInt16 nSlot ) const { return pSet->GetPool()->GetWhich( nSlot ); } public : + virtual ~IconChoicePage(); + virtual void dispose() SAL_OVERRIDE; const SfxItemSet& GetItemSet() const { return *pSet; } @@ -124,18 +126,18 @@ private : ::std::vector< IconChoicePageData* > maPageList; - SvtIconChoiceCtrl *m_pIconCtrl; + VclPtr<SvtIconChoiceCtrl> m_pIconCtrl; sal_uInt16 mnCurrentPageId; // Buttons - OKButton *m_pOKBtn; - PushButton *m_pApplyBtn; - CancelButton *m_pCancelBtn; - HelpButton *m_pHelpBtn; - PushButton *m_pResetBtn; + VclPtr<OKButton> m_pOKBtn; + VclPtr<PushButton> m_pApplyBtn; + VclPtr<CancelButton> m_pCancelBtn; + VclPtr<HelpButton> m_pHelpBtn; + VclPtr<PushButton> m_pResetBtn; - VclVBox *m_pTabContainer; + VclPtr<VclVBox> m_pTabContainer; const SfxItemSet* pSet; SfxItemSet* pOutSet; SfxItemSet* pExampleSet; @@ -166,7 +168,7 @@ protected : SfxItemSet* CreateInputItemSet( sal_uInt16 nId ); inline SfxItemSet* GetInputSetImpl() { return const_cast<SfxItemSet*>(pSet); } inline IconChoicePage* GetTabPage( sal_uInt16 nPageId ) - { return ( GetPageData (nPageId)->pPage?GetPageData (nPageId)->pPage:NULL); } + { return ( GetPageData (nPageId)->pPage?GetPageData (nPageId)->pPage.get():NULL); } void RefreshInputSet(); void ActivatePageImpl (); diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx index 009174bbffcc..eda64bad3349 100644 --- a/cui/source/inc/insdlg.hxx +++ b/cui/source/inc/insdlg.hxx @@ -56,14 +56,14 @@ public: class SvInsertOleDlg : public InsertObjectDialog_Impl { - RadioButton* m_pRbNewObject; - RadioButton* m_pRbObjectFromfile; - VclFrame* m_pObjectTypeFrame; - ListBox* m_pLbObjecttype; - VclFrame* m_pFileFrame; - Edit* m_pEdFilepath; - PushButton* m_pBtnFilepath; - CheckBox* m_pCbFilelink; + VclPtr<RadioButton> m_pRbNewObject; + VclPtr<RadioButton> m_pRbObjectFromfile; + VclPtr<VclFrame> m_pObjectTypeFrame; + VclPtr<ListBox> m_pLbObjecttype; + VclPtr<VclFrame> m_pFileFrame; + VclPtr<Edit> m_pEdFilepath; + VclPtr<PushButton> m_pBtnFilepath; + VclPtr<CheckBox> m_pCbFilelink; const SvObjectServerList* m_pServers; ::com::sun::star::uno::Sequence< sal_Int8 > m_aIconMetaFile; @@ -86,6 +86,8 @@ public: SvInsertOleDlg( vcl::Window* pParent, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage, const SvObjectServerList* pServers = NULL ); + virtual ~SvInsertOleDlg(); + virtual void dispose() SAL_OVERRIDE; virtual short Execute() SAL_OVERRIDE; /// get replacement for the iconified embedded object and the mediatype of the replacement @@ -95,9 +97,9 @@ public: class SvInsertPlugInDialog : public InsertObjectDialog_Impl { private: - Edit* m_pEdFileurl; - PushButton* m_pBtnFileurl; - VclMultiLineEdit* m_pEdPluginsOptions; + VclPtr<Edit> m_pEdFileurl; + VclPtr<PushButton> m_pBtnFileurl; + VclPtr<VclMultiLineEdit> m_pEdPluginsOptions; INetURLObject* m_pURL; OUString m_aCommands; @@ -116,23 +118,23 @@ public: class SfxInsertFloatingFrameDialog : public InsertObjectDialog_Impl { private: - Edit* m_pEDName; - Edit* m_pEDURL; - PushButton* m_pBTOpen; + VclPtr<Edit> m_pEDName; + VclPtr<Edit> m_pEDURL; + VclPtr<PushButton> m_pBTOpen; - RadioButton* m_pRBScrollingOn; - RadioButton* m_pRBScrollingOff; - RadioButton* m_pRBScrollingAuto; + VclPtr<RadioButton> m_pRBScrollingOn; + VclPtr<RadioButton> m_pRBScrollingOff; + VclPtr<RadioButton> m_pRBScrollingAuto; - RadioButton* m_pRBFrameBorderOn; - RadioButton* m_pRBFrameBorderOff; + VclPtr<RadioButton> m_pRBFrameBorderOn; + VclPtr<RadioButton> m_pRBFrameBorderOff; - FixedText* m_pFTMarginWidth; - NumericField* m_pNMMarginWidth; - CheckBox* m_pCBMarginWidthDefault; - FixedText* m_pFTMarginHeight; - NumericField* m_pNMMarginHeight; - CheckBox* m_pCBMarginHeightDefault; + VclPtr<FixedText> m_pFTMarginWidth; + VclPtr<NumericField> m_pNMMarginWidth; + VclPtr<CheckBox> m_pCBMarginWidthDefault; + VclPtr<FixedText> m_pFTMarginHeight; + VclPtr<NumericField> m_pNMMarginHeight; + VclPtr<CheckBox> m_pCBMarginHeightDefault; DECL_STATIC_LINK(SfxInsertFloatingFrameDialog, OpenHdl, PushButton* ); DECL_STATIC_LINK(SfxInsertFloatingFrameDialog, CheckHdl, CheckBox* ); @@ -144,6 +146,8 @@ public: const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage ); SfxInsertFloatingFrameDialog( vcl::Window* pParent, const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& xObj ); + virtual ~SfxInsertFloatingFrameDialog(); + virtual void dispose() SAL_OVERRIDE; virtual short Execute() SAL_OVERRIDE; }; diff --git a/cui/source/inc/insrc.hxx b/cui/source/inc/insrc.hxx index 012916b89423..f24467db07cd 100644 --- a/cui/source/inc/insrc.hxx +++ b/cui/source/inc/insrc.hxx @@ -31,10 +31,10 @@ class SvxInsRowColDlg : public SvxAbstractInsRowColDlg, public ModalDialog { - NumericField* m_pCountEdit; + VclPtr<NumericField> m_pCountEdit; - RadioButton* m_pBeforeBtn; - RadioButton* m_pAfterBtn; + VclPtr<RadioButton> m_pBeforeBtn; + VclPtr<RadioButton> m_pAfterBtn; OUString aRow; OUString aCol; @@ -43,6 +43,8 @@ class SvxInsRowColDlg : public SvxAbstractInsRowColDlg, public ModalDialog public: SvxInsRowColDlg( vcl::Window* pParent, bool bCol, const OString& sHelpId ); + virtual ~SvxInsRowColDlg(); + virtual void dispose() SAL_OVERRIDE; virtual short Execute(void) SAL_OVERRIDE; diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx index 446499f28887..7b20283f2ebc 100644 --- a/cui/source/inc/labdlg.hxx +++ b/cui/source/inc/labdlg.hxx @@ -34,16 +34,16 @@ class SvxCaptionTabPage : public SfxTabPage { private: static const sal_uInt16 pCaptionRanges[]; - ValueSet* m_pCT_CAPTTYPE; - MetricField* m_pMF_ABSTAND; - ListBox* m_pLB_ANSATZ; - FixedText* m_pFT_UM; - MetricField* m_pMF_ANSATZ; - FixedText* m_pFT_ANSATZ_REL; - ListBox* m_pLB_ANSATZ_REL; - FixedText* m_pFT_LAENGE; - MetricField* m_pMF_LAENGE; - CheckBox* m_pCB_LAENGE; + VclPtr<ValueSet> m_pCT_CAPTTYPE; + VclPtr<MetricField> m_pMF_ABSTAND; + VclPtr<ListBox> m_pLB_ANSATZ; + VclPtr<FixedText> m_pFT_UM; + VclPtr<MetricField> m_pMF_ANSATZ; + VclPtr<FixedText> m_pFT_ANSATZ_REL; + VclPtr<ListBox> m_pLB_ANSATZ_REL; + VclPtr<FixedText> m_pFT_LAENGE; + VclPtr<MetricField> m_pMF_LAENGE; + VclPtr<CheckBox> m_pCB_LAENGE; Image m_aBmpCapTypes[CAPTYPE_BITMAPS_COUNT]; @@ -75,6 +75,8 @@ private: public: SvxCaptionTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); + virtual ~SvxCaptionTabPage(); + virtual void dispose() SAL_OVERRIDE; static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pCaptionRanges; } diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx index 62afb0c54b80..7e953fcd747e 100644 --- a/cui/source/inc/linkdlg.hxx +++ b/cui/source/inc/linkdlg.hxx @@ -44,16 +44,16 @@ class SvBaseLinksDlg : public ModalDialog { using Window::SetType; - SvTabListBox *m_pTbLinks; - FixedText *m_pFtFullFileName; - FixedText *m_pFtFullSourceName; - FixedText *m_pFtFullTypeName; - RadioButton *m_pRbAutomatic; - RadioButton *m_pRbManual; - PushButton *m_pPbUpdateNow; - PushButton *m_pPbOpenSource; - PushButton *m_pPbChangeSource; - PushButton *m_pPbBreakLink; + VclPtr<SvTabListBox> m_pTbLinks; + VclPtr<FixedText> m_pFtFullFileName; + VclPtr<FixedText> m_pFtFullSourceName; + VclPtr<FixedText> m_pFtFullTypeName; + VclPtr<RadioButton> m_pRbAutomatic; + VclPtr<RadioButton> m_pRbManual; + VclPtr<PushButton> m_pPbUpdateNow; + VclPtr<PushButton> m_pPbOpenSource; + VclPtr<PushButton> m_pPbChangeSource; + VclPtr<PushButton> m_pPbBreakLink; OUString aStrAutolink; OUString aStrManuallink; OUString aStrBrokenlink; @@ -95,6 +95,8 @@ class SvBaseLinksDlg : public ModalDialog public: SvBaseLinksDlg( vcl::Window * pParent, sfx2::LinkManager*, bool bHtml = false ); + virtual ~SvBaseLinksDlg(); + virtual void dispose() SAL_OVERRIDE; void SetActLink( sfx2::SvBaseLink * pLink ); }; diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx index 7e7bc034cbbe..18b0fc6ce20d 100644 --- a/cui/source/inc/measure.hxx +++ b/cui/source/inc/measure.hxx @@ -33,23 +33,23 @@ class SvxMeasurePage : public SvxTabPage private: static const sal_uInt16 pRanges[]; - MetricField* m_pMtrFldLineDist; - MetricField* m_pMtrFldHelplineOverhang; - MetricField* m_pMtrFldHelplineDist; - MetricField* m_pMtrFldHelpline1Len; - MetricField* m_pMtrFldHelpline2Len; - TriStateBox* m_pTsbBelowRefEdge; - MetricField* m_pMtrFldDecimalPlaces; - - SvxRectCtl* m_pCtlPosition; - TriStateBox* m_pTsbAutoPosV; - TriStateBox* m_pTsbAutoPosH; - TriStateBox* m_pTsbShowUnit; - ListBox* m_pLbUnit; - TriStateBox* m_pTsbParallel; - FixedText* m_pFtAutomatic; - - SvxXMeasurePreview* m_pCtlPreview; + VclPtr<MetricField> m_pMtrFldLineDist; + VclPtr<MetricField> m_pMtrFldHelplineOverhang; + VclPtr<MetricField> m_pMtrFldHelplineDist; + VclPtr<MetricField> m_pMtrFldHelpline1Len; + VclPtr<MetricField> m_pMtrFldHelpline2Len; + VclPtr<TriStateBox> m_pTsbBelowRefEdge; + VclPtr<MetricField> m_pMtrFldDecimalPlaces; + + VclPtr<SvxRectCtl> m_pCtlPosition; + VclPtr<TriStateBox> m_pTsbAutoPosV; + VclPtr<TriStateBox> m_pTsbAutoPosH; + VclPtr<TriStateBox> m_pTsbShowUnit; + VclPtr<ListBox> m_pLbUnit; + VclPtr<TriStateBox> m_pTsbParallel; + VclPtr<FixedText> m_pFtAutomatic; + + VclPtr<SvxXMeasurePreview> m_pCtlPreview; const SfxItemSet& rOutAttrs; SfxItemSet aAttrSet; @@ -66,6 +66,8 @@ private: public: SvxMeasurePage( vcl::Window* pWindow, const SfxItemSet& rInAttrs ); + virtual ~SvxMeasurePage(); + virtual void dispose() SAL_OVERRIDE; static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pRanges; } diff --git a/cui/source/inc/multipat.hxx b/cui/source/inc/multipat.hxx index 685bbc32d96d..ecc1395f6cad 100644 --- a/cui/source/inc/multipat.hxx +++ b/cui/source/inc/multipat.hxx @@ -39,9 +39,9 @@ class SvxMultiPathDialog : public ModalDialog { private: - svx::SvxRadioButtonListBox* m_pRadioLB; - PushButton* m_pAddBtn; - PushButton* m_pDelBtn; + VclPtr<svx::SvxRadioButtonListBox> m_pRadioLB; + VclPtr<PushButton> m_pAddBtn; + VclPtr<PushButton> m_pDelBtn; DECL_LINK(AddHdl_Impl, void *); DECL_LINK(DelHdl_Impl, void *); @@ -60,9 +60,9 @@ public: class SvxPathSelectDialog : public ModalDialog { private: - ListBox* m_pPathLB; - PushButton* m_pAddBtn; - PushButton* m_pDelBtn; + VclPtr<ListBox> m_pPathLB; + VclPtr<PushButton> m_pAddBtn; + VclPtr<PushButton> m_pDelBtn; DECL_LINK(AddHdl_Impl, void *); DECL_LINK(DelHdl_Impl, void *); diff --git a/cui/source/inc/newtabledlg.hxx b/cui/source/inc/newtabledlg.hxx index 778457aec69e..f6be298f88d2 100644 --- a/cui/source/inc/newtabledlg.hxx +++ b/cui/source/inc/newtabledlg.hxx @@ -29,11 +29,13 @@ class SvxNewTableDialog : public SvxAbstractNewTableDialog, public ModalDialog { private: - NumericField* mpNumColumns; - NumericField* mpNumRows; + VclPtr<NumericField> mpNumColumns; + VclPtr<NumericField> mpNumRows; public: SvxNewTableDialog( vcl::Window* pWindow ); + virtual ~SvxNewTableDialog(); + virtual void dispose() SAL_OVERRIDE; virtual short Execute(void) SAL_OVERRIDE; diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx index 7a633e325872..552f59249a3e 100644 --- a/cui/source/inc/numfmt.hxx +++ b/cui/source/inc/numfmt.hxx @@ -92,31 +92,31 @@ public: private: SvxNumberFormatTabPage( vcl::Window* pParent, const SfxItemSet& rCoreAttrs ); - FixedText* m_pFtCategory; - ListBox* m_pLbCategory; - FixedText* m_pFtFormat; - ListBox* m_pLbCurrency; - SvxFontListBox* m_pLbFormat; - FixedText* m_pFtLanguage; - SvxLanguageBox* m_pLbLanguage; - CheckBox* m_pCbSourceFormat; - SvxNumberPreview* m_pWndPreview; - FixedText* m_pFtOptions; - FixedText* m_pFtDecimals; - NumericField* m_pEdDecimals; - CheckBox* m_pBtnNegRed; - FixedText* m_pFtLeadZeroes; - NumericField* m_pEdLeadZeroes; - CheckBox* m_pBtnThousand; - - VclContainer* m_pFormatCodeFrame; - Edit* m_pEdFormat; - PushButton* m_pIbAdd; - PushButton* m_pIbInfo; - PushButton* m_pIbRemove; - - FixedText* m_pFtComment; - Edit* m_pEdComment; + VclPtr<FixedText> m_pFtCategory; + VclPtr<ListBox> m_pLbCategory; + VclPtr<FixedText> m_pFtFormat; + VclPtr<ListBox> m_pLbCurrency; + VclPtr<SvxFontListBox> m_pLbFormat; + VclPtr<FixedText> m_pFtLanguage; + VclPtr<SvxLanguageBox> m_pLbLanguage; + VclPtr<CheckBox> m_pCbSourceFormat; + VclPtr<SvxNumberPreview> m_pWndPreview; + VclPtr<FixedText> m_pFtOptions; + VclPtr<FixedText> m_pFtDecimals; + VclPtr<NumericField> m_pEdDecimals; + VclPtr<CheckBox> m_pBtnNegRed; + VclPtr<FixedText> m_pFtLeadZeroes; + VclPtr<NumericField> m_pEdLeadZeroes; + VclPtr<CheckBox> m_pBtnThousand; + + VclPtr<VclContainer> m_pFormatCodeFrame; + VclPtr<Edit> m_pEdFormat; + VclPtr<PushButton> m_pIbAdd; + VclPtr<PushButton> m_pIbInfo; + VclPtr<PushButton> m_pIbRemove; + + VclPtr<FixedText> m_pFtComment; + VclPtr<Edit> m_pEdComment; Timer aResetWinTimer; @@ -131,7 +131,7 @@ private: OUString sAutomaticEntry; - vcl::Window* pLastActivWindow; + VclPtr<vcl::Window> pLastActivWindow; void Init_Impl(); void FillCurrencyBox(); @@ -146,11 +146,11 @@ private: void ChangePreviewText( sal_uInt16 nPos ); void AddAutomaticLanguage_Impl(LanguageType eAutoLang, bool bSelect); // Handler - DECL_LINK( LostFocusHdl_Impl, Edit* pEd ); - DECL_LINK( DoubleClickHdl_Impl, SvxFontListBox* pLb ); + DECL_LINK( LostFocusHdl_Impl, Edit* ); + DECL_LINK( DoubleClickHdl_Impl, SvxFontListBox* ); DECL_LINK( SelFormatHdl_Impl, void * ); - DECL_LINK( ClickHdl_Impl, PushButton* pIB ); - DECL_LINK( EditHdl_Impl, Edit* pEdFormat ); + DECL_LINK( ClickHdl_Impl, PushButton* ); + DECL_LINK( EditHdl_Impl, Edit* ); DECL_LINK( OptHdl_Impl, void * ); DECL_LINK(TimeHdl_Impl, void *); }; diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index 9f9cca7bd9df..f2cb95c9c112 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -90,7 +90,7 @@ class SvxSingleNumPickTabPage : public SfxTabPage using TabPage::ActivatePage; using TabPage::DeactivatePage; - SvxNumValueSet* m_pExamplesVS; + VclPtr<SvxNumValueSet> m_pExamplesVS; SvxNumSettingsArr_Impl aNumSettingsArr; SvxNumRule* pActNum; SvxNumRule* pSaveNum; @@ -130,7 +130,7 @@ class SvxBulletPickTabPage : public SfxTabPage using TabPage::ActivatePage; using TabPage::DeactivatePage; - SvxNumValueSet* m_pExamplesVS; + VclPtr<SvxNumValueSet> m_pExamplesVS; SvxNumRule* pActNum; SvxNumRule* pSaveNum; sal_uInt16 nActNumLvl; @@ -168,7 +168,7 @@ class SvxNumPickTabPage : public SfxTabPage using TabPage::ActivatePage; using TabPage::DeactivatePage; - SvxNumValueSet* m_pExamplesVS; + VclPtr<SvxNumValueSet> m_pExamplesVS; OUString sNumCharFmtName; OUString sBulletCharFmtName; @@ -213,8 +213,8 @@ class SvxBitmapPickTabPage : public SfxTabPage using TabPage::ActivatePage; using TabPage::DeactivatePage; - FixedText* m_pErrorText; - SvxBmpNumValueSet* m_pExamplesVS; + VclPtr<FixedText> m_pErrorText; + VclPtr<SvxBmpNumValueSet> m_pExamplesVS; std::vector<OUString> aGrfNames; OUString sNumCharFmtName; @@ -255,44 +255,44 @@ class SvxNumOptionsTabPage : public SfxTabPage using TabPage::ActivatePage; using TabPage::DeactivatePage; - ListBox* m_pLevelLB; - - ListBox* m_pFmtLB; - - FixedText* m_pSeparatorFT; - FixedText* m_pPrefixFT; - Edit* m_pPrefixED; - FixedText* m_pSuffixFT; - Edit* m_pSuffixED; - FixedText* m_pCharFmtFT; - ListBox* m_pCharFmtLB; - FixedText* m_pBulColorFT; - ColorListBox* m_pBulColLB; - FixedText* m_pBulRelSizeFT; - MetricField* m_pBulRelSizeMF; - FixedText* m_pAllLevelFT; - NumericField* m_pAllLevelNF; - FixedText* m_pStartFT; - NumericField* m_pStartED; - FixedText* m_pBulletFT; - PushButton* m_pBulletPB; - FixedText* m_pAlignFT; - ListBox* m_pAlignLB; - FixedText* m_pBitmapFT; - MenuButton* m_pBitmapMB; + VclPtr<ListBox> m_pLevelLB; + + VclPtr<ListBox> m_pFmtLB; + + VclPtr<FixedText> m_pSeparatorFT; + VclPtr<FixedText> m_pPrefixFT; + VclPtr<Edit> m_pPrefixED; + VclPtr<FixedText> m_pSuffixFT; + VclPtr<Edit> m_pSuffixED; + VclPtr<FixedText> m_pCharFmtFT; + VclPtr<ListBox> m_pCharFmtLB; + VclPtr<FixedText> m_pBulColorFT; + VclPtr<ColorListBox> m_pBulColLB; + VclPtr<FixedText> m_pBulRelSizeFT; + VclPtr<MetricField> m_pBulRelSizeMF; + VclPtr<FixedText> m_pAllLevelFT; + VclPtr<NumericField> m_pAllLevelNF; + VclPtr<FixedText> m_pStartFT; + VclPtr<NumericField> m_pStartED; + VclPtr<FixedText> m_pBulletFT; + VclPtr<PushButton> m_pBulletPB; + VclPtr<FixedText> m_pAlignFT; + VclPtr<ListBox> m_pAlignLB; + VclPtr<FixedText> m_pBitmapFT; + VclPtr<MenuButton> m_pBitmapMB; sal_uInt16 m_nGalleryId; - FixedText* m_pWidthFT; - MetricField* m_pWidthMF; - FixedText* m_pHeightFT; - MetricField* m_pHeightMF; - CheckBox* m_pRatioCB; - FixedText* m_pOrientFT; - ListBox* m_pOrientLB; + VclPtr<FixedText> m_pWidthFT; + VclPtr<MetricField> m_pWidthMF; + VclPtr<FixedText> m_pHeightFT; + VclPtr<MetricField> m_pHeightMF; + VclPtr<CheckBox> m_pRatioCB; + VclPtr<FixedText> m_pOrientFT; + VclPtr<ListBox> m_pOrientLB; - VclContainer* m_pAllLevelsFrame; - CheckBox* m_pSameLevelCB; + VclPtr<VclContainer> m_pAllLevelsFrame; + VclPtr<CheckBox> m_pSameLevelCB; - SvxNumberingPreview* m_pPreviewWIN; + VclPtr<SvxNumberingPreview> m_pPreviewWIN; OUString m_sNumCharFmtName; OUString m_sBulletCharFmtName; @@ -390,36 +390,36 @@ class SvxNumPositionTabPage : public SfxTabPage using TabPage::ActivatePage; using TabPage::DeactivatePage; - ListBox* m_pLevelLB; + VclPtr<ListBox> m_pLevelLB; // former set of controls shown for numbering rules containing list level // attributes in SvxNumberFormat::SvxNumPositionAndSpaceMode == LABEL_WIDTH_AND_POSITION - FixedText* m_pDistBorderFT; - MetricField* m_pDistBorderMF; - CheckBox* m_pRelativeCB; - FixedText* m_pIndentFT; - MetricField* m_pIndentMF; - FixedText* m_pDistNumFT; - MetricField* m_pDistNumMF; - FixedText* m_pAlignFT; - ListBox* m_pAlignLB; + VclPtr<FixedText> m_pDistBorderFT; + VclPtr<MetricField> m_pDistBorderMF; + VclPtr<CheckBox> m_pRelativeCB; + VclPtr<FixedText> m_pIndentFT; + VclPtr<MetricField> m_pIndentMF; + VclPtr<FixedText> m_pDistNumFT; + VclPtr<MetricField> m_pDistNumMF; + VclPtr<FixedText> m_pAlignFT; + VclPtr<ListBox> m_pAlignLB; // new set of controls shown for numbering rules containing list level // attributes in SvxNumberFormat::SvxNumPositionAndSpaceMode == LABEL_ALIGNMENT - FixedText* m_pLabelFollowedByFT; - ListBox* m_pLabelFollowedByLB; - FixedText* m_pListtabFT; - MetricField* m_pListtabMF; - FixedText* m_pAlign2FT; - ListBox* m_pAlign2LB; - FixedText* m_pAlignedAtFT; - MetricField* m_pAlignedAtMF; - FixedText* m_pIndentAtFT; - MetricField* m_pIndentAtMF; - - PushButton* m_pStandardPB; - - SvxNumberingPreview* m_pPreviewWIN; + VclPtr<FixedText> m_pLabelFollowedByFT; + VclPtr<ListBox> m_pLabelFollowedByLB; + VclPtr<FixedText> m_pListtabFT; + VclPtr<MetricField> m_pListtabMF; + VclPtr<FixedText> m_pAlign2FT; + VclPtr<ListBox> m_pAlign2LB; + VclPtr<FixedText> m_pAlignedAtFT; + VclPtr<MetricField> m_pAlignedAtMF; + VclPtr<FixedText> m_pIndentAtFT; + VclPtr<MetricField> m_pIndentAtMF; + + VclPtr<PushButton> m_pStandardPB; + + VclPtr<SvxNumberingPreview> m_pPreviewWIN; SvxNumRule* pActNum; SvxNumRule* pSaveNum; diff --git a/cui/source/inc/optasian.hxx b/cui/source/inc/optasian.hxx index 5dc19787d471..5be6d8034a51 100644 --- a/cui/source/inc/optasian.hxx +++ b/cui/source/inc/optasian.hxx @@ -29,22 +29,22 @@ struct SvxAsianLayoutPage_Impl; class SvxAsianLayoutPage : public SfxTabPage { - RadioButton* m_pCharKerningRB; - RadioButton* m_pCharPunctKerningRB; + VclPtr<RadioButton> m_pCharKerningRB; + VclPtr<RadioButton> m_pCharPunctKerningRB; - RadioButton* m_pNoCompressionRB; - RadioButton* m_pPunctCompressionRB; - RadioButton* m_pPunctKanaCompressionRB; + VclPtr<RadioButton> m_pNoCompressionRB; + VclPtr<RadioButton> m_pPunctCompressionRB; + VclPtr<RadioButton> m_pPunctKanaCompressionRB; - FixedText* m_pLanguageFT; - SvxLanguageBox* m_pLanguageLB; - CheckBox* m_pStandardCB; + VclPtr<FixedText> m_pLanguageFT; + VclPtr<SvxLanguageBox> m_pLanguageLB; + VclPtr<CheckBox> m_pStandardCB; - FixedText* m_pStartFT; - Edit* m_pStartED; - FixedText* m_pEndFT; - Edit* m_pEndED; - FixedText* m_pHintFT; + VclPtr<FixedText> m_pStartFT; + VclPtr<Edit> m_pStartED; + VclPtr<FixedText> m_pEndFT; + VclPtr<Edit> m_pEndED; + VclPtr<FixedText> m_pHintFT; SvxAsianLayoutPage_Impl* pImpl; diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx index 9ed48ed6f1f8..3bdffc3f0edd 100644 --- a/cui/source/inc/optdict.hxx +++ b/cui/source/inc/optdict.hxx @@ -50,10 +50,10 @@ namespace linguistic2{ class SvxNewDictionaryDialog : public ModalDialog { private: - Edit* pNameEdit; - SvxLanguageBox* pLanguageLB; - CheckBox* pExceptBtn; - OKButton* pOKBtn; + VclPtr<Edit> pNameEdit; + VclPtr<SvxLanguageBox> pLanguageLB; + VclPtr<CheckBox> pExceptBtn; + VclPtr<OKButton> pOKBtn; ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > xSpell; ::com::sun::star::uno::Reference< @@ -66,6 +66,8 @@ public: SvxNewDictionaryDialog( vcl::Window* pParent, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > &xSpl ); + virtual ~SvxNewDictionaryDialog(); + virtual void dispose() SAL_OVERRIDE; ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > @@ -100,16 +102,16 @@ class SvxEditDictionaryDialog : public ModalDialog { private: - ListBox* pAllDictsLB; - FixedText* pLangFT; - SvxLanguageBox* pLangLB; + VclPtr<ListBox> pAllDictsLB; + VclPtr<FixedText> pLangFT; + VclPtr<SvxLanguageBox> pLangLB; - SvxDictEdit* pWordED; - FixedText* pReplaceFT; - SvxDictEdit* pReplaceED; - SvTabListBox* pWordsLB; - PushButton* pNewReplacePB; - PushButton* pDeletePB; + VclPtr<SvxDictEdit> pWordED; + VclPtr<FixedText> pReplaceFT; + VclPtr<SvxDictEdit> pReplaceED; + VclPtr<SvTabListBox> pWordsLB; + VclPtr<PushButton> pNewReplacePB; + VclPtr<PushButton> pDeletePB; OUString sModify; OUString sNew; @@ -152,6 +154,8 @@ public: const OUString& rName, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1> &xSpl ); + virtual ~SvxEditDictionaryDialog(); + virtual void dispose() SAL_OVERRIDE; sal_uInt16 GetSelectedDict() {return pAllDictsLB->GetSelectEntryPos();} }; diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx index cb49363bafe6..0dea8bc01149 100644 --- a/cui/source/inc/optlingu.hxx +++ b/cui/source/inc/optlingu.hxx @@ -52,15 +52,15 @@ class SvxLinguData_Impl; class SvxEditModulesDlg : public ModalDialog { - SvxLanguageBox* m_pLanguageLB; + VclPtr<SvxLanguageBox> m_pLanguageLB; - SvxCheckListBox* m_pModulesCLB; - PushButton* m_pPrioUpPB; - PushButton* m_pPrioDownPB; - PushButton* m_pBackPB; - FixedHyperlink* m_pMoreDictsLink; + VclPtr<SvxCheckListBox> m_pModulesCLB; + VclPtr<PushButton> m_pPrioUpPB; + VclPtr<PushButton> m_pPrioDownPB; + VclPtr<PushButton> m_pBackPB; + VclPtr<FixedHyperlink> m_pMoreDictsLink; - CloseButton* m_pClosePB; + VclPtr<CloseButton> m_pClosePB; OUString sSpell; OUString sHyph; @@ -94,17 +94,17 @@ public: class SvxLinguTabPage : public SfxTabPage { private: - FixedText* m_pLinguModulesFT; - SvxCheckListBox* m_pLinguModulesCLB; - PushButton* m_pLinguModulesEditPB; - FixedText* m_pLinguDicsFT; - SvxCheckListBox* m_pLinguDicsCLB; - PushButton* m_pLinguDicsNewPB; - PushButton* m_pLinguDicsEditPB; - PushButton* m_pLinguDicsDelPB; - SvxCheckListBox* m_pLinguOptionsCLB; - PushButton* m_pLinguOptionsEditPB; - FixedHyperlink* m_pMoreDictsLink; + VclPtr<FixedText> m_pLinguModulesFT; + VclPtr<SvxCheckListBox> m_pLinguModulesCLB; + VclPtr<PushButton> m_pLinguModulesEditPB; + VclPtr<FixedText> m_pLinguDicsFT; + VclPtr<SvxCheckListBox> m_pLinguDicsCLB; + VclPtr<PushButton> m_pLinguDicsNewPB; + VclPtr<PushButton> m_pLinguDicsEditPB; + VclPtr<PushButton> m_pLinguDicsDelPB; + VclPtr<SvxCheckListBox> m_pLinguOptionsCLB; + VclPtr<PushButton> m_pLinguOptionsEditPB; + VclPtr<FixedHyperlink> m_pMoreDictsLink; OUString sCapitalWords; OUString sWordsWithDigits; diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx index 89cf4857371a..3e0ff7e7dc71 100644 --- a/cui/source/inc/optpath.hxx +++ b/cui/source/inc/optpath.hxx @@ -42,11 +42,11 @@ class SvxPathTabPage; class SvxPathTabPage : public SfxTabPage { private: - SvSimpleTableContainer* m_pPathCtrl; - PushButton* m_pStandardBtn; - PushButton* m_pPathBtn; + VclPtr<SvSimpleTableContainer> m_pPathCtrl; + VclPtr<PushButton> m_pStandardBtn; + VclPtr<PushButton> m_pPathBtn; - ::svx::OptHeaderTabListBox* pPathBox; + VclPtr<::svx::OptHeaderTabListBox> pPathBox; OptPath_Impl* pImpl; ::com::sun::star::uno::Reference< ::svt::DialogClosedListener > xDialogListener; diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx index fae515c87d41..f34239c850f2 100644 --- a/cui/source/inc/page.hxx +++ b/cui/source/inc/page.hxx @@ -75,53 +75,53 @@ class SvxPageDescPage : public SfxTabPage static const sal_uInt16 pRanges[]; private: // paper format - ListBox* m_pPaperSizeBox; + VclPtr<ListBox> m_pPaperSizeBox; - MetricField* m_pPaperWidthEdit; - MetricField* m_pPaperHeightEdit; + VclPtr<MetricField> m_pPaperWidthEdit; + VclPtr<MetricField> m_pPaperHeightEdit; - FixedText* m_pOrientationFT; - RadioButton* m_pPortraitBtn; - RadioButton* m_pLandscapeBtn; + VclPtr<FixedText> m_pOrientationFT; + VclPtr<RadioButton> m_pPortraitBtn; + VclPtr<RadioButton> m_pLandscapeBtn; - SvxPageWindow* m_pBspWin; + VclPtr<SvxPageWindow> m_pBspWin; - FixedText* m_pTextFlowLbl; - svx::FrameDirectionListBox* m_pTextFlowBox; + VclPtr<FixedText> m_pTextFlowLbl; + VclPtr<svx::FrameDirectionListBox> m_pTextFlowBox; - ListBox* m_pPaperTrayBox; + VclPtr<ListBox> m_pPaperTrayBox; // Margins - FixedText* m_pLeftMarginLbl; - MetricField* m_pLeftMarginEdit; - FixedText* m_pRightMarginLbl; - MetricField* m_pRightMarginEdit; - MetricField* m_pTopMarginEdit; - MetricField* m_pBottomMarginEdit; + VclPtr<FixedText> m_pLeftMarginLbl; + VclPtr<MetricField> m_pLeftMarginEdit; + VclPtr<FixedText> m_pRightMarginLbl; + VclPtr<MetricField> m_pRightMarginEdit; + VclPtr<MetricField> m_pTopMarginEdit; + VclPtr<MetricField> m_pBottomMarginEdit; // layout settings - FixedText* m_pPageText; - ListBox* m_pLayoutBox; - ListBox* m_pNumberFormatBox; + VclPtr<FixedText> m_pPageText; + VclPtr<ListBox> m_pLayoutBox; + VclPtr<ListBox> m_pNumberFormatBox; //Extras Calc - FixedText* m_pTblAlignFT; - CheckBox* m_pHorzBox; - CheckBox* m_pVertBox; + VclPtr<FixedText> m_pTblAlignFT; + VclPtr<CheckBox> m_pHorzBox; + VclPtr<CheckBox> m_pVertBox; // Impress and Draw - CheckBox* m_pAdaptBox; + VclPtr<CheckBox> m_pAdaptBox; //Register Writer - CheckBox* m_pRegisterCB; - FixedText* m_pRegisterFT; - ListBox* m_pRegisterLB; + VclPtr<CheckBox> m_pRegisterCB; + VclPtr<FixedText> m_pRegisterFT; + VclPtr<ListBox> m_pRegisterLB; OUString sStandardRegister; - FixedText* m_pInsideLbl; - FixedText* m_pOutsideLbl; - FixedText* m_pPrintRangeQueryText; + VclPtr<FixedText> m_pInsideLbl; + VclPtr<FixedText> m_pOutsideLbl; + VclPtr<FixedText> m_pPrintRangeQueryText; long nFirstLeftMargin; long nFirstRightMargin; diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx index 26a9bc78d9cf..401158ead1da 100644 --- a/cui/source/inc/paragrph.hxx +++ b/cui/source/inc/paragrph.hxx @@ -52,32 +52,32 @@ private: SvxStdParagraphTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); // indention - SvxRelativeField* m_pLeftIndent; + VclPtr<SvxRelativeField> m_pLeftIndent; - FixedText* m_pRightLabel; - SvxRelativeField* m_pRightIndent; + VclPtr<FixedText> m_pRightLabel; + VclPtr<SvxRelativeField> m_pRightIndent; - FixedText* m_pFLineLabel; - SvxRelativeField* m_pFLineIndent; - CheckBox* m_pAutoCB; + VclPtr<FixedText> m_pFLineLabel; + VclPtr<SvxRelativeField> m_pFLineIndent; + VclPtr<CheckBox> m_pAutoCB; // distance - SvxRelativeField* m_pTopDist; - SvxRelativeField* m_pBottomDist; - CheckBox* m_pContextualCB; + VclPtr<SvxRelativeField> m_pTopDist; + VclPtr<SvxRelativeField> m_pBottomDist; + VclPtr<CheckBox> m_pContextualCB; // line spacing - ListBox* m_pLineDist; - FixedText* m_pLineDistAtLabel; - MetricField* m_pLineDistAtPercentBox; - MetricField* m_pLineDistAtMetricBox; - FixedText* m_pAbsDist; + VclPtr<ListBox> m_pLineDist; + VclPtr<FixedText> m_pLineDistAtLabel; + VclPtr<MetricField> m_pLineDistAtPercentBox; + VclPtr<MetricField> m_pLineDistAtMetricBox; + VclPtr<FixedText> m_pAbsDist; OUString sAbsDist; - SvxParaPrevWindow* m_pExampleWin; + VclPtr<SvxParaPrevWindow> m_pExampleWin; // only writer - VclFrame* m_pRegisterFL; - CheckBox* m_pRegisterCB; + VclPtr<VclFrame> m_pRegisterFL; + VclPtr<CheckBox> m_pRegisterCB; long nAbst; long nWidth; @@ -98,6 +98,9 @@ protected: public: + virtual ~SvxStdParagraphTabPage(); + virtual void dispose() SAL_OVERRIDE; + DECL_LINK(ELRLoseFocusHdl, void *); static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); @@ -125,27 +128,27 @@ class SvxParaAlignTabPage : public SfxTabPage static const sal_uInt16 pAlignRanges[]; // alignment - RadioButton* m_pLeft; - RadioButton* m_pRight; - RadioButton* m_pCenter; - RadioButton* m_pJustify; - FixedText* m_pLeftBottom; - FixedText* m_pRightTop; + VclPtr<RadioButton> m_pLeft; + VclPtr<RadioButton> m_pRight; + VclPtr<RadioButton> m_pCenter; + VclPtr<RadioButton> m_pJustify; + VclPtr<FixedText> m_pLeftBottom; + VclPtr<FixedText> m_pRightTop; - FixedText* m_pLastLineFT; - ListBox* m_pLastLineLB; - CheckBox* m_pExpandCB; + VclPtr<FixedText> m_pLastLineFT; + VclPtr<ListBox> m_pLastLineLB; + VclPtr<CheckBox> m_pExpandCB; - CheckBox* m_pSnapToGridCB; + VclPtr<CheckBox> m_pSnapToGridCB; //preview - SvxParaPrevWindow* m_pExampleWin; + VclPtr<SvxParaPrevWindow> m_pExampleWin; //vertical alignment - VclFrame* m_pVertAlignFL; - ListBox* m_pVertAlignLB; + VclPtr<VclFrame> m_pVertAlignFL; + VclPtr<ListBox> m_pVertAlignLB; - VclFrame* m_pPropertiesFL; - svx::FrameDirectionListBox* m_pTextDirectionLB; + VclPtr<VclFrame> m_pPropertiesFL; + VclPtr<svx::FrameDirectionListBox> m_pTextDirectionLB; DECL_LINK(AlignHdl_Impl, void *); DECL_LINK(LastLineHdl_Impl, void *); @@ -159,6 +162,9 @@ protected: virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; public: + virtual ~SvxParaAlignTabPage(); + virtual void dispose() SAL_OVERRIDE; + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges() { return pAlignRanges; } @@ -189,6 +195,9 @@ class SvxExtParagraphTabPage: public SfxTabPage static const sal_uInt16 pExtRanges[]; public: + virtual ~SvxExtParagraphTabPage(); + virtual void dispose() SAL_OVERRIDE; + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges() { return pExtRanges; } @@ -205,37 +214,37 @@ private: SvxExtParagraphTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); // hyphenation - TriStateBox* m_pHyphenBox; - FixedText* m_pBeforeText; - NumericField* m_pExtHyphenBeforeBox; - FixedText* m_pAfterText; - NumericField* m_pExtHyphenAfterBox; - FixedText* m_pMaxHyphenLabel; - NumericField* m_pMaxHyphenEdit; + VclPtr<TriStateBox> m_pHyphenBox; + VclPtr<FixedText> m_pBeforeText; + VclPtr<NumericField> m_pExtHyphenBeforeBox; + VclPtr<FixedText> m_pAfterText; + VclPtr<NumericField> m_pExtHyphenAfterBox; + VclPtr<FixedText> m_pMaxHyphenLabel; + VclPtr<NumericField> m_pMaxHyphenEdit; // pagebreak - TriStateBox* m_pPageBreakBox; - FixedText* m_pBreakTypeFT; - ListBox* m_pBreakTypeLB; - FixedText* m_pBreakPositionFT; - ListBox* m_pBreakPositionLB; - TriStateBox* m_pApplyCollBtn; - ListBox* m_pApplyCollBox; - FixedText* m_pPagenumText; - NumericField* m_pPagenumEdit; + VclPtr<TriStateBox> m_pPageBreakBox; + VclPtr<FixedText> m_pBreakTypeFT; + VclPtr<ListBox> m_pBreakTypeLB; + VclPtr<FixedText> m_pBreakPositionFT; + VclPtr<ListBox> m_pBreakPositionLB; + VclPtr<TriStateBox> m_pApplyCollBtn; + VclPtr<ListBox> m_pApplyCollBox; + VclPtr<FixedText> m_pPagenumText; + VclPtr<NumericField> m_pPagenumEdit; // paragraph division - TriStateBox* m_pKeepTogetherBox; - TriStateBox* m_pKeepParaBox; + VclPtr<TriStateBox> m_pKeepTogetherBox; + VclPtr<TriStateBox> m_pKeepParaBox; // orphan/widow - TriStateBox* m_pOrphanBox; - NumericField* m_pOrphanRowNo; - FixedText* m_pOrphanRowLabel; + VclPtr<TriStateBox> m_pOrphanBox; + VclPtr<NumericField> m_pOrphanRowNo; + VclPtr<FixedText> m_pOrphanRowLabel; - TriStateBox* m_pWidowBox; - NumericField* m_pWidowRowNo; - FixedText* m_pWidowRowLabel; + VclPtr<TriStateBox> m_pWidowBox; + VclPtr<NumericField> m_pWidowRowNo; + VclPtr<FixedText> m_pWidowRowLabel; bool bPageBreak; bool bHtmlMode; @@ -257,15 +266,18 @@ private: class SvxAsianTabPage : public SfxTabPage { - CheckBox* m_pForbiddenRulesCB; - CheckBox* m_pHangingPunctCB; - CheckBox* m_pScriptSpaceCB; + VclPtr<CheckBox> m_pForbiddenRulesCB; + VclPtr<CheckBox> m_pHangingPunctCB; + VclPtr<CheckBox> m_pScriptSpaceCB; SvxAsianTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); DECL_LINK( ClickHdl_Impl, CheckBox* ); public: + virtual ~SvxAsianTabPage(); + virtual void dispose() SAL_OVERRIDE; + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); diff --git a/cui/source/inc/pastedlg.hxx b/cui/source/inc/pastedlg.hxx index a4ac2415f9f5..ef4779dddd72 100644 --- a/cui/source/inc/pastedlg.hxx +++ b/cui/source/inc/pastedlg.hxx @@ -39,10 +39,10 @@ class TransferableDataHelper; class SvPasteObjectDialog : public ModalDialog { - FixedText* m_pFtObjectSource; - ListBox* m_pLbInsertList; - OKButton* m_pOKButton; - ::std::map< SotClipboardFormatId, OUString > aSupplementMap; + VclPtr<FixedText> m_pFtObjectSource; + VclPtr<ListBox> m_pLbInsertList; + VclPtr<OKButton> m_pOKButton; + ::std::map< SotFormatStringId, OUString > aSupplementMap; SvGlobalName aObjClassName; OUString aObjName; @@ -55,6 +55,8 @@ class SvPasteObjectDialog : public ModalDialog public: SvPasteObjectDialog( vcl::Window* pParent ); + virtual ~SvPasteObjectDialog(); + virtual void dispose() SAL_OVERRIDE; void Insert( SotClipboardFormatId nFormat, const OUString & rFormatName ); void SetObjName( const SvGlobalName & rClass, const OUString & rObjName ); diff --git a/cui/source/inc/postdlg.hxx b/cui/source/inc/postdlg.hxx index fa3124359e7c..170e00692379 100644 --- a/cui/source/inc/postdlg.hxx +++ b/cui/source/inc/postdlg.hxx @@ -88,17 +88,17 @@ public: } private: - FixedText* m_pLastEditFT; + VclPtr<FixedText> m_pLastEditFT; - VclMultiLineEdit* m_pEditED; + VclPtr<VclMultiLineEdit> m_pEditED; - VclContainer* m_pInsertAuthor; - PushButton* m_pAuthorBtn; + VclPtr<VclContainer> m_pInsertAuthor; + VclPtr<PushButton> m_pAuthorBtn; - OKButton* m_pOKBtn; + VclPtr<OKButton> m_pOKBtn; - PushButton* m_pPrevBtn; - PushButton* m_pNextBtn; + VclPtr<PushButton> m_pPrevBtn; + VclPtr<PushButton> m_pNextBtn; const SfxItemSet& rSet; SfxItemSet* pOutSet; diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx index 0936ff2faabe..d3847dc6de62 100644 --- a/cui/source/inc/scriptdlg.hxx +++ b/cui/source/inc/scriptdlg.hxx @@ -95,9 +95,11 @@ public: class CuiInputDialog : public ModalDialog { private: - Edit* m_pEdit; + VclPtr<Edit> m_pEdit; public: CuiInputDialog(vcl::Window * pParent, sal_uInt16 nMode); + virtual ~CuiInputDialog(); + virtual void dispose() SAL_OVERRIDE; OUString GetObjectName() const { return m_pEdit->GetText(); } void SetObjectName(const OUString& rName) @@ -132,14 +134,14 @@ public: class SvxScriptOrgDialog : public SfxModalDialog { protected: - SFTreeListBox* m_pScriptsBox; - - PushButton* m_pRunButton; - CloseButton* m_pCloseButton; - PushButton* m_pCreateButton; - PushButton* m_pEditButton; - PushButton* m_pRenameButton; - PushButton* m_pDelButton; + VclPtr<SFTreeListBox> m_pScriptsBox; + + VclPtr<PushButton> m_pRunButton; + VclPtr<CloseButton> m_pCloseButton; + VclPtr<PushButton> m_pCreateButton; + VclPtr<PushButton> m_pEditButton; + VclPtr<PushButton> m_pRenameButton; + VclPtr<PushButton> m_pDelButton; OUString m_sLanguage; static Selection_hash m_lastSelection; diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx index de029f891868..c1ac1e3f6b62 100644 --- a/cui/source/inc/selector.hxx +++ b/cui/source/inc/selector.hxx @@ -123,7 +123,7 @@ class SvxConfigGroupListBox : public SvTreeListBox SvxGroupInfoArr_Impl aArr; bool m_bShowSlots; - SvxConfigFunctionListBox* pFunctionListBox; + VclPtr<SvxConfigFunctionListBox> pFunctionListBox; ImageProvider* m_pImageProvider; ::com::sun::star::uno::Reference @@ -181,12 +181,12 @@ public: class SvxScriptSelectorDialog : public ModelessDialog { - FixedText* m_pDialogDescription; - SvxConfigGroupListBox* m_pCategories; - SvxConfigFunctionListBox* m_pCommands; - PushButton* m_pOKButton; - PushButton* m_pCancelButton; - VclMultiLineEdit* m_pDescriptionText; + VclPtr<FixedText> m_pDialogDescription; + VclPtr<SvxConfigGroupListBox> m_pCategories; + VclPtr<SvxConfigFunctionListBox> m_pCommands; + VclPtr<PushButton> m_pOKButton; + VclPtr<PushButton> m_pCancelButton; + VclPtr<VclMultiLineEdit> m_pDescriptionText; OUString m_sDefaultDesc; bool m_bShowSlots; Link m_aAddHdl; @@ -205,6 +205,8 @@ public: const ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame >& xFrame = 0 ); + virtual ~SvxScriptSelectorDialog(); + virtual void dispose() SAL_OVERRIDE; void SetAddHdl( const Link& rLink ) { m_aAddHdl = rLink; } const Link& GetAddHdl() const { return m_aAddHdl; } diff --git a/cui/source/inc/showcols.hxx b/cui/source/inc/showcols.hxx index dceddb7e3a00..d7494d72896b 100644 --- a/cui/source/inc/showcols.hxx +++ b/cui/source/inc/showcols.hxx @@ -35,13 +35,15 @@ class FmShowColsDialog : public ModalDialog { - ListBox* m_pList; - OKButton* m_pOK; + VclPtr<ListBox> m_pList; + VclPtr<OKButton> m_pOK; ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > m_xColumns; public: FmShowColsDialog(vcl::Window* pParent); + virtual ~FmShowColsDialog(); + virtual void dispose() SAL_OVERRIDE; void SetColumns(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer>& xCols); diff --git a/cui/source/inc/splitcelldlg.hxx b/cui/source/inc/splitcelldlg.hxx index bc5fc701e449..e9142e24005f 100644 --- a/cui/source/inc/splitcelldlg.hxx +++ b/cui/source/inc/splitcelldlg.hxx @@ -28,10 +28,10 @@ class SvxSplitTableDlg : public SvxAbstractSplittTableDialog, public SvxStandardDialog { - NumericField* m_pCountEdit; - RadioButton* m_pHorzBox; - RadioButton* m_pVertBox; - CheckBox* m_pPropCB; + VclPtr<NumericField> m_pCountEdit; + VclPtr<RadioButton> m_pHorzBox; + VclPtr<RadioButton> m_pVertBox; + VclPtr<CheckBox> m_pPropCB; long mnMaxVertical; long mnMaxHorizontal; @@ -40,6 +40,8 @@ protected: public: SvxSplitTableDlg(vcl::Window *pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal ); + virtual ~SvxSplitTableDlg(); + virtual void dispose() SAL_OVERRIDE; DECL_LINK( ClickHdl, Button * ); diff --git a/cui/source/inc/srchxtra.hxx b/cui/source/inc/srchxtra.hxx index 705c4d2a96fc..f1c6aefde1a9 100644 --- a/cui/source/inc/srchxtra.hxx +++ b/cui/source/inc/srchxtra.hxx @@ -51,10 +51,12 @@ class SvxSearchAttributeDialog : public ModalDialog public: SvxSearchAttributeDialog( vcl::Window* pParent, SearchAttrItemList& rLst, const sal_uInt16* pWhRanges ); + virtual ~SvxSearchAttributeDialog(); + virtual void dispose() SAL_OVERRIDE; private: - SvxCheckListBox* m_pAttrLB; - OKButton* m_pOKBtn; + VclPtr<SvxCheckListBox> m_pAttrLB; + VclPtr<OKButton> m_pOKBtn; SearchAttrItemList& rList; @@ -66,10 +68,10 @@ private: class SvxSearchSimilarityDialog : public ModalDialog { private: - NumericField* m_pOtherFld; - NumericField* m_pLongerFld; - NumericField* m_pShorterFld; - CheckBox* m_pRelaxBox; + VclPtr<NumericField> m_pOtherFld; + VclPtr<NumericField> m_pLongerFld; + VclPtr<NumericField> m_pShorterFld; + VclPtr<CheckBox> m_pRelaxBox; public: SvxSearchSimilarityDialog( vcl::Window* pParent, @@ -77,6 +79,8 @@ public: sal_uInt16 nOther, sal_uInt16 nShorter, sal_uInt16 nLonger ); + virtual ~SvxSearchSimilarityDialog(); + virtual void dispose() SAL_OVERRIDE; sal_uInt16 GetOther() { return (sal_uInt16)m_pOtherFld->GetValue(); } sal_uInt16 GetShorter() { return (sal_uInt16)m_pShorterFld->GetValue(); } diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx index 3c3d3e622f41..5ed3ad77df18 100644 --- a/cui/source/inc/swpossizetabpage.hxx +++ b/cui/source/inc/swpossizetabpage.hxx @@ -34,39 +34,39 @@ class SvxSwPosSizeTabPage : public SfxTabPage { using TabPage::DeactivatePage; - MetricField* m_pWidthMF; - MetricField* m_pHeightMF; - CheckBox* m_pKeepRatioCB; + VclPtr<MetricField> m_pWidthMF; + VclPtr<MetricField> m_pHeightMF; + VclPtr<CheckBox> m_pKeepRatioCB; - RadioButton* m_pToPageRB; - RadioButton* m_pToParaRB; - RadioButton* m_pToCharRB; - RadioButton* m_pAsCharRB; - RadioButton* m_pToFrameRB; + VclPtr<RadioButton> m_pToPageRB; + VclPtr<RadioButton> m_pToParaRB; + VclPtr<RadioButton> m_pToCharRB; + VclPtr<RadioButton> m_pAsCharRB; + VclPtr<RadioButton> m_pToFrameRB; - TriStateBox* m_pPositionCB; - TriStateBox* m_pSizeCB; + VclPtr<TriStateBox> m_pPositionCB; + VclPtr<TriStateBox> m_pSizeCB; - VclContainer* m_pPosFrame; - FixedText* m_pHoriFT; - ListBox* m_pHoriLB; - FixedText* m_pHoriByFT; - MetricField* m_pHoriByMF; - FixedText* m_pHoriToFT; - ListBox* m_pHoriToLB; + VclPtr<VclContainer> m_pPosFrame; + VclPtr<FixedText> m_pHoriFT; + VclPtr<ListBox> m_pHoriLB; + VclPtr<FixedText> m_pHoriByFT; + VclPtr<MetricField> m_pHoriByMF; + VclPtr<FixedText> m_pHoriToFT; + VclPtr<ListBox> m_pHoriToLB; - CheckBox* m_pHoriMirrorCB; + VclPtr<CheckBox> m_pHoriMirrorCB; - FixedText* m_pVertFT; - ListBox* m_pVertLB; - FixedText* m_pVertByFT; - MetricField* m_pVertByMF; - FixedText* m_pVertToFT; - ListBox* m_pVertToLB; + VclPtr<FixedText> m_pVertFT; + VclPtr<ListBox> m_pVertLB; + VclPtr<FixedText> m_pVertByFT; + VclPtr<MetricField> m_pVertByMF; + VclPtr<FixedText> m_pVertToFT; + VclPtr<ListBox> m_pVertToLB; - CheckBox* m_pFollowCB; + VclPtr<CheckBox> m_pFollowCB; - SvxSwFrameExample* m_pExampleWN; + VclPtr<SvxSwFrameExample> m_pExampleWN; Link m_aValidateLink; @@ -123,6 +123,8 @@ class SvxSwPosSizeTabPage : public SfxTabPage public: SvxSwPosSizeTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); + virtual ~SvxSwPosSizeTabPage(); + virtual void dispose() SAL_OVERRIDE; static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges(); diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx index 2fd0d3aa8f18..4a67cd9cd008 100644 --- a/cui/source/inc/tabstpge.hxx +++ b/cui/source/inc/tabstpge.hxx @@ -49,6 +49,8 @@ class SvxTabulatorTabPage : public SfxTabPage static const sal_uInt16 pRanges[]; public: + virtual ~SvxTabulatorTabPage(); + virtual void dispose() SAL_OVERRIDE; static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges() { return pRanges; } @@ -64,34 +66,34 @@ private: SvxTabulatorTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); // tabulators and positions - MetricBox* m_pTabBox; + VclPtr<MetricBox> m_pTabBox; // TabType - RadioButton* m_pLeftTab; - RadioButton* m_pRightTab; - RadioButton* m_pCenterTab; - RadioButton* m_pDezTab; - - TabWin_Impl* m_pLeftWin; - TabWin_Impl* m_pRightWin; - TabWin_Impl* m_pCenterWin; - TabWin_Impl* m_pDezWin; - - FixedText* m_pDezCharLabel; - Edit* m_pDezChar; - - RadioButton* m_pNoFillChar; - RadioButton* m_pFillPoints; - RadioButton* m_pFillDashLine ; - RadioButton* m_pFillSolidLine; - RadioButton* m_pFillSpecial; - Edit* m_pFillChar; - - PushButton* m_pNewBtn; - PushButton* m_pDelAllBtn; - PushButton* m_pDelBtn; - - VclContainer* m_pTypeFrame; - VclContainer* m_pFillFrame; + VclPtr<RadioButton> m_pLeftTab; + VclPtr<RadioButton> m_pRightTab; + VclPtr<RadioButton> m_pCenterTab; + VclPtr<RadioButton> m_pDezTab; + + VclPtr<TabWin_Impl> m_pLeftWin; + VclPtr<TabWin_Impl> m_pRightWin; + VclPtr<TabWin_Impl> m_pCenterWin; + VclPtr<TabWin_Impl> m_pDezWin; + + VclPtr<FixedText> m_pDezCharLabel; + VclPtr<Edit> m_pDezChar; + + VclPtr<RadioButton> m_pNoFillChar; + VclPtr<RadioButton> m_pFillPoints; + VclPtr<RadioButton> m_pFillDashLine ; + VclPtr<RadioButton> m_pFillSolidLine; + VclPtr<RadioButton> m_pFillSpecial; + VclPtr<Edit> m_pFillChar; + + VclPtr<PushButton> m_pNewBtn; + VclPtr<PushButton> m_pDelAllBtn; + VclPtr<PushButton> m_pDelBtn; + + VclPtr<VclContainer> m_pTypeFrame; + VclPtr<VclContainer> m_pFillFrame; // local variables, internal functions SvxTabStop aAktTab; diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx index 31a705d488b3..8ba2ad2ff956 100644 --- a/cui/source/inc/textanim.hxx +++ b/cui/source/inc/textanim.hxx @@ -37,27 +37,28 @@ class SdrView; class SvxTextAnimationPage : public SfxTabPage { private: - static const sal_uInt16 pRanges[]; - ListBox* m_pLbEffect; - VclBox* m_pBoxDirection; - PushButton* m_pBtnUp; - PushButton* m_pBtnLeft; - PushButton* m_pBtnRight; - PushButton* m_pBtnDown; + static const sal_uInt16 pRanges[]; - VclFrame* m_pFlProperties; - TriStateBox* m_pTsbStartInside; - TriStateBox* m_pTsbStopInside; + VclPtr<ListBox> m_pLbEffect; + VclPtr<VclBox> m_pBoxDirection; + VclPtr<PushButton> m_pBtnUp; + VclPtr<PushButton> m_pBtnLeft; + VclPtr<PushButton> m_pBtnRight; + VclPtr<PushButton> m_pBtnDown; - VclBox* m_pBoxCount; - TriStateBox* m_pTsbEndless; - NumericField* m_pNumFldCount; + VclPtr<VclFrame> m_pFlProperties; + VclPtr<TriStateBox> m_pTsbStartInside; + VclPtr<TriStateBox> m_pTsbStopInside; - TriStateBox* m_pTsbPixel; - MetricField* m_pMtrFldAmount; + VclPtr<VclBox> m_pBoxCount; + VclPtr<TriStateBox> m_pTsbEndless; + VclPtr<NumericField> m_pNumFldCount; - TriStateBox* m_pTsbAuto; - MetricField* m_pMtrFldDelay; + VclPtr<TriStateBox> m_pTsbPixel; + VclPtr<MetricField> m_pMtrFldAmount; + + VclPtr<TriStateBox> m_pTsbAuto; + VclPtr<MetricField> m_pMtrFldDelay; const SfxItemSet& rOutAttrs; SdrTextAniKind eAniKind; @@ -75,6 +76,8 @@ private: public: SvxTextAnimationPage( vcl::Window* pWindow, const SfxItemSet& rInAttrs ); + virtual ~SvxTextAnimationPage(); + virtual void dispose() SAL_OVERRIDE; static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pRanges; } diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx index 439eb82ba2d3..eacc8265d4ab 100644 --- a/cui/source/inc/textattr.hxx +++ b/cui/source/inc/textattr.hxx @@ -38,22 +38,23 @@ class SvxTextAttrPage : public SvxTabPage { private: static const sal_uInt16 pRanges[]; - TriStateBox* m_pTsbAutoGrowWidth; - TriStateBox* m_pTsbAutoGrowHeight; - TriStateBox* m_pTsbFitToSize; - TriStateBox* m_pTsbContour; - TriStateBox* m_pTsbWordWrapText; - TriStateBox* m_pTsbAutoGrowSize; - - VclFrame* m_pFlDistance; - MetricField* m_pMtrFldLeft; - MetricField* m_pMtrFldRight; - MetricField* m_pMtrFldTop; - MetricField* m_pMtrFldBottom; - - VclFrame* m_pFlPosition; - SvxRectCtl* m_pCtlPosition; - TriStateBox* m_pTsbFullWidth; + + VclPtr<TriStateBox> m_pTsbAutoGrowWidth; + VclPtr<TriStateBox> m_pTsbAutoGrowHeight; + VclPtr<TriStateBox> m_pTsbFitToSize; + VclPtr<TriStateBox> m_pTsbContour; + VclPtr<TriStateBox> m_pTsbWordWrapText; + VclPtr<TriStateBox> m_pTsbAutoGrowSize; + + VclPtr<VclFrame> m_pFlDistance; + VclPtr<MetricField> m_pMtrFldLeft; + VclPtr<MetricField> m_pMtrFldRight; + VclPtr<MetricField> m_pMtrFldTop; + VclPtr<MetricField> m_pMtrFldBottom; + + VclPtr<VclFrame> m_pFlPosition; + VclPtr<SvxRectCtl> m_pCtlPosition; + VclPtr<TriStateBox> m_pTsbFullWidth; const SfxItemSet& rOutAttrs; const SdrView* pView; @@ -76,6 +77,8 @@ private: public: SvxTextAttrPage( vcl::Window* pWindow, const SfxItemSet& rInAttrs ); + virtual ~SvxTextAttrPage(); + virtual void dispose() SAL_OVERRIDE; static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pRanges; } diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx index 9b035f14d03f..661788124c3f 100644 --- a/cui/source/inc/thesdlg.hxx +++ b/cui/source/inc/thesdlg.hxx @@ -35,13 +35,15 @@ class SvxThesaurusDialog; class LookUpComboBox : public ComboBox { Idle m_aModifyIdle; - SvxThesaurusDialog* m_pDialog; + VclPtr<SvxThesaurusDialog> m_pDialog; LookUpComboBox( const LookUpComboBox & ) SAL_DELETED_FUNCTION; LookUpComboBox& operator = ( const LookUpComboBox & ) SAL_DELETED_FUNCTION; public: LookUpComboBox(vcl::Window *pParent); + virtual ~LookUpComboBox(); + virtual void dispose() SAL_OVERRIDE; DECL_LINK( ModifyTimer_Hdl, Timer * ); @@ -71,7 +73,7 @@ public: class ThesaurusAlternativesCtrl : public SvxCheckListBox { - SvxThesaurusDialog* m_pDialog; + VclPtr<SvxThesaurusDialog> m_pDialog; typedef std::map< const SvTreeListEntry *, AlternativesExtraData > UserDataMap_t; UserDataMap_t m_aUserData; @@ -98,13 +100,15 @@ public: class ReplaceEdit : public Edit { - Button * m_pBtn; + VclPtr<Button> m_pBtn; ReplaceEdit( const ReplaceEdit & ) SAL_DELETED_FUNCTION; ReplaceEdit & operator = ( const ReplaceEdit & ) SAL_DELETED_FUNCTION; public: ReplaceEdit(vcl::Window *pParent); + virtual ~ReplaceEdit(); + virtual void dispose() SAL_OVERRIDE; void init(Button *pBtn) { m_pBtn = pBtn; } @@ -116,11 +120,11 @@ public: class SvxThesaurusDialog : public SvxStandardDialog { - PushButton* m_pLeftBtn; - LookUpComboBox* m_pWordCB; - ThesaurusAlternativesCtrl* m_pAlternativesCT; - ReplaceEdit* m_pReplaceEdit; - ListBox* m_pLangLB; + VclPtr<PushButton> m_pLeftBtn; + VclPtr<LookUpComboBox> m_pWordCB; + VclPtr<ThesaurusAlternativesCtrl> m_pAlternativesCT; + VclPtr<ReplaceEdit> m_pReplaceEdit; + VclPtr<ListBox> m_pLangLB; OUString m_aErrStr; @@ -131,6 +135,9 @@ class SvxThesaurusDialog : public SvxStandardDialog bool m_bWordFound; public: + virtual ~SvxThesaurusDialog(); + virtual void dispose() SAL_OVERRIDE; + bool WordFound() const { return m_bWordFound; } OUString getErrStr() const { return m_aErrStr; } diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx index 6d477a573e30..e2a516303b3d 100644 --- a/cui/source/inc/transfrm.hxx +++ b/cui/source/inc/transfrm.hxx @@ -81,29 +81,29 @@ class SvxPositionSizeTabPage : public SvxTabPage private: // position - VclFrame* m_pFlPosition; - MetricField* m_pMtrPosX; - MetricField* m_pMtrPosY; - SvxRectCtl* m_pCtlPos; + VclPtr<VclFrame> m_pFlPosition; + VclPtr<MetricField> m_pMtrPosX; + VclPtr<MetricField> m_pMtrPosY; + VclPtr<SvxRectCtl> m_pCtlPos; // size - VclFrame* m_pFlSize; - FixedText* m_pFtWidth; - MetricField* m_pMtrWidth; - FixedText* m_pFtHeight; - MetricField* m_pMtrHeight; - CheckBox* m_pCbxScale; - SvxRectCtl* m_pCtlSize; + VclPtr<VclFrame> m_pFlSize; + VclPtr<FixedText> m_pFtWidth; + VclPtr<MetricField> m_pMtrWidth; + VclPtr<FixedText> m_pFtHeight; + VclPtr<MetricField> m_pMtrHeight; + VclPtr<CheckBox> m_pCbxScale; + VclPtr<SvxRectCtl> m_pCtlSize; // protect - VclFrame* m_pFlProtect; - TriStateBox* m_pTsbPosProtect; - TriStateBox* m_pTsbSizeProtect; + VclPtr<VclFrame> m_pFlProtect; + VclPtr<TriStateBox> m_pTsbPosProtect; + VclPtr<TriStateBox> m_pTsbSizeProtect; // adjust - VclFrame* m_pFlAdjust; - TriStateBox* m_pTsbAutoGrowWidth; - TriStateBox* m_pTsbAutoGrowHeight; + VclPtr<VclFrame> m_pFlAdjust; + VclPtr<TriStateBox> m_pTsbAutoGrowWidth; + VclPtr<TriStateBox> m_pTsbAutoGrowHeight; private: const SfxItemSet& mrOutAttrs; @@ -146,6 +146,8 @@ private: public: SvxPositionSizeTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); + virtual ~SvxPositionSizeTabPage(); + virtual void dispose() SAL_OVERRIDE; static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pPosSizeRanges; } @@ -181,14 +183,14 @@ class SvxAngleTabPage : public SvxTabPage static const sal_uInt16 pAngleRanges[]; private: - VclFrame* m_pFlPosition; - MetricField* m_pMtrPosX; - MetricField* m_pMtrPosY; - SvxRectCtl* m_pCtlRect; + VclPtr<VclFrame> m_pFlPosition; + VclPtr<MetricField> m_pMtrPosX; + VclPtr<MetricField> m_pMtrPosY; + VclPtr<SvxRectCtl> m_pCtlRect; - VclFrame* m_pFlAngle; - NumericField* m_pNfAngle; - svx::DialControl* m_pCtlAngle; + VclPtr<VclFrame> m_pFlAngle; + VclPtr<NumericField> m_pNfAngle; + VclPtr<svx::DialControl> m_pCtlAngle; const SfxItemSet& rOutAttrs; const SdrView* pView; @@ -202,6 +204,8 @@ private: public: SvxAngleTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); + virtual ~SvxAngleTabPage(); + virtual void dispose() SAL_OVERRIDE; static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pAngleRanges; } @@ -230,10 +234,10 @@ class SvxSlantTabPage : public SvxTabPage static const sal_uInt16 pSlantRanges[]; private: - VclFrame* m_pFlRadius; - MetricField* m_pMtrRadius; - VclFrame* m_pFlAngle; - MetricField* m_pMtrAngle; + VclPtr<VclFrame> m_pFlRadius; + VclPtr<MetricField> m_pMtrRadius; + VclPtr<VclFrame> m_pFlAngle; + VclPtr<MetricField> m_pMtrAngle; const SfxItemSet& rOutAttrs; @@ -247,6 +251,8 @@ private: public: SvxSlantTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); + virtual ~SvxSlantTabPage(); + virtual void dispose() SAL_OVERRIDE; static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pSlantRanges; } diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx index e00602962106..5fa829c4d33b 100644 --- a/cui/source/inc/treeopt.hxx +++ b/cui/source/inc/treeopt.hxx @@ -146,18 +146,18 @@ private: SvTreeListEntry* pCurrentPageEntry; bool hasTreePendingLayout() const; - OKButton* pOkPB; - PushButton* pBackPB; + VclPtr<OKButton> pOkPB; + VclPtr<PushButton> pBackPB; - SvTreeListBox* pTreeLB; - VclBox* pTabBox; + VclPtr<SvTreeListBox> pTreeLB; + VclPtr<VclBox> pTabBox; OUString sTitle; OUString sNotLoadedError; // for the ColorTabPage SfxItemSet* pColorPageItemSet; - SvxColorTabPage *mpColorPage; + VclPtr<SvxColorTabPage> mpColorPage; bool bForgetSelection; bool bIsFromExtensionManager; diff --git a/cui/source/inc/zoom.hxx b/cui/source/inc/zoom.hxx index 3664ecc57ca2..882be467f95d 100644 --- a/cui/source/inc/zoom.hxx +++ b/cui/source/inc/zoom.hxx @@ -27,21 +27,21 @@ class SvxZoomDialog : public SfxModalDialog { private: - RadioButton* m_pOptimalBtn; - RadioButton* m_pWholePageBtn; - RadioButton* m_pPageWidthBtn; - RadioButton* m_p100Btn; - RadioButton* m_pUserBtn; - MetricField* m_pUserEdit; + VclPtr<RadioButton> m_pOptimalBtn; + VclPtr<RadioButton> m_pWholePageBtn; + VclPtr<RadioButton> m_pPageWidthBtn; + VclPtr<RadioButton> m_p100Btn; + VclPtr<RadioButton> m_pUserBtn; + VclPtr<MetricField> m_pUserEdit; - VclContainer* m_pViewFrame; - RadioButton* m_pAutomaticBtn; - RadioButton* m_pSingleBtn; - RadioButton* m_pColumnsBtn; - NumericField* m_pColumnsEdit; - CheckBox* m_pBookModeChk; + VclPtr<VclContainer> m_pViewFrame; + VclPtr<RadioButton> m_pAutomaticBtn; + VclPtr<RadioButton> m_pSingleBtn; + VclPtr<RadioButton> m_pColumnsBtn; + VclPtr<NumericField> m_pColumnsEdit; + VclPtr<CheckBox> m_pBookModeChk; - OKButton* m_pOKBtn; + VclPtr<OKButton> m_pOKBtn; const SfxItemSet& mrSet; std::unique_ptr<SfxItemSet> mpOutSet; diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx index 8e4776361897..55b85df456fa 100644 --- a/cui/source/options/certpath.cxx +++ b/cui/source/options/certpath.cxx @@ -156,8 +156,10 @@ void CertPathDialog::dispose() delete pCertPath; pEntry = m_pCertPathList->Next( pEntry ); } - delete m_pCertPathList; - m_pCertPathList = NULL; + m_pCertPathListContainer.clear(); + m_pCertPathList.clear(); + m_pAddBtn.clear(); + m_pOKBtn.clear(); ModalDialog::dispose(); } diff --git a/cui/source/options/certpath.hxx b/cui/source/options/certpath.hxx index 1add8ea14c1f..29a3e1aa45fb 100644 --- a/cui/source/options/certpath.hxx +++ b/cui/source/options/certpath.hxx @@ -19,10 +19,10 @@ class CertPathDialog : public ModalDialog { private: - SvSimpleTableContainer* m_pCertPathListContainer; - svx::SvxRadioButtonListBox* m_pCertPathList; - PushButton* m_pAddBtn; - OKButton* m_pOKBtn; + VclPtr<SvSimpleTableContainer> m_pCertPathListContainer; + VclPtr<svx::SvxRadioButtonListBox> m_pCertPathList; + VclPtr<PushButton> m_pAddBtn; + VclPtr<OKButton> m_pOKBtn; OUString m_sAddDialogText; OUString m_sManual; diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx index 3d432698e0fc..ecb996322bee 100644 --- a/cui/source/options/connpooloptions.cxx +++ b/cui/source/options/connpooloptions.cxx @@ -325,6 +325,23 @@ namespace offapp m_pDriverList->SetRowChangeHandler( LINK(this, ConnectionPoolOptionsPage, OnDriverRowChanged) ); } + ConnectionPoolOptionsPage::~ConnectionPoolOptionsPage() + { + dispose(); + } + + void ConnectionPoolOptionsPage::dispose() + { + m_pEnablePooling.clear(); + m_pDriversLabel.clear(); + m_pDriverList.clear(); + m_pDriverLabel.clear(); + m_pDriver.clear(); + m_pDriverPoolingEnabled.clear(); + m_pTimeoutLabel.clear(); + m_pTimeout.clear(); + SfxTabPage::dispose(); + } SfxTabPage* ConnectionPoolOptionsPage::Create(vcl::Window* _pParent, const SfxItemSet* _rAttrSet) { diff --git a/cui/source/options/connpooloptions.hxx b/cui/source/options/connpooloptions.hxx index 868c42702a16..8650d121ce16 100644 --- a/cui/source/options/connpooloptions.hxx +++ b/cui/source/options/connpooloptions.hxx @@ -38,19 +38,21 @@ namespace offapp using TabPage::ActivatePage; protected: - CheckBox* m_pEnablePooling; - FixedText* m_pDriversLabel; - DriverListControl* m_pDriverList; - FixedText* m_pDriverLabel; - FixedText* m_pDriver; - CheckBox* m_pDriverPoolingEnabled; - FixedText* m_pTimeoutLabel; - NumericField* m_pTimeout; + VclPtr<CheckBox> m_pEnablePooling; + VclPtr<FixedText> m_pDriversLabel; + VclPtr<DriverListControl> m_pDriverList; + VclPtr<FixedText> m_pDriverLabel; + VclPtr<FixedText> m_pDriver; + VclPtr<CheckBox> m_pDriverPoolingEnabled; + VclPtr<FixedText> m_pTimeoutLabel; + VclPtr<NumericField> m_pTimeout; protected: ConnectionPoolOptionsPage(vcl::Window* _pParent, const SfxItemSet& _rAttrSet); public: + virtual ~ConnectionPoolOptionsPage(); + virtual void dispose() SAL_OVERRIDE; static SfxTabPage* Create(vcl::Window* _pParent, const SfxItemSet* _rAttrSet); protected: diff --git a/cui/source/options/cuisrchdlg.cxx b/cui/source/options/cuisrchdlg.cxx index a7041604683b..a911a1eaceee 100644 --- a/cui/source/options/cuisrchdlg.cxx +++ b/cui/source/options/cuisrchdlg.cxx @@ -60,6 +60,17 @@ SvxJSearchOptionsDialog::SvxJSearchOptionsDialog(vcl::Window *pParent, pPage->EnableSaveOptions(false); } +SvxJSearchOptionsDialog::~SvxJSearchOptionsDialog() +{ + dispose(); +} + +void SvxJSearchOptionsDialog::dispose() +{ + pPage.clear(); + SfxSingleTabDialog::dispose(); +} + void SvxJSearchOptionsDialog::Activate() { pPage->SetTransliterationFlags( nInitialTlFlags ); diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index de08fa07c5e0..f149629776b8 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -170,8 +170,11 @@ void DbRegistrationOptionsPage::dispose() { for ( sal_uInt16 i = 0; i < pPathBox->GetEntryCount(); ++i ) delete static_cast< DatabaseRegistration* >( pPathBox->GetEntry(i)->GetUserData() ); - delete pPathBox; - pPathBox = NULL; + pPathBox.clear(); + m_pPathCtrl.clear(); + m_pNew.clear(); + m_pEdit.clear(); + m_pDelete.clear(); SfxTabPage::dispose(); } diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx index 01482292caf4..74e87425b1e5 100644 --- a/cui/source/options/doclinkdialog.cxx +++ b/cui/source/options/doclinkdialog.cxx @@ -70,6 +70,20 @@ namespace svx m_pURL->SetDropDownLineCount( 5 ); } + ODocumentLinkDialog::~ODocumentLinkDialog() + { + dispose(); + } + + void ODocumentLinkDialog::dispose() + { + m_pURL.clear(); + m_pBrowseFile.clear(); + m_pName.clear(); + m_pOK.clear(); + ModalDialog::dispose(); + } + void ODocumentLinkDialog::setLink( const OUString& _rName, const OUString& _rURL ) { diff --git a/cui/source/options/doclinkdialog.hxx b/cui/source/options/doclinkdialog.hxx index 0584734b761d..55493e9e9974 100644 --- a/cui/source/options/doclinkdialog.hxx +++ b/cui/source/options/doclinkdialog.hxx @@ -40,10 +40,10 @@ namespace svx class ODocumentLinkDialog : public ModalDialog { protected: - ::svt::OFileURLControl* m_pURL; - PushButton* m_pBrowseFile; - Edit* m_pName; - OKButton* m_pOK; + VclPtr<::svt::OFileURLControl> m_pURL; + VclPtr<PushButton> m_pBrowseFile; + VclPtr<Edit> m_pName; + VclPtr<OKButton> m_pOK; bool m_bCreatingNew; @@ -51,6 +51,8 @@ namespace svx public: ODocumentLinkDialog( vcl::Window* _pParent, bool _bCreateNew ); + virtual ~ODocumentLinkDialog(); + virtual void dispose() SAL_OVERRIDE; // name validation has to be done by an external instance // the validator link gets a pointer to a String, and should return 0 if the string is not diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index 098855ae032e..6dfd19f52a2a 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -147,8 +147,16 @@ void SvxFontSubstTabPage::dispose() pCheckButtonData = NULL; delete pConfig; pConfig = NULL; - delete m_pCheckLB; - m_pCheckLB = NULL; + m_pCheckLB.clear(); + m_pUseTableCB.clear(); + m_pReplacements.clear(); + m_pFont1CB.clear(); + m_pFont2CB.clear(); + m_pApply.clear(); + m_pDelete.clear(); + m_pFontNameLB.clear(); + m_pNonPropFontsOnlyCB.clear(); + m_pFontHeightLB.clear(); SfxTabPage::dispose(); } diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx index b051cdd3c752..3a5b967a3908 100644 --- a/cui/source/options/fontsubs.hxx +++ b/cui/source/options/fontsubs.hxx @@ -63,18 +63,18 @@ class SvxFontSubstCheckListBox : public SvSimpleTable class SvtFontSubstConfig; class SvxFontSubstTabPage : public SfxTabPage { - CheckBox* m_pUseTableCB; - VclContainer* m_pReplacements; - FontNameBox* m_pFont1CB; - FontNameBox* m_pFont2CB; - PushButton* m_pApply; - PushButton* m_pDelete; - - SvxFontSubstCheckListBox* m_pCheckLB; - - ListBox* m_pFontNameLB; - CheckBox* m_pNonPropFontsOnlyCB; - ListBox* m_pFontHeightLB; + VclPtr<CheckBox> m_pUseTableCB; + VclPtr<VclContainer> m_pReplacements; + VclPtr<FontNameBox> m_pFont1CB; + VclPtr<FontNameBox> m_pFont2CB; + VclPtr<PushButton> m_pApply; + VclPtr<PushButton> m_pDelete; + + VclPtr<SvxFontSubstCheckListBox> m_pCheckLB; + + VclPtr<ListBox> m_pFontNameLB; + VclPtr<CheckBox> m_pNonPropFontsOnlyCB; + VclPtr<ListBox> m_pFontHeightLB; OUString m_sAutomatic; diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx index c5ef749ec20f..02d818438286 100644 --- a/cui/source/options/optaboutconfig.cxx +++ b/cui/source/options/optaboutconfig.cxx @@ -164,6 +164,21 @@ CuiAboutConfigTabPage::CuiAboutConfigTabPage( vcl::Window* pParent/*, const SfxI m_pPrefBox->SetAlternatingRowColors( true ); } +CuiAboutConfigTabPage::~CuiAboutConfigTabPage() +{ + dispose(); +} + +void CuiAboutConfigTabPage::dispose() +{ + m_pPrefCtrl.clear(); + m_pResetBtn.clear(); + m_pEditBtn.clear(); + m_pSearchBtn.clear(); + m_pSearchEdit.clear(); + ModelessDialog::dispose(); +} + void CuiAboutConfigTabPage::InsertEntry(const OUString& rProp, const OUString& rStatus, const OUString& rType, const OUString& rValue) { SvTreeListEntry* pEntry = new SvTreeListEntry; @@ -477,6 +492,17 @@ CuiAboutConfigValueDialog::CuiAboutConfigValueDialog( vcl::Window* pWindow, } +CuiAboutConfigValueDialog::~CuiAboutConfigValueDialog() +{ + dispose(); +} + +void CuiAboutConfigValueDialog::dispose() +{ + m_pEDValue.clear(); + ModalDialog::dispose(); +} + IMPL_LINK_NOARG( CuiAboutConfigTabPage, ResetBtnHdl_Impl ) { Reset(); diff --git a/cui/source/options/optaboutconfig.hxx b/cui/source/options/optaboutconfig.hxx index dc19e4ae6539..85a10deb5ff1 100644 --- a/cui/source/options/optaboutconfig.hxx +++ b/cui/source/options/optaboutconfig.hxx @@ -43,11 +43,11 @@ public: class CuiAboutConfigTabPage : public ModelessDialog { private: - SvSimpleTableContainer* m_pPrefCtrl; - PushButton* m_pResetBtn; - PushButton* m_pEditBtn; - PushButton* m_pSearchBtn; - Edit* m_pSearchEdit; + VclPtr<SvSimpleTableContainer> m_pPrefCtrl; + VclPtr<PushButton> m_pResetBtn; + VclPtr<PushButton> m_pEditBtn; + VclPtr<PushButton> m_pSearchBtn; + VclPtr<Edit> m_pSearchEdit; std::vector< boost::shared_ptr< Prop_Impl > > m_vectorOfModified; boost::scoped_ptr< SvSimpleTable > m_pPrefBox; @@ -65,6 +65,8 @@ private: public: CuiAboutConfigTabPage(vcl::Window* pParent); + virtual ~CuiAboutConfigTabPage(); + virtual void dispose() SAL_OVERRIDE; void InsertEntry(const OUString& rProp, const OUString& rStatus, const OUString& rType, const OUString& rValue); void Reset(); void FillItems(const com::sun::star::uno::Reference<com::sun::star::container::XNameAccess>& xNameAccess); @@ -75,10 +77,12 @@ public: class CuiAboutConfigValueDialog : public ModalDialog { private: - CuiCustomMultilineEdit* m_pEDValue; + VclPtr<CuiCustomMultilineEdit> m_pEDValue; public: CuiAboutConfigValueDialog( vcl::Window* pWindow, const OUString& rValue , int limit = 0); + virtual ~CuiAboutConfigValueDialog(); + virtual void dispose() SAL_OVERRIDE; OUString getValue() { diff --git a/cui/source/options/optaccessibility.cxx b/cui/source/options/optaccessibility.cxx index f09b19c5eafa..61354e138c6b 100644 --- a/cui/source/options/optaccessibility.cxx +++ b/cui/source/options/optaccessibility.cxx @@ -65,6 +65,15 @@ void SvxAccessibilityOptionsTabPage::dispose() { delete m_pImpl; m_pImpl = NULL; + m_pAccessibilityTool.clear(); + m_pTextSelectionInReadonly.clear(); + m_pAnimatedGraphics.clear(); + m_pAnimatedTexts.clear(); + m_pTipHelpCB.clear(); + m_pTipHelpNF.clear(); + m_pAutoDetectHC.clear(); + m_pAutomaticFontColor.clear(); + m_pPagePreviews.clear(); SfxTabPage::dispose(); } diff --git a/cui/source/options/optaccessibility.hxx b/cui/source/options/optaccessibility.hxx index ccf2ac00712b..0a33851b6f56 100644 --- a/cui/source/options/optaccessibility.hxx +++ b/cui/source/options/optaccessibility.hxx @@ -25,15 +25,15 @@ struct SvxAccessibilityOptionsTabPage_Impl; class SvxAccessibilityOptionsTabPage : public SfxTabPage { - CheckBox* m_pAccessibilityTool; - CheckBox* m_pTextSelectionInReadonly; - CheckBox* m_pAnimatedGraphics; - CheckBox* m_pAnimatedTexts; - CheckBox* m_pTipHelpCB; - NumericField* m_pTipHelpNF; - CheckBox* m_pAutoDetectHC; - CheckBox* m_pAutomaticFontColor; - CheckBox* m_pPagePreviews; + VclPtr<CheckBox> m_pAccessibilityTool; + VclPtr<CheckBox> m_pTextSelectionInReadonly; + VclPtr<CheckBox> m_pAnimatedGraphics; + VclPtr<CheckBox> m_pAnimatedTexts; + VclPtr<CheckBox> m_pTipHelpCB; + VclPtr<NumericField> m_pTipHelpNF; + VclPtr<CheckBox> m_pAutoDetectHC; + VclPtr<CheckBox> m_pAutomaticFontColor; + VclPtr<CheckBox> m_pPagePreviews; DECL_LINK(TipHelpHdl, CheckBox*); void EnableTipHelp(bool bCheck); diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx index 0f9bab237d61..49b501572ce9 100644 --- a/cui/source/options/optasian.cxx +++ b/cui/source/options/optasian.cxx @@ -158,6 +158,19 @@ void SvxAsianLayoutPage::dispose() { delete pImpl; pImpl = NULL; + m_pCharKerningRB.clear(); + m_pCharPunctKerningRB.clear(); + m_pNoCompressionRB.clear(); + m_pPunctCompressionRB.clear(); + m_pPunctKanaCompressionRB.clear(); + m_pLanguageFT.clear(); + m_pLanguageLB.clear(); + m_pStandardCB.clear(); + m_pStartFT.clear(); + m_pStartED.clear(); + m_pEndFT.clear(); + m_pEndED.clear(); + m_pHintFT.clear(); SfxTabPage::dispose(); } diff --git a/cui/source/options/optbasic.cxx b/cui/source/options/optbasic.cxx index 74028ff45621..1be35826d5d5 100644 --- a/cui/source/options/optbasic.cxx +++ b/cui/source/options/optbasic.cxx @@ -45,6 +45,22 @@ SvxBasicIDEOptionsPage::SvxBasicIDEOptionsPage( vcl::Window* pParent, const SfxI } +SvxBasicIDEOptionsPage::~SvxBasicIDEOptionsPage() +{ + dispose(); +} + +void SvxBasicIDEOptionsPage::dispose() +{ + pCodeCompleteChk.clear(); + pAutocloseProcChk.clear(); + pAutocloseParenChk.clear(); + pAutocloseQuotesChk.clear(); + pAutoCorrectChk.clear(); + pUseExtendedTypesChk.clear(); + SfxTabPage::dispose(); +} + void SvxBasicIDEOptionsPage::LoadConfig() { bool bProcClose = officecfg::Office::BasicIDE::Autocomplete::AutocloseProc::get(); diff --git a/cui/source/options/optbasic.hxx b/cui/source/options/optbasic.hxx index 45f93120bcf4..9aaced3eb2a9 100644 --- a/cui/source/options/optbasic.hxx +++ b/cui/source/options/optbasic.hxx @@ -27,17 +27,19 @@ class SvxBasicIDEOptionsPage: public SfxTabPage { private: - CheckBox* pCodeCompleteChk; - CheckBox* pAutocloseProcChk; - CheckBox* pAutocloseParenChk; - CheckBox* pAutocloseQuotesChk; - CheckBox* pAutoCorrectChk; - CheckBox* pUseExtendedTypesChk; + VclPtr<CheckBox> pCodeCompleteChk; + VclPtr<CheckBox> pAutocloseProcChk; + VclPtr<CheckBox> pAutocloseParenChk; + VclPtr<CheckBox> pAutocloseQuotesChk; + VclPtr<CheckBox> pAutoCorrectChk; + VclPtr<CheckBox> pUseExtendedTypesChk; void LoadConfig(); public: SvxBasicIDEOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ); + virtual ~SvxBasicIDEOptionsPage(); + virtual void dispose() SAL_OVERRIDE; static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx index 8005483464f1..7cb85b4fe9f1 100644 --- a/cui/source/options/optchart.cxx +++ b/cui/source/options/optchart.cxx @@ -99,6 +99,11 @@ void SvxDefaultColorOptPage::dispose() delete pChartOptions; pChartOptions = NULL; } + m_pLbChartColors.clear(); + m_pValSetColorBox.clear(); + m_pPBDefault.clear(); + m_pPBAdd.clear(); + m_pPBRemove.clear(); SfxTabPage::dispose(); } diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx index 99d5377ccd00..ff6970627113 100644 --- a/cui/source/options/optchart.hxx +++ b/cui/source/options/optchart.hxx @@ -33,11 +33,11 @@ class SvxDefaultColorOptPage : public SfxTabPage { private: - ColorLB* m_pLbChartColors; - ValueSet* m_pValSetColorBox; - PushButton* m_pPBDefault; - PushButton* m_pPBAdd; - PushButton* m_pPBRemove; + VclPtr<ColorLB> m_pLbChartColors; + VclPtr<ValueSet> m_pValSetColorBox; + VclPtr<PushButton> m_pPBDefault; + VclPtr<PushButton> m_pPBAdd; + VclPtr<PushButton> m_pPBRemove; SvxChartOptions* pChartOptions; SvxChartColorTableItem* pColorConfig; diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index b18abccdec0f..6bdf8a1340e7 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -174,7 +174,7 @@ class ColorConfigWindow_Impl { public: ColorConfigWindow_Impl(vcl::Window* pParent); - ~ColorConfigWindow_Impl() { dispose(); } + virtual ~ColorConfigWindow_Impl() { dispose(); } virtual void dispose() SAL_OVERRIDE; public: @@ -193,8 +193,7 @@ private: class Chapter { // text - bool m_bOwnsWidget; - FixedText *m_pText; + VclPtr<FixedText> m_pText; public: Chapter(FixedText *pText, bool bShow); Chapter(vcl::Window *pGrid, unsigned nYPos, const OUString& sDisplayName); @@ -235,11 +234,11 @@ private: private: bool m_bOwnsWidgets; // checkbox (CheckBox) or simple text (FixedText) - Control* m_pText; + VclPtr<Control> m_pText; // color list box - ColorListBox* m_pColorList; + VclPtr<ColorListBox> m_pColorList; // color preview box - vcl::Window* m_pPreview; + VclPtr<vcl::Window> m_pPreview; // default color Color m_aDefaultColor; private: @@ -256,9 +255,9 @@ private: private: - VclGrid *m_pGrid; - ScrollBar *m_pVScroll; - HeaderBar *m_pHeaderHB; + VclPtr<VclGrid> m_pGrid; + VclPtr<ScrollBar> m_pVScroll; + VclPtr<HeaderBar> m_pHeaderHB; // initialization void CreateEntries(); @@ -283,8 +282,7 @@ private: // eGroup: which group is this? // rResMgr: resource manager ColorConfigWindow_Impl::Chapter::Chapter(FixedText* pText, bool bShow) - : m_bOwnsWidget(false) - , m_pText(pText) + : m_pText(pText) { if (!bShow) Hide(); @@ -293,7 +291,6 @@ ColorConfigWindow_Impl::Chapter::Chapter(FixedText* pText, bool bShow) // ctor for extended groups ColorConfigWindow_Impl::Chapter::Chapter(vcl::Window *pGrid, unsigned nYPos, const OUString& rDisplayName) - : m_bOwnsWidget(true) { m_pText = new FixedText(pGrid, WB_LEFT|WB_VCENTER|WB_3DLOOK); m_pText->set_font_attribute("weight", "bold"); @@ -305,8 +302,6 @@ ColorConfigWindow_Impl::Chapter::Chapter(vcl::Window *pGrid, ColorConfigWindow_Impl::Chapter::~Chapter() { - if (m_bOwnsWidget) - delete m_pText; } void ColorConfigWindow_Impl::Chapter::Show(Wallpaper const& rBackWall) @@ -373,9 +368,9 @@ ColorConfigWindow_Impl::Entry::~Entry() { if (m_bOwnsWidgets) { - delete m_pText; - delete m_pColorList; - delete m_pPreview; + m_pText.clear(); + m_pColorList.clear(); + m_pPreview.clear(); } } @@ -417,7 +412,7 @@ void ColorConfigWindow_Impl::Entry::SetLinks( { m_pColorList->SetSelectHdl(aColorLink); m_pColorList->SetGetFocusHdl(aGetFocusLink); - if (CheckBox* pCheckBox = dynamic_cast<CheckBox*>(m_pText)) + if (CheckBox* pCheckBox = dynamic_cast<CheckBox*>(m_pText.get())) { pCheckBox->SetClickHdl(aCheckLink); pCheckBox->SetGetFocusHdl(aGetFocusLink); @@ -440,7 +435,7 @@ void ColorConfigWindow_Impl::Entry::Update ( m_pColorList->SelectEntry(aColor); } m_pPreview->SetBackground(Wallpaper(aColor)); - if (CheckBox* pCheckBox = dynamic_cast<CheckBox*>(m_pText)) + if (CheckBox* pCheckBox = dynamic_cast<CheckBox*>(m_pText.get())) pCheckBox->Check(rValue.bIsVisible); } @@ -513,6 +508,9 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(vcl::Window* pParent) void ColorConfigWindow_Impl::dispose() { disposeBuilder(); + m_pGrid.clear(); + m_pVScroll.clear(); + m_pHeaderHB.clear(); VclContainer::dispose(); } @@ -827,10 +825,10 @@ void ColorConfigWindow_Impl::Command( const CommandEvent& rCEvt ) class ColorConfigCtrl_Impl : public VclVBox { - HeaderBar* m_pHeaderHB; - VclHBox* m_pBody; - ColorConfigWindow_Impl* m_pScrollWindow; - ScrollBar* m_pVScroll; + VclPtr<HeaderBar> m_pHeaderHB; + VclPtr<VclHBox> m_pBody; + VclPtr<ColorConfigWindow_Impl> m_pScrollWindow; + VclPtr<ScrollBar> m_pVScroll; EditableColorConfig* pColorConfig; EditableExtendedColorConfig* pExtColorConfig; @@ -920,15 +918,10 @@ ColorConfigCtrl_Impl::~ColorConfigCtrl_Impl() void ColorConfigCtrl_Impl::dispose() { - delete m_pVScroll; - m_pVScroll = NULL; - delete m_pScrollWindow; - m_pScrollWindow = NULL; - delete m_pBody; - m_pBody = NULL; - delete m_pHeaderHB; - m_pHeaderHB = NULL; - + m_pVScroll.clear(); + m_pScrollWindow.clear(); + m_pBody.clear(); + m_pHeaderHB.clear(); VclVBox::dispose(); } @@ -1100,6 +1093,10 @@ void SvxColorOptionsTabPage::dispose() delete pExtColorConfig; pExtColorConfig = NULL; } + m_pColorSchemeLB.clear(); + m_pSaveSchemePB.clear(); + m_pDeleteSchemePB.clear(); + m_pColorConfigCT.clear(); SfxTabPage::dispose(); } diff --git a/cui/source/options/optcolor.hxx b/cui/source/options/optcolor.hxx index cc886b5e2d79..f5c31bdb1ac1 100644 --- a/cui/source/options/optcolor.hxx +++ b/cui/source/options/optcolor.hxx @@ -31,10 +31,10 @@ class SvxColorOptionsTabPage : public SfxTabPage { using SfxTabPage::DeactivatePage; - ListBox* m_pColorSchemeLB; - PushButton* m_pSaveSchemePB; - PushButton* m_pDeleteSchemePB; - ColorConfigCtrl_Impl* m_pColorConfigCT; + VclPtr<ListBox> m_pColorSchemeLB; + VclPtr<PushButton> m_pSaveSchemePB; + VclPtr<PushButton> m_pDeleteSchemePB; + VclPtr<ColorConfigCtrl_Impl> m_pColorConfigCT; bool bFillItemSetCalled; diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx index caaa0471294d..40203d831f41 100644 --- a/cui/source/options/optctl.cxx +++ b/cui/source/options/optctl.cxx @@ -57,6 +57,22 @@ SvxCTLOptionsPage::SvxCTLOptionsPage( vcl::Window* pParent, const SfxItemSet& rS m_pNumeralsLB->SetDropDownLineCount( m_pNumeralsLB->GetEntryCount() ); } +SvxCTLOptionsPage::~SvxCTLOptionsPage() +{ + dispose(); +} + +void SvxCTLOptionsPage::dispose() +{ + m_pSequenceCheckingCB.clear(); + m_pRestrictedCB.clear(); + m_pTypeReplaceCB.clear(); + m_pMovementLogicalRB.clear(); + m_pMovementVisualRB.clear(); + m_pNumeralsLB.clear(); + SfxTabPage::dispose(); +} + SfxTabPage* SvxCTLOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return new SvxCTLOptionsPage( pParent, *rAttrSet ); diff --git a/cui/source/options/optctl.hxx b/cui/source/options/optctl.hxx index 034e04b6d70f..4c086eb90726 100644 --- a/cui/source/options/optctl.hxx +++ b/cui/source/options/optctl.hxx @@ -30,20 +30,22 @@ class SvxCTLOptionsPage : public SfxTabPage { private: - CheckBox* m_pSequenceCheckingCB; - CheckBox* m_pRestrictedCB; - CheckBox* m_pTypeReplaceCB; + VclPtr<CheckBox> m_pSequenceCheckingCB; + VclPtr<CheckBox> m_pRestrictedCB; + VclPtr<CheckBox> m_pTypeReplaceCB; - RadioButton* m_pMovementLogicalRB; - RadioButton* m_pMovementVisualRB; + VclPtr<RadioButton> m_pMovementLogicalRB; + VclPtr<RadioButton> m_pMovementVisualRB; - ListBox* m_pNumeralsLB; + VclPtr<ListBox> m_pNumeralsLB; DECL_LINK( SequenceCheckingCB_Hdl, void* ); SvxCTLOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ); public: + virtual ~SvxCTLOptionsPage(); + virtual void dispose() SAL_OVERRIDE; static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index fefbbd25ef39..d48e9a5fa348 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -117,6 +117,19 @@ SvxNewDictionaryDialog::SvxNewDictionaryDialog( vcl::Window* pParent, pLanguageLB->SelectEntryPos(0); } +SvxNewDictionaryDialog::~SvxNewDictionaryDialog() +{ + dispose(); +} + +void SvxNewDictionaryDialog::dispose() +{ + pNameEdit.clear(); + pLanguageLB.clear(); + pExceptBtn.clear(); + pOKBtn.clear(); + ModalDialog::dispose(); +} IMPL_LINK_NOARG(SvxNewDictionaryDialog, OKHdl_Impl) @@ -331,6 +344,24 @@ SvxEditDictionaryDialog::SvxEditDictionaryDialog( } } +SvxEditDictionaryDialog::~SvxEditDictionaryDialog() +{ + dispose(); +} + +void SvxEditDictionaryDialog::dispose() +{ + pAllDictsLB.clear(); + pLangFT.clear(); + pLangLB.clear(); + pWordED.clear(); + pReplaceFT.clear(); + pReplaceED.clear(); + pWordsLB.clear(); + pNewReplacePB.clear(); + pDeletePB.clear(); + ModalDialog::dispose(); +} /* diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index 6a6d7116d70b..65953a886a0a 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -54,6 +54,25 @@ OfaMSFilterTabPage::OfaMSFilterTabPage(vcl::Window* pParent, const SfxItemSet& r aEBasicCodeCB->SetClickHdl( LINK( this, OfaMSFilterTabPage, LoadExcelBasicCheckHdl_Impl ) ); } +OfaMSFilterTabPage::~OfaMSFilterTabPage() +{ + dispose(); +} + +void OfaMSFilterTabPage::dispose() +{ + aWBasicCodeCB.clear(); + aWBasicWbctblCB.clear(); + aWBasicStgCB.clear(); + aEBasicCodeCB.clear(); + aEBasicExectblCB.clear(); + aEBasicStgCB.clear(); + aPBasicCodeCB.clear(); + aPBasicStgCB.clear(); + SfxTabPage::dispose(); +} + + IMPL_LINK_NOARG(OfaMSFilterTabPage, LoadWordBasicCheckHdl_Impl) { aWBasicWbctblCB->Enable( aWBasicCodeCB->IsChecked() ); @@ -166,8 +185,8 @@ void OfaMSFilterTabPage2::dispose() { delete pCheckButtonData; pCheckButtonData = NULL; - delete m_pCheckLB; - m_pCheckLB = NULL; + m_pCheckLB.clear(); + m_pCheckLBContainer.clear(); SfxTabPage::dispose(); } diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx index 763794fd36b9..20b01c1916f8 100644 --- a/cui/source/options/optfltr.hxx +++ b/cui/source/options/optfltr.hxx @@ -27,20 +27,22 @@ class OfaMSFilterTabPage : public SfxTabPage { - CheckBox* aWBasicCodeCB; - CheckBox* aWBasicWbctblCB; - CheckBox* aWBasicStgCB; - CheckBox* aEBasicCodeCB; - CheckBox* aEBasicExectblCB; - CheckBox* aEBasicStgCB; - CheckBox* aPBasicCodeCB; - CheckBox* aPBasicStgCB; + VclPtr<CheckBox> aWBasicCodeCB; + VclPtr<CheckBox> aWBasicWbctblCB; + VclPtr<CheckBox> aWBasicStgCB; + VclPtr<CheckBox> aEBasicCodeCB; + VclPtr<CheckBox> aEBasicExectblCB; + VclPtr<CheckBox> aEBasicStgCB; + VclPtr<CheckBox> aPBasicCodeCB; + VclPtr<CheckBox> aPBasicStgCB; OfaMSFilterTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); DECL_LINK(LoadWordBasicCheckHdl_Impl, void *); DECL_LINK(LoadExcelBasicCheckHdl_Impl, void *); public: + virtual ~OfaMSFilterTabPage(); + virtual void dispose() SAL_OVERRIDE; static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); @@ -72,8 +74,8 @@ class OfaMSFilterTabPage2 : public SfxTabPage } }; - SvSimpleTableContainer* m_pCheckLBContainer; - MSFltrSimpleTable* m_pCheckLB; + VclPtr<SvSimpleTableContainer> m_pCheckLBContainer; + VclPtr<MSFltrSimpleTable> m_pCheckLB; OUString sHeader1, sHeader2; OUString sChgToFromMath, sChgToFromWriter, diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 3ab3ae842707..dabfc6b8fdb1 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -307,6 +307,27 @@ OfaMiscTabPage::OfaMiscTabPage(vcl::Window* pParent, const SfxItemSet& rSet) m_pToolTipsCB->SetClickHdl( aLink ); } +OfaMiscTabPage::~OfaMiscTabPage() +{ + dispose(); +} + +void OfaMiscTabPage::dispose() +{ + m_pToolTipsCB.clear(); + m_pExtHelpCB.clear(); + m_pFileDlgROImage.clear(); + m_pFileDlgCB.clear(); + m_pPrintDlgCB.clear(); + m_pDocStatusCB.clear(); + m_pSaveAlwaysCB.clear(); + m_pYearFrame.clear(); + m_pYearValueField.clear(); + m_pToYearFT.clear(); + m_pCollectUsageInfo.clear(); + SfxTabPage::dispose(); +} + SfxTabPage* OfaMiscTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return new OfaMiscTabPage( pParent, *rAttrSet ); @@ -693,6 +714,23 @@ void OfaViewTabPage::dispose() pCanvasSettings = NULL; delete pAppearanceCfg; pAppearanceCfg = NULL; + m_pWindowSizeMF.clear(); + m_pIconSizeLB.clear(); + m_pIconStyleLB.clear(); + m_pFontAntiAliasing.clear(); + m_pAAPointLimitLabel.clear(); + m_pAAPointLimit.clear(); + m_pMenuIconsLB.clear(); + m_pFontShowCB.clear(); + m_pFontHistoryCB.clear(); + m_pUseHardwareAccell.clear(); + m_pUseAntiAliase.clear(); + m_pUseOpenGL.clear(); + m_pForceOpenGL.clear(); + m_pMousePosLB.clear(); + m_pMouseMiddleLB.clear(); + m_pSelectionCB.clear(); + m_pSelectionMF.clear(); SfxTabPage::dispose(); } @@ -1217,6 +1255,22 @@ void OfaLanguagesTabPage::dispose() { delete pLangConfig; pLangConfig = NULL; + m_pUserInterfaceLB.clear(); + m_pLocaleSettingFT.clear(); + m_pLocaleSettingLB.clear(); + m_pDecimalSeparatorCB.clear(); + m_pCurrencyFT.clear(); + m_pCurrencyLB.clear(); + m_pDatePatternsFT.clear(); + m_pDatePatternsED.clear(); + m_pWesternLanguageLB.clear(); + m_pWesternLanguageFT.clear(); + m_pAsianLanguageLB.clear(); + m_pComplexLanguageLB.clear(); + m_pCurrentDocCB.clear(); + m_pAsianSupportCB.clear(); + m_pCTLSupportCB.clear(); + m_pIgnoreLanguageChangeCB.clear(); SfxTabPage::dispose(); } diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index 4f01834727ed..19ec2a06ef56 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -44,24 +44,24 @@ class OfaMiscTabPage : public SfxTabPage { using TabPage::DeactivatePage; private: - CheckBox* m_pToolTipsCB; - CheckBox* m_pExtHelpCB; + VclPtr<CheckBox> m_pToolTipsCB; + VclPtr<CheckBox> m_pExtHelpCB; - FixedImage* m_pFileDlgROImage; - CheckBox* m_pFileDlgCB; + VclPtr<FixedImage> m_pFileDlgROImage; + VclPtr<CheckBox> m_pFileDlgCB; - CheckBox* m_pPrintDlgCB; + VclPtr<CheckBox> m_pPrintDlgCB; - CheckBox* m_pDocStatusCB; - CheckBox* m_pSaveAlwaysCB; + VclPtr<CheckBox> m_pDocStatusCB; + VclPtr<CheckBox> m_pSaveAlwaysCB; - VclContainer* m_pYearFrame; - NumericField* m_pYearValueField; - FixedText* m_pToYearFT; + VclPtr<VclContainer> m_pYearFrame; + VclPtr<NumericField> m_pYearValueField; + VclPtr<FixedText> m_pToYearFT; OUString m_aStrDateInfo; - CheckBox* m_pCollectUsageInfo; + VclPtr<CheckBox> m_pCollectUsageInfo; DECL_LINK( TwoFigureHdl, NumericField* ); DECL_LINK( TwoFigureConfigHdl, NumericField* ); @@ -74,6 +74,8 @@ protected: public: OfaMiscTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); + virtual ~OfaMiscTabPage(); + virtual void dispose() SAL_OVERRIDE; static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); @@ -87,30 +89,30 @@ class SvtTabAppearanceCfg; class OfaViewTabPage : public SfxTabPage { private: - MetricField* m_pWindowSizeMF; - ListBox* m_pIconSizeLB; - ListBox* m_pIconStyleLB; + VclPtr<MetricField> m_pWindowSizeMF; + VclPtr<ListBox> m_pIconSizeLB; + VclPtr<ListBox> m_pIconStyleLB; - CheckBox* m_pFontAntiAliasing; - FixedText* m_pAAPointLimitLabel; - MetricField* m_pAAPointLimit; + VclPtr<CheckBox> m_pFontAntiAliasing; + VclPtr<FixedText> m_pAAPointLimitLabel; + VclPtr<MetricField> m_pAAPointLimit; - ListBox* m_pMenuIconsLB; + VclPtr<ListBox> m_pMenuIconsLB; - CheckBox* m_pFontShowCB; - CheckBox* m_pFontHistoryCB; + VclPtr<CheckBox> m_pFontShowCB; + VclPtr<CheckBox> m_pFontHistoryCB; - CheckBox* m_pUseHardwareAccell; - CheckBox* m_pUseAntiAliase; - CheckBox* m_pUseOpenGL; - CheckBox* m_pForceOpenGL; + VclPtr<CheckBox> m_pUseHardwareAccell; + VclPtr<CheckBox> m_pUseAntiAliase; + VclPtr<CheckBox> m_pUseOpenGL; + VclPtr<CheckBox> m_pForceOpenGL; - ListBox* m_pMousePosLB; - ListBox* m_pMouseMiddleLB; + VclPtr<ListBox> m_pMousePosLB; + VclPtr<ListBox> m_pMouseMiddleLB; // #i97672# - CheckBox* m_pSelectionCB; - MetricField* m_pSelectionMF; + VclPtr<CheckBox> m_pSelectionCB; + VclPtr<MetricField> m_pSelectionMF; sal_uInt16 nSizeLB_InitialSelection; sal_uInt16 nStyleLB_InitialSelection; @@ -142,23 +144,23 @@ public: struct LanguageConfig_Impl; class OfaLanguagesTabPage : public SfxTabPage { - ListBox* m_pUserInterfaceLB; - FixedText* m_pLocaleSettingFT; - SvxLanguageBox* m_pLocaleSettingLB; - CheckBox* m_pDecimalSeparatorCB; - FixedText* m_pCurrencyFT; - ListBox* m_pCurrencyLB; - FixedText* m_pDatePatternsFT; - Edit* m_pDatePatternsED; - - SvxLanguageBox* m_pWesternLanguageLB; - FixedText* m_pWesternLanguageFT; - SvxLanguageBox* m_pAsianLanguageLB; - SvxLanguageBox* m_pComplexLanguageLB; - CheckBox* m_pCurrentDocCB; - CheckBox* m_pAsianSupportCB; - CheckBox* m_pCTLSupportCB; - CheckBox* m_pIgnoreLanguageChangeCB; + VclPtr<ListBox> m_pUserInterfaceLB; + VclPtr<FixedText> m_pLocaleSettingFT; + VclPtr<SvxLanguageBox> m_pLocaleSettingLB; + VclPtr<CheckBox> m_pDecimalSeparatorCB; + VclPtr<FixedText> m_pCurrencyFT; + VclPtr<ListBox> m_pCurrencyLB; + VclPtr<FixedText> m_pDatePatternsFT; + VclPtr<Edit> m_pDatePatternsED; + + VclPtr<SvxLanguageBox> m_pWesternLanguageLB; + VclPtr<FixedText> m_pWesternLanguageFT; + VclPtr<SvxLanguageBox> m_pAsianLanguageLB; + VclPtr<SvxLanguageBox> m_pComplexLanguageLB; + VclPtr<CheckBox> m_pCurrentDocCB; + VclPtr<CheckBox> m_pAsianSupportCB; + VclPtr<CheckBox> m_pCTLSupportCB; + VclPtr<CheckBox> m_pIgnoreLanguageChangeCB; bool m_bOldAsian; bool m_bOldCtl; diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx index 28fde5a5fd7e..9d6afd387479 100644 --- a/cui/source/options/optgenrl.cxx +++ b/cui/source/options/optgenrl.cxx @@ -166,7 +166,7 @@ struct SvxGeneralTabPage::Row // which row is it? RowType eRow; // row label - FixedText* pLabel; + VclPtr<FixedText> pLabel; // first and last field in the row (last is exclusive) unsigned nFirstField, nLastField; @@ -191,7 +191,7 @@ struct SvxGeneralTabPage::Field // which field is this? (in vFieldInfo[] above) unsigned iField; // edit box - Edit *pEdit; + VclPtr<Edit> pEdit; public: Field (Edit *pEdit_, unsigned iField_) @@ -219,6 +219,16 @@ SvxGeneralTabPage::SvxGeneralTabPage(vcl::Window* pParent, const SfxItemSet& rCo SetLinks(); } +SvxGeneralTabPage::~SvxGeneralTabPage() +{ + dispose(); +} + +void SvxGeneralTabPage::dispose() +{ + m_pUseDataCB.clear(); + SfxTabPage::dispose(); +} // Initializes the titles and the edit boxes, diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx index eeae4d7d14ce..34d7fff2d462 100644 --- a/cui/source/options/opthtml.cxx +++ b/cui/source/options/opthtml.cxx @@ -84,6 +84,32 @@ SfxTabPage( pParent, "OptHtmlPage" , "cui/ui/opthtmlpage.ui", &rSet ) aCharSetLB->FillWithMimeAndSelectBest(); } +OfaHtmlTabPage::~OfaHtmlTabPage() +{ + dispose(); +} + +void OfaHtmlTabPage::dispose() +{ + aSize1NF.clear(); + aSize2NF.clear(); + aSize3NF.clear(); + aSize4NF.clear(); + aSize5NF.clear(); + aSize6NF.clear(); + aSize7NF.clear(); + aNumbersEnglishUSCB.clear(); + aUnknownTagCB.clear(); + aIgnoreFontNamesCB.clear(); + aExportLB.clear(); + aStarBasicCB.clear(); + aStarBasicWarningCB.clear(); + aPrintExtensionCB.clear(); + aSaveGrfLocalCB.clear(); + aCharSetLB.clear(); + SfxTabPage::dispose(); +} + SfxTabPage* OfaHtmlTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { diff --git a/cui/source/options/opthtml.hxx b/cui/source/options/opthtml.hxx index 2697fb50a830..0e17f48330e6 100644 --- a/cui/source/options/opthtml.hxx +++ b/cui/source/options/opthtml.hxx @@ -30,30 +30,32 @@ class OfaHtmlTabPage : public SfxTabPage { - NumericField* aSize1NF; - NumericField* aSize2NF; - NumericField* aSize3NF; - NumericField* aSize4NF; - NumericField* aSize5NF; - NumericField* aSize6NF; - NumericField* aSize7NF; + VclPtr<NumericField> aSize1NF; + VclPtr<NumericField> aSize2NF; + VclPtr<NumericField> aSize3NF; + VclPtr<NumericField> aSize4NF; + VclPtr<NumericField> aSize5NF; + VclPtr<NumericField> aSize6NF; + VclPtr<NumericField> aSize7NF; - CheckBox* aNumbersEnglishUSCB; - CheckBox* aUnknownTagCB; - CheckBox* aIgnoreFontNamesCB; + VclPtr<CheckBox> aNumbersEnglishUSCB; + VclPtr<CheckBox> aUnknownTagCB; + VclPtr<CheckBox> aIgnoreFontNamesCB; - ListBox* aExportLB; - CheckBox* aStarBasicCB; - CheckBox* aStarBasicWarningCB; - CheckBox* aPrintExtensionCB; - CheckBox* aSaveGrfLocalCB; - SvxTextEncodingBox* aCharSetLB; + VclPtr<ListBox> aExportLB; + VclPtr<CheckBox> aStarBasicCB; + VclPtr<CheckBox> aStarBasicWarningCB; + VclPtr<CheckBox> aPrintExtensionCB; + VclPtr<CheckBox> aSaveGrfLocalCB; + VclPtr<SvxTextEncodingBox> aCharSetLB; DECL_LINK(ExportHdl_Impl, ListBox*); DECL_LINK(CheckBoxHdl_Impl, CheckBox*); OfaHtmlTabPage(vcl::Window* pParent, const SfxItemSet& rSet); public: + virtual ~OfaHtmlTabPage(); + virtual void dispose() SAL_OVERRIDE; static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index a9063ece06d4..5dc7a284e51f 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -215,6 +215,32 @@ SvxProxyTabPage::SvxProxyTabPage(vcl::Window* pParent, const SfxItemSet& rSet) aArgumentList ); } +SvxProxyTabPage::~SvxProxyTabPage() +{ + dispose(); +} + +void SvxProxyTabPage::dispose() +{ + m_pProxyModeLB.clear(); + m_pHttpProxyFT.clear(); + m_pHttpProxyED.clear(); + m_pHttpPortFT.clear(); + m_pHttpPortED.clear(); + m_pHttpsProxyFT.clear(); + m_pHttpsProxyED.clear(); + m_pHttpsPortFT.clear(); + m_pHttpsPortED.clear(); + m_pFtpProxyFT.clear(); + m_pFtpProxyED.clear(); + m_pFtpPortFT.clear(); + m_pFtpPortED.clear(); + m_pNoProxyForFT.clear(); + m_pNoProxyForED.clear(); + m_pNoProxyDescFT.clear(); + SfxTabPage::dispose(); +} + SfxTabPage* SvxProxyTabPage::Create(vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return new SvxProxyTabPage(pParent, *rAttrSet); @@ -627,12 +653,20 @@ SvxSecurityTabPage::~SvxSecurityTabPage() void SvxSecurityTabPage::dispose() { - delete mpCertPathDlg; - mpCertPathDlg = NULL; delete mpSecOptions; mpSecOptions = NULL; - delete mpSecOptDlg; - mpSecOptDlg = NULL; + mpCertPathDlg.clear(); + mpSecOptDlg.clear(); + m_pSecurityOptionsPB.clear(); + m_pSavePasswordsCB.clear(); + m_pShowConnectionsPB.clear(); + m_pMasterPasswordCB.clear(); + m_pMasterPasswordFT.clear(); + m_pMasterPasswordPB.clear(); + m_pMacroSecFrame.clear(); + m_pMacroSecPB.clear(); + m_pCertFrame.clear(); + m_pCertPathPB.clear(); SfxTabPage::dispose(); } @@ -983,6 +1017,13 @@ void SvxEMailTabPage::dispose() { delete pImpl; pImpl = NULL; + m_pMailContainer.clear(); + m_pMailerURLFI.clear(); + m_pMailerURLED.clear(); + m_pMailerURLPB.clear(); + m_pSuppressHiddenContainer.clear(); + m_pSuppressHiddenFI.clear(); + m_pSuppressHidden.clear(); SfxTabPage::dispose(); } diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx index 6eddd54219b3..e1cccd41a09f 100644 --- a/cui/source/options/optinet2.hxx +++ b/cui/source/options/optinet2.hxx @@ -58,26 +58,26 @@ class SvxProxyTabPage : public SfxTabPage { private: - ListBox* m_pProxyModeLB; + VclPtr<ListBox> m_pProxyModeLB; - FixedText* m_pHttpProxyFT; - SvxNoSpaceEdit* m_pHttpProxyED; - FixedText* m_pHttpPortFT; - SvxNoSpaceEdit* m_pHttpPortED; + VclPtr<FixedText> m_pHttpProxyFT; + VclPtr<SvxNoSpaceEdit> m_pHttpProxyED; + VclPtr<FixedText> m_pHttpPortFT; + VclPtr<SvxNoSpaceEdit> m_pHttpPortED; - FixedText* m_pHttpsProxyFT; - SvxNoSpaceEdit* m_pHttpsProxyED; - FixedText* m_pHttpsPortFT; - SvxNoSpaceEdit* m_pHttpsPortED; + VclPtr<FixedText> m_pHttpsProxyFT; + VclPtr<SvxNoSpaceEdit> m_pHttpsProxyED; + VclPtr<FixedText> m_pHttpsPortFT; + VclPtr<SvxNoSpaceEdit> m_pHttpsPortED; - FixedText* m_pFtpProxyFT; - SvxNoSpaceEdit* m_pFtpProxyED; - FixedText* m_pFtpPortFT; - SvxNoSpaceEdit* m_pFtpPortED; + VclPtr<FixedText> m_pFtpProxyFT; + VclPtr<SvxNoSpaceEdit> m_pFtpProxyED; + VclPtr<FixedText> m_pFtpPortFT; + VclPtr<SvxNoSpaceEdit> m_pFtpPortED; - FixedText* m_pNoProxyForFT; - Edit* m_pNoProxyForED; - FixedText* m_pNoProxyDescFT; + VclPtr<FixedText> m_pNoProxyForFT; + VclPtr<Edit> m_pNoProxyForED; + VclPtr<FixedText> m_pNoProxyDescFT; const OUString aProxyModePN; const OUString aHttpProxyPN; @@ -101,6 +101,8 @@ private: SvxProxyTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); public: + virtual ~SvxProxyTabPage(); + virtual void dispose() SAL_OVERRIDE; static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; @@ -129,28 +131,28 @@ class SvxSecurityTabPage : public SfxTabPage using TabPage::DeactivatePage; private: - PushButton* m_pSecurityOptionsPB; + VclPtr<PushButton> m_pSecurityOptionsPB; - CheckBox* m_pSavePasswordsCB; - PushButton* m_pShowConnectionsPB; + VclPtr<CheckBox> m_pSavePasswordsCB; + VclPtr<PushButton> m_pShowConnectionsPB; - CheckBox* m_pMasterPasswordCB; - FixedText* m_pMasterPasswordFT; - PushButton* m_pMasterPasswordPB; + VclPtr<CheckBox> m_pMasterPasswordCB; + VclPtr<FixedText> m_pMasterPasswordFT; + VclPtr<PushButton> m_pMasterPasswordPB; - VclContainer* m_pMacroSecFrame; - PushButton* m_pMacroSecPB; + VclPtr<VclContainer> m_pMacroSecFrame; + VclPtr<PushButton> m_pMacroSecPB; - VclContainer* m_pCertFrame; - PushButton* m_pCertPathPB; + VclPtr<VclContainer> m_pCertFrame; + VclPtr<PushButton> m_pCertPathPB; VclContainer* m_pTSAURLsFrame; PushButton* m_pTSAURLsPB; SvtSecurityOptions* mpSecOptions; - svx::SecurityOptionsDialog* mpSecOptDlg; + VclPtr<svx::SecurityOptionsDialog> mpSecOptDlg; - CertPathDialog* mpCertPathDlg; + VclPtr<CertPathDialog> mpCertPathDlg; OUString m_sPasswordStoringDeactivateStr; @@ -182,13 +184,13 @@ public: struct SvxEMailTabPage_Impl; class SvxEMailTabPage : public SfxTabPage { - VclContainer* m_pMailContainer; - FixedImage* m_pMailerURLFI; - Edit* m_pMailerURLED; - PushButton* m_pMailerURLPB; - VclContainer* m_pSuppressHiddenContainer; - FixedImage* m_pSuppressHiddenFI; - CheckBox* m_pSuppressHidden; + VclPtr<VclContainer> m_pMailContainer; + VclPtr<FixedImage> m_pMailerURLFI; + VclPtr<Edit> m_pMailerURLED; + VclPtr<PushButton> m_pMailerURLPB; + VclPtr<VclContainer> m_pSuppressHiddenContainer; + VclPtr<FixedImage> m_pSuppressHiddenFI; + VclPtr<CheckBox> m_pSuppressHidden; OUString m_sDefaultFilterName; diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 5be1b1fa39fe..98853d58b743 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -207,12 +207,7 @@ SvxJavaOptionsPage::~SvxJavaOptionsPage() void SvxJavaOptionsPage::dispose() { - delete m_pJavaList; - m_pJavaList = NULL; - delete m_pParamDlg; - m_pParamDlg = NULL; - delete m_pPathDlg; - m_pPathDlg = NULL; + m_pJavaList.clear(); ClearJavaInfo(); #if HAVE_FEATURE_JAVA std::vector< JavaInfo* >::iterator pIter; @@ -225,6 +220,17 @@ void SvxJavaOptionsPage::dispose() jfw_unlock(); #endif + m_pJavaEnableCB.clear(); + m_pJavaBox.clear(); + m_pJavaPathText.clear(); + m_pAddBtn.clear(); + m_pParameterBtn.clear(); + m_pClassPathBtn.clear(); + m_pExpertConfigBtn.clear(); + m_pExperimentalCB.clear(); + m_pMacroCB.clear(); + m_pParamDlg.clear(); + m_pPathDlg.clear(); SfxTabPage::dispose(); } @@ -815,6 +821,19 @@ SvxJavaParameterDlg::SvxJavaParameterDlg( vcl::Window* pParent ) : EnableRemoveButton(); } +SvxJavaParameterDlg::~SvxJavaParameterDlg() +{ + dispose(); +} + +void SvxJavaParameterDlg::dispose() +{ + m_pParameterEdit.clear(); + m_pAssignBtn.clear(); + m_pAssignedList.clear(); + m_pRemoveBtn.clear(); + ModalDialog::dispose(); +} IMPL_LINK_NOARG(SvxJavaParameterDlg, ModifyHdl_Impl) @@ -955,6 +974,10 @@ void SvxJavaClassPathDlg::dispose() delete static_cast< OUString* >( m_pPathList->GetEntryData(i) ); m_pPathList = NULL; } + m_pPathList.clear(); + m_pAddArchiveBtn.clear(); + m_pAddPathBtn.clear(); + m_pRemoveBtn.clear(); ModalDialog::dispose(); } diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx index 4c422011a02f..68ed24427d85 100644 --- a/cui/source/options/optjava.hxx +++ b/cui/source/options/optjava.hxx @@ -51,17 +51,17 @@ class SvxJavaListBox; class SvxJavaOptionsPage : public SfxTabPage { private: - CheckBox* m_pJavaEnableCB; - VclContainer* m_pJavaBox; - SvxJavaListBox* m_pJavaList; - FixedText* m_pJavaPathText; - PushButton* m_pAddBtn; - PushButton* m_pParameterBtn; - PushButton* m_pClassPathBtn; - PushButton* m_pExpertConfigBtn; - - SvxJavaParameterDlg* m_pParamDlg; - SvxJavaClassPathDlg* m_pPathDlg; + VclPtr<CheckBox> m_pJavaEnableCB; + VclPtr<VclContainer> m_pJavaBox; + VclPtr<SvxJavaListBox> m_pJavaList; + VclPtr<FixedText> m_pJavaPathText; + VclPtr<PushButton> m_pAddBtn; + VclPtr<PushButton> m_pParameterBtn; + VclPtr<PushButton> m_pClassPathBtn; + VclPtr<PushButton> m_pExpertConfigBtn; + + VclPtr<SvxJavaParameterDlg> m_pParamDlg; + VclPtr<SvxJavaClassPathDlg> m_pPathDlg; #if HAVE_FEATURE_JAVA JavaInfo** m_parJavaInfo; @@ -75,8 +75,8 @@ private: OUString m_sAddDialogText; Idle m_aResetIdle; - CheckBox* m_pExperimentalCB; - CheckBox* m_pMacroCB; + VclPtr<CheckBox> m_pExperimentalCB; + VclPtr<CheckBox> m_pMacroCB; ::std::vector< JavaInfo* > m_aAddedInfos; @@ -121,11 +121,11 @@ public: class SvxJavaParameterDlg : public ModalDialog { private: - Edit* m_pParameterEdit; - PushButton* m_pAssignBtn; + VclPtr<Edit> m_pParameterEdit; + VclPtr<PushButton> m_pAssignBtn; - ListBox* m_pAssignedList; - PushButton* m_pRemoveBtn; + VclPtr<ListBox> m_pAssignedList; + VclPtr<PushButton> m_pRemoveBtn; DECL_LINK(ModifyHdl_Impl, void *); DECL_LINK(AssignHdl_Impl, void *); @@ -141,6 +141,8 @@ private: public: SvxJavaParameterDlg( vcl::Window* pParent ); + virtual ~SvxJavaParameterDlg(); + virtual void dispose() SAL_OVERRIDE; virtual short Execute() SAL_OVERRIDE; @@ -153,10 +155,10 @@ public: class SvxJavaClassPathDlg : public ModalDialog { private: - ListBox* m_pPathList; - PushButton* m_pAddArchiveBtn; - PushButton* m_pAddPathBtn; - PushButton* m_pRemoveBtn; + VclPtr<ListBox> m_pPathList; + VclPtr<PushButton> m_pAddArchiveBtn; + VclPtr<PushButton> m_pAddPathBtn; + VclPtr<PushButton> m_pRemoveBtn; OUString m_sOldPath; diff --git a/cui/source/options/optjsearch.cxx b/cui/source/options/optjsearch.cxx index 707717f34218..263405d1322e 100644 --- a/cui/source/options/optjsearch.cxx +++ b/cui/source/options/optjsearch.cxx @@ -55,6 +55,34 @@ SvxJSearchOptionsPage::SvxJSearchOptionsPage( vcl::Window* pParent, const SfxIte nTransliterationFlags = 0x00000000; } +SvxJSearchOptionsPage::~SvxJSearchOptionsPage() +{ + dispose(); +} + +void SvxJSearchOptionsPage::dispose() +{ + m_pMatchCase.clear(); + m_pMatchFullHalfWidth.clear(); + m_pMatchHiraganaKatakana.clear(); + m_pMatchContractions.clear(); + m_pMatchMinusDashChoon.clear(); + m_pMatchRepeatCharMarks.clear(); + m_pMatchVariantFormKanji.clear(); + m_pMatchOldKanaForms.clear(); + m_pMatchDiziDuzu.clear(); + m_pMatchBavaHafa.clear(); + m_pMatchTsithichiDhizi.clear(); + m_pMatchHyuiyuByuvyu.clear(); + m_pMatchSesheZeje.clear(); + m_pMatchIaiya.clear(); + m_pMatchKiku.clear(); + m_pMatchProlongedSoundMark.clear(); + m_pIgnorePunctuation.clear(); + m_pIgnoreWhitespace.clear(); + m_pIgnoreMiddleDot.clear(); + SfxTabPage::dispose(); +} SfxTabPage* SvxJSearchOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { diff --git a/cui/source/options/optjsearch.hxx b/cui/source/options/optjsearch.hxx index 35639dfbff58..70d03acb2b2f 100644 --- a/cui/source/options/optjsearch.hxx +++ b/cui/source/options/optjsearch.hxx @@ -32,26 +32,26 @@ class SfxItemSet; class SvxJSearchOptionsPage : public SfxTabPage { private: - CheckBox* m_pMatchCase; - CheckBox* m_pMatchFullHalfWidth; - CheckBox* m_pMatchHiraganaKatakana; - CheckBox* m_pMatchContractions; - CheckBox* m_pMatchMinusDashChoon; - CheckBox* m_pMatchRepeatCharMarks; - CheckBox* m_pMatchVariantFormKanji; - CheckBox* m_pMatchOldKanaForms; - CheckBox* m_pMatchDiziDuzu; - CheckBox* m_pMatchBavaHafa; - CheckBox* m_pMatchTsithichiDhizi; - CheckBox* m_pMatchHyuiyuByuvyu; - CheckBox* m_pMatchSesheZeje; - CheckBox* m_pMatchIaiya; - CheckBox* m_pMatchKiku; - CheckBox* m_pMatchProlongedSoundMark; - - CheckBox* m_pIgnorePunctuation; - CheckBox* m_pIgnoreWhitespace; - CheckBox* m_pIgnoreMiddleDot; + VclPtr<CheckBox> m_pMatchCase; + VclPtr<CheckBox> m_pMatchFullHalfWidth; + VclPtr<CheckBox> m_pMatchHiraganaKatakana; + VclPtr<CheckBox> m_pMatchContractions; + VclPtr<CheckBox> m_pMatchMinusDashChoon; + VclPtr<CheckBox> m_pMatchRepeatCharMarks; + VclPtr<CheckBox> m_pMatchVariantFormKanji; + VclPtr<CheckBox> m_pMatchOldKanaForms; + VclPtr<CheckBox> m_pMatchDiziDuzu; + VclPtr<CheckBox> m_pMatchBavaHafa; + VclPtr<CheckBox> m_pMatchTsithichiDhizi; + VclPtr<CheckBox> m_pMatchHyuiyuByuvyu; + VclPtr<CheckBox> m_pMatchSesheZeje; + VclPtr<CheckBox> m_pMatchIaiya; + VclPtr<CheckBox> m_pMatchKiku; + VclPtr<CheckBox> m_pMatchProlongedSoundMark; + + VclPtr<CheckBox> m_pIgnorePunctuation; + VclPtr<CheckBox> m_pIgnoreWhitespace; + VclPtr<CheckBox> m_pIgnoreMiddleDot; sal_Int32 nTransliterationFlags; bool bSaveOptions; @@ -62,6 +62,8 @@ protected: SvxJSearchOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ); public: + virtual ~SvxJSearchOptionsPage(); + virtual void dispose() SAL_OVERRIDE; static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 8e7929e0334f..9c357e682d8d 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -329,10 +329,10 @@ static inline OUString lcl_GetPropertyName( EID_OPTIONS eEntryId ) class OptionsBreakSet : public ModalDialog { - VclFrame* m_pBeforeFrame; - VclFrame* m_pAfterFrame; - VclFrame* m_pMinimalFrame; - NumericField* m_pBreakNF; + VclPtr<VclFrame> m_pBeforeFrame; + VclPtr<VclFrame> m_pAfterFrame; + VclPtr<VclFrame> m_pMinimalFrame; + VclPtr<NumericField> m_pBreakNF; public: OptionsBreakSet(vcl::Window* pParent, sal_uInt16 nRID) @@ -364,6 +364,15 @@ public: get(m_pBreakNF, "wordlength"); } } + virtual ~OptionsBreakSet() { dispose(); } + virtual void dispose() SAL_OVERRIDE + { + m_pBeforeFrame.clear(); + m_pAfterFrame.clear(); + m_pMinimalFrame.clear(); + m_pBreakNF.clear(); + ModalDialog::dispose(); + } NumericField& GetNumericFld() { @@ -1129,6 +1138,17 @@ void SvxLinguTabPage::dispose() { delete pLinguData; pLinguData = NULL; + m_pLinguModulesFT.clear(); + m_pLinguModulesCLB.clear(); + m_pLinguModulesEditPB.clear(); + m_pLinguDicsFT.clear(); + m_pLinguDicsCLB.clear(); + m_pLinguDicsNewPB.clear(); + m_pLinguDicsEditPB.clear(); + m_pLinguDicsDelPB.clear(); + m_pLinguOptionsCLB.clear(); + m_pLinguOptionsEditPB.clear(); + m_pMoreDictsLink.clear(); SfxTabPage::dispose(); } @@ -1905,6 +1925,13 @@ void SvxEditModulesDlg::dispose() { delete pDefaultLinguData; pDefaultLinguData = NULL; + m_pLanguageLB.clear(); + m_pModulesCLB.clear(); + m_pPrioUpPB.clear(); + m_pPrioDownPB.clear(); + m_pBackPB.clear(); + m_pMoreDictsLink.clear(); + m_pClosePB.clear(); ModalDialog::dispose(); } diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx index 3f509a431084..79a86d9d6f69 100644 --- a/cui/source/options/optmemory.cxx +++ b/cui/source/options/optmemory.cxx @@ -141,6 +141,23 @@ OfaMemoryOptionsPage::OfaMemoryOptionsPage(vcl::Window* pParent, const SfxItemSe m_pNfGraphicCache->SetModifyHdl( LINK( this, OfaMemoryOptionsPage, GraphicCacheConfigHdl ) ); } +OfaMemoryOptionsPage::~OfaMemoryOptionsPage() +{ + dispose(); +} + +void OfaMemoryOptionsPage::dispose() +{ + m_pUndoEdit.clear(); + m_pNfGraphicCache.clear(); + m_pNfGraphicObjectCache.clear(); + m_pTfGraphicObjectTime.clear(); + m_pNfOLECache.clear(); + m_pQuickStarterFrame.clear(); + m_pQuickLaunchCB.clear(); + SfxTabPage::dispose(); +} + SfxTabPage* OfaMemoryOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return new OfaMemoryOptionsPage( pParent, *rAttrSet ); diff --git a/cui/source/options/optmemory.hxx b/cui/source/options/optmemory.hxx index c3d189f37bdc..91559d99da1e 100644 --- a/cui/source/options/optmemory.hxx +++ b/cui/source/options/optmemory.hxx @@ -32,16 +32,16 @@ class OfaMemoryOptionsPage : public SfxTabPage { using SfxTabPage::DeactivatePage; private: - NumericField* m_pUndoEdit; + VclPtr<NumericField> m_pUndoEdit; - NumericField* m_pNfGraphicCache; - NumericField* m_pNfGraphicObjectCache; - TimeField* m_pTfGraphicObjectTime; + VclPtr<NumericField> m_pNfGraphicCache; + VclPtr<NumericField> m_pNfGraphicObjectCache; + VclPtr<TimeField> m_pTfGraphicObjectTime; - NumericField* m_pNfOLECache; + VclPtr<NumericField> m_pNfOLECache; - VclContainer* m_pQuickStarterFrame; - CheckBox* m_pQuickLaunchCB; + VclPtr<VclContainer> m_pQuickStarterFrame; + VclPtr<CheckBox> m_pQuickLaunchCB; DECL_LINK(GraphicCacheConfigHdl, void *); @@ -57,6 +57,8 @@ protected: public: OfaMemoryOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ); + virtual ~OfaMemoryOptionsPage(); + virtual void dispose() SAL_OVERRIDE; static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx index b6faede94b5e..bd8c7846002b 100644 --- a/cui/source/options/optopencl.cxx +++ b/cui/source/options/optopencl.cxx @@ -117,6 +117,34 @@ void SvxOpenCLTabPage::dispose() mpWhiteList.disposeAndClear() } +SvxOpenCLTabPage::~SvxOpenCLTabPage() +{ + dispose(); +} + +void SvxOpenCLTabPage::dispose() +{ + mpUseOpenCL.clear(); + mpBlackListFrame.clear(); + mpBlackList.clear(); + mpBlackListTable.clear(); + mpBlackListEdit.clear(); + mpBlackListAdd.clear(); + mpBlackListDelete.clear(); + mpOS.clear(); + mpOSVersion.clear(); + mpDevice.clear(); + mpVendor.clear(); + mpDrvVersion.clear(); + mpWhiteListFrame.clear(); + mpWhiteList.clear(); + mpWhiteListTable.clear(); + mpWhiteListEdit.clear(); + mpWhiteListAdd.clear(); + mpWhiteListDelete.clear(); + SfxTabPage::dispose(); +} + SfxTabPage* SvxOpenCLTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return new SvxOpenCLTabPage(pParent, *rAttrSet); @@ -194,16 +222,27 @@ class ListEntryDialog : public ModalDialog public: OpenCLConfig::ImplMatcher maEntry; - ListBox* mpOS; - Edit* mpOSVersion; - Edit* mpPlatformVendor; - Edit* mpDevice; - Edit* mpDriverVersion; + VclPtr<ListBox> mpOS; + VclPtr<Edit> mpOSVersion; + VclPtr<Edit> mpPlatformVendor; + VclPtr<Edit> mpDevice; + VclPtr<Edit> mpDriverVersion; DECL_LINK(OSSelectHdl, ListBox*); DECL_LINK(EditModifiedHdl, Edit*); ListEntryDialog(vcl::Window* pParent, const OpenCLConfig::ImplMatcher& rEntry, const OString& rTag); + virtual ~ListEntryDialog() { dispose(); } + virtual void dispose() SAL_OVERRIDE + { + mpOS.clear(); + mpOSVersion.clear(); + mpPlatformVendor.clear(); + mpDevice.clear(); + mpDriverVersion.clear(); + ModalDialog::dispose(); + } + }; ListEntryDialog::ListEntryDialog(vcl::Window* pParent, const OpenCLConfig::ImplMatcher& rEntry, const OString& rTag) diff --git a/cui/source/options/optopencl.hxx b/cui/source/options/optopencl.hxx index 378dd5ab6c7b..067b038e22d7 100644 --- a/cui/source/options/optopencl.hxx +++ b/cui/source/options/optopencl.hxx @@ -31,26 +31,26 @@ class SvxOpenCLTabPage : public SfxTabPage private: OpenCLConfig maConfig; - CheckBox* mpUseOpenCL; - - VclFrame* mpBlackListFrame; - SvSimpleTable* mpBlackList; - SvSimpleTableContainer* mpBlackListTable; - PushButton* mpBlackListEdit; - PushButton* mpBlackListAdd; - PushButton* mpBlackListDelete; - FixedText* mpOS; - FixedText* mpOSVersion; - FixedText* mpDevice; - FixedText* mpVendor; - FixedText* mpDrvVersion; - - VclFrame* mpWhiteListFrame; - SvSimpleTable* mpWhiteList; - SvSimpleTableContainer* mpWhiteListTable; - PushButton* mpWhiteListEdit; - PushButton* mpWhiteListAdd; - PushButton* mpWhiteListDelete; + VclPtr<CheckBox> mpUseOpenCL; + + VclPtr<VclFrame> mpBlackListFrame; + VclPtr<SvSimpleTable> mpBlackList; + VclPtr<SvSimpleTableContainer> mpBlackListTable; + VclPtr<PushButton> mpBlackListEdit; + VclPtr<PushButton> mpBlackListAdd; + VclPtr<PushButton> mpBlackListDelete; + VclPtr<FixedText> mpOS; + VclPtr<FixedText> mpOSVersion; + VclPtr<FixedText> mpDevice; + VclPtr<FixedText> mpVendor; + VclPtr<FixedText> mpDrvVersion; + + VclPtr<VclFrame> mpWhiteListFrame; + VclPtr<SvSimpleTable> mpWhiteList; + VclPtr<SvSimpleTableContainer> mpWhiteListTable; + VclPtr<PushButton> mpWhiteListEdit; + VclPtr<PushButton> mpWhiteListAdd; + VclPtr<PushButton> mpWhiteListDelete; DECL_LINK(BlackListEditHdl, void*); DECL_LINK(BlackListAddHdl, void*); @@ -70,6 +70,7 @@ private: public: SvxOpenCLTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); + virtual ~SvxOpenCLTabPage(); virtual void dispose() SAL_OVERRIDE; static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index 94de402f231c..7d2d48c9baca 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -256,11 +256,13 @@ void SvxPathTabPage::dispose() { for ( sal_uInt16 i = 0; i < pPathBox->GetEntryCount(); ++i ) delete static_cast<PathUserData_Impl*>(pPathBox->GetEntry(i)->GetUserData()); - delete pPathBox; - pPathBox = NULL; + pPathBox.clear(); } delete pImpl; pImpl = NULL; + m_pPathCtrl.clear(); + m_pStandardBtn.clear(); + m_pPathBtn.clear(); SfxTabPage::dispose(); } diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index 00d3aff38e77..8da1a6cbf11f 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -206,6 +206,23 @@ void SvxSaveTabPage::dispose() { delete pImpl; pImpl = NULL; + aLoadUserSettingsCB.clear(); + aLoadDocPrinterCB.clear(); + aDocInfoCB.clear(); + aBackupCB.clear(); + aAutoSaveCB.clear(); + aAutoSaveEdit.clear(); + aMinuteFT.clear(); + aUserAutoSaveCB.clear(); + aRelativeFsysCB.clear(); + aRelativeInetCB.clear(); + aODFVersionLB.clear(); + aWarnAlienFormatCB.clear(); + aDocTypeLB.clear(); + aSaveAsFT.clear(); + aSaveAsLB.clear(); + aODFWarningFI.clear(); + aODFWarningFT.clear(); SfxTabPage::dispose(); } diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx index 87bd682dddcf..0cb7526de828 100644 --- a/cui/source/options/optsave.hxx +++ b/cui/source/options/optsave.hxx @@ -42,25 +42,25 @@ struct SvxSaveTabPage_Impl; class SvxSaveTabPage : public SfxTabPage { private: - CheckBox* aLoadUserSettingsCB; - CheckBox* aLoadDocPrinterCB; - - CheckBox* aDocInfoCB; - CheckBox* aBackupCB; - CheckBox* aAutoSaveCB; - NumericField* aAutoSaveEdit; - FixedText* aMinuteFT; - CheckBox* aUserAutoSaveCB; - CheckBox* aRelativeFsysCB; - CheckBox* aRelativeInetCB; - - ListBox* aODFVersionLB; - CheckBox* aWarnAlienFormatCB; - ListBox* aDocTypeLB; - FixedText* aSaveAsFT; - ListBox* aSaveAsLB; - FixedImage* aODFWarningFI; - FixedText* aODFWarningFT; + VclPtr<CheckBox> aLoadUserSettingsCB; + VclPtr<CheckBox> aLoadDocPrinterCB; + + VclPtr<CheckBox> aDocInfoCB; + VclPtr<CheckBox> aBackupCB; + VclPtr<CheckBox> aAutoSaveCB; + VclPtr<NumericField> aAutoSaveEdit; + VclPtr<FixedText> aMinuteFT; + VclPtr<CheckBox> aUserAutoSaveCB; + VclPtr<CheckBox> aRelativeFsysCB; + VclPtr<CheckBox> aRelativeInetCB; + + VclPtr<ListBox> aODFVersionLB; + VclPtr<CheckBox> aWarnAlienFormatCB; + VclPtr<ListBox> aDocTypeLB; + VclPtr<FixedText> aSaveAsFT; + VclPtr<ListBox> aSaveAsLB; + VclPtr<FixedImage> aODFWarningFI; + VclPtr<FixedText> aODFWarningFT; SvxSaveTabPage_Impl* pImpl; diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx index 0c7894c63164..30eb7188e71f 100644 --- a/cui/source/options/optupdt.cxx +++ b/cui/source/options/optupdt.cxx @@ -82,6 +82,25 @@ SvxOnlineUpdateTabPage::SvxOnlineUpdateTabPage(vcl::Window* pParent, const SfxIt UpdateLastCheckedText(); } +SvxOnlineUpdateTabPage::~SvxOnlineUpdateTabPage() +{ + dispose(); +} + +void SvxOnlineUpdateTabPage::dispose() +{ + m_pAutoCheckCheckBox.clear(); + m_pEveryDayButton.clear(); + m_pEveryWeekButton.clear(); + m_pEveryMonthButton.clear(); + m_pCheckNowButton.clear(); + m_pAutoDownloadCheckBox.clear(); + m_pDestPathLabel.clear(); + m_pDestPath.clear(); + m_pChangePathButton.clear(); + m_pLastChecked.clear(); + SfxTabPage::dispose(); +} void SvxOnlineUpdateTabPage::UpdateLastCheckedText() diff --git a/cui/source/options/optupdt.hxx b/cui/source/options/optupdt.hxx index ce5362bd94aa..4324cafe34fe 100644 --- a/cui/source/options/optupdt.hxx +++ b/cui/source/options/optupdt.hxx @@ -29,16 +29,16 @@ class SvxOnlineUpdateTabPage : public SfxTabPage { private: - CheckBox* m_pAutoCheckCheckBox; - RadioButton* m_pEveryDayButton; - RadioButton* m_pEveryWeekButton; - RadioButton* m_pEveryMonthButton; - PushButton* m_pCheckNowButton; - CheckBox* m_pAutoDownloadCheckBox; - FixedText* m_pDestPathLabel; - FixedText* m_pDestPath; - PushButton* m_pChangePathButton; - FixedText* m_pLastChecked; + VclPtr<CheckBox> m_pAutoCheckCheckBox; + VclPtr<RadioButton> m_pEveryDayButton; + VclPtr<RadioButton> m_pEveryWeekButton; + VclPtr<RadioButton> m_pEveryMonthButton; + VclPtr<PushButton> m_pCheckNowButton; + VclPtr<CheckBox> m_pAutoDownloadCheckBox; + VclPtr<FixedText> m_pDestPathLabel; + VclPtr<FixedText> m_pDestPath; + VclPtr<PushButton> m_pChangePathButton; + VclPtr<FixedText> m_pLastChecked; OUString m_aNeverChecked; OUString m_aLastCheckedTemplate; @@ -52,6 +52,8 @@ private: public: SvxOnlineUpdateTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); + virtual ~SvxOnlineUpdateTabPage(); + virtual void dispose() SAL_OVERRIDE; static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx index 1bae7f526f79..e6d73e4dd044 100644 --- a/cui/source/options/personalization.cxx +++ b/cui/source/options/personalization.cxx @@ -92,6 +92,25 @@ SelectPersonaDialog::SelectPersonaDialog( vcl::Window *pParent ) } } +SelectPersonaDialog::~SelectPersonaDialog() +{ + dispose(); +} + +void SelectPersonaDialog::dispose() +{ + m_pEdit.clear(); + m_pSearchButton.clear(); + m_pProgressLabel.clear(); + for (VclPtr<PushButton> vp : m_vResultList) + vp.clear(); + for (VclPtr<PushButton> vp : m_vSearchSuggestions) + vp.clear(); + m_pOkButton.clear(); + m_pCancelButton.clear(); + ModalDialog::dispose(); +} + OUString SelectPersonaDialog::GetSelectedPersona() const { if( !m_aSelectedPersona.isEmpty( ) ) @@ -291,6 +310,26 @@ SvxPersonalizationTabPage::SvxPersonalizationTabPage( vcl::Window *pParent, cons LoadExtensionThemes(); } +SvxPersonalizationTabPage::~SvxPersonalizationTabPage() +{ + dispose(); +} + +void SvxPersonalizationTabPage::dispose() +{ + m_pNoPersona.clear(); + m_pDefaultPersona.clear(); + m_pOwnPersona.clear(); + m_pSelectPersona.clear(); + for (int i=0; i<3; ++i) + m_vDefaultPersonaImages[i].clear(); + m_pExtensionPersonaPreview.clear(); + m_pPersonaList.clear(); + m_pExtensionLabel.clear(); + SfxTabPage::dispose(); +} + + SfxTabPage* SvxPersonalizationTabPage::Create( vcl::Window *pParent, const SfxItemSet *rSet ) { return new SvxPersonalizationTabPage( pParent, *rSet ); diff --git a/cui/source/options/personalization.hxx b/cui/source/options/personalization.hxx index 4c147ab926cf..e491d8b1853e 100644 --- a/cui/source/options/personalization.hxx +++ b/cui/source/options/personalization.hxx @@ -25,15 +25,15 @@ class SvxPersonalizationTabPage : public SfxTabPage using SfxTabPage::DeactivatePage; private: - RadioButton *m_pNoPersona; ///< Just the default look, without any bitmap - RadioButton *m_pDefaultPersona; ///< Use the built-in bitmap - RadioButton *m_pOwnPersona; ///< Use the user-defined bitmap - PushButton *m_pSelectPersona; ///< Let the user select in the 'own' case - PushButton *m_vDefaultPersonaImages[3]; ///< Buttons to show the default persona images - PushButton *m_pExtensionPersonaPreview; ///< Buttons to show the last 3 personas installed via extensions - ListBox* m_pPersonaList; ///< The ListBox to show the list of installed personas + VclPtr<RadioButton> m_pNoPersona; ///< Just the default look, without any bitmap + VclPtr<RadioButton> m_pDefaultPersona; ///< Use the built-in bitmap + VclPtr<RadioButton> m_pOwnPersona; ///< Use the user-defined bitmap + VclPtr<PushButton> m_pSelectPersona; ///< Let the user select in the 'own' case + VclPtr<PushButton> m_vDefaultPersonaImages[3]; ///< Buttons to show the default persona images + VclPtr<PushButton> m_pExtensionPersonaPreview; ///< Buttons to show the last 3 personas installed via extensions + VclPtr<ListBox> m_pPersonaList; ///< The ListBox to show the list of installed personas OUString m_aPersonaSettings; ///< Header and footer images + color to be set in the settings. - FixedText *m_pExtensionLabel; ///< The "select persona installed via extensions" label + VclPtr<FixedText> m_pExtensionLabel; ///< The "select persona installed via extensions" label std::vector<OUString> m_vDefaultPersonaSettings; std::vector<OUString> m_vExtensionPersonaSettings; @@ -41,6 +41,8 @@ private: public: ::rtl::Reference< SearchAndParseThread > m_rApplyThread; SvxPersonalizationTabPage( vcl::Window *pParent, const SfxItemSet &rSet ); + virtual ~SvxPersonalizationTabPage(); + virtual void dispose() SAL_OVERRIDE; static SfxTabPage* Create( vcl::Window *pParent, const SfxItemSet *rSet ); @@ -77,13 +79,13 @@ https://addons.mozilla.org/firefox/themes ... class SelectPersonaDialog : public ModalDialog { private: - Edit *m_pEdit; ///< The input line for the search term - PushButton *m_pSearchButton; ///< The search button - FixedText *m_pProgressLabel; ///< The label for showing progress of search - PushButton *m_vResultList[9]; ///< List of buttons to show search results - PushButton *m_vSearchSuggestions[5]; ///< List of buttons for the search suggestions - PushButton *m_pOkButton; ///< The OK button - PushButton *m_pCancelButton; ///< The Cancel button + VclPtr<Edit> m_pEdit; ///< The input line for the search term + VclPtr<PushButton> m_pSearchButton; ///< The search button + VclPtr<FixedText> m_pProgressLabel; ///< The label for showing progress of search + VclPtr<PushButton> m_vResultList[9]; ///< List of buttons to show search results + VclPtr<PushButton> m_vSearchSuggestions[5]; ///< List of buttons for the search suggestions + VclPtr<PushButton> m_pOkButton; ///< The OK button + VclPtr<PushButton> m_pCancelButton; ///< The Cancel button std::vector<OUString> m_vPersonaSettings; OUString m_aSelectedPersona; @@ -91,6 +93,8 @@ private: public: SelectPersonaDialog( vcl::Window *pParent ); + virtual ~SelectPersonaDialog(); + virtual void dispose() SAL_OVERRIDE; ::rtl::Reference< SearchAndParseThread > m_rSearchThread; OUString GetSelectedPersona() const; @@ -113,7 +117,7 @@ class SearchAndParseThread: public salhelper::Thread { private: - SelectPersonaDialog *m_pPersonaDialog; + VclPtr<SelectPersonaDialog> m_pPersonaDialog; OUString m_aURL; bool m_bExecute; diff --git a/cui/source/options/securityoptions.cxx b/cui/source/options/securityoptions.cxx index 64d81bc589a4..5071769e2c40 100644 --- a/cui/source/options/securityoptions.cxx +++ b/cui/source/options/securityoptions.cxx @@ -72,6 +72,24 @@ SecurityOptionsDialog::SecurityOptionsDialog(vcl::Window* pParent, SvtSecurityOp *get<FixedImage>("lockblockuntrusted")); } +SecurityOptionsDialog::~SecurityOptionsDialog() +{ + dispose(); +} + +void SecurityOptionsDialog::dispose() +{ + m_pSaveOrSendDocsCB.clear(); + m_pSignDocsCB.clear(); + m_pPrintDocsCB.clear(); + m_pCreatePdfCB.clear(); + m_pRemovePersInfoCB.clear(); + m_pRecommPasswdCB.clear(); + m_pCtrlHyperlinkCB.clear(); + m_pBlockUntrustedRefererLinksCB.clear(); + ModalDialog::dispose(); +} + } // namespace svx diff --git a/cui/source/options/securityoptions.hxx b/cui/source/options/securityoptions.hxx index 4581ed7ff072..216e372e945f 100644 --- a/cui/source/options/securityoptions.hxx +++ b/cui/source/options/securityoptions.hxx @@ -37,18 +37,20 @@ namespace svx class SecurityOptionsDialog : public ModalDialog { private: - CheckBox* m_pSaveOrSendDocsCB; - CheckBox* m_pSignDocsCB; - CheckBox* m_pPrintDocsCB; - CheckBox* m_pCreatePdfCB; + VclPtr<CheckBox> m_pSaveOrSendDocsCB; + VclPtr<CheckBox> m_pSignDocsCB; + VclPtr<CheckBox> m_pPrintDocsCB; + VclPtr<CheckBox> m_pCreatePdfCB; - CheckBox* m_pRemovePersInfoCB; - CheckBox* m_pRecommPasswdCB; - CheckBox* m_pCtrlHyperlinkCB; - CheckBox* m_pBlockUntrustedRefererLinksCB; + VclPtr<CheckBox> m_pRemovePersInfoCB; + VclPtr<CheckBox> m_pRecommPasswdCB; + VclPtr<CheckBox> m_pCtrlHyperlinkCB; + VclPtr<CheckBox> m_pBlockUntrustedRefererLinksCB; public: SecurityOptionsDialog( vcl::Window* pParent, SvtSecurityOptions* pOptions ); + virtual ~SecurityOptionsDialog(); + virtual void dispose() SAL_OVERRIDE; bool IsSaveOrSendDocsChecked() const { return m_pSaveOrSendDocsCB->IsChecked(); } bool IsSignDocsChecked() const { return m_pSignDocsCB->IsChecked(); } diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 095b6fc3b6c8..f37c797d3f66 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -465,11 +465,11 @@ static bool lcl_isOptionHidden( sal_uInt16 _nPageId, const SvtOptionsDialogOptio struct OptionsPageInfo { - SfxTabPage* m_pPage; + VclPtr<SfxTabPage> m_pPage; sal_uInt16 m_nPageId; OUString m_sPageURL; OUString m_sEventHdl; - ExtensionsTabPage* m_pExtPage; + VclPtr<ExtensionsTabPage> m_pExtPage; OptionsPageInfo( sal_uInt16 nId ) : m_pPage( NULL ), m_nPageId( nId ), m_pExtPage( NULL ) {} }; @@ -483,7 +483,7 @@ struct OptionsGroupInfo sal_uInt16 m_nDialogId; // Id of the former dialog bool m_bLoadError; // load fails? OUString m_sPageURL; - ExtensionsTabPage* m_pExtPage; + VclPtr<ExtensionsTabPage> m_pExtPage; OptionsGroupInfo( SfxShell* pSh, SfxModule* pMod, sal_uInt16 nId ) : m_pInItemSet( NULL ), m_pOutItemSet( NULL ), m_pShell( pSh ), @@ -575,7 +575,6 @@ void OfaTreeOptionsDialog::dispose() SvtViewOptions aTabPageOpt( E_TABPAGE, OUString::number( pPageInfo->m_nPageId) ); SetViewOptUserItem( aTabPageOpt, aPageData ); } - delete pPageInfo->m_pPage; } if (pPageInfo->m_nPageId == RID_SFXPAGE_LINGU) @@ -588,8 +587,6 @@ void OfaTreeOptionsDialog::dispose() } } - delete pPageInfo->m_pExtPage; - delete pPageInfo; } pEntry = pTreeLB->Next(pEntry); @@ -602,8 +599,8 @@ void OfaTreeOptionsDialog::dispose() if(!pTreeLB->GetParent(pEntry)) { OptionsGroupInfo* pGroupInfo = static_cast<OptionsGroupInfo*>(pEntry->GetUserData()); - if ( pGroupInfo && pGroupInfo->m_pExtPage ) - delete pGroupInfo->m_pExtPage; + if ( pGroupInfo ) + pGroupInfo->m_pExtPage.clear(); delete pGroupInfo; } pEntry = pTreeLB->Next(pEntry); @@ -611,7 +608,11 @@ void OfaTreeOptionsDialog::dispose() delete pColorPageItemSet; pColorPageItemSet = NULL; deleteGroupNames(); - pTreeLB = NULL; + pOkPB.clear(); + pBackPB.clear(); + pTreeLB.clear(); + pTabBox.clear(); + mpColorPage.clear(); SfxModalDialog::dispose(); } @@ -1048,7 +1049,7 @@ void OfaTreeOptionsDialog::SelectHdl_Impl() { pPageInfo->m_pPage = ::CreateGeneralTabPage( pPageInfo->m_nPageId, pTabBox, *pColorPageItemSet ); - mpColorPage = static_cast<SvxColorTabPage*>(pPageInfo->m_pPage); + mpColorPage = static_cast<SvxColorTabPage*>(pPageInfo->m_pPage.get()); mpColorPage->SetupForViewFrame( SfxViewFrame::Current() ); } else diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx index 6628b18d4fb5..16fcd75a6de6 100644 --- a/cui/source/options/webconninfo.cxx +++ b/cui/source/options/webconninfo.cxx @@ -147,8 +147,10 @@ WebConnectionInfoDialog::~WebConnectionInfoDialog() void WebConnectionInfoDialog::dispose() { - delete m_pPasswordsLB; - m_pPasswordsLB = NULL; + m_pPasswordsLB.clear(); + m_pRemoveBtn.clear(); + m_pRemoveAllBtn.clear(); + m_pChangeBtn.clear(); ModalDialog::dispose(); } diff --git a/cui/source/options/webconninfo.hxx b/cui/source/options/webconninfo.hxx index 2cd37eb03f5e..a9d1b566d592 100644 --- a/cui/source/options/webconninfo.hxx +++ b/cui/source/options/webconninfo.hxx @@ -47,10 +47,10 @@ namespace svx class WebConnectionInfoDialog : public ModalDialog { private: - PasswordTable* m_pPasswordsLB; - PushButton* m_pRemoveBtn; - PushButton* m_pRemoveAllBtn; - PushButton* m_pChangeBtn; + VclPtr<PasswordTable> m_pPasswordsLB; + VclPtr<PushButton> m_pRemoveBtn; + VclPtr<PushButton> m_pRemoveAllBtn; + VclPtr<PushButton> m_pChangeBtn; sal_Int32 m_nPos; DECL_LINK( HeaderBarClickedHdl, SvSimpleTable* ); diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index 7405627bf192..ada97c51da63 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -257,6 +257,30 @@ void AlignmentTabPage::dispose() { delete m_pOrientHlp; m_pOrientHlp = NULL; + m_pLbHorAlign.clear(); + m_pFtIndent.clear(); + m_pEdIndent.clear(); + m_pFtVerAlign.clear(); + m_pLbVerAlign.clear(); + m_pCtrlDial.clear(); + m_pFtRotate.clear(); + m_pNfRotate.clear(); + m_pFtRefEdge.clear(); + m_pVsRefEdge.clear(); + m_pCbStacked.clear(); + m_pCbAsianMode.clear(); + m_pBoxDirection.clear(); + m_pBtnWrap.clear(); + m_pBtnHyphen.clear(); + m_pBtnShrink.clear(); + m_pLbFrameDir.clear(); + m_pFtBotLock.clear(); + m_pFtTopLock.clear(); + m_pFtCelLock.clear(); + m_pFtABCD.clear(); + m_pAlignmentFrame.clear(); + m_pOrientFrame.clear(); + m_pPropertiesFrame.clear(); SfxTabPage::dispose(); } diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 9ad3cfca5369..346fc8b342e9 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -137,6 +137,18 @@ OfaAutoCorrDlg::OfaAutoCorrDlg(vcl::Window* pParent, const SfxItemSet* _pSet ) SetCurPageId("smarttags"); } +OfaAutoCorrDlg::~OfaAutoCorrDlg() +{ + dispose(); +} + +void OfaAutoCorrDlg::dispose() +{ + m_pLanguageBox.clear(); + m_pLanguageLB.clear(); + SfxTabDialog::dispose(); +} + void OfaAutoCorrDlg::EnableLanguage(bool bEnable) { m_pLanguageBox->Enable(bEnable); @@ -192,6 +204,17 @@ OfaAutocorrOptionsPage::OfaAutocorrOptionsPage(vcl::Window* pParent, const SfxIt get(m_pCheckLB, "checklist"); } +OfaAutocorrOptionsPage::~OfaAutocorrOptionsPage() +{ + dispose(); +} + +void OfaAutocorrOptionsPage::dispose() +{ + m_pCheckLB.clear(); + SfxTabPage::dispose(); +} + SfxTabPage* OfaAutocorrOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rSet) { @@ -282,13 +305,16 @@ struct ImpUserData class OfaAutoFmtPrcntSet : public ModalDialog { - MetricField* m_pPrcntMF; + VclPtr<MetricField> m_pPrcntMF; public: OfaAutoFmtPrcntSet(vcl::Window* pParent) : ModalDialog(pParent, "PercentDialog","cui/ui/percentdialog.ui") { get(m_pPrcntMF, "margin"); } + virtual ~OfaAutoFmtPrcntSet() { dispose(); } + virtual void dispose() SAL_OVERRIDE { m_pPrcntMF.clear(); ModalDialog::dispose(); } + MetricField& GetPrcntFld() { return *m_pPrcntMF; @@ -481,9 +507,9 @@ void OfaSwAutoFmtOptionsPage::dispose() delete static_cast<ImpUserData*>(m_pCheckLB->GetUserData( MERGE_SINGLE_LINE_PARA )); delete pCheckButtonData; pCheckButtonData = NULL; - delete m_pCheckLB; - m_pCheckLB = NULL; } + m_pCheckLB.clear(); + m_pEditPB.clear(); SfxTabPage::dispose(); } @@ -920,6 +946,13 @@ void OfaAutocorrReplacePage::dispose() pCompareClass = NULL; delete pCharClass; pCharClass = NULL; + + m_pTextOnlyCB.clear(); + m_pShortED.clear(); + m_pReplaceED.clear(); + m_pReplaceTLB.clear(); + m_pNewReplacePB.clear(); + m_pDeleteReplacePB.clear(); SfxTabPage::dispose(); } @@ -1426,6 +1459,16 @@ void OfaAutocorrExceptPage::dispose() { aStringsTable.clear(); delete pCompareClass; + m_pAbbrevED.clear(); + m_pAbbrevLB.clear(); + m_pNewAbbrevPB.clear(); + m_pDelAbbrevPB.clear(); + m_pAutoAbbrevCB.clear(); + m_pDoubleCapsED.clear(); + m_pDoubleCapsLB.clear(); + m_pNewDoublePB.clear(); + m_pDelDoublePB.clear(); + m_pAutoCapsCB.clear(); SfxTabPage::dispose(); } @@ -1643,7 +1686,7 @@ void OfaAutocorrExceptPage::Reset( const SfxItemSet* ) IMPL_LINK(OfaAutocorrExceptPage, NewDelHdl, void*, pBtn) { - if((pBtn == m_pNewAbbrevPB || pBtn == m_pAbbrevED ) + if((pBtn == m_pNewAbbrevPB || pBtn == (PushButton*)m_pAbbrevED.get() ) && !m_pAbbrevED->GetText().isEmpty()) { m_pAbbrevLB->InsertEntry(m_pAbbrevED->GetText()); @@ -1654,7 +1697,7 @@ IMPL_LINK(OfaAutocorrExceptPage, NewDelHdl, void*, pBtn) m_pAbbrevLB->RemoveEntry(m_pAbbrevED->GetText()); ModifyHdl(m_pAbbrevED); } - else if((pBtn == m_pNewDoublePB || pBtn == m_pDoubleCapsED ) + else if((pBtn == m_pNewDoublePB || pBtn == (PushButton*)m_pDoubleCapsED.get() ) && !m_pDoubleCapsED->GetText().isEmpty()) { m_pDoubleCapsLB->InsertEntry(m_pDoubleCapsED->GetText()); @@ -1849,8 +1892,20 @@ void OfaQuoteTabPage::dispose() { delete pCheckButtonData; pCheckButtonData = NULL; - delete m_pSwCheckLB; - m_pSwCheckLB = NULL; + m_pSwCheckLB.clear(); + m_pCheckLB.clear(); + m_pSingleTypoCB.clear(); + m_pSglStartQuotePB.clear(); + m_pSglStartExFT.clear(); + m_pSglEndQuotePB.clear(); + m_pSglEndExFT.clear(); + m_pSglStandardPB.clear(); + m_pDoubleTypoCB.clear(); + m_pDblStartQuotePB.clear(); + m_pDblStartExFT.clear(); + m_pDblEndQuotePB.clear(); + m_pDblEndExFT.clear(); + m_pDblStandardPB.clear(); SfxTabPage::dispose(); } @@ -2174,6 +2229,26 @@ OfaAutoCompleteTabPage::OfaAutoCompleteTabPage(vcl::Window* pParent, m_pCBCollect->SetToggleHdl(LINK(this, OfaAutoCompleteTabPage, CheckHdl)); } +OfaAutoCompleteTabPage::~OfaAutoCompleteTabPage() +{ + dispose(); +} + +void OfaAutoCompleteTabPage::dispose() +{ + m_pCBActiv.clear(); + m_pCBAppendSpace.clear(); + m_pCBAsTip.clear(); + m_pCBCollect.clear(); + m_pCBRemoveList.clear(); + m_pDCBExpandKey.clear(); + m_pNFMinWordlen.clear(); + m_pNFMaxEntries.clear(); + m_pLBEntries.clear(); + m_pPBEntries.clear(); + SfxTabPage::dispose(); +} + SfxTabPage* OfaAutoCompleteTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet) { @@ -2347,6 +2422,17 @@ void OfaAutoCompleteTabPage::CopyToClipboard() const } } +OfaAutoCompleteTabPage::AutoCompleteMultiListBox::~AutoCompleteMultiListBox() +{ + dispose(); +} + +void OfaAutoCompleteTabPage::AutoCompleteMultiListBox::dispose() +{ + m_pPage.clear(); + MultiListBox::dispose(); +} + bool OfaAutoCompleteTabPage::AutoCompleteMultiListBox::PreNotify( NotifyEvent& rNEvt ) { @@ -2408,6 +2494,19 @@ OfaSmartTagOptionsTabPage::OfaSmartTagOptionsTabPage( vcl::Window* pParent, m_pSmartTagTypesLB->SetSelectHdl(LINK(this, OfaSmartTagOptionsTabPage, SelectHdl)); } +OfaSmartTagOptionsTabPage::~OfaSmartTagOptionsTabPage() +{ + dispose(); +} + +void OfaSmartTagOptionsTabPage::dispose() +{ + m_pMainCB.clear(); + m_pSmartTagTypesLB.clear(); + m_pPropertiesPB.clear(); + SfxTabPage::dispose(); +} + SfxTabPage* OfaSmartTagOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet) { return new OfaSmartTagOptionsTabPage( pParent, *rSet ); diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 15c78264e57b..0771bcd816f3 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -460,6 +460,33 @@ void SvxBackgroundTabPage::dispose() delete pParaBck_Impl; pParaBck_Impl = NULL; } + + m_pAsGrid.clear(); + m_pSelectTxt.clear(); + m_pLbSelect.clear(); + m_pTblDesc.clear(); + m_pTblLBox.clear(); + m_pParaLBox.clear(); + m_pBackGroundColorFrame.clear(); + m_pBackgroundColorSet.clear(); + m_pPreviewWin1.clear(); + m_pColTransFT.clear(); + m_pColTransMF.clear(); + m_pBtnPreview.clear(); + m_pBitmapContainer.clear(); + m_pFileFrame.clear(); + m_pBtnBrowse.clear(); + m_pBtnLink.clear(); + m_pFtUnlinked.clear(); + m_pFtFile.clear(); + m_pTypeFrame.clear(); + m_pBtnPosition.clear(); + m_pBtnArea.clear(); + m_pBtnTile.clear(); + m_pWndPosition.clear(); + m_pGraphTransFrame.clear(); + m_pGraphTransMF.clear(); + m_pPreviewWin2.clear(); SvxTabPage::dispose(); } diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index 9159dc6e977a..40788336ab58 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -334,6 +334,40 @@ SvxBorderTabPage::SvxBorderTabPage(vcl::Window* pParent, const SfxItemSet& rCore m_pMergeAdjacentBordersCB->Hide(); } +SvxBorderTabPage::~SvxBorderTabPage() +{ + dispose(); +} + +void SvxBorderTabPage::dispose() +{ + m_pWndPresets.clear(); + m_pUserDefFT.clear(); + m_pFrameSel.clear(); + m_pLbLineStyle.clear(); + m_pLbLineColor.clear(); + m_pLineWidthMF.clear(); + m_pSpacingFrame.clear(); + m_pLeftFT.clear(); + m_pLeftMF.clear(); + m_pRightFT.clear(); + m_pRightMF.clear(); + m_pTopFT.clear(); + m_pTopMF.clear(); + m_pBottomFT.clear(); + m_pBottomMF.clear(); + m_pSynchronizeCB.clear(); + m_pShadowFrame.clear(); + m_pWndShadows.clear(); + m_pFtShadowSize.clear(); + m_pEdShadowSize.clear(); + m_pFtShadowColor.clear(); + m_pLbShadowColor.clear(); + m_pPropertiesFrame.clear(); + m_pMergeWithNextCB.clear(); + m_pMergeAdjacentBordersCB.clear(); + SfxTabPage::dispose(); +} SfxTabPage* SvxBorderTabPage::Create( vcl::Window* pParent, diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index f4c10541ef8f..37c96344822f 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -183,6 +183,16 @@ SvxCharBasePage::SvxCharBasePage(vcl::Window* pParent, const OString& rID, const { } +SvxCharBasePage::~SvxCharBasePage() +{ + dispose(); +} + +void SvxCharBasePage::dispose() +{ + m_pPreviewWin.clear(); + SfxTabPage::dispose(); +} void SvxCharBasePage::ActivatePage( const SfxItemSet& rSet ) @@ -376,6 +386,36 @@ void SvxCharNamePage::dispose() { delete m_pImpl; m_pImpl = NULL; + m_pWestFrame.clear(); + m_pWestFontNameFT.clear(); + m_pWestFontNameLB.clear(); + m_pWestFontStyleFT.clear(); + m_pWestFontStyleLB.clear(); + m_pWestFontSizeFT.clear(); + m_pWestFontSizeLB.clear(); + m_pWestFontLanguageFT.clear(); + m_pWestFontLanguageLB.clear(); + m_pWestFontTypeFT.clear(); + m_pEastFrame.clear(); + m_pEastFontNameFT.clear(); + m_pEastFontNameLB.clear(); + m_pEastFontStyleFT.clear(); + m_pEastFontStyleLB.clear(); + m_pEastFontSizeFT.clear(); + m_pEastFontSizeLB.clear(); + m_pEastFontLanguageFT.clear(); + m_pEastFontLanguageLB.clear(); + m_pEastFontTypeFT.clear(); + m_pCTLFrame.clear(); + m_pCTLFontNameFT.clear(); + m_pCTLFontNameLB.clear(); + m_pCTLFontStyleFT.clear(); + m_pCTLFontStyleLB.clear(); + m_pCTLFontSizeFT.clear(); + m_pCTLFontSizeLB.clear(); + m_pCTLFontLanguageFT.clear(); + m_pCTLFontLanguageLB.clear(); + m_pCTLFontTypeFT.clear(); SvxCharBasePage::dispose(); } @@ -1336,6 +1376,37 @@ SvxCharEffectsPage::SvxCharEffectsPage( vcl::Window* pParent, const SfxItemSet& Initialize(); } +SvxCharEffectsPage::~SvxCharEffectsPage() +{ + dispose(); +} + +void SvxCharEffectsPage::dispose() +{ + m_pFontColorFT.clear(); + m_pFontColorLB.clear(); + m_pEffectsFT.clear(); + m_pEffectsLB.clear(); + m_pReliefFT.clear(); + m_pReliefLB.clear(); + m_pOutlineBtn.clear(); + m_pShadowBtn.clear(); + m_pBlinkingBtn.clear(); + m_pHiddenBtn.clear(); + m_pOverlineLB.clear(); + m_pOverlineColorFT.clear(); + m_pOverlineColorLB.clear(); + m_pStrikeoutLB.clear(); + m_pUnderlineLB.clear(); + m_pUnderlineColorFT.clear(); + m_pUnderlineColorLB.clear(); + m_pIndividualWordsBtn.clear(); + m_pEmphasisFT.clear(); + m_pEmphasisLB.clear(); + m_pPositionFT.clear(); + m_pPositionLB.clear(); + SvxCharBasePage::dispose(); +} void SvxCharEffectsPage::Initialize() @@ -1636,7 +1707,7 @@ IMPL_LINK( SvxCharEffectsPage, SelectHdl_Impl, ListBox*, pBox ) m_pOutlineBtn->Enable( bEnable ); m_pShadowBtn->Enable( bEnable ); } - else if ( m_pPositionLB != pBox ) + else if ( m_pPositionLB.get() != pBox ) { sal_Int32 nUPos = m_pUnderlineLB->GetSelectEntryPos(), nOPos = m_pOverlineLB->GetSelectEntryPos(), @@ -2578,6 +2649,35 @@ SvxCharPositionPage::SvxCharPositionPage( vcl::Window* pParent, const SfxItemSet Initialize(); } +SvxCharPositionPage::~SvxCharPositionPage() +{ + dispose(); +} + +void SvxCharPositionPage::dispose() +{ + m_pHighPosBtn.clear(); + m_pNormalPosBtn.clear(); + m_pLowPosBtn.clear(); + m_pHighLowFT.clear(); + m_pHighLowMF.clear(); + m_pHighLowRB.clear(); + m_pFontSizeFT.clear(); + m_pFontSizeMF.clear(); + m_pRotationContainer.clear(); + m_pScalingFT.clear(); + m_pScalingAndRotationFT.clear(); + m_p0degRB.clear(); + m_p90degRB.clear(); + m_p270degRB.clear(); + m_pFitToLineCB.clear(); + m_pScaleWidthMF.clear(); + m_pKerningLB.clear(); + m_pKerningFT.clear(); + m_pKerningMF.clear(); + m_pPairKerningBtn.clear(); + SvxCharBasePage::dispose(); +} void SvxCharPositionPage::Initialize() @@ -3308,6 +3408,20 @@ SvxCharTwoLinesPage::SvxCharTwoLinesPage(vcl::Window* pParent, const SfxItemSet& Initialize(); } +SvxCharTwoLinesPage::~SvxCharTwoLinesPage() +{ + dispose(); +} + +void SvxCharTwoLinesPage::dispose() +{ + m_pTwoLinesBtn.clear(); + m_pEnclosingFrame.clear(); + m_pStartBracketLB.clear(); + m_pEndBracketLB.clear(); + SvxCharBasePage::dispose(); +} + void SvxCharTwoLinesPage::Initialize() { m_pTwoLinesBtn->Check( false ); diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx index a17148abd912..de8cce55975f 100644 --- a/cui/source/tabpages/connect.cxx +++ b/cui/source/tabpages/connect.cxx @@ -131,6 +131,28 @@ SvxConnectionPage::SvxConnectionPage( vcl::Window* pWindow, const SfxItemSet& rI m_pLbType->SetSelectHdl( aLink ); } +SvxConnectionPage::~SvxConnectionPage() +{ + dispose(); +} + +void SvxConnectionPage::dispose() +{ + m_pLbType.clear(); + m_pFtLine1.clear(); + m_pMtrFldLine1.clear(); + m_pFtLine2.clear(); + m_pMtrFldLine2.clear(); + m_pFtLine3.clear(); + m_pMtrFldLine3.clear(); + m_pMtrFldHorz1.clear(); + m_pMtrFldVert1.clear(); + m_pMtrFldHorz2.clear(); + m_pMtrFldVert2.clear(); + m_pCtlPreview.clear(); + SfxTabPage::dispose(); +} + /************************************************************************* |* |* reads passed Item-Set diff --git a/cui/source/tabpages/dstribut.cxx b/cui/source/tabpages/dstribut.cxx index 86d23299112b..c82c33f0fab7 100644 --- a/cui/source/tabpages/dstribut.cxx +++ b/cui/source/tabpages/dstribut.cxx @@ -41,6 +41,17 @@ SvxDistributeDialog::SvxDistributeDialog(vcl::Window* pParent, SetTabPage(mpPage); } +SvxDistributeDialog::~SvxDistributeDialog() +{ + dispose(); +} + +void SvxDistributeDialog::dispose() +{ + mpPage.clear(); + SfxSingleTabDialog::dispose(); +} + /************************************************************************* |* |* Tabpage @@ -68,6 +79,27 @@ SvxDistributePage::SvxDistributePage(vcl::Window* pWindow, get(m_pBtnVerBottom, "verbottom"); } +SvxDistributePage::~SvxDistributePage() +{ + dispose(); +} + +void SvxDistributePage::dispose() +{ + m_pBtnHorNone.clear(); + m_pBtnHorLeft.clear(); + m_pBtnHorCenter.clear(); + m_pBtnHorDistance.clear(); + m_pBtnHorRight.clear(); + m_pBtnVerNone.clear(); + m_pBtnVerTop.clear(); + m_pBtnVerCenter.clear(); + m_pBtnVerDistance.clear(); + m_pBtnVerBottom.clear(); + SvxTabPage::dispose(); +} + + /************************************************************************* |* |* create the tabpage diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index 70c126dcf651..a1294a536cc8 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -133,6 +133,24 @@ SvxGrfCropPage::~SvxGrfCropPage() void SvxGrfCropPage::dispose() { aTimer.Stop(); + m_pCropFrame.clear(); + m_pZoomConstRB.clear(); + m_pSizeConstRB.clear(); + m_pLeftMF.clear(); + m_pRightMF.clear(); + m_pTopMF.clear(); + m_pBottomMF.clear(); + m_pScaleFrame.clear(); + m_pWidthZoomMF.clear(); + m_pHeightZoomMF.clear(); + m_pSizeFrame.clear(); + m_pWidthMF.clear(); + m_pHeightMF.clear(); + m_pOrigSizeGrid.clear(); + m_pOrigSizeFT.clear(); + m_pOrigSizePB.clear(); + m_pExampleWN.clear(); + pLastCropField.clear(); SfxTabPage::dispose(); } diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx index 243d9dcf038d..1f9c31d46e3e 100644 --- a/cui/source/tabpages/labdlg.cxx +++ b/cui/source/tabpages/labdlg.cxx @@ -138,6 +138,26 @@ SvxCaptionTabPage::SvxCaptionTabPage(vcl::Window* pParent, const SfxItemSet& rIn m_pCB_LAENGE->SetClickHdl(LINK(this,SvxCaptionTabPage,LineOptHdl_Impl)); } +SvxCaptionTabPage::~SvxCaptionTabPage() +{ + dispose(); +} + +void SvxCaptionTabPage::dispose() +{ + m_pCT_CAPTTYPE.clear(); + m_pMF_ABSTAND.clear(); + m_pLB_ANSATZ.clear(); + m_pFT_UM.clear(); + m_pMF_ANSATZ.clear(); + m_pFT_ANSATZ_REL.clear(); + m_pLB_ANSATZ_REL.clear(); + m_pFT_LAENGE.clear(); + m_pMF_LAENGE.clear(); + m_pCB_LAENGE.clear(); + SfxTabPage::dispose(); +} + void SvxCaptionTabPage::Construct() { // set rectangle and working area diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index 43330b99c046..4bc1917a8fde 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -44,16 +44,16 @@ class _SfxMacroTabPage_Impl public: _SfxMacroTabPage_Impl(); - OUString maStaticMacroLBLabel; - PushButton* pAssignPB; - PushButton* pDeletePB; - OUString sStrEvent; - OUString sAssignedMacro; - MacroEventListBox* pEventLB; - VclFrame* pGroupFrame; - SfxConfigGroupListBox* pGroupLB; - VclFrame* pMacroFrame; - SfxConfigFunctionListBox* pMacroLB; + OUString maStaticMacroLBLabel; + VclPtr<PushButton> pAssignPB; + VclPtr<PushButton> pDeletePB; + OUString sStrEvent; + OUString sAssignedMacro; + VclPtr<MacroEventListBox> pEventLB; + VclPtr<VclFrame> pGroupFrame; + VclPtr<SfxConfigGroupListBox> pGroupLB; + VclPtr<VclFrame> pMacroFrame; + VclPtr<SfxConfigFunctionListBox> pMacroLB; bool bReadOnly; Idle maFillGroupIdle; diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx index f6b906d9a352..ee178dcf9ce1 100644 --- a/cui/source/tabpages/measure.cxx +++ b/cui/source/tabpages/measure.cxx @@ -148,6 +148,31 @@ SvxMeasurePage::SvxMeasurePage( vcl::Window* pWindow, const SfxItemSet& rInAttrs m_pLbUnit->SetSelectHdl( aLink ); } +SvxMeasurePage::~SvxMeasurePage() +{ + dispose(); +} + +void SvxMeasurePage::dispose() +{ + m_pMtrFldLineDist.clear(); + m_pMtrFldHelplineOverhang.clear(); + m_pMtrFldHelplineDist.clear(); + m_pMtrFldHelpline1Len.clear(); + m_pMtrFldHelpline2Len.clear(); + m_pTsbBelowRefEdge.clear(); + m_pMtrFldDecimalPlaces.clear(); + m_pCtlPosition.clear(); + m_pTsbAutoPosV.clear(); + m_pTsbAutoPosH.clear(); + m_pTsbShowUnit.clear(); + m_pLbUnit.clear(); + m_pTsbParallel.clear(); + m_pFtAutomatic.clear(); + m_pCtlPreview.clear(); + SvxTabPage::dispose(); +} + /************************************************************************* |* |* read the delivered Item-Set diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index cab5ff266877..9b8b85bb56f7 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -292,6 +292,30 @@ void SvxNumberFormatTabPage::dispose() pNumFmtShell = NULL; delete pNumItem; pNumItem = NULL; + m_pFtCategory.clear(); + m_pLbCategory.clear(); + m_pFtFormat.clear(); + m_pLbCurrency.clear(); + m_pLbFormat.clear(); + m_pFtLanguage.clear(); + m_pLbLanguage.clear(); + m_pCbSourceFormat.clear(); + m_pWndPreview.clear(); + m_pFtOptions.clear(); + m_pFtDecimals.clear(); + m_pEdDecimals.clear(); + m_pBtnNegRed.clear(); + m_pFtLeadZeroes.clear(); + m_pEdLeadZeroes.clear(); + m_pBtnThousand.clear(); + m_pFormatCodeFrame.clear(); + m_pEdFormat.clear(); + m_pIbAdd.clear(); + m_pIbInfo.clear(); + m_pIbRemove.clear(); + m_pFtComment.clear(); + m_pEdComment.clear(); + pLastActivWindow.clear(); SfxTabPage::dispose(); } @@ -1653,7 +1677,7 @@ bool SvxNumberFormatTabPage::PreNotify( NotifyEvent& rNEvt ) { if(rNEvt.GetType()==MouseNotifyEvent::LOSEFOCUS) { - if ( rNEvt.GetWindow() == dynamic_cast< vcl::Window* >( m_pEdComment ) && !m_pEdComment->IsVisible() ) + if ( rNEvt.GetWindow() == dynamic_cast< vcl::Window* >( m_pEdComment.get() ) && !m_pEdComment->IsVisible() ) { pLastActivWindow = NULL; } diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 56d500e35164..3c0c619859e0 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -228,6 +228,7 @@ void SvxSingleNumPickTabPage::dispose() pActNum = NULL; delete pSaveNum; pSaveNum = NULL; + m_pExamplesVS.clear(); SfxTabPage::dispose(); } @@ -397,6 +398,7 @@ void SvxBulletPickTabPage::dispose() pActNum = NULL; delete pSaveNum; pSaveNum = NULL; + m_pExamplesVS.clear(); SfxTabPage::dispose(); } @@ -602,6 +604,7 @@ void SvxNumPickTabPage::dispose() pActNum = NULL; delete pSaveNum; pSaveNum = NULL; + m_pExamplesVS.clear(); SfxTabPage::dispose(); } @@ -851,6 +854,8 @@ void SvxBitmapPickTabPage::dispose() pActNum = NULL; delete pSaveNum; pSaveNum = NULL; + m_pErrorText.clear(); + m_pExamplesVS.clear(); SfxTabPage::dispose(); } @@ -1165,12 +1170,44 @@ void SvxNumOptionsTabPage::dispose() if (m_pBitmapMB) { delete m_pBitmapMB->GetPopupMenu()->GetPopupMenu(m_nGalleryId); - m_pBitmapMB = NULL; } delete pActNum; pActNum = NULL; delete pSaveNum; pSaveNum = NULL; + m_pLevelLB.clear(); + m_pFmtLB.clear(); + m_pSeparatorFT.clear(); + m_pPrefixFT.clear(); + m_pPrefixED.clear(); + m_pSuffixFT.clear(); + m_pSuffixED.clear(); + m_pCharFmtFT.clear(); + m_pCharFmtLB.clear(); + m_pBulColorFT.clear(); + m_pBulColLB.clear(); + m_pBulRelSizeFT.clear(); + m_pBulRelSizeMF.clear(); + m_pAllLevelFT.clear(); + m_pAllLevelNF.clear(); + m_pStartFT.clear(); + m_pStartED.clear(); + m_pBulletFT.clear(); + m_pBulletPB.clear(); + m_pAlignFT.clear(); + m_pAlignLB.clear(); + m_pBitmapFT.clear(); + m_pBitmapMB.clear(); + m_pWidthFT.clear(); + m_pWidthMF.clear(); + m_pHeightFT.clear(); + m_pHeightMF.clear(); + m_pRatioCB.clear(); + m_pOrientFT.clear(); + m_pOrientLB.clear(); + m_pAllLevelsFrame.clear(); + m_pSameLevelCB.clear(); + m_pPreviewWIN.clear(); SfxTabPage::dispose(); } @@ -2736,6 +2773,28 @@ void SvxNumPositionTabPage::dispose() pActNum = NULL; delete pSaveNum; pSaveNum = NULL; + m_pLevelLB.clear(); + m_pDistBorderFT.clear(); + m_pDistBorderMF.clear(); + m_pRelativeCB.clear(); + m_pIndentFT.clear(); + m_pIndentMF.clear(); + m_pDistNumFT.clear(); + m_pDistNumMF.clear(); + m_pAlignFT.clear(); + m_pAlignLB.clear(); + m_pLabelFollowedByFT.clear(); + m_pLabelFollowedByLB.clear(); + m_pListtabFT.clear(); + m_pListtabMF.clear(); + m_pAlign2FT.clear(); + m_pAlign2LB.clear(); + m_pAlignedAtFT.clear(); + m_pAlignedAtMF.clear(); + m_pIndentAtFT.clear(); + m_pIndentAtMF.clear(); + m_pStandardPB.clear(); + m_pPreviewWIN.clear(); SfxTabPage::dispose(); } diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 6c8c41eaa0bd..fb67d8b445d7 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -377,6 +377,35 @@ void SvxPageDescPage::dispose() mpDefPrinter = NULL; mbDelPrinter = false; } + m_pPaperSizeBox.clear(); + m_pPaperWidthEdit.clear(); + m_pPaperHeightEdit.clear(); + m_pOrientationFT.clear(); + m_pPortraitBtn.clear(); + m_pLandscapeBtn.clear(); + m_pBspWin.clear(); + m_pTextFlowLbl.clear(); + m_pTextFlowBox.clear(); + m_pPaperTrayBox.clear(); + m_pLeftMarginLbl.clear(); + m_pLeftMarginEdit.clear(); + m_pRightMarginLbl.clear(); + m_pRightMarginEdit.clear(); + m_pTopMarginEdit.clear(); + m_pBottomMarginEdit.clear(); + m_pPageText.clear(); + m_pLayoutBox.clear(); + m_pNumberFormatBox.clear(); + m_pTblAlignFT.clear(); + m_pHorzBox.clear(); + m_pVertBox.clear(); + m_pAdaptBox.clear(); + m_pRegisterCB.clear(); + m_pRegisterFT.clear(); + m_pRegisterLB.clear(); + m_pInsideLbl.clear(); + m_pOutsideLbl.clear(); + m_pPrintRangeQueryText.clear(); SfxTabPage::dispose(); } diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index d80ed2f1b1a6..d8ecedeb5220 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -654,6 +654,33 @@ SvxStdParagraphTabPage::SvxStdParagraphTabPage( vcl::Window* pParent, const Sfx setPreviewsToSamePlace(pParent, this); } +SvxStdParagraphTabPage::~SvxStdParagraphTabPage() +{ + dispose(); +} + +void SvxStdParagraphTabPage::dispose() +{ + m_pLeftIndent.clear(); + m_pRightLabel.clear(); + m_pRightIndent.clear(); + m_pFLineLabel.clear(); + m_pFLineIndent.clear(); + m_pAutoCB.clear(); + m_pTopDist.clear(); + m_pBottomDist.clear(); + m_pContextualCB.clear(); + m_pLineDist.clear(); + m_pLineDistAtLabel.clear(); + m_pLineDistAtPercentBox.clear(); + m_pLineDistAtMetricBox.clear(); + m_pAbsDist.clear(); + m_pExampleWin.clear(); + m_pRegisterFL.clear(); + m_pRegisterCB.clear(); + SfxTabPage::dispose(); +} + void SvxStdParagraphTabPage::EnableNegativeMode() { m_pLeftIndent->SetMin(-9999); @@ -1012,6 +1039,31 @@ SvxParaAlignTabPage::SvxParaAlignTabPage( vcl::Window* pParent, const SfxItemSet setPreviewsToSamePlace(pParent, this); } +SvxParaAlignTabPage::~SvxParaAlignTabPage() +{ + dispose(); +} + +void SvxParaAlignTabPage::dispose() +{ + m_pLeft.clear(); + m_pRight.clear(); + m_pCenter.clear(); + m_pJustify.clear(); + m_pLeftBottom.clear(); + m_pRightTop.clear(); + m_pLastLineFT.clear(); + m_pLastLineLB.clear(); + m_pExpandCB.clear(); + m_pSnapToGridCB.clear(); + m_pExampleWin.clear(); + m_pVertAlignFL.clear(); + m_pVertAlignLB.clear(); + m_pPropertiesFL.clear(); + m_pTextDirectionLB.clear(); + SfxTabPage::dispose(); +} + int SvxParaAlignTabPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) @@ -1891,6 +1943,40 @@ SvxExtParagraphTabPage::SvxExtParagraphTabPage( vcl::Window* pParent, const SfxI } } +SvxExtParagraphTabPage::~SvxExtParagraphTabPage() +{ + dispose(); +} + +void SvxExtParagraphTabPage::dispose() +{ + m_pHyphenBox.clear(); + m_pBeforeText.clear(); + m_pExtHyphenBeforeBox.clear(); + m_pAfterText.clear(); + m_pExtHyphenAfterBox.clear(); + m_pMaxHyphenLabel.clear(); + m_pMaxHyphenEdit.clear(); + m_pPageBreakBox.clear(); + m_pBreakTypeFT.clear(); + m_pBreakTypeLB.clear(); + m_pBreakPositionFT.clear(); + m_pBreakPositionLB.clear(); + m_pApplyCollBtn.clear(); + m_pApplyCollBox.clear(); + m_pPagenumText.clear(); + m_pPagenumEdit.clear(); + m_pKeepTogetherBox.clear(); + m_pKeepParaBox.clear(); + m_pOrphanBox.clear(); + m_pOrphanRowNo.clear(); + m_pOrphanRowLabel.clear(); + m_pWidowBox.clear(); + m_pWidowRowNo.clear(); + m_pWidowRowLabel.clear(); + SfxTabPage::dispose(); +} + IMPL_LINK_NOARG(SvxExtParagraphTabPage, PageBreakHdl_Impl) { switch ( m_pPageBreakBox->GetState() ) @@ -2093,6 +2179,19 @@ SvxAsianTabPage::SvxAsianTabPage( vcl::Window* pParent, const SfxItemSet& rSet ) } +SvxAsianTabPage::~SvxAsianTabPage() +{ + dispose(); +} + +void SvxAsianTabPage::dispose() +{ + m_pForbiddenRulesCB.clear(); + m_pHangingPunctCB.clear(); + m_pScriptSpaceCB.clear(); + SfxTabPage::dispose(); +} + SfxTabPage* SvxAsianTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { return new SvxAsianTabPage(pParent, *rSet); diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index 305b877aad1b..d9c26b4bcbfd 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -588,6 +588,43 @@ SvxSwPosSizeTabPage::SvxSwPosSizeTabPage(vcl::Window* pParent, const SfxItemSet& m_pPositionCB->SetClickHdl(LINK(this, SvxSwPosSizeTabPage, ProtectHdl)); } +SvxSwPosSizeTabPage::~SvxSwPosSizeTabPage() +{ + dispose(); +} + +void SvxSwPosSizeTabPage::dispose() +{ + m_pWidthMF.clear(); + m_pHeightMF.clear(); + m_pKeepRatioCB.clear(); + m_pToPageRB.clear(); + m_pToParaRB.clear(); + m_pToCharRB.clear(); + m_pAsCharRB.clear(); + m_pToFrameRB.clear(); + m_pPositionCB.clear(); + m_pSizeCB.clear(); + m_pPosFrame.clear(); + m_pHoriFT.clear(); + m_pHoriLB.clear(); + m_pHoriByFT.clear(); + m_pHoriByMF.clear(); + m_pHoriToFT.clear(); + m_pHoriToLB.clear(); + m_pHoriMirrorCB.clear(); + m_pVertFT.clear(); + m_pVertLB.clear(); + m_pVertByFT.clear(); + m_pVertByMF.clear(); + m_pVertToFT.clear(); + m_pVertToLB.clear(); + m_pFollowCB.clear(); + m_pExampleWN.clear(); + SfxTabPage::dispose(); +} + + namespace { struct FrmMaps diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index 6167f0db6d32..3820ea8d32e8 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -38,7 +38,7 @@ class TabWin_Impl : public vcl::Window { - SvxTabulatorTabPage* mpPage; + VclPtr<SvxTabulatorTabPage> mpPage; private: sal_uInt16 nTabStyle; @@ -50,6 +50,8 @@ public: , nTabStyle(0) { } + virtual ~TabWin_Impl() { dispose(); } + virtual void dispose() SAL_OVERRIDE { mpPage.clear(); vcl::Window::dispose(); } virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; @@ -185,6 +187,37 @@ SvxTabulatorTabPage::SvxTabulatorTabPage( vcl::Window* pParent, const SfxItemSet aAktTab.GetDecimal() = rLocaleWrapper.getNumDecimalSep()[0]; } +SvxTabulatorTabPage::~SvxTabulatorTabPage() +{ + dispose(); +} + +void SvxTabulatorTabPage::dispose() +{ + m_pTabBox.clear(); + m_pLeftTab.clear(); + m_pRightTab.clear(); + m_pCenterTab.clear(); + m_pDezTab.clear(); + m_pLeftWin.clear(); + m_pRightWin.clear(); + m_pCenterWin.clear(); + m_pDezWin.clear(); + m_pDezCharLabel.clear(); + m_pDezChar.clear(); + m_pNoFillChar.clear(); + m_pFillPoints.clear(); + m_pFillDashLine.clear(); + m_pFillSolidLine.clear(); + m_pFillSpecial.clear(); + m_pFillChar.clear(); + m_pNewBtn.clear(); + m_pDelAllBtn.clear(); + m_pDelBtn.clear(); + m_pTypeFrame.clear(); + m_pFillFrame.clear(); + SfxTabPage::dispose(); +} bool SvxTabulatorTabPage::FillItemSet( SfxItemSet* rSet ) { diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx index 23f9d9980a37..45d48ecdaf35 100644 --- a/cui/source/tabpages/textanim.cxx +++ b/cui/source/tabpages/textanim.cxx @@ -122,6 +122,32 @@ SvxTextAnimationPage::SvxTextAnimationPage( vcl::Window* pWindow, const SfxItemS m_pBtnDown->SetClickHdl( aLink ); } +SvxTextAnimationPage::~SvxTextAnimationPage() +{ + dispose(); +} + +void SvxTextAnimationPage::dispose() +{ + m_pLbEffect.clear(); + m_pBoxDirection.clear(); + m_pBtnUp.clear(); + m_pBtnLeft.clear(); + m_pBtnRight.clear(); + m_pBtnDown.clear(); + m_pFlProperties.clear(); + m_pTsbStartInside.clear(); + m_pTsbStopInside.clear(); + m_pBoxCount.clear(); + m_pTsbEndless.clear(); + m_pNumFldCount.clear(); + m_pTsbPixel.clear(); + m_pMtrFldAmount.clear(); + m_pTsbAuto.clear(); + m_pMtrFldDelay.clear(); + SfxTabPage::dispose(); +} + /************************************************************************* |* |* reads the passed item set diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index 7805f4cfc3cf..de0eeab1be24 100644 --- a/cui/source/tabpages/textattr.cxx +++ b/cui/source/tabpages/textattr.cxx @@ -96,6 +96,30 @@ SvxTextAttrPage::SvxTextAttrPage(vcl::Window* pWindow, const SfxItemSet& rInAttr m_pTsbFullWidth->SetClickHdl(LINK( this, SvxTextAttrPage, ClickFullWidthHdl_Impl ) ); } +SvxTextAttrPage::~SvxTextAttrPage() +{ + dispose(); +} + +void SvxTextAttrPage::dispose() +{ + m_pTsbAutoGrowWidth.clear(); + m_pTsbAutoGrowHeight.clear(); + m_pTsbFitToSize.clear(); + m_pTsbContour.clear(); + m_pTsbWordWrapText.clear(); + m_pTsbAutoGrowSize.clear(); + m_pFlDistance.clear(); + m_pMtrFldLeft.clear(); + m_pMtrFldRight.clear(); + m_pMtrFldTop.clear(); + m_pMtrFldBottom.clear(); + m_pFlPosition.clear(); + m_pCtlPosition.clear(); + m_pTsbFullWidth.clear(); + SvxTabPage::dispose(); +} + /************************************************************************* |* |* reads the passed item set diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index 5d4abf6f58a0..9f13a52d928b 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -118,6 +118,33 @@ IMPL_LINK_NOARG(SvxTransparenceTabPage, ClickTransGradientHdl_Impl) return 0L; } +SvxTransparenceTabPage::~SvxTransparenceTabPage() +{ + dispose(); +} + +void SvxTransparenceTabPage::dispose() +{ + m_pRbtTransOff.clear(); + m_pRbtTransLinear.clear(); + m_pRbtTransGradient.clear(); + m_pMtrTransparent.clear(); + m_pGridGradient.clear(); + m_pLbTrgrGradientType.clear(); + m_pFtTrgrCenterX.clear(); + m_pMtrTrgrCenterX.clear(); + m_pFtTrgrCenterY.clear(); + m_pMtrTrgrCenterY.clear(); + m_pFtTrgrAngle.clear(); + m_pMtrTrgrAngle.clear(); + m_pMtrTrgrBorder.clear(); + m_pMtrTrgrStartValue.clear(); + m_pMtrTrgrEndValue.clear(); + m_pCtlBitmapPreview.clear(); + m_pCtlXRectPreview.clear(); + SvxTabPage::dispose(); +} + void SvxTransparenceTabPage::ActivateLinear(bool bActivate) { m_pMtrTransparent->Enable(bActivate); @@ -768,6 +795,51 @@ SvxAreaTabPage::SvxAreaTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs m_pCtlXRectPreview->set_height_request(aSize2.Height()); } +SvxAreaTabPage::~SvxAreaTabPage() +{ + dispose(); +} + +void SvxAreaTabPage::dispose() +{ + m_pTypeLB.clear(); + m_pFillLB.clear(); + m_pLbColor.clear(); + m_pLbGradient.clear(); + m_pLbHatching.clear(); + m_pLbBitmap.clear(); + m_pCtlBitmapPreview.clear(); + m_pTsbStepCount.clear(); + m_pFlStepCount.clear(); + m_pNumFldStepCount.clear(); + m_pFlHatchBckgrd.clear(); + m_pCbxHatchBckgrd.clear(); + m_pLbHatchBckgrdColor.clear(); + m_pBxBitmap.clear(); + m_pFlSize.clear(); + m_pTsbOriginal.clear(); + m_pTsbScale.clear(); + m_pGridX_Y.clear(); + m_pFtXSize.clear(); + m_pMtrFldXSize.clear(); + m_pFtYSize.clear(); + m_pMtrFldYSize.clear(); + m_pFlPosition.clear(); + m_pCtlPosition.clear(); + m_pGridOffset.clear(); + m_pMtrFldXOffset.clear(); + m_pMtrFldYOffset.clear(); + m_pBxTile.clear(); + m_pTsbTile.clear(); + m_pTsbStretch.clear(); + m_pFlOffset.clear(); + m_pRbtRow.clear(); + m_pRbtColumn.clear(); + m_pMtrFldOffset.clear(); + m_pCtlXRectPreview.clear(); + m_pBtnImport.clear(); + SvxTabPage::dispose(); +} void SvxAreaTabPage::Construct() diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index faf565ce7549..59e1b8b03e22 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -129,6 +129,19 @@ void SvxBitmapTabPage::dispose() { delete m_pBitmapCtl; m_pBitmapCtl = NULL; + m_pBxPixelEditor.clear(); + m_pCtlPixel.clear(); + m_pLbColor.clear(); + m_pLbBackgroundColor.clear(); + m_pLbBitmapsHidden.clear(); + m_pLbBitmaps.clear(); + m_pCtlPreview.clear(); + m_pBtnAdd.clear(); + m_pBtnModify.clear(); + m_pBtnImport.clear(); + m_pBtnDelete.clear(); + m_pBtnLoad.clear(); + m_pBtnSave.clear(); SvxTabPage::dispose(); } @@ -974,7 +987,7 @@ void SvxBitmapTabPage::PointChanged( vcl::Window* pWindow, RECT_POINT ) vcl::Window* SvxBitmapTabPage::GetParentLabeledBy( const vcl::Window* pLabeled ) const { if (pLabeled == m_pLbBitmaps) - return const_cast<FixedText*>(m_pLbBitmapsHidden); + return const_cast<FixedText*>(m_pLbBitmapsHidden.get()); else return SvxTabPage::GetParentLabeledBy (pLabeled); } diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index 3d74649ae106..b9c73e424f26 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -51,8 +51,8 @@ using namespace com::sun::star; XPropertyListRef SvxColorTabPage::GetList() { - SvxAreaTabDialog* pArea = dynamic_cast< SvxAreaTabDialog* >( mpTopDlg ); - SvxLineTabDialog* pLine = dynamic_cast< SvxLineTabDialog* >( mpTopDlg ); + SvxAreaTabDialog* pArea = dynamic_cast< SvxAreaTabDialog* >( mpTopDlg.get() ); + SvxLineTabDialog* pLine = dynamic_cast< SvxLineTabDialog* >( mpTopDlg.get() ); XColorListRef pList; if( pArea ) @@ -162,8 +162,8 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickLoadHdl_Impl) if( pList->Load() ) { // check whether the table may be deleted: - SvxAreaTabDialog* pArea = dynamic_cast< SvxAreaTabDialog* >( mpTopDlg ); - SvxLineTabDialog* pLine = dynamic_cast< SvxLineTabDialog* >( mpTopDlg ); + SvxAreaTabDialog* pArea = dynamic_cast< SvxAreaTabDialog* >( mpTopDlg.get() ); + SvxLineTabDialog* pLine = dynamic_cast< SvxLineTabDialog* >( mpTopDlg.get() ); // FIXME: want to have a generic set and get method by type ... if( pArea ) @@ -404,6 +404,30 @@ void SvxColorTabPage::dispose() { delete pShadow; pShadow = NULL; + mpTopDlg.clear(); + m_pBoxEmbed.clear(); + m_pBtnLoad.clear(); + m_pBtnSave.clear(); + m_pTableName.clear(); + m_pEdtName.clear(); + m_pLbColor.clear(); + m_pValSetColorList.clear(); + m_pCtlPreviewOld.clear(); + m_pCtlPreviewNew.clear(); + m_pLbColorModel.clear(); + m_pRGB.clear(); + m_pR.clear(); + m_pG.clear(); + m_pB.clear(); + m_pCMYK.clear(); + m_pC.clear(); + m_pY.clear(); + m_pM.clear(); + m_pK.clear(); + m_pBtnAdd.clear(); + m_pBtnModify.clear(); + m_pBtnWorkOn.clear(); + m_pBtnDelete.clear(); SfxTabPage::dispose(); } diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index 98caa11d0905..4713c93e2097 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -139,6 +139,34 @@ SvxGradientTabPage::SvxGradientTabPage setPreviewsToSamePlace(pParent, this); } +SvxGradientTabPage::~SvxGradientTabPage() +{ + dispose(); +} + +void SvxGradientTabPage::dispose() +{ + m_pLbGradientType.clear(); + m_pFtCenterX.clear(); + m_pMtrCenterX.clear(); + m_pFtCenterY.clear(); + m_pMtrCenterY.clear(); + m_pFtAngle.clear(); + m_pMtrAngle.clear(); + m_pMtrBorder.clear(); + m_pLbColorFrom.clear(); + m_pMtrColorFrom.clear(); + m_pLbColorTo.clear(); + m_pMtrColorTo.clear(); + m_pLbGradients.clear(); + m_pCtlPreview.clear(); + m_pBtnAdd.clear(); + m_pBtnModify.clear(); + m_pBtnDelete.clear(); + m_pBtnLoad.clear(); + m_pBtnSave.clear(); + SfxTabPage::dispose(); +} void SvxGradientTabPage::Construct() diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index 782b98b66d72..2022fed19ea5 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -137,6 +137,27 @@ SvxHatchTabPage::SvxHatchTabPage setPreviewsToSamePlace(pParent, this); } +SvxHatchTabPage::~SvxHatchTabPage() +{ + dispose(); +} + +void SvxHatchTabPage::dispose() +{ + m_pMtrDistance.clear(); + m_pMtrAngle.clear(); + m_pCtlAngle.clear(); + m_pLbLineType.clear(); + m_pLbLineColor.clear(); + m_pLbHatchings.clear(); + m_pCtlPreview.clear(); + m_pBtnAdd.clear(); + m_pBtnModify.clear(); + m_pBtnDelete.clear(); + m_pBtnLoad.clear(); + m_pBtnSave.clear(); + SvxTabPage::dispose(); +} void SvxHatchTabPage::Construct() diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index e6fe6a96f899..8bc7abd4d22d 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -253,6 +253,35 @@ void SvxLineTabPage::dispose() } aGrfBrushItems.clear(); + m_pBoxColor.clear(); + m_pLbLineStyle.clear(); + m_pLbColor.clear(); + m_pBoxWidth.clear(); + m_pMtrLineWidth.clear(); + m_pBoxTransparency.clear(); + m_pMtrTransparent.clear(); + m_pFlLineEnds.clear(); + m_pBoxArrowStyles.clear(); + m_pLbStartStyle.clear(); + m_pBoxStart.clear(); + m_pMtrStartWidth.clear(); + m_pTsbCenterStart.clear(); + m_pBoxEnd.clear(); + m_pLbEndStyle.clear(); + m_pMtrEndWidth.clear(); + m_pTsbCenterEnd.clear(); + m_pCbxSynchronize.clear(); + m_pCtlPreview.clear(); + m_pFLEdgeStyle.clear(); + m_pGridEdgeCaps.clear(); + m_pLBEdgeStyle.clear(); + m_pLBCapStyle.clear(); + m_pFlSymbol.clear(); + m_pGridIconSize.clear(); + m_pSymbolMB.clear(); + m_pSymbolWidthMF.clear(); + m_pSymbolHeightMF.clear(); + m_pSymbolRatioCB.clear(); SvxTabPage::dispose(); } diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index 04b7ff0905cc..0d84db38fa2e 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -154,6 +154,31 @@ SvxLineDefTabPage::SvxLineDefTabPage pDashList = NULL; } +SvxLineDefTabPage::~SvxLineDefTabPage() +{ + dispose(); +} + +void SvxLineDefTabPage::dispose() +{ + m_pLbLineStyles.clear(); + m_pLbType1.clear(); + m_pLbType2.clear(); + m_pNumFldNumber1.clear(); + m_pNumFldNumber2.clear(); + m_pMtrLength1.clear(); + m_pMtrLength2.clear(); + m_pMtrDistance.clear(); + m_pCbxSynchronize.clear(); + m_pBtnAdd.clear(); + m_pBtnModify.clear(); + m_pBtnDelete.clear(); + m_pBtnLoad.clear(); + m_pBtnSave.clear(); + m_pCtlPreview.clear(); + SfxTabPage::dispose(); +} + void SvxLineDefTabPage::Construct() { // Line style fill; do *not* add default fields here diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index 5235d1dd7325..4163b575a8f0 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -105,6 +105,24 @@ SvxLineEndDefTabPage::SvxLineEndDefTabPage } +SvxLineEndDefTabPage::~SvxLineEndDefTabPage() +{ + dispose(); +} + +void SvxLineEndDefTabPage::dispose() +{ + m_pEdtName.clear(); + m_pLbLineEnds.clear(); + m_pBtnAdd.clear(); + m_pBtnModify.clear(); + m_pBtnDelete.clear(); + m_pBtnLoad.clear(); + m_pBtnSave.clear(); + m_pCtlPreview.clear(); + SfxTabPage::dispose(); +} + void SvxLineEndDefTabPage::Resize() { rXLSet.Put(XLineStartWidthItem(m_pCtlPreview->GetOutputSize().Height() / 2 )); diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx index b163ceb16d05..6b3f38eb19f9 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.cxx @@ -165,6 +165,23 @@ SvxShadowTabPage::SvxShadowTabPage( vcl::Window* pParent, const SfxItemSet& rInA m_pMtrDistance->SetModifyHdl( aLink ); } +SvxShadowTabPage::~SvxShadowTabPage() +{ + dispose(); +} + +void SvxShadowTabPage::dispose() +{ + m_pTsbShowShadow.clear(); + m_pGridShadow.clear(); + m_pCtlPosition.clear(); + m_pMtrDistance.clear(); + m_pLbShadowColor.clear(); + m_pMtrTransparent.clear(); + m_pCtlXRectPreview.clear(); + SvxTabPage::dispose(); +} + void SvxShadowTabPage::Construct() { m_pLbShadowColor->Fill( pColorList ); diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index ce21ccf236eb..31a5bbb974c3 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -197,6 +197,23 @@ SvxAngleTabPage::SvxAngleTabPage(vcl::Window* pParent, const SfxItemSet& rInAttr m_pCtlAngle->SetLinkedField( m_pNfAngle, 2 ); } +SvxAngleTabPage::~SvxAngleTabPage() +{ + dispose(); +} + +void SvxAngleTabPage::dispose() +{ + m_pFlPosition.clear(); + m_pMtrPosX.clear(); + m_pMtrPosY.clear(); + m_pCtlRect.clear(); + m_pFlAngle.clear(); + m_pNfAngle.clear(); + m_pCtlAngle.clear(); + SvxTabPage::dispose(); +} + void SvxAngleTabPage::Construct() { DBG_ASSERT(pView, "No valid view (!)"); @@ -422,6 +439,20 @@ SvxSlantTabPage::SvxSlantTabPage(vcl::Window* pParent, const SfxItemSet& rInAttr ePoolUnit = pPool->GetMetric( SID_ATTR_TRANSFORM_POS_X ); } +SvxSlantTabPage::~SvxSlantTabPage() +{ + dispose(); +} + +void SvxSlantTabPage::dispose() +{ + m_pFlRadius.clear(); + m_pMtrRadius.clear(); + m_pFlAngle.clear(); + m_pMtrAngle.clear(); + SvxTabPage::dispose(); +} + void SvxSlantTabPage::Construct() { // get the range @@ -637,6 +668,33 @@ SvxPositionSizeTabPage::SvxPositionSizeTabPage(vcl::Window* pParent, const SfxIt } +SvxPositionSizeTabPage::~SvxPositionSizeTabPage() +{ + dispose(); +} + +void SvxPositionSizeTabPage::dispose() +{ + m_pFlPosition.clear(); + m_pMtrPosX.clear(); + m_pMtrPosY.clear(); + m_pCtlPos.clear(); + m_pFlSize.clear(); + m_pFtWidth.clear(); + m_pMtrWidth.clear(); + m_pFtHeight.clear(); + m_pMtrHeight.clear(); + m_pCbxScale.clear(); + m_pCtlSize.clear(); + m_pFlProtect.clear(); + m_pTsbPosProtect.clear(); + m_pTsbSizeProtect.clear(); + m_pFlAdjust.clear(); + m_pTsbAutoGrowWidth.clear(); + m_pTsbAutoGrowHeight.clear(); + SvxTabPage::dispose(); +} + void SvxPositionSizeTabPage::Construct() { // get range and work area |