diff options
Diffstat (limited to 'cui/source/inc')
71 files changed, 1527 insertions, 1344 deletions
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 7b8646fee38b..411df36dd123 100644 --- a/cui/source/inc/SpellDialog.hxx +++ b/cui/source/inc/SpellDialog.hxx @@ -76,7 +76,6 @@ protected: public: SentenceEditWindow_Impl(vcl::Window* pParent, WinBits nBits); - virtual ~SentenceEditWindow_Impl(); void SetModifyHdl(const Link& rLink) SAL_OVERRIDE { m_aModifyLink = rLink;} @@ -125,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; @@ -220,6 +219,7 @@ public: vcl::Window * pParent, SfxBindings* pBindings); virtual ~SpellDialog(); + virtual void dispose() SAL_OVERRIDE; void SetLanguage( sal_uInt16 nLang ); virtual bool Close() SAL_OVERRIDE; 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 88d096f8425f..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; @@ -172,6 +174,7 @@ private: public: SfxAcceleratorConfigPage( vcl::Window *pParent, const SfxItemSet& rItemSet ); virtual ~SfxAcceleratorConfigPage(); + virtual void dispose() SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx index b6d9e46baa9b..b0f5e0aa7b5f 100644 --- a/cui/source/inc/align.hxx +++ b/cui/source/inc/align.hxx @@ -58,8 +58,9 @@ class AlignmentTabPage : public SfxTabPage public: virtual ~AlignmentTabPage(); + virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); static const sal_uInt16* GetRanges() { return s_pRanges; } virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -78,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 8d6d1bc16f58..d56700e45e7a 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,8 +109,10 @@ private: public: OfaAutocorrOptionsPage(vcl::Window* pParent, const SfxItemSet& rSet); + virtual ~OfaAutocorrOptionsPage(); + virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -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; @@ -163,9 +167,10 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage OfaSwAutoFmtOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~OfaSwAutoFmtOptionsPage(); + virtual void dispose() SAL_OVERRIDE; - public: - static SfxTabPage* Create( vcl::Window* pParent, +public: + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; @@ -224,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; @@ -257,8 +262,9 @@ private: public: OfaAutocorrReplacePage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~OfaAutocorrReplacePage(); + virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; @@ -289,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; @@ -315,8 +321,9 @@ private: public: OfaAutocorrExceptPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~OfaAutocorrExceptPage(); + virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -335,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; @@ -381,8 +388,9 @@ private: OfaQuoteTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); public: virtual ~OfaQuoteTabPage(); + virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -397,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; @@ -430,9 +440,9 @@ private: OfaAutoCompleteTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); public: - virtual ~OfaAutoCompleteTabPage(); - - static SfxTabPage* Create( vcl::Window* pParent, + virtual ~OfaAutoCompleteTabPage(); + virtual void dispose() SAL_OVERRIDE; + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -456,12 +466,9 @@ class OfaSmartTagOptionsTabPage : public SfxTabPage private: // controls - CheckBox* m_pMainCB; - SvxCheckListBox* m_pSmartTagTypesLB; - PushButton* m_pPropertiesPB; - - /// construction via Create() - OfaSmartTagOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); + VclPtr<CheckBox> m_pMainCB; + VclPtr<SvxCheckListBox> m_pSmartTagTypesLB; + VclPtr<PushButton> m_pPropertiesPB; /** Inserts items into m_aSmartTagTypesLB @@ -496,10 +503,12 @@ private: DECL_LINK(SelectHdl, void *); public: - + /// construction via Create() + OfaSmartTagOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~OfaSmartTagOptionsTabPage(); + virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); + static VclPtr<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/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx index 0686c81ceb3a..70d01e9b87ff 100644 --- a/cui/source/inc/backgrnd.hxx +++ b/cui/source/inc/backgrnd.hxx @@ -47,7 +47,7 @@ class SvxBackgroundTabPage : public SvxTabPage using TabPage::DeactivatePage; static const sal_uInt16 pPageRanges[]; public: - static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); // returns the area of the which-values static const sal_uInt16* GetRanges() { return pPageRanges; } @@ -71,40 +71,41 @@ protected: private: SvxBackgroundTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet ); 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 9e2ed6622c9d..8f129977a546 100644 --- a/cui/source/inc/border.hxx +++ b/cui/source/inc/border.hxx @@ -45,7 +45,9 @@ class SvxBorderTabPage : public SfxTabPage static const sal_uInt16 pRanges[]; public: - static SfxTabPage* Create( vcl::Window* pParent, + virtual ~SvxBorderTabPage(); + virtual void dispose() SAL_OVERRIDE; + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); static const sal_uInt16* GetRanges() { return pRanges; } @@ -61,40 +63,39 @@ protected: private: SvxBorderTabPage( vcl::Window* pParent, const SfxItemSet& rCoreAttrs ); - virtual ~SvxBorderTabPage(); // 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; @@ -114,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 58505ff614e2..759b1406d3e6 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -315,7 +315,7 @@ public: class SvxMenuEntriesListBox : public SvTreeListBox { private: - SvxConfigPage* pPage; + VclPtr<SvxConfigPage> pPage; protected: bool m_bIsInternalDrag; @@ -323,6 +323,7 @@ protected: public: SvxMenuEntriesListBox(vcl::Window*, SvxConfigPage*); virtual ~SvxMenuEntriesListBox(); + virtual void dispose() SAL_OVERRIDE; virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; @@ -359,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; @@ -410,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, @@ -423,6 +424,9 @@ protected: public: + virtual ~SvxConfigPage(); + virtual void dispose() SAL_OVERRIDE; + static bool CanConfig( const OUString& rModuleId ); SaveInData* GetSaveInData() { return pCurrentSaveInData; } @@ -483,6 +487,7 @@ private: public: SvxMenuConfigPage( vcl::Window *pParent, const SfxItemSet& rItemSet ); virtual ~SvxMenuConfigPage(); + virtual void dispose() SAL_OVERRIDE; SaveInData* CreateSaveInData( const ::com::sun::star::uno::Reference < @@ -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,8 +520,8 @@ public: SvxMainMenuOrganizerDialog ( vcl::Window*, SvxEntries*, SvxConfigEntry*, bool bCreateMenu = false ); - - virtual ~SvxMainMenuOrganizerDialog (); + virtual ~SvxMainMenuOrganizerDialog(); + virtual void dispose() SAL_OVERRIDE; SvxEntries* GetEntries() { return mpEntries;} void SetEntries( SvxEntries* ); @@ -528,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 ); @@ -544,6 +549,7 @@ public: SvxToolbarEntriesListBox(vcl::Window* pParent, SvxToolbarConfigPage* pPg); virtual ~SvxToolbarEntriesListBox(); + virtual void dispose() SAL_OVERRIDE; void SetChangedListener( const Link& aChangedListener ) { m_aChangedListener = aChangedListener; } @@ -584,6 +590,7 @@ private: public: SvxToolbarConfigPage( vcl::Window *pParent, const SfxItemSet& rItemSet ); virtual ~SvxToolbarConfigPage(); + virtual void dispose() SAL_OVERRIDE; SvTreeListEntry* AddFunction( SvTreeListEntry* pTarget = NULL, bool bFront = false, @@ -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; @@ -741,6 +750,7 @@ public: ); virtual ~SvxIconSelectorDialog(); + virtual void dispose() SAL_OVERRIDE; ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > GetSelectedIcon(); @@ -769,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 3e445ce0e853..984e8e9e4c80 100644 --- a/cui/source/inc/cfgutil.hxx +++ b/cui/source/inc/cfgutil.hxx @@ -113,6 +113,7 @@ class SfxConfigFunctionListBox : public SvTreeListBox public: SfxConfigFunctionListBox(vcl::Window*, WinBits nStyle); virtual ~SfxConfigFunctionListBox(); + virtual void dispose() SAL_OVERRIDE; void ClearAll(); using Window::GetHelpText; @@ -127,7 +128,7 @@ struct SvxConfigGroupBoxResource_Impl; class SfxConfigGroupListBox : public SvTreeListBox { SvxConfigGroupBoxResource_Impl* pImp; - SfxConfigFunctionListBox* pFunctionListBox; + VclPtr<SfxConfigFunctionListBox> pFunctionListBox; SfxGroupInfoArr_Impl aArr; OUString m_sModuleLongName; @@ -162,6 +163,7 @@ protected: public: SfxConfigGroupListBox(vcl::Window* pParent, WinBits nStyle); virtual ~SfxConfigGroupListBox(); + virtual void dispose() SAL_OVERRIDE; void ClearAll(); void Init(const css::uno::Reference< css::uno::XComponentContext >& xContext, diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index 9a471ff3e048..fad03f168fe4 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -47,14 +47,12 @@ class FontList; class SvxCharBasePage : public SfxTabPage { protected: - SvxFontPrevWindow* m_pPreviewWin; + VclPtr<SvxFontPrevWindow> m_pPreviewWin; bool m_bPreviewBackgroundToCharacter; SvxCharBasePage(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet& rItemset); - virtual ~SvxCharBasePage(); - void SetPrevFontWidthScale( const SfxItemSet& rSet ); void SetPrevFontEscapement( sal_uInt8 nProp, sal_uInt8 nEscProp, short nEsc ); @@ -63,6 +61,9 @@ protected: inline SvxFont& GetPreviewCTLFont(); public: + virtual ~SvxCharBasePage(); + virtual void dispose() SAL_OVERRIDE; + using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; @@ -79,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; @@ -152,8 +153,9 @@ public: public: virtual ~SvxCharNamePage(); + virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges() { return pNameRanges; } virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; @@ -176,44 +178,43 @@ 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; OUString m_aTransparentColorName; SvxCharEffectsPage( vcl::Window* pParent, const SfxItemSet& rSet ); - virtual ~SvxCharEffectsPage(); void Initialize(); void UpdatePreview_Impl(); @@ -228,12 +229,14 @@ private: DECL_LINK( ColorBoxSelectHdl_Impl, ColorListBox* ); public: - using SfxTabPage::DeactivatePage; + virtual ~SvxCharEffectsPage(); + virtual void dispose() SAL_OVERRIDE; + using SfxTabPage::DeactivatePage; virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; public: - static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges() { return pEffectsRanges; } virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; @@ -254,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; @@ -289,7 +292,6 @@ private: sal_uInt8 m_nSubProp; SvxCharPositionPage( vcl::Window* pParent, const SfxItemSet& rSet ); - virtual ~SvxCharPositionPage(); void Initialize(); void UpdatePreview_Impl( sal_uInt8 nProp, sal_uInt8 nEscProp, short nEsc ); @@ -307,6 +309,9 @@ private: DECL_LINK(ScaleWidthModifyHdl_Impl, void *); public: + virtual ~SvxCharPositionPage(); + virtual void dispose() SAL_OVERRIDE; + using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; @@ -314,7 +319,7 @@ public: virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; public: - static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges() { return pPositionRanges; } virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; @@ -331,16 +336,15 @@ 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; SvxCharTwoLinesPage(vcl::Window* pParent, const SfxItemSet& rSet); - virtual ~SvxCharTwoLinesPage(); void UpdatePreview_Impl(); void Initialize(); @@ -351,14 +355,16 @@ 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 sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; -public: - static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges() { return pTwoLinesRanges; } virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/cui/source/inc/connect.hxx b/cui/source/inc/connect.hxx index a85dabdb8a5f..875ff89baf9b 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; @@ -63,8 +63,9 @@ public: SvxConnectionPage( vcl::Window* pWindow, const SfxItemSet& rInAttrs ); virtual ~SvxConnectionPage(); + virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); + static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pRanges; } virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; @@ -82,7 +83,6 @@ class SvxConnectionDialog : public SfxSingleTabDialog public: SvxConnectionDialog( vcl::Window* pParent, const SfxItemSet& rAttr, const SdrView* pView ); - virtual ~SvxConnectionDialog(); }; #endif // INCLUDED_CUI_SOURCE_INC_CONNECT_HXX diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx index a2e30e516502..596d3231443e 100644 --- a/cui/source/inc/cuicharmap.hxx +++ b/cui/source/inc/cuicharmap.hxx @@ -41,7 +41,6 @@ class SvxShowText : public Control public: SvxShowText( vcl::Window* pParent, bool bCenter = false ); - virtual ~SvxShowText(); void SetFont( const vcl::Font& rFont ); void SetText( const OUString& rText ) SAL_OVERRIDE; @@ -68,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; @@ -94,7 +93,8 @@ private: public: SvxCharacterMap( vcl::Window* pParent, bool bOne=true, const SfxItemSet* pSet=0 ); - virtual ~SvxCharacterMap(); + virtual ~SvxCharacterMap(); + virtual void dispose() SAL_OVERRIDE; void DisableFontSelection(); diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx index d163b3d44b6f..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 @@ -111,6 +111,7 @@ public: const Link& lnkContextSupplier); virtual ~FmSearchDialog(); + virtual void dispose() SAL_OVERRIDE; /** The found-handler gets in the 'found'-case a pointer on a FmFoundRecordInformation-structure (which is only valid in the handler; so if one needs to memorize the data, don't copy the pointer but diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx index a57904afd53a..a1855b1a1fdd 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,7 +93,8 @@ private: public: SearchProgress( vcl::Window* pParent, const INetURLObject& rStartURL ); - virtual ~SearchProgress() {}; + virtual ~SearchProgress(); + virtual void dispose() SAL_OVERRIDE; DECL_LINK( CleanUpHdl, void* ); @@ -107,8 +108,8 @@ class TakeThread: public salhelper::Thread { private: - TakeProgress* mpProgress; - TPGalleryThemeProperties* mpBrowser; + VclPtr<TakeProgress> mpProgress; + VclPtr<TPGalleryThemeProperties> mpBrowser; TokenList_impl& mrTakenList; virtual ~TakeThread(); @@ -126,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; @@ -138,6 +139,8 @@ private: public: TakeProgress( vcl::Window* pWindow ); + virtual ~TakeProgress(); + virtual void dispose() SAL_OVERRIDE; DECL_LINK( CleanUpHdl, void* ); @@ -149,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; @@ -161,7 +164,8 @@ private: public: ActualizeProgress( vcl::Window* pWindow, GalleryTheme* pThm ); - virtual ~ActualizeProgress() {}; + virtual ~ActualizeProgress(); + virtual void dispose() SAL_OVERRIDE; virtual short Execute() SAL_OVERRIDE; }; @@ -169,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(); } }; @@ -206,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 {} @@ -221,12 +229,13 @@ private: public: TPGalleryThemeGeneral( vcl::Window* pParent, const SfxItemSet& rSet ); - virtual ~TPGalleryThemeGeneral() {} + virtual ~TPGalleryThemeGeneral(); + virtual void dispose() SAL_OVERRIDE; void SetXChgData( ExchangeData* pData ); const ExchangeData* GetXChgData() const { return pData; } - static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); }; typedef ::std::vector< FilterEntry* > FilterEntryList_impl; @@ -237,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; @@ -287,13 +296,14 @@ class TPGalleryThemeProperties : public SfxTabPage public: TPGalleryThemeProperties( vcl::Window* pWindow, const SfxItemSet& rSet ); virtual ~TPGalleryThemeProperties(); + virtual void dispose() SAL_OVERRIDE; void SetXChgData( ExchangeData* pData ); const ExchangeData* GetXChgData() const { return pData; } void StartSearchFiles( const OUString& _rFolderURL, short _nDlgResult ); - static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); }; #endif // INCLUDED_CUI_SOURCE_INC_CUIGALDLG_HXX 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 8ef2930ae952..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; @@ -80,6 +80,7 @@ protected: public: SvxHpLinkDlg (vcl::Window* pParent, SfxBindings* pBindings ); virtual ~SvxHpLinkDlg (); + virtual void dispose() SAL_OVERRIDE; virtual void PageCreated( sal_uInt16 nId, IconChoicePage& rPage ) SAL_OVERRIDE; 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 e6906f1c3244..8e911729fe5f 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,9 +64,10 @@ protected: public: SvxGeneralTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); - virtual ~SvxGeneralTabPage (); + virtual ~SvxGeneralTabPage(); + virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); + static VclPtr<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/inc/cuisrchdlg.hxx b/cui/source/inc/cuisrchdlg.hxx index 3dc19f0a1c97..be75242a8238 100644 --- a/cui/source/inc/cuisrchdlg.hxx +++ b/cui/source/inc/cuisrchdlg.hxx @@ -36,8 +36,8 @@ class SvxJSearchOptionsPage; class SvxJSearchOptionsDialog : public SfxSingleTabDialog { - sal_Int32 nInitialTlFlags; - SvxJSearchOptionsPage *pPage; + sal_Int32 nInitialTlFlags; + 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 3fe91da9f651..baa67bc85d4c 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -76,7 +76,6 @@ protected: public: SvxAreaTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, bool bShadow ); - virtual ~SvxAreaTabDialog(); void SetNewColorList( XColorListRef pColTab ) { mpNewColorList = pColTab; } @@ -116,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; @@ -161,8 +160,10 @@ 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 VclPtr<SfxTabPage> Create(vcl::Window*, const SfxItemSet*); static const sal_uInt16* GetRanges() { return pTransparenceRanges; } virtual bool FillItemSet(SfxItemSet*) SAL_OVERRIDE; @@ -184,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; @@ -265,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 * ); @@ -289,10 +290,12 @@ private: public: SvxAreaTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); + virtual ~SvxAreaTabPage(); + virtual void dispose() SAL_OVERRIDE; void Construct(); - static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); + static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pAreaRanges; } virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; @@ -327,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; @@ -356,9 +359,11 @@ 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* ); + static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pShadowRanges; } virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; @@ -384,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; @@ -435,10 +440,12 @@ private: public: SvxGradientTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); + virtual ~SvxGradientTabPage(); + virtual void dispose() SAL_OVERRIDE; void Construct(); - static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); + static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; @@ -466,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; @@ -511,10 +518,12 @@ private: public: SvxHatchTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); + virtual ~SvxHatchTabPage(); + virtual void dispose() SAL_OVERRIDE; void Construct(); - static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); + static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; @@ -546,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; @@ -597,10 +606,11 @@ private: public: SvxBitmapTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SvxBitmapTabPage(); + virtual void dispose() SAL_OVERRIDE; void Construct(); - static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); + static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; @@ -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; @@ -731,10 +741,11 @@ private: public: SvxColorTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SvxColorTabPage(); + virtual void dispose() SAL_OVERRIDE; void Construct(); - static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); + static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx index 31550706538a..3bb1f2b414ea 100644 --- a/cui/source/inc/cuitabline.hxx +++ b/cui/source/inc/cuitabline.hxx @@ -64,7 +64,6 @@ public: SvxLineTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* pObj = NULL, bool bHasObj = true ); - virtual ~SvxLineTabDialog(); void SetNewDashList( XDashListRef pInLst) { pNewDashList = pInLst; } @@ -92,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. @@ -132,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; @@ -205,10 +204,11 @@ public: SvxLineTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SvxLineTabPage(); + virtual void dispose() SAL_OVERRIDE; void Construct(); - static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); + static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pLineRanges; } virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; @@ -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,10 +303,12 @@ private: public: SvxLineDefTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); + virtual ~SvxLineDefTabPage(); + virtual void dispose() SAL_OVERRIDE; void Construct(); - static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); + static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; @@ -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; @@ -373,10 +375,11 @@ private: public: SvxLineEndDefTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SvxLineEndDefTabPage(); + virtual void dispose() SAL_OVERRIDE; void Construct(); - static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); + static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; 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 f35f2adb57c8..cf0142120532 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; @@ -91,8 +91,9 @@ namespace svx public: DbRegistrationOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~DbRegistrationOptionsPage(); + virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -129,7 +130,6 @@ namespace svx { public: DatabaseRegistrationDialog( vcl::Window* pParent, const SfxItemSet& rAttr ); - virtual ~DatabaseRegistrationDialog(); virtual short Execute() SAL_OVERRIDE; }; diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx index e6d9ea26c9fd..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 *); @@ -140,6 +145,7 @@ private: public: SvxMessDialog( vcl::Window* pWindow, const OUString& rText, const OUString& rDesc, Image* pImg = NULL ); virtual ~SvxMessDialog(); + virtual void dispose() SAL_OVERRIDE; void SetButtonText( sal_uInt16 nBtnId, const OUString& rNewTxt ); }; diff --git a/cui/source/inc/dstribut.hxx b/cui/source/inc/dstribut.hxx index e0be5f3dd87e..46e18129968f 100644 --- a/cui/source/inc/dstribut.hxx +++ b/cui/source/inc/dstribut.hxx @@ -29,23 +29,25 @@ 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&, + static VclPtr<SfxTabPage> Create(vcl::Window*, const SfxItemSet&, SvxDistributeHorizontal eHor, SvxDistributeVertical eVer); virtual bool FillItemSet(SfxItemSet*) SAL_OVERRIDE; virtual void Reset(const SfxItemSet*) SAL_OVERRIDE; @@ -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 18769aee67b2..4ce44f8ec257 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; @@ -95,6 +95,7 @@ class SvxGrfCropPage : public SfxTabPage SvxGrfCropPage( vcl::Window *pParent, const SfxItemSet &rSet ); virtual ~SvxGrfCropPage(); + virtual void dispose() SAL_OVERRIDE; DECL_LINK( ZoomHdl, MetricField * ); DECL_LINK( SizeHdl, MetricField * ); @@ -111,7 +112,7 @@ class SvxGrfCropPage : public SfxTabPage Size GetGrfOrigSize( const Graphic& ) const; public: - static SfxTabPage *Create( vcl::Window *pParent, const SfxItemSet *rSet ); + static VclPtr<SfxTabPage> Create( vcl::Window *pParent, const SfxItemSet *rSet ); virtual bool FillItemSet( SfxItemSet *rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet *rSet ) SAL_OVERRIDE; diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx index cb228daebc1e..2aa203c85319 100644 --- a/cui/source/inc/hangulhanjadlg.hxx +++ b/cui/source/inc/hangulhanjadlg.hxx @@ -43,6 +43,7 @@ namespace svx public: SuggestionSet( vcl::Window* pParent ); virtual ~SuggestionSet(); + virtual void dispose() SAL_OVERRIDE; virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; void ClearSet(); @@ -53,6 +54,7 @@ namespace svx public: SuggestionDisplay( vcl::Window* pParent, WinBits nBits ); virtual ~SuggestionDisplay(); + virtual void dispose() SAL_OVERRIDE; void DisplayListBox( bool bDisplayListBox ); @@ -87,8 +89,8 @@ namespace svx private: bool m_bDisplayListBox;//otherwise ValueSet - SuggestionSet m_aValueSet; - ListBox m_aListBox; + VclPtr<SuggestionSet> m_aValueSet; + VclPtr<ListBox> m_aListBox; Link m_aSelectLink; bool m_bInSelectionUpdate; @@ -102,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 @@ -136,7 +138,8 @@ namespace svx HangulHanjaConversionDialog( vcl::Window* _pParent, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryDirection ); - virtual ~HangulHanjaConversionDialog( ); + virtual ~HangulHanjaConversionDialog(); + virtual void dispose() SAL_OVERRIDE; public: void SetOptionsChangedHdl( const Link& _rHdl ); @@ -195,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; @@ -222,6 +225,7 @@ namespace svx public: HangulHanjaOptionsDialog( vcl::Window* _pParent ); virtual ~HangulHanjaOptionsDialog(); + virtual void dispose() SAL_OVERRIDE; void AddDict( const OUString& _rName, bool _bChecked ); }; @@ -230,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; @@ -239,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; }; @@ -249,15 +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); }; @@ -273,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; @@ -312,6 +319,7 @@ namespace svx public: HangulHanjaEditDictDialog( vcl::Window* _pParent, HHDictList& _rDictList, sal_uInt32 _nSelDict ); virtual ~HangulHanjaEditDictDialog(); + virtual void dispose() SAL_OVERRIDE; void UpdateScrollbar(); }; diff --git a/cui/source/inc/headertablistbox.hxx b/cui/source/inc/headertablistbox.hxx index d368d4dc27c9..f63eba3c73c1 100644 --- a/cui/source/inc/headertablistbox.hxx +++ b/cui/source/inc/headertablistbox.hxx @@ -27,25 +27,27 @@ class MacroEventListBox : public Control { private: - HeaderBar maHeaderBar; - SvHeaderTabListBox maListBox; + VclPtr<HeaderBar> maHeaderBar; + VclPtr<SvHeaderTabListBox> maListBox; protected: DECL_LINK( HeaderEndDrag_Impl, HeaderBar* ); virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: MacroEventListBox( vcl::Window* pParent, WinBits nStyle ); + virtual ~MacroEventListBox(); + virtual void dispose() SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual Size GetOptimalSize() const SAL_OVERRIDE; SvHeaderTabListBox& GetListBox() { - return maListBox; + return *maListBox.get(); } HeaderBar& GetHeaderBar() { - return maHeaderBar; + return *maHeaderBar.get(); } void ConnectElements();/**< should be called after all manipulations on elements are done diff --git a/cui/source/inc/hldocntp.hxx b/cui/source/inc/hldocntp.hxx index 98731d7e6172..e72b13387e0e 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 (); @@ -52,8 +52,9 @@ protected: public: SvxHyperlinkNewDocTp ( vcl::Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet); virtual ~SvxHyperlinkNewDocTp (); + virtual void dispose() SAL_OVERRIDE; - static IconChoicePage* Create( vcl::Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ); + static VclPtr<IconChoicePage> Create( vcl::Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ); virtual bool AskApply () SAL_OVERRIDE; virtual void DoApply () SAL_OVERRIDE; diff --git a/cui/source/inc/hldoctp.hxx b/cui/source/inc/hldoctp.hxx index 1b7e3525840d..457cf1e0ea28 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,9 +67,10 @@ protected: public: SvxHyperlinkDocTp ( vcl::Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet); - virtual ~SvxHyperlinkDocTp (); + virtual ~SvxHyperlinkDocTp(); + virtual void dispose() SAL_OVERRIDE; - static IconChoicePage* Create( vcl::Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ); + static VclPtr<IconChoicePage> Create( vcl::Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ); virtual void SetMarkStr ( const OUString& aStrMark ) SAL_OVERRIDE; diff --git a/cui/source/inc/hlinettp.hxx b/cui/source/inc/hlinettp.hxx index e11b74456b32..99f60cdca909 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,9 +78,10 @@ protected: public: SvxHyperlinkInternetTp ( vcl::Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet); - virtual ~SvxHyperlinkInternetTp (); + virtual ~SvxHyperlinkInternetTp(); + virtual void dispose() SAL_OVERRIDE; - static IconChoicePage* Create( vcl::Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ); + static VclPtr<IconChoicePage> Create( vcl::Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ); virtual void SetMarkStr ( const OUString& aStrMark ) SAL_OVERRIDE; diff --git a/cui/source/inc/hlmailtp.hxx b/cui/source/inc/hlmailtp.hxx index 6f847976e16b..705a9a3a8fda 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,9 +51,10 @@ protected: public: SvxHyperlinkMailTp ( vcl::Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet); - virtual ~SvxHyperlinkMailTp (); + virtual ~SvxHyperlinkMailTp(); + virtual void dispose() SAL_OVERRIDE; - static IconChoicePage* Create( vcl::Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ); + static VclPtr<IconChoicePage> Create( vcl::Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ); virtual void SetInitFocus() SAL_OVERRIDE; }; diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx index 2108beb587b4..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; @@ -90,6 +92,7 @@ protected: public: SvxHlinkDlgMarkWnd (SvxHyperlinkTabPageBase *pParent); virtual ~SvxHlinkDlgMarkWnd(); + virtual void dispose() SAL_OVERRIDE; bool MoveTo ( Point aNewPos ); void RefreshTree(const OUString& aStrURL); diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx index f1df0e407056..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 ); @@ -118,6 +118,7 @@ public: const SfxItemSet& rItemSet ); virtual ~SvxHyperlinkTabPageBase (); + virtual void dispose() SAL_OVERRIDE; void SetDocumentFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxDocumentFrame ) diff --git a/cui/source/inc/hyphen.hxx b/cui/source/inc/hyphen.hxx index 4d0b7ba7c489..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; @@ -86,6 +86,7 @@ public: 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 8831eb65f3d0..74b686d17ca5 100644 --- a/cui/source/inc/iconcdlg.hxx +++ b/cui/source/inc/iconcdlg.hxx @@ -40,8 +40,8 @@ class IconChoiceDialog; class IconChoicePage; // Create-Function -typedef IconChoicePage* (*CreatePage)(vcl::Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet &rAttrSet); -typedef const sal_uInt16* (*GetPageRanges)(); // gives international Which-value +typedef VclPtr<IconChoicePage> (*CreatePage)(vcl::Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet &rAttrSet); +typedef const sal_uInt16* (*GetPageRanges)(); // gives international Which-value /// Data-structure for pages in dialog struct IconChoicePageData @@ -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,11 +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 ~IconChoicePage(); + virtual void dispose() SAL_OVERRIDE; const SfxItemSet& GetItemSet() const { return *pSet; } @@ -125,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; @@ -167,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 (); @@ -182,6 +183,7 @@ public : IconChoiceDialog ( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, const SfxItemSet * pItemSet = 0 ); virtual ~IconChoiceDialog (); + virtual void dispose() SAL_OVERRIDE; // interface SvxIconChoiceCtrlEntry* AddTabPage( diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx index 5807c240b826..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; @@ -109,29 +111,30 @@ public: SvInsertPlugInDialog(vcl::Window* pParent, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage); virtual ~SvInsertPlugInDialog(); + virtual void dispose() SAL_OVERRIDE; virtual short Execute() SAL_OVERRIDE; }; 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* ); @@ -143,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 a6e215e2ee49..0e66966be946 100644 --- a/cui/source/inc/insrc.hxx +++ b/cui/source/inc/insrc.hxx @@ -29,20 +29,22 @@ #include <vcl/group.hxx> #include <vcl/button.hxx> -class SvxInsRowColDlg : public SvxAbstractInsRowColDlg, public ModalDialog +class SvxInsRowColDlg : public SvxAbstractInsRowColDlg { - NumericField* m_pCountEdit; + VclPtr<ModalDialog> m_pDialog; + VclPtr<NumericField> m_pCountEdit; - RadioButton* m_pBeforeBtn; - RadioButton* m_pAfterBtn; + VclPtr<RadioButton> m_pBeforeBtn; + VclPtr<RadioButton> m_pAfterBtn; OUString aRow; OUString aCol; - bool bColumn; + bool bColumn; public: SvxInsRowColDlg( vcl::Window* pParent, bool bCol, const OString& sHelpId ); + virtual ~SvxInsRowColDlg(); virtual short Execute() SAL_OVERRIDE; diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx index 446499f28887..610c63b2f2f9 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,8 +75,10 @@ private: public: SvxCaptionTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); + virtual ~SvxCaptionTabPage(); + virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); + static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pCaptionRanges; } virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx index 89491007d919..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; @@ -96,6 +96,7 @@ 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/macroass.hxx b/cui/source/inc/macroass.hxx index c0e4fd66492b..696c8bf55711 100644 --- a/cui/source/inc/macroass.hxx +++ b/cui/source/inc/macroass.hxx @@ -57,6 +57,7 @@ protected: public: virtual ~_SfxMacroTabPage(); + virtual void dispose() SAL_OVERRIDE; void AddEvent( const OUString & rEventName, sal_uInt16 nEventId ); @@ -96,7 +97,7 @@ public: ); // --------- inherit from the base ------------- - static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); }; class SfxMacroAssignDlg : public SfxSingleTabDialog diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx index c1cded175f5e..befe9e3607f9 100644 --- a/cui/source/inc/macropg.hxx +++ b/cui/source/inc/macropg.hxx @@ -82,6 +82,7 @@ protected: public: virtual ~_SvxMacroTabPage(); + virtual void dispose() SAL_OVERRIDE; void InitResources(); void InitAndSetHandler( ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > xAppEvents, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > xDocEvents, ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifiable > xModifiable ); diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx index aadc276d3641..28dbdfdc7c28 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; @@ -67,8 +67,9 @@ public: SvxMeasurePage( vcl::Window* pWindow, const SfxItemSet& rInAttrs ); virtual ~SvxMeasurePage(); + virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); + static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pRanges; } virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; diff --git a/cui/source/inc/multipat.hxx b/cui/source/inc/multipat.hxx index 0508ff40aba1..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 *); @@ -51,6 +51,7 @@ private: public: SvxMultiPathDialog(vcl::Window* pParent); virtual ~SvxMultiPathDialog(); + virtual void dispose() SAL_OVERRIDE; OUString GetPath() const; void SetPath( const OUString& rPath ); @@ -59,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 *); @@ -70,6 +71,7 @@ private: public: SvxPathSelectDialog(vcl::Window* pParent); virtual ~SvxPathSelectDialog(); + virtual void dispose() SAL_OVERRIDE; OUString GetPath() const; void SetPath( const OUString& rPath ); diff --git a/cui/source/inc/newtabledlg.hxx b/cui/source/inc/newtabledlg.hxx index 109d62f1509e..394d04265344 100644 --- a/cui/source/inc/newtabledlg.hxx +++ b/cui/source/inc/newtabledlg.hxx @@ -26,14 +26,16 @@ #include <svx/stddlg.hxx> #include <svx/svxdlg.hxx> -class SvxNewTableDialog : public SvxAbstractNewTableDialog, public ModalDialog +class SvxNewTableDialog : public SvxAbstractNewTableDialog { private: - NumericField* mpNumColumns; - NumericField* mpNumRows; + VclPtr<ModalDialog> m_pDialog; + VclPtr<NumericField> mpNumColumns; + VclPtr<NumericField> mpNumRows; public: SvxNewTableDialog( vcl::Window* pWindow ); + virtual ~SvxNewTableDialog(); virtual short Execute() SAL_OVERRIDE; diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx index 9a6172a5a753..e2fa378794a2 100644 --- a/cui/source/inc/numfmt.hxx +++ b/cui/source/inc/numfmt.hxx @@ -70,8 +70,9 @@ class SvxNumberFormatTabPage : public SfxTabPage public: virtual ~SvxNumberFormatTabPage(); + virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); // Returns area information. static const sal_uInt16* GetRanges() { return pRanges; } @@ -91,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; @@ -130,7 +131,7 @@ private: OUString sAutomaticEntry; - vcl::Window* pLastActivWindow; + VclPtr<vcl::Window> pLastActivWindow; void Init_Impl(); void FillCurrencyBox(); @@ -145,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 739249fbde20..108f9e3bea39 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; @@ -101,16 +101,17 @@ class SvxSingleNumPickTabPage : public SfxTabPage OUString sNumCharFmtName; sal_uInt16 nNumItemId; - protected: +protected: DECL_LINK(NumSelectHdl_Impl, void *); DECL_LINK(DoubleClickHdl_Impl, void *); - public: +public: SvxSingleNumPickTabPage(vcl::Window* pParent, const SfxItemSet& rSet); - virtual ~SvxSingleNumPickTabPage(); + virtual ~SvxSingleNumPickTabPage(); + virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; @@ -129,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; @@ -138,15 +139,16 @@ class SvxBulletPickTabPage : public SfxTabPage sal_uInt16 nNumItemId; OUString sBulletCharFmtName; - protected: +protected: DECL_LINK(NumSelectHdl_Impl, void *); DECL_LINK(DoubleClickHdl_Impl, void *); - public: +public: SvxBulletPickTabPage(vcl::Window* pParent, const SfxItemSet& rSet); - virtual ~SvxBulletPickTabPage(); + virtual ~SvxBulletPickTabPage(); + virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; @@ -166,7 +168,7 @@ class SvxNumPickTabPage : public SfxTabPage using TabPage::ActivatePage; using TabPage::DeactivatePage; - SvxNumValueSet* m_pExamplesVS; + VclPtr<SvxNumValueSet> m_pExamplesVS; OUString sNumCharFmtName; OUString sBulletCharFmtName; @@ -180,16 +182,17 @@ class SvxNumPickTabPage : public SfxTabPage bool bPreset : 1; - protected: +protected: DECL_LINK(NumSelectHdl_Impl, void *); DECL_LINK(DoubleClickHdl_Impl, void *); - public: - SvxNumPickTabPage(vcl::Window* pParent, +public: + SvxNumPickTabPage(vcl::Window* pParent, const SfxItemSet& rSet); - virtual ~SvxNumPickTabPage(); + virtual ~SvxNumPickTabPage(); + virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; @@ -210,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; @@ -224,17 +227,18 @@ class SvxBitmapPickTabPage : public SfxTabPage bool bModified : 1; bool bPreset : 1; - protected: +protected: DECL_LINK(NumSelectHdl_Impl, void *); DECL_LINK(DoubleClickHdl_Impl, void *); DECL_LINK(LinkBmpHdl_Impl, void *); - public: +public: SvxBitmapPickTabPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SvxBitmapPickTabPage(); + virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; @@ -251,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; @@ -341,12 +345,13 @@ class SvxNumOptionsTabPage : public SfxTabPage DECL_STATIC_LINK( SvxNumOptionsTabPage, GraphicArrivedHdl_Impl, SvxBrushItem* ); - public: +public: SvxNumOptionsTabPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SvxNumOptionsTabPage(); + virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; @@ -385,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; + 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; - PushButton* m_pStandardPB; + VclPtr<PushButton> m_pStandardPB; - SvxNumberingPreview* m_pPreviewWIN; + VclPtr<SvxNumberingPreview> m_pPreviewWIN; SvxNumRule* pActNum; SvxNumRule* pSaveNum; @@ -448,13 +453,14 @@ public: SvxNumPositionTabPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SvxNumPositionTabPage(); + virtual void dispose() SAL_OVERRIDE; virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); void SetMetric(FieldUnit eSet); diff --git a/cui/source/inc/optasian.hxx b/cui/source/inc/optasian.hxx index d2d182420783..39d18ef48976 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; @@ -52,12 +52,12 @@ class SvxAsianLayoutPage : public SfxTabPage DECL_LINK(ChangeStandardHdl, CheckBox*); DECL_LINK(ModifyHdl, Edit*); - SvxAsianLayoutPage( vcl::Window* pParent, const SfxItemSet& rSet ); public: - + SvxAsianLayoutPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxAsianLayoutPage(); + virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx index e26a4b37f253..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; @@ -153,6 +155,7 @@ public: ::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 8529393a14a0..f99e3bb7ba46 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; @@ -86,6 +86,7 @@ class SvxEditModulesDlg : public ModalDialog public: SvxEditModulesDlg(vcl::Window* pParent, SvxLinguData_Impl& rData); virtual ~SvxEditModulesDlg(); + virtual void dispose() SAL_OVERRIDE; }; // class SvxLinguTabPage ------------------------------------------------- @@ -93,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; @@ -147,7 +148,8 @@ private: public: virtual ~SvxLinguTabPage(); - static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); + virtual void dispose() SAL_OVERRIDE; + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx index 8db65294ce6d..df078cec88b8 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; @@ -71,8 +71,9 @@ private: public: SvxPathTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxPathTabPage(); + virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx index 90dadaea13e8..f68bf339bab7 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; @@ -140,7 +140,7 @@ private: //UUUU SvxPage_Impl* pImpl; MarginPosition m_nPos; - Printer* mpDefPrinter; + VclPtr<Printer> mpDefPrinter; bool mbDelPrinter : 1; @@ -188,7 +188,7 @@ protected: virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; public: - static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); // returns the range of the Which values static const sal_uInt16* GetRanges() { return pRanges; } @@ -197,6 +197,7 @@ public: virtual void FillUserData() SAL_OVERRIDE; virtual ~SvxPageDescPage(); + virtual void dispose() SAL_OVERRIDE; void SetMode( SvxModeType eMType ) { eMode = eMType; } void SetPaperFormatRanges( Paper eStart, Paper eEnd ) diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx index e0ca89f29da9..80b2536aed21 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,9 +98,12 @@ protected: public: + virtual ~SvxStdParagraphTabPage(); + virtual void dispose() SAL_OVERRIDE; + DECL_LINK(ELRLoseFocusHdl, void *); - static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges() { return pStdRanges; } virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -115,8 +118,6 @@ public: void EnableAbsLineDist(long nMinTwip); void EnableNegativeMode(); virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE; - - virtual ~SvxStdParagraphTabPage(); }; // class SvxParaAlignTabPage ------------------------------------------------ @@ -127,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 *); @@ -156,13 +157,15 @@ class SvxParaAlignTabPage : public SfxTabPage void UpdateExample_Impl( bool bAll = false ); SvxParaAlignTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); - virtual ~SvxParaAlignTabPage(); protected: virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; public: - static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); + virtual ~SvxParaAlignTabPage(); + virtual void dispose() SAL_OVERRIDE; + + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges() { return pAlignRanges; } virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -192,9 +195,10 @@ class SvxExtParagraphTabPage: public SfxTabPage static const sal_uInt16 pExtRanges[]; public: - virtual ~SvxExtParagraphTabPage(); + virtual ~SvxExtParagraphTabPage(); + virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges() { return pExtRanges; } @@ -210,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; @@ -262,9 +266,9 @@ 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 ); @@ -272,9 +276,9 @@ class SvxAsianTabPage : public SfxTabPage public: virtual ~SvxAsianTabPage(); + virtual void dispose() SAL_OVERRIDE; - - static SfxTabPage* Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); diff --git a/cui/source/inc/passwdomdlg.hxx b/cui/source/inc/passwdomdlg.hxx index 9dd7aca1e11b..59fd9e479a78 100644 --- a/cui/source/inc/passwdomdlg.hxx +++ b/cui/source/inc/passwdomdlg.hxx @@ -40,6 +40,7 @@ public: sal_uInt16 nMaxPasswdLen /* 0 -> no max len enforced */, bool bIsPasswordToModify ); virtual ~PasswordToOpenModifyDialog(); + virtual void dispose() SAL_OVERRIDE; // AbstractPasswordToOpenModifyDialog OUString GetPasswordToOpen() const; diff --git a/cui/source/inc/pastedlg.hxx b/cui/source/inc/pastedlg.hxx index 52332ac398ed..c634dc715a6b 100644 --- a/cui/source/inc/pastedlg.hxx +++ b/cui/source/inc/pastedlg.hxx @@ -39,9 +39,9 @@ class TransferableDataHelper; class SvPasteObjectDialog : public ModalDialog { - FixedText* m_pFtObjectSource; - ListBox* m_pLbInsertList; - OKButton* m_pOKButton; + VclPtr<FixedText> m_pFtObjectSource; + VclPtr<ListBox> m_pLbInsertList; + VclPtr<OKButton> m_pOKButton; ::std::map< SotClipboardFormatId, OUString > aSupplementMap; SvGlobalName aObjClassName; OUString aObjName; @@ -55,7 +55,8 @@ class SvPasteObjectDialog : public ModalDialog public: SvPasteObjectDialog( vcl::Window* pParent ); - virtual ~SvPasteObjectDialog(); + 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 624649689e6a..170e00692379 100644 --- a/cui/source/inc/postdlg.hxx +++ b/cui/source/inc/postdlg.hxx @@ -46,6 +46,7 @@ public: SvxPostItDialog(vcl::Window* pParent, const SfxItemSet& rCoreSet, bool bPrevNext = false); virtual ~SvxPostItDialog(); + virtual void dispose() SAL_OVERRIDE; static const sal_uInt16* GetRanges(); const SfxItemSet* GetOutputItemSet() const { return pOutSet; } @@ -87,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/radiobtnbox.hxx b/cui/source/inc/radiobtnbox.hxx index 1688bcd43905..7c31f340be54 100644 --- a/cui/source/inc/radiobtnbox.hxx +++ b/cui/source/inc/radiobtnbox.hxx @@ -39,7 +39,6 @@ protected: public: SvxRadioButtonListBox(SvSimpleTableContainer& rParent, WinBits nBits); - virtual ~SvxRadioButtonListBox(); void HandleEntryChecked( SvTreeListEntry* _pEntry ); diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx index 8778123ed582..d3847dc6de62 100644 --- a/cui/source/inc/scriptdlg.hxx +++ b/cui/source/inc/scriptdlg.hxx @@ -77,6 +77,7 @@ public: ::com::sun::star::uno::Reference< com::sun::star::frame::XModel>& model ); SFTreeListBox(vcl::Window* pParent); virtual ~SFTreeListBox(); + virtual void dispose() SAL_OVERRIDE; SvTreeListEntry * insertEntry(OUString const & rText, sal_uInt16 nBitmap, SvTreeListEntry * pParent, @@ -94,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) @@ -131,14 +134,14 @@ public: class SvxScriptOrgDialog : public SfxModalDialog { protected: - SFTreeListBox* m_pScriptsBox; + VclPtr<SFTreeListBox> m_pScriptsBox; - PushButton* m_pRunButton; - CloseButton* m_pCloseButton; - PushButton* m_pCreateButton; - PushButton* m_pEditButton; - PushButton* m_pRenameButton; - PushButton* m_pDelButton; + 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; @@ -175,6 +178,7 @@ public: // to specify the language or provider SvxScriptOrgDialog( vcl::Window* pParent, const OUString& language ); virtual ~SvxScriptOrgDialog(); + virtual void dispose() SAL_OVERRIDE; virtual short Execute() SAL_OVERRIDE; diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx index b22b85e30f30..c1ac1e3f6b62 100644 --- a/cui/source/inc/selector.hxx +++ b/cui/source/inc/selector.hxx @@ -102,6 +102,7 @@ friend class SvxConfigGroupListBox; public: SvxConfigFunctionListBox(vcl::Window* pParent, WinBits nStyle); virtual ~SvxConfigFunctionListBox(); + virtual void dispose() SAL_OVERRIDE; void ClearAll(); OUString GetHelpText( SvTreeListEntry *pEntry ); using Window::GetHelpText; @@ -122,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 @@ -162,6 +163,7 @@ protected: public: SvxConfigGroupListBox(vcl::Window* pParent, WinBits nStyle); virtual ~SvxConfigGroupListBox(); + virtual void dispose() SAL_OVERRIDE; void Init(bool bShowSlots, const ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame >& xFrame); @@ -179,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; @@ -203,8 +205,8 @@ public: const ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame >& xFrame = 0 ); - - virtual ~SvxScriptSelectorDialog ( ); + 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 212559f32968..9d727d1583f1 100644 --- a/cui/source/inc/splitcelldlg.hxx +++ b/cui/source/inc/splitcelldlg.hxx @@ -26,17 +26,16 @@ #include <svx/stddlg.hxx> #include <svx/svxdlg.hxx> -class SvxSplitTableDlg : public SvxAbstractSplittTableDialog, public SvxStandardDialog +class SvxSplitTableDlg : public SvxAbstractSplittTableDialog { - NumericField* m_pCountEdit; - RadioButton* m_pHorzBox; - RadioButton* m_pVertBox; - CheckBox* m_pPropCB; + VclPtr<SvxStandardDialog> m_pDialog; + VclPtr<NumericField> m_pCountEdit; + VclPtr<RadioButton> m_pHorzBox; + VclPtr<RadioButton> m_pVertBox; + VclPtr<CheckBox> m_pPropCB; long mnMaxVertical; long mnMaxHorizontal; -protected: - virtual void Apply() SAL_OVERRIDE; public: SvxSplitTableDlg(vcl::Window *pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal ); diff --git a/cui/source/inc/srchxtra.hxx b/cui/source/inc/srchxtra.hxx index 0965484c9c45..f1c6aefde1a9 100644 --- a/cui/source/inc/srchxtra.hxx +++ b/cui/source/inc/srchxtra.hxx @@ -31,6 +31,7 @@ class SvxSearchFormatDialog : public SfxTabDialog public: SvxSearchFormatDialog( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxSearchFormatDialog(); + virtual void dispose() SAL_OVERRIDE; protected: virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; @@ -50,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; @@ -65,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, @@ -76,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 d293468214e7..e1db4048acc7 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; @@ -124,8 +124,9 @@ 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 VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx index 39c761a5b15e..05903afd03a4 100644 --- a/cui/source/inc/tabstpge.hxx +++ b/cui/source/inc/tabstpge.hxx @@ -50,8 +50,8 @@ class SvxTabulatorTabPage : public SfxTabPage public: virtual ~SvxTabulatorTabPage(); - - static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); + virtual void dispose() SAL_OVERRIDE; + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges() { return pRanges; } virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -66,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 2f1031d3d572..875b4d2a087f 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; @@ -76,8 +77,9 @@ private: public: SvxTextAnimationPage( vcl::Window* pWindow, const SfxItemSet& rInAttrs ); virtual ~SvxTextAnimationPage(); + virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); + static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pRanges; } virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; @@ -104,7 +106,6 @@ public: SvxTextTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, const SdrView* pView ); - virtual ~SvxTextTabDialog() {}; }; diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx index 6c309a329b92..881f3fd4837c 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; @@ -77,8 +78,9 @@ public: SvxTextAttrPage( vcl::Window* pWindow, const SfxItemSet& rInAttrs ); virtual ~SvxTextAttrPage(); + virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); + static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pRanges; } virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx index a2dcc8580118..661788124c3f 100644 --- a/cui/source/inc/thesdlg.hxx +++ b/cui/source/inc/thesdlg.hxx @@ -35,7 +35,7 @@ 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; @@ -43,6 +43,7 @@ class LookUpComboBox : public ComboBox public: LookUpComboBox(vcl::Window *pParent); virtual ~LookUpComboBox(); + virtual void dispose() SAL_OVERRIDE; DECL_LINK( ModifyTimer_Hdl, Timer * ); @@ -72,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; @@ -85,7 +86,7 @@ public: void init(SvxThesaurusDialog *pDialog); virtual ~ThesaurusAlternativesCtrl(); - + virtual void dispose() SAL_OVERRIDE; SvTreeListEntry * AddEntry( sal_Int32 nVal, const OUString &rText, bool bIsHeader ); @@ -99,7 +100,7 @@ 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; @@ -107,6 +108,7 @@ class ReplaceEdit : public Edit public: ReplaceEdit(vcl::Window *pParent); virtual ~ReplaceEdit(); + virtual void dispose() SAL_OVERRIDE; void init(Button *pBtn) { m_pBtn = pBtn; } @@ -118,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; @@ -133,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; } @@ -159,7 +164,6 @@ public: SvxThesaurusDialog( vcl::Window* pParent, css::uno::Reference< css::linguistic2::XThesaurus > xThesaurus, const OUString &rWord, LanguageType nLanguage ); - virtual ~SvxThesaurusDialog(); void SetWindowTitle( LanguageType nLanguage ); OUString GetWord(); diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx index ccc70d1b349b..52489521102e 100644 --- a/cui/source/inc/transfrm.hxx +++ b/cui/source/inc/transfrm.hxx @@ -62,7 +62,6 @@ public: SvxTransformTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, const SdrView* pView, sal_uInt16 nAnchorTypes = 0); - virtual ~SvxTransformTabDialog(); //link for the Writer to validate positions void SetValidateFramePosLink( const Link& rLink ); @@ -82,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; @@ -147,8 +146,10 @@ private: public: SvxPositionSizeTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); + virtual ~SvxPositionSizeTabPage(); + virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); + static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pPosSizeRanges; } virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; @@ -182,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; @@ -203,8 +204,10 @@ private: public: SvxAngleTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); + virtual ~SvxAngleTabPage(); + virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); + static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pAngleRanges; } virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; @@ -231,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; @@ -248,8 +251,10 @@ private: public: SvxSlantTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); + virtual ~SvxSlantTabPage(); + virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); + static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pSlantRanges; } virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx index 2fa0d064ef9c..78b63bd68761 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; @@ -200,6 +200,7 @@ public: bool bActivateLastSelection = true ); OfaTreeOptionsDialog( vcl::Window* pParent, const OUString& rExtensionId ); virtual ~OfaTreeOptionsDialog(); + virtual void dispose() SAL_OVERRIDE; OptionsPageInfo* AddTabPage( sal_uInt16 nId, const OUString& rPageName, sal_uInt16 nGroup ); sal_uInt16 AddGroup( const OUString& rGroupName, SfxShell* pCreateShell, @@ -277,6 +278,7 @@ public: com::sun::star::awt::XContainerWindowProvider >& rProvider ); virtual ~ExtensionsTabPage(); + virtual void dispose() SAL_OVERRIDE; virtual void ActivatePage() SAL_OVERRIDE; virtual void DeactivatePage() SAL_OVERRIDE; diff --git a/cui/source/inc/zoom.hxx b/cui/source/inc/zoom.hxx index 3cccaceb49e8..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; @@ -57,6 +57,7 @@ private: public: SvxZoomDialog(vcl::Window* pParent, const SfxItemSet& rCoreSet); virtual ~SvxZoomDialog(); + virtual void dispose() SAL_OVERRIDE; const SfxItemSet* GetOutputItemSet() const; |