diff options
Diffstat (limited to 'sw/source/uibase/inc')
83 files changed, 1225 insertions, 1111 deletions
diff --git a/sw/source/uibase/inc/DropDownFieldDialog.hxx b/sw/source/uibase/inc/DropDownFieldDialog.hxx index 19c42cf7dbfc..a7ef05f126f1 100644 --- a/sw/source/uibase/inc/DropDownFieldDialog.hxx +++ b/sw/source/uibase/inc/DropDownFieldDialog.hxx @@ -33,12 +33,12 @@ namespace sw { class DropDownFieldDialog : public SvxStandardDialog { - ListBox* m_pListItemsLB; + VclPtr<ListBox> m_pListItemsLB; - OKButton* m_pOKPB; - PushButton* m_pNextPB; + VclPtr<OKButton> m_pOKPB; + VclPtr<PushButton> m_pNextPB; - PushButton* m_pEditPB; + VclPtr<PushButton> m_pEditPB; SwWrtShell &rSh; SwDropDownField* pDropField; @@ -48,6 +48,8 @@ class DropDownFieldDialog : public SvxStandardDialog public: DropDownFieldDialog( vcl::Window *pParent, SwWrtShell &rSh, SwField* pField, bool bNextButton = false ); + virtual ~DropDownFieldDialog(); + virtual void dispose() SAL_OVERRIDE; }; } //namespace sw diff --git a/sw/source/uibase/inc/FrameControl.hxx b/sw/source/uibase/inc/FrameControl.hxx index 0235084c4160..936be2a1cbc8 100644 --- a/sw/source/uibase/inc/FrameControl.hxx +++ b/sw/source/uibase/inc/FrameControl.hxx @@ -17,7 +17,7 @@ class Point; */ class SwFrameControl { - SwEditWin* m_pEditWin; + VclPtr<SwEditWin> m_pEditWin; const SwFrm* m_pFrm; public: diff --git a/sw/source/uibase/inc/FrameControlsManager.hxx b/sw/source/uibase/inc/FrameControlsManager.hxx index 75585ea8fe0b..e87124b64be5 100644 --- a/sw/source/uibase/inc/FrameControlsManager.hxx +++ b/sw/source/uibase/inc/FrameControlsManager.hxx @@ -30,12 +30,13 @@ typedef std::map<const SwFrm*, SwFrameControlPtr> SwFrameControlPtrMap; class SwFrameControlsManager { private: - SwEditWin* m_pEditWin; + VclPtr<SwEditWin> m_pEditWin; std::map< FrameControlType, SwFrameControlPtrMap > m_aControls; public: SwFrameControlsManager( SwEditWin* pEditWin ); - ~SwFrameControlsManager( ); + ~SwFrameControlsManager(); + void dispose(); SwFrameControlsManager( const SwFrameControlsManager& rCopy ); const SwFrameControlsManager& operator=( const SwFrameControlsManager& rCopy ); diff --git a/sw/source/uibase/inc/HeaderFooterWin.hxx b/sw/source/uibase/inc/HeaderFooterWin.hxx index 6f151fd8ec69..32e30f5cc70b 100644 --- a/sw/source/uibase/inc/HeaderFooterWin.hxx +++ b/sw/source/uibase/inc/HeaderFooterWin.hxx @@ -20,10 +20,10 @@ */ class SwHeaderFooterWin : public MenuButton, public SwFrameControl { - OUString m_sLabel; + OUString m_sLabel; bool m_bIsHeader; PopupMenu* m_pPopupMenu; - vcl::Window* m_pLine; + VclPtr<vcl::Window> m_pLine; bool m_bIsAppearing; int m_nFadeRate; Timer m_aFadeTimer; @@ -31,6 +31,7 @@ class SwHeaderFooterWin : public MenuButton, public SwFrameControl public: SwHeaderFooterWin( SwEditWin* pEditWin, const SwPageFrm* pPageFrm, bool bHeader ); virtual ~SwHeaderFooterWin( ); + virtual void dispose() SAL_OVERRIDE; void SetOffset( Point aOffset, long nXLineStart, long nXLineEnd ); diff --git a/sw/source/uibase/inc/PageBreakWin.hxx b/sw/source/uibase/inc/PageBreakWin.hxx index ff28df16ca3f..d1b048fbc1a3 100644 --- a/sw/source/uibase/inc/PageBreakWin.hxx +++ b/sw/source/uibase/inc/PageBreakWin.hxx @@ -23,7 +23,7 @@ class SwPageFrm; class SwPageBreakWin : public MenuButton, public SwFrameControl { PopupMenu* m_pPopupMenu; - vcl::Window* m_pLine; + VclPtr<vcl::Window> m_pLine; bool m_bIsAppearing; int m_nFadeRate; int m_nDelayAppearing; ///< Before we show the control, let it transparent for a few timer ticks to avoid appearing with every mouse over. @@ -35,6 +35,7 @@ class SwPageBreakWin : public MenuButton, public SwFrameControl public: SwPageBreakWin( SwEditWin* pEditWin, const SwPageFrm* pPageFrm ); virtual ~SwPageBreakWin( ); + virtual void dispose() SAL_OVERRIDE; virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; virtual void Select( ) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/abstract.hxx b/sw/source/uibase/inc/abstract.hxx index 92443efa9d9d..0c12d35e1812 100644 --- a/sw/source/uibase/inc/abstract.hxx +++ b/sw/source/uibase/inc/abstract.hxx @@ -25,13 +25,13 @@ class SwInsertAbstractDlg : public SfxModalDialog { - NumericField* m_pLevelNF; - NumericField* m_pParaNF; - -protected: + VclPtr<NumericField> m_pLevelNF; + VclPtr<NumericField> m_pParaNF; public: SwInsertAbstractDlg( vcl::Window* pParent ); + virtual ~SwInsertAbstractDlg(); + virtual void dispose() SAL_OVERRIDE; sal_uInt8 GetLevel() const; sal_uInt8 GetPara() const; diff --git a/sw/source/uibase/inc/ascfldlg.hxx b/sw/source/uibase/inc/ascfldlg.hxx index 827d5032bcbc..b7e693814c3c 100644 --- a/sw/source/uibase/inc/ascfldlg.hxx +++ b/sw/source/uibase/inc/ascfldlg.hxx @@ -32,14 +32,14 @@ class SwDocShell; class SwAsciiFilterDlg : public SfxModalDialog { - SvxTextEncodingBox* m_pCharSetLB; - FixedText* m_pFontFT; - ListBox* m_pFontLB; - FixedText* m_pLanguageFT; - SvxLanguageBox* m_pLanguageLB; - RadioButton* m_pCRLF_RB; - RadioButton* m_pCR_RB; - RadioButton* m_pLF_RB; + VclPtr<SvxTextEncodingBox> m_pCharSetLB; + VclPtr<FixedText> m_pFontFT; + VclPtr<ListBox> m_pFontLB; + VclPtr<FixedText> m_pLanguageFT; + VclPtr<SvxLanguageBox> m_pLanguageLB; + VclPtr<RadioButton> m_pCRLF_RB; + VclPtr<RadioButton> m_pCR_RB; + VclPtr<RadioButton> m_pLF_RB; bool m_bSaveLineStatus; DECL_LINK( CharSetSelHdl, SvxTextEncodingBox* ); @@ -53,6 +53,7 @@ public: SwAsciiFilterDlg( vcl::Window* pParent, SwDocShell& rDocSh, SvStream* pStream ); virtual ~SwAsciiFilterDlg(); + virtual void dispose() SAL_OVERRIDE; void FillOptions( SwAsciiOptions& rOptions ); }; diff --git a/sw/source/uibase/inc/bookmark.hxx b/sw/source/uibase/inc/bookmark.hxx index d64a08e69a8f..1185317191d6 100644 --- a/sw/source/uibase/inc/bookmark.hxx +++ b/sw/source/uibase/inc/bookmark.hxx @@ -47,9 +47,9 @@ public: class SwInsertBookmarkDlg: public SvxStandardDialog { - BookmarkCombo* m_pBookmarkBox; - OKButton* m_pOkBtn; - PushButton* m_pDeleteBtn; + VclPtr<BookmarkCombo> m_pBookmarkBox; + VclPtr<OKButton> m_pOkBtn; + VclPtr<PushButton> m_pDeleteBtn; OUString sRemoveWarning; SwWrtShell &rSh; @@ -63,6 +63,7 @@ class SwInsertBookmarkDlg: public SvxStandardDialog public: SwInsertBookmarkDlg(vcl::Window *pParent, SwWrtShell &rSh, SfxRequest& rReq); virtual ~SwInsertBookmarkDlg(); + virtual void dispose() SAL_OVERRIDE; }; #endif diff --git a/sw/source/uibase/inc/break.hxx b/sw/source/uibase/inc/break.hxx index 55610b7dbe8c..85ce67b0ce26 100644 --- a/sw/source/uibase/inc/break.hxx +++ b/sw/source/uibase/inc/break.hxx @@ -37,13 +37,13 @@ class SwWrtShell; class SwBreakDlg: public SvxStandardDialog { SwWrtShell &rSh; - RadioButton* m_pLineBtn; - RadioButton* m_pColumnBtn; - RadioButton* m_pPageBtn; - FixedText* m_pPageCollText; - ListBox* m_pPageCollBox; - CheckBox* m_pPageNumBox; - NumericField* m_pPageNumEdit; + VclPtr<RadioButton> m_pLineBtn; + VclPtr<RadioButton> m_pColumnBtn; + VclPtr<RadioButton> m_pPageBtn; + VclPtr<FixedText> m_pPageCollText; + VclPtr<ListBox> m_pPageCollBox; + VclPtr<CheckBox> m_pPageNumBox; + VclPtr<NumericField> m_pPageNumEdit; OUString aTemplate; sal_uInt16 nKind; @@ -64,6 +64,7 @@ protected: public: SwBreakDlg( vcl::Window *pParent, SwWrtShell &rSh ); virtual ~SwBreakDlg(); + virtual void dispose() SAL_OVERRIDE; OUString GetTemplateName() { return aTemplate; } sal_uInt16 GetKind() { return nKind; } diff --git a/sw/source/uibase/inc/changedb.hxx b/sw/source/uibase/inc/changedb.hxx index 128d7aa8338d..c10948bab9c2 100644 --- a/sw/source/uibase/inc/changedb.hxx +++ b/sw/source/uibase/inc/changedb.hxx @@ -35,11 +35,11 @@ struct SwDBData; // exchange database at fields class SwChangeDBDlg: public SvxStandardDialog { - SvTreeListBox* m_pUsedDBTLB; - SwDBTreeList* m_pAvailDBTLB; - PushButton* m_pAddDBPB; - FixedText* m_pDocDBNameFT; - PushButton* m_pDefineBT; + VclPtr<SvTreeListBox> m_pUsedDBTLB; + VclPtr<SwDBTreeList> m_pAvailDBTLB; + VclPtr<PushButton> m_pAddDBPB; + VclPtr<FixedText> m_pDocDBNameFT; + VclPtr<PushButton> m_pDefineBT; ImageList aImageList; @@ -59,6 +59,7 @@ class SwChangeDBDlg: public SvxStandardDialog public: SwChangeDBDlg(SwView& rVw); virtual ~SwChangeDBDlg(); + virtual void dispose() SAL_OVERRIDE; }; #endif diff --git a/sw/source/uibase/inc/chrdlg.hxx b/sw/source/uibase/inc/chrdlg.hxx index 7c0520ade242..ff6f91b3a516 100644 --- a/sw/source/uibase/inc/chrdlg.hxx +++ b/sw/source/uibase/inc/chrdlg.hxx @@ -59,17 +59,17 @@ public: class SwCharURLPage : public SfxTabPage { - Edit* m_pURLED; - FixedText* m_pTextFT; - Edit* m_pTextED; - Edit* m_pNameED; - ComboBox* m_pTargetFrmLB; - PushButton* m_pURLPB; - PushButton* m_pEventPB; - ListBox* m_pVisitedLB; - ListBox* m_pNotVisitedLB; - - VclContainer* m_pCharStyleContainer; + VclPtr<Edit> m_pURLED; + VclPtr<FixedText> m_pTextFT; + VclPtr<Edit> m_pTextED; + VclPtr<Edit> m_pNameED; + VclPtr<ComboBox> m_pTargetFrmLB; + VclPtr<PushButton> m_pURLPB; + VclPtr<PushButton> m_pEventPB; + VclPtr<ListBox> m_pVisitedLB; + VclPtr<ListBox> m_pNotVisitedLB; + + VclPtr<VclContainer> m_pCharStyleContainer; SvxMacroItem* pINetItem; bool bModified; @@ -82,8 +82,9 @@ public: const SfxItemSet& rSet ); virtual ~SwCharURLPage(); - static SfxTabPage* Create( vcl::Window* pParent, - const SfxItemSet* rAttrSet); + virtual void dispose() SAL_OVERRIDE; + 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/sw/source/uibase/inc/colex.hxx b/sw/source/uibase/inc/colex.hxx index ce03ddce93b2..638b3c78ab2a 100644 --- a/sw/source/uibase/inc/colex.hxx +++ b/sw/source/uibase/inc/colex.hxx @@ -57,6 +57,7 @@ public: m_bVertical(false){} virtual ~SwPageGridExample(); + virtual void dispose() SAL_OVERRIDE; void UpdateExample( const SfxItemSet& rSet ); }; diff --git a/sw/source/uibase/inc/column.hxx b/sw/source/uibase/inc/column.hxx index d5efa31c7e59..fda9458182d6 100644 --- a/sw/source/uibase/inc/column.hxx +++ b/sw/source/uibase/inc/column.hxx @@ -42,10 +42,10 @@ class SwColumnPage; class SwColumnDlg : public SfxModalDialog { - ListBox* m_pApplyToLB; + VclPtr<ListBox> m_pApplyToLB; SwWrtShell& rWrtShell; - SwColumnPage* pTabPage; + VclPtr<SwColumnPage> pTabPage; SfxItemSet* pPageSet; SfxItemSet* pSectionSet; SfxItemSet* pSelectionSet; @@ -66,6 +66,7 @@ class SwColumnDlg : public SfxModalDialog public: SwColumnDlg(vcl::Window* pParent, SwWrtShell& rSh); virtual ~SwColumnDlg(); + virtual void dispose() SAL_OVERRIDE; SwWrtShell& GetWrtShell() { return rWrtShell; } }; @@ -88,39 +89,39 @@ public: // column dialog now as TabPage class SwColumnPage : public SfxTabPage { - NumericField* m_pCLNrEdt; - ColumnValueSet* m_pDefaultVS; - CheckBox* m_pBalanceColsCB; + VclPtr<NumericField> m_pCLNrEdt; + VclPtr<ColumnValueSet> m_pDefaultVS; + VclPtr<CheckBox> m_pBalanceColsCB; - PushButton* m_pBtnBack; - FixedText* m_pLbl1; + VclPtr<PushButton> m_pBtnBack; + VclPtr<FixedText> m_pLbl1; PercentField aEd1; - FixedText* m_pLbl2; + VclPtr<FixedText> m_pLbl2; PercentField aEd2; - FixedText* m_pLbl3; + VclPtr<FixedText> m_pLbl3; PercentField aEd3; - PushButton* m_pBtnNext; + VclPtr<PushButton> m_pBtnNext; PercentField aDistEd1; PercentField aDistEd2; - CheckBox* m_pAutoWidthBox; - - FixedText* m_pLineTypeLbl; - LineListBox* m_pLineTypeDLB; - FixedText* m_pLineWidthLbl; - MetricField* m_pLineWidthEdit; - FixedText* m_pLineColorLbl; - ColorListBox* m_pLineColorDLB; - FixedText* m_pLineHeightLbl; - MetricField* m_pLineHeightEdit; - FixedText* m_pLinePosLbl; - ListBox* m_pLinePosDLB; - - FixedText* m_pTextDirectionFT; - ListBox* m_pTextDirectionLB; + VclPtr<CheckBox> m_pAutoWidthBox; + + VclPtr<FixedText> m_pLineTypeLbl; + VclPtr<LineListBox> m_pLineTypeDLB; + VclPtr<FixedText> m_pLineWidthLbl; + VclPtr<MetricField> m_pLineWidthEdit; + VclPtr<FixedText> m_pLineColorLbl; + VclPtr<ColorListBox> m_pLineColorDLB; + VclPtr<FixedText> m_pLineHeightLbl; + VclPtr<MetricField> m_pLineHeightEdit; + VclPtr<FixedText> m_pLinePosLbl; + VclPtr<ListBox> m_pLinePosDLB; + + VclPtr<FixedText> m_pTextDirectionFT; + VclPtr<ListBox> m_pTextDirectionLB; // Example - SwColExample* m_pPgeExampleWN; - SwColumnOnlyExample* m_pFrmExampleWN; + VclPtr<SwColExample> m_pPgeExampleWN; + VclPtr<SwColumnOnlyExample> m_pFrmExampleWN; SwColMgr* pColMgr; @@ -131,7 +132,7 @@ class SwColumnPage : public SfxTabPage sal_uInt16 nMinWidth; PercentField* pModifiedField; - std::map<MetricField*, PercentField*> m_aPercentFieldsMap; + std::map<VclPtr<MetricField>, PercentField*> m_aPercentFieldsMap; bool bFormat; bool bFrm; @@ -163,8 +164,6 @@ class SwColumnPage : public SfxTabPage virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; - SwColumnPage(vcl::Window *pParent, const SfxItemSet &rSet); - void connectPercentField(PercentField &rWrap, const OString &rName); bool isLineNotNone() const; @@ -172,9 +171,11 @@ class SwColumnPage : public SfxTabPage static const sal_uInt16 aPageRg[]; public: + SwColumnPage(vcl::Window *pParent, const SfxItemSet &rSet); virtual ~SwColumnPage(); + 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 aPageRg; } virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/conttree.hxx b/sw/source/uibase/inc/conttree.hxx index 080572081d5a..ee23a095d861 100644 --- a/sw/source/uibase/inc/conttree.hxx +++ b/sw/source/uibase/inc/conttree.hxx @@ -144,6 +144,7 @@ protected: public: SwContentTree(vcl::Window* pParent, const ResId& rResId); virtual ~SwContentTree(); + virtual void dispose() SAL_OVERRIDE; OUString GetEntryAltText( SvTreeListEntry* pEntry ) const SAL_OVERRIDE; OUString GetEntryLongDescription( SvTreeListEntry* pEntry ) const SAL_OVERRIDE; SdrObject* GetDrawingObjectsByContent(const SwContent *pCnt); @@ -232,11 +233,11 @@ private: ImageList aEntryImages; SwWrtShell* pActiveShell; - SvTreeListEntry* pEmphasisEntry; // Drag'n Drop emphasis - SvTreeListEntry* pDDSource; // source for Drag'n Drop + SvTreeListEntry* pEmphasisEntry; // Drag'n Drop emphasis + SvTreeListEntry* pDDSource; // source for Drag'n Drop SwGlblDocContents* pSwGlblDocContents; // array with sorted content - vcl::Window* pDefParentWin; + VclPtr<vcl::Window> pDefParentWin; SwGlblDocContent* pDocContent; sfx2::DocumentInserter* pDocInserter; @@ -313,6 +314,7 @@ protected: public: SwGlobalTree(vcl::Window* pParent, const ResId& rResId); virtual ~SwGlobalTree(); + virtual void dispose() SAL_OVERRIDE; void TbxMenuHdl(sal_uInt16 nTbxId, ToolBox* pBox); void InsertRegion( const SwGlblDocContent* pCont, diff --git a/sw/source/uibase/inc/convert.hxx b/sw/source/uibase/inc/convert.hxx index 8b803bfee2db..1a52d8ba2c99 100644 --- a/sw/source/uibase/inc/convert.hxx +++ b/sw/source/uibase/inc/convert.hxx @@ -32,24 +32,24 @@ struct SwInsertTableOptions; class SwConvertTableDlg: public SfxModalDialog { - RadioButton* mpTabBtn; - RadioButton* mpSemiBtn; - RadioButton* mpParaBtn; - RadioButton* mpOtherBtn; - Edit* mpOtherEd; - CheckBox* mpKeepColumn; + VclPtr<RadioButton> mpTabBtn; + VclPtr<RadioButton> mpSemiBtn; + VclPtr<RadioButton> mpParaBtn; + VclPtr<RadioButton> mpOtherBtn; + VclPtr<Edit> mpOtherEd; + VclPtr<CheckBox> mpKeepColumn; - VclContainer* mpOptions; + VclPtr<VclContainer> mpOptions; - CheckBox* mpHeaderCB; - CheckBox* mpRepeatHeaderCB; + VclPtr<CheckBox> mpHeaderCB; + VclPtr<CheckBox> mpRepeatHeaderCB; - VclContainer* mpRepeatRows; - NumericField* mpRepeatHeaderNF; + VclPtr<VclContainer> mpRepeatRows; + VclPtr<NumericField> mpRepeatHeaderNF; - CheckBox* mpDontSplitCB; - CheckBox* mpBorderCB; - PushButton* mpAutoFmtBtn; + VclPtr<CheckBox> mpDontSplitCB; + VclPtr<CheckBox> mpBorderCB; + VclPtr<PushButton> mpAutoFmtBtn; OUString sConvertTextTable; SwTableAutoFmt* pTAutoFmt; @@ -63,6 +63,7 @@ class SwConvertTableDlg: public SfxModalDialog public: SwConvertTableDlg( SwView& rView, bool bToTable ); virtual ~SwConvertTableDlg(); + virtual void dispose() SAL_OVERRIDE; void GetValues( sal_Unicode& rDelim, SwInsertTableOptions& rInsTblOpts, diff --git a/sw/source/uibase/inc/cption.hxx b/sw/source/uibase/inc/cption.hxx index 98ed59d65c0d..5f99c2025360 100644 --- a/sw/source/uibase/inc/cption.hxx +++ b/sw/source/uibase/inc/cption.hxx @@ -63,24 +63,24 @@ public: class SwCaptionDialog : public SvxStandardDialog { - Edit* m_pTextEdit; - ComboBox* m_pCategoryBox; + VclPtr<Edit> m_pTextEdit; + VclPtr<ComboBox> m_pCategoryBox; OUString m_sNone; TextFilterAutoConvert m_aTextFilter; - FixedText* m_pFormatText; - ListBox* m_pFormatBox; + VclPtr<FixedText> m_pFormatText; + VclPtr<ListBox> m_pFormatBox; //#i61007# order of captions - FixedText* m_pNumberingSeparatorFT; - Edit* m_pNumberingSeparatorED; - FixedText* m_pSepText; - Edit* m_pSepEdit; - FixedText* m_pPosText; - ListBox* m_pPosBox; - OKButton* m_pOKButton; - PushButton* m_pAutoCaptionButton; - PushButton* m_pOptionButton; - - SwCaptionPreview* m_pPreview; + VclPtr<FixedText> m_pNumberingSeparatorFT; + VclPtr<Edit> m_pNumberingSeparatorED; + VclPtr<FixedText> m_pSepText; + VclPtr<Edit> m_pSepEdit; + VclPtr<FixedText> m_pPosText; + VclPtr<ListBox> m_pPosBox; + VclPtr<OKButton> m_pOKButton; + VclPtr<PushButton> m_pAutoCaptionButton; + VclPtr<PushButton> m_pOptionButton; + + VclPtr<SwCaptionPreview> m_pPreview; SwView &rView; // search per active, avoid View SwFldMgr *pMgr; // pointer to save the include @@ -109,6 +109,7 @@ class SwCaptionDialog : public SvxStandardDialog public: SwCaptionDialog( vcl::Window *pParent, SwView &rV ); virtual ~SwCaptionDialog(); + virtual void dispose() SAL_OVERRIDE; }; #endif diff --git a/sw/source/uibase/inc/dbinsdlg.hxx b/sw/source/uibase/inc/dbinsdlg.hxx index e48f422fed9a..260a7fcc96e1 100644 --- a/sw/source/uibase/inc/dbinsdlg.hxx +++ b/sw/source/uibase/inc/dbinsdlg.hxx @@ -87,38 +87,38 @@ public: class SwInsertDBColAutoPilot : public SfxModalDialog, public utl::ConfigItem { - RadioButton* m_pRbAsTable; - RadioButton* m_pRbAsField; - RadioButton* m_pRbAsText; + VclPtr<RadioButton> m_pRbAsTable; + VclPtr<RadioButton> m_pRbAsField; + VclPtr<RadioButton> m_pRbAsText; - VclFrame* m_pHeadFrame; + VclPtr<VclFrame> m_pHeadFrame; - ListBox* m_pLbTblDbColumn; - ListBox* m_pLbTxtDbColumn; + VclPtr<ListBox> m_pLbTblDbColumn; + VclPtr<ListBox> m_pLbTxtDbColumn; - VclFrame* m_pFormatFrame; - RadioButton* m_pRbDbFmtFromDb; - RadioButton* m_pRbDbFmtFromUsr; - NumFormatListBox* m_pLbDbFmtFromUsr; + VclPtr<VclFrame> m_pFormatFrame; + VclPtr<RadioButton> m_pRbDbFmtFromDb; + VclPtr<RadioButton> m_pRbDbFmtFromUsr; + VclPtr<NumFormatListBox> m_pLbDbFmtFromUsr; // Page Text/Field - PushButton* m_pIbDbcolToEdit; - VclMultiLineEdit* m_pEdDbText; - FixedText* m_pFtDbParaColl; - ListBox* m_pLbDbParaColl; + VclPtr<PushButton> m_pIbDbcolToEdit; + VclPtr<VclMultiLineEdit> m_pEdDbText; + VclPtr<FixedText> m_pFtDbParaColl; + VclPtr<ListBox> m_pLbDbParaColl; // Page Table - PushButton* m_pIbDbcolAllTo; - PushButton* m_pIbDbcolOneTo; - PushButton* m_pIbDbcolOneFrom; - PushButton* m_pIbDbcolAllFrom; - FixedText* m_pFtTableCol; - ListBox* m_pLbTableCol; - CheckBox* m_pCbTableHeadon; - RadioButton* m_pRbHeadlColnms; - RadioButton* m_pRbHeadlEmpty; - PushButton* m_pPbTblFormat; - PushButton* m_pPbTblAutofmt; + VclPtr<PushButton> m_pIbDbcolAllTo; + VclPtr<PushButton> m_pIbDbcolOneTo; + VclPtr<PushButton> m_pIbDbcolOneFrom; + VclPtr<PushButton> m_pIbDbcolAllFrom; + VclPtr<FixedText> m_pFtTableCol; + VclPtr<ListBox> m_pLbTableCol; + VclPtr<CheckBox> m_pCbTableHeadon; + VclPtr<RadioButton> m_pRbHeadlColnms; + VclPtr<RadioButton> m_pRbHeadlEmpty; + VclPtr<PushButton> m_pPbTblFormat; + VclPtr<PushButton> m_pPbTblAutofmt; SwInsDBColumns aDBColumns; const SwDBData aDBData; @@ -158,6 +158,7 @@ public: const SwDBData& rData ); virtual ~SwInsertDBColAutoPilot(); + virtual void dispose() SAL_OVERRIDE; void DataToDoc( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rSelection, ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> rxSource, diff --git a/sw/source/uibase/inc/dbtree.hxx b/sw/source/uibase/inc/dbtree.hxx index e41d911bf141..94179d40e062 100644 --- a/sw/source/uibase/inc/dbtree.hxx +++ b/sw/source/uibase/inc/dbtree.hxx @@ -54,6 +54,7 @@ class SW_DLLPUBLIC SwDBTreeList : public SvTreeListBox public: SwDBTreeList(vcl::Window* pParent, WinBits nStyle); virtual ~SwDBTreeList(); + virtual void dispose() SAL_OVERRIDE; virtual Size GetOptimalSize() const SAL_OVERRIDE; OUString GetDBName( OUString& rTableName, OUString& rColumnName, sal_Bool* pbIsTable = 0); diff --git a/sw/source/uibase/inc/dbui.hxx b/sw/source/uibase/inc/dbui.hxx index 0649bcb9ca6e..879da6302939 100644 --- a/sw/source/uibase/inc/dbui.hxx +++ b/sw/source/uibase/inc/dbui.hxx @@ -29,7 +29,7 @@ class SW_DLLPUBLIC CancelableDialog : public Dialog bool mbModal; protected: - CancelButton* m_pCancelButton; + VclPtr<CancelButton> m_pCancelButton; CancelableDialog( vcl::Window *pParent, bool modal, const OUString& rID, const OUString& rUIXMLDescription ); @@ -40,6 +40,8 @@ protected: public: virtual ~CancelableDialog(); + virtual void dispose() SAL_OVERRIDE; + void SetCancelHdl( const Link& rLink ); void Show(); }; @@ -53,18 +55,22 @@ public: MONITOR_TYPE_SAVE }; - FixedText* m_pDocName; - FixedText* m_pPrinting; - FixedText* m_pPrinter; - FixedText* m_pPrintInfo; + VclPtr<FixedText> m_pDocName; + VclPtr<FixedText> m_pPrinting; + VclPtr<FixedText> m_pPrinter; + VclPtr<FixedText> m_pPrintInfo; PrintMonitor( vcl::Window *pParent, bool modal, PrintMonitorType eType ); + virtual ~PrintMonitor(); + virtual void dispose() SAL_OVERRIDE; }; class CreateMonitor : public CancelableDialog { public: CreateMonitor( vcl::Window *pParent, bool modal ); + virtual ~CreateMonitor(); + virtual void dispose() SAL_OVERRIDE; void SetTotalCount( sal_Int32 nTotal ); void SetCurrentPosition( sal_Int32 nCurrent ); @@ -73,7 +79,7 @@ private: void UpdateCountingText(); private: - FixedText* m_pCounting; + VclPtr<FixedText> m_pCounting; OUString m_sCountingPattern; OUString m_sVariable_Total; diff --git a/sw/source/uibase/inc/docstdlg.hxx b/sw/source/uibase/inc/docstdlg.hxx index e02a80ea0369..ce769478e3b2 100644 --- a/sw/source/uibase/inc/docstdlg.hxx +++ b/sw/source/uibase/inc/docstdlg.hxx @@ -32,8 +32,9 @@ class SwDocStatPage: public SfxTabPage public: SwDocStatPage(vcl::Window *pParent, const SfxItemSet &rSet); virtual ~SwDocStatPage(); + virtual void dispose() SAL_OVERRIDE; - static SfxTabPage *Create(vcl::Window *pParent, const SfxItemSet *rSet); + static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet); protected: virtual bool FillItemSet( SfxItemSet *rSet) SAL_OVERRIDE; @@ -42,18 +43,18 @@ protected: DECL_LINK(UpdateHdl, void *); private: - FixedText* m_pPageNo; - FixedText* m_pTableNo; - FixedText* m_pGrfNo; - FixedText* m_pOLENo; - FixedText* m_pParaNo; - FixedText* m_pWordNo; - FixedText* m_pCharNo; - FixedText* m_pCharExclSpacesNo; + VclPtr<FixedText> m_pPageNo; + VclPtr<FixedText> m_pTableNo; + VclPtr<FixedText> m_pGrfNo; + VclPtr<FixedText> m_pOLENo; + VclPtr<FixedText> m_pParaNo; + VclPtr<FixedText> m_pWordNo; + VclPtr<FixedText> m_pCharNo; + VclPtr<FixedText> m_pCharExclSpacesNo; - FixedText* m_pLineLbl; - FixedText* m_pLineNo; - PushButton* m_pUpdatePB; + VclPtr<FixedText> m_pLineLbl; + VclPtr<FixedText> m_pLineNo; + VclPtr<PushButton> m_pUpdatePB; SwDocStat aDocStat; diff --git a/sw/source/uibase/inc/drawbase.hxx b/sw/source/uibase/inc/drawbase.hxx index b6aa7ea849ce..42c3adada3d1 100644 --- a/sw/source/uibase/inc/drawbase.hxx +++ b/sw/source/uibase/inc/drawbase.hxx @@ -33,7 +33,7 @@ class SwDrawBase protected: SwView* m_pView; SwWrtShell* m_pSh; - SwEditWin* m_pWin; + VclPtr<SwEditWin> m_pWin; Point m_aStartPos; // position of BeginCreate Point m_aMDPos; // position of MouseButtonDown sal_uInt16 m_nSlotId; diff --git a/sw/source/uibase/inc/drpcps.hxx b/sw/source/uibase/inc/drpcps.hxx index f24a6051f4b3..c54fdf8c48a7 100644 --- a/sw/source/uibase/inc/drpcps.hxx +++ b/sw/source/uibase/inc/drpcps.hxx @@ -45,20 +45,20 @@ class SwDropCapsPict; class SwDropCapsPage : public SfxTabPage { friend class SwDropCapsPict; - CheckBox* m_pDropCapsBox; - CheckBox* m_pWholeWordCB; - FixedText* m_pSwitchText; - NumericField* m_pDropCapsField; - FixedText* m_pLinesText; - NumericField* m_pLinesField; - FixedText* m_pDistanceText; - MetricField* m_pDistanceField; - FixedText* m_pTextText; - Edit* m_pTextEdit; - FixedText* m_pTemplateText; - ListBox* m_pTemplateBox; - - SwDropCapsPict* m_pPict; + VclPtr<CheckBox> m_pDropCapsBox; + VclPtr<CheckBox> m_pWholeWordCB; + VclPtr<FixedText> m_pSwitchText; + VclPtr<NumericField> m_pDropCapsField; + VclPtr<FixedText> m_pLinesText; + VclPtr<NumericField> m_pLinesField; + VclPtr<FixedText> m_pDistanceText; + VclPtr<MetricField> m_pDistanceField; + VclPtr<FixedText> m_pTextText; + VclPtr<Edit> m_pTextEdit; + VclPtr<FixedText> m_pTemplateText; + VclPtr<ListBox> m_pTemplateBox; + + VclPtr<SwDropCapsPict> m_pPict; bool bModified; bool bFormat; @@ -66,9 +66,6 @@ friend class SwDropCapsPict; SwWrtShell &rSh; - SwDropCapsPage(vcl::Window *pParent, const SfxItemSet &rSet); - virtual ~SwDropCapsPage(); - virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; void FillSet( SfxItemSet &rSet ); @@ -83,8 +80,11 @@ friend class SwDropCapsPict; static const sal_uInt16 aPageRg[]; public: + SwDropCapsPage(vcl::Window *pParent, const SfxItemSet &rSet); + virtual ~SwDropCapsPage(); + 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 aPageRg; } diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx index ae961362af52..aaf06adaa854 100644 --- a/sw/source/uibase/inc/edtwin.hxx +++ b/sw/source/uibase/inc/edtwin.hxx @@ -296,6 +296,8 @@ public: SwEditWin(vcl::Window *pParent, SwView &); virtual ~SwEditWin(); + virtual void dispose() SAL_OVERRIDE; + /// @see OutputDevice::LogicInvalidate(). void LogicInvalidate(const Rectangle* pRectangle) SAL_OVERRIDE; /// Same as MouseButtonDown(), but coordinates are in logic unit. diff --git a/sw/source/uibase/inc/envlop.hxx b/sw/source/uibase/inc/envlop.hxx index 1cbd63545850..962dd8ca8dd1 100644 --- a/sw/source/uibase/inc/envlop.hxx +++ b/sw/source/uibase/inc/envlop.hxx @@ -62,7 +62,7 @@ friend class SwEnvPreview; SwEnvItem aEnvItem; SwWrtShell *pSh; - Printer *pPrinter; + VclPtr<Printer> pPrinter; SfxItemSet *pAddresseeSet; SfxItemSet *pSenderSet; sal_uInt16 m_nEnvPrintId; @@ -73,25 +73,23 @@ friend class SwEnvPreview; public: SwEnvDlg(vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, bool bInsert); virtual ~SwEnvDlg(); + virtual void dispose() SAL_OVERRIDE; }; class SwEnvPage : public SfxTabPage { - VclMultiLineEdit* m_pAddrEdit; - ListBox* m_pDatabaseLB; - ListBox* m_pTableLB; - ListBox* m_pDBFieldLB; - PushButton* m_pInsertBT; - CheckBox* m_pSenderBox; - VclMultiLineEdit* m_pSenderEdit; - SwEnvPreview* m_pPreview; + VclPtr<VclMultiLineEdit> m_pAddrEdit; + VclPtr<ListBox> m_pDatabaseLB; + VclPtr<ListBox> m_pTableLB; + VclPtr<ListBox> m_pDBFieldLB; + VclPtr<PushButton> m_pInsertBT; + VclPtr<CheckBox> m_pSenderBox; + VclPtr<VclMultiLineEdit> m_pSenderEdit; + VclPtr<SwEnvPreview> m_pPreview; SwWrtShell* pSh; OUString sActDBName; - SwEnvPage(vcl::Window* pParent, const SfxItemSet& rSet); - virtual ~SwEnvPage(); - DECL_LINK( DatabaseHdl, ListBox * ); DECL_LINK(FieldHdl, void *); DECL_LINK(SenderHdl, void *); @@ -104,8 +102,11 @@ class SwEnvPage : public SfxTabPage using SfxTabPage::DeactivatePage; public: + SwEnvPage(vcl::Window* pParent, const SfxItemSet& rSet); + virtual ~SwEnvPage(); + virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rSet); + static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual sfxpg DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/fldedt.hxx b/sw/source/uibase/inc/fldedt.hxx index 26dc320e0a04..626dc917c8fa 100644 --- a/sw/source/uibase/inc/fldedt.hxx +++ b/sw/source/uibase/inc/fldedt.hxx @@ -28,21 +28,22 @@ class SwFldMgr; class SwFldEditDlg : public SfxSingleTabDialog { SwWrtShell* pSh; - PushButton* m_pPrevBT; - PushButton* m_pNextBT; - PushButton* m_pAddressBT; + VclPtr<PushButton> m_pPrevBT; + VclPtr<PushButton> m_pNextBT; + VclPtr<PushButton> m_pAddressBT; DECL_LINK(AddressHdl, void *); DECL_LINK(NextPrevHdl, Button *pBt = 0); void Init(); - SfxTabPage* CreatePage(sal_uInt16 nGroup); + VclPtr<SfxTabPage> CreatePage(sal_uInt16 nGroup); void EnsureSelection(SwField *pCurFld, SwFldMgr &rMgr); public: SwFldEditDlg(SwView& rVw); virtual ~SwFldEditDlg(); + virtual void dispose() SAL_OVERRIDE; DECL_LINK(OKHdl, void *); diff --git a/sw/source/uibase/inc/fldmgr.hxx b/sw/source/uibase/inc/fldmgr.hxx index e24f19d89303..57cfeda448c8 100644 --- a/sw/source/uibase/inc/fldmgr.hxx +++ b/sw/source/uibase/inc/fldmgr.hxx @@ -24,6 +24,7 @@ #include <com/sun/star/uno/Reference.h> #include <com/sun/star/uno/Any.h> #include <vector> +#include <vcl/vclptr.hxx> namespace com{namespace sun{namespace star{ namespace container{ @@ -75,7 +76,7 @@ struct SwInsertFld_Data ::com::sun::star::uno::Any aDBDataSource; ::com::sun::star::uno::Any aDBConnection; ::com::sun::star::uno::Any aDBColumn; - vcl::Window* pParent; // parent dialog used for SwWrtShell::StartInputFldDlg() + VclPtr<vcl::Window> pParent; // parent dialog used for SwWrtShell::StartInputFldDlg() SwInsertFld_Data(sal_uInt16 nType, sal_uInt16 nSub, const OUString& rPar1, const OUString& rPar2, sal_uLong nFmtId, SwWrtShell* pShell = NULL, sal_Unicode cSep = ' ', bool bIsAutoLanguage = true) : diff --git a/sw/source/uibase/inc/formedt.hxx b/sw/source/uibase/inc/formedt.hxx index 118869e93e74..32f6d8e7de8d 100644 --- a/sw/source/uibase/inc/formedt.hxx +++ b/sw/source/uibase/inc/formedt.hxx @@ -50,23 +50,23 @@ class SwIdxFormDlg : public SvxStandardDialog void UpdatePattern(); void Apply() SAL_OVERRIDE; - ListBox aEntryLB; - OKButton aOKBtn; - CancelButton aCancelBT; - FixedText aLevelFT; - Edit aEntryED; - PushButton aEntryBT; - PushButton aTabBT; - PushButton aPageBT; - PushButton aJumpBT; - FixedLine aEntryFL; - FixedText aLevelFT2; - ListBox aLevelLB; - FixedText aTemplateFT; - ListBox aParaLayLB; - PushButton aStdBT; - PushButton aAssignBT; - FixedLine aFormatFL; + VclPtr<ListBox> aEntryLB; + VclPtr<OKButton> aOKBtn; + VclPtr<CancelButton> aCancelBT; + VclPtr<FixedText> aLevelFT; + VclPtr<Edit> aEntryED; + VclPtr<PushButton> aEntryBT; + VclPtr<PushButton> aTabBT; + VclPtr<PushButton> aPageBT; + VclPtr<PushButton> aJumpBT; + VclPtr<FixedLine> aEntryFL; + VclPtr<FixedText> aLevelFT2; + VclPtr<ListBox> aLevelLB; + VclPtr<FixedText> aTemplateFT; + VclPtr<ListBox> aParaLayLB; + VclPtr<PushButton> aStdBT; + VclPtr<PushButton> aAssignBT; + VclPtr<FixedLine> aFormatFL; SwWrtShell &rSh; SwForm *pForm; @@ -76,6 +76,7 @@ class SwIdxFormDlg : public SvxStandardDialog public: SwIdxFormDlg( vcl::Window* pParent, SwWrtShell &rShell, const SwForm& rForm ); virtual ~SwIdxFormDlg(); + virtual void dispose() SAL_OVERRIDE; const SwForm& GetTOXForm(); }; diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx index 6d5ab8e198ee..88498685c99e 100644 --- a/sw/source/uibase/inc/frmpage.hxx +++ b/sw/source/uibase/inc/frmpage.hxx @@ -42,52 +42,52 @@ struct SwPosition; class SwFrmPage: public SfxTabPage { // size - FixedText* m_pWidthFT; - FixedText* m_pWidthAutoFT; - PercentField m_aWidthED; - CheckBox* m_pRelWidthCB; - ListBox* m_pRelWidthRelationLB; - CheckBox* m_pAutoWidthCB; - - FixedText* m_pHeightFT; - FixedText* m_pHeightAutoFT; - PercentField m_aHeightED; - CheckBox* m_pRelHeightCB; - ListBox* m_pRelHeightRelationLB; - CheckBox* m_pAutoHeightCB; - - CheckBox* m_pFixedRatioCB; - PushButton* m_pRealSizeBT; + VclPtr<FixedText> m_pWidthFT; + VclPtr<FixedText> m_pWidthAutoFT; + PercentField m_aWidthED; + VclPtr<CheckBox> m_pRelWidthCB; + VclPtr<ListBox> m_pRelWidthRelationLB; + VclPtr<CheckBox> m_pAutoWidthCB; + + VclPtr<FixedText> m_pHeightFT; + VclPtr<FixedText> m_pHeightAutoFT; + PercentField m_aHeightED; + VclPtr<CheckBox> m_pRelHeightCB; + VclPtr<ListBox> m_pRelHeightRelationLB; + VclPtr<CheckBox> m_pAutoHeightCB; + + VclPtr<CheckBox> m_pFixedRatioCB; + VclPtr<PushButton> m_pRealSizeBT; // anchor - VclContainer* m_pAnchorFrame; - RadioButton* m_pAnchorAtPageRB; - RadioButton* m_pAnchorAtParaRB; - RadioButton* m_pAnchorAtCharRB; - RadioButton* m_pAnchorAsCharRB; - RadioButton* m_pAnchorAtFrameRB; + VclPtr<VclContainer> m_pAnchorFrame; + VclPtr<RadioButton> m_pAnchorAtPageRB; + VclPtr<RadioButton> m_pAnchorAtParaRB; + VclPtr<RadioButton> m_pAnchorAtCharRB; + VclPtr<RadioButton> m_pAnchorAsCharRB; + VclPtr<RadioButton> m_pAnchorAtFrameRB; // position - FixedText* m_pHorizontalFT; - ListBox* m_pHorizontalDLB; - FixedText* m_pAtHorzPosFT; - MetricField* m_pAtHorzPosED; - FixedText* m_pHoriRelationFT; - ListBox* m_pHoriRelationLB; - - CheckBox* m_pMirrorPagesCB; - - FixedText* m_pVerticalFT; - ListBox* m_pVerticalDLB; - FixedText* m_pAtVertPosFT; - MetricField* m_pAtVertPosED; - FixedText* m_pVertRelationFT; - ListBox* m_pVertRelationLB; + VclPtr<FixedText> m_pHorizontalFT; + VclPtr<ListBox> m_pHorizontalDLB; + VclPtr<FixedText> m_pAtHorzPosFT; + VclPtr<MetricField> m_pAtHorzPosED; + VclPtr<FixedText> m_pHoriRelationFT; + VclPtr<ListBox> m_pHoriRelationLB; + + VclPtr<CheckBox> m_pMirrorPagesCB; + + VclPtr<FixedText> m_pVerticalFT; + VclPtr<ListBox> m_pVerticalDLB; + VclPtr<FixedText> m_pAtVertPosFT; + VclPtr<MetricField> m_pAtVertPosED; + VclPtr<FixedText> m_pVertRelationFT; + VclPtr<ListBox> m_pVertRelationLB; // #i18732# - check box for new option 'FollowTextFlow' - CheckBox* m_pFollowTextFlowCB; + VclPtr<CheckBox> m_pFollowTextFlowCB; // example - SvxSwFrameExample* m_pExampleWN; + VclPtr<SvxSwFrameExample> m_pExampleWN; //'string provider' SvxSwFramePosString aFramePosString; @@ -174,9 +174,6 @@ class SwFrmPage: public SfxTabPage void EnableGraficMode(); // hides auto check boxes and re-org controls for "Real Size" button - SwFrmPage(vcl::Window *pParent, const SfxItemSet &rSet); - virtual ~SwFrmPage(); - SwWrtShell *getFrmDlgParentShell(); using SfxTabPage::ActivatePage; @@ -185,8 +182,11 @@ class SwFrmPage: public SfxTabPage static const sal_uInt16 aPageRg[]; public: + SwFrmPage(vcl::Window *pParent, const SfxItemSet &rSet); + virtual ~SwFrmPage(); + 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 aPageRg; } virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; @@ -202,16 +202,16 @@ public: class SwGrfExtPage: public SfxTabPage { // mirror - VclContainer* m_pMirror; - CheckBox* m_pMirrorVertBox; - CheckBox* m_pMirrorHorzBox; - RadioButton* m_pAllPagesRB; - RadioButton* m_pLeftPagesRB; - RadioButton* m_pRightPagesRB; - BmpWindow* m_pBmpWin; + VclPtr<VclContainer> m_pMirror; + VclPtr<CheckBox> m_pMirrorVertBox; + VclPtr<CheckBox> m_pMirrorHorzBox; + VclPtr<RadioButton> m_pAllPagesRB; + VclPtr<RadioButton> m_pLeftPagesRB; + VclPtr<RadioButton> m_pRightPagesRB; + VclPtr<BmpWindow> m_pBmpWin; - Edit* m_pConnectED; - PushButton* m_pBrowseBT; + VclPtr<Edit> m_pConnectED; + VclPtr<PushButton> m_pBrowseBT; OUString aFilterName; OUString aGrfName, aNewGrfName; @@ -225,15 +225,16 @@ class SwGrfExtPage: public SfxTabPage DECL_LINK(BrowseHdl, void *); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; - SwGrfExtPage(vcl::Window *pParent, const SfxItemSet &rSet); virtual ~SwGrfExtPage(); + virtual void dispose() SAL_OVERRIDE; using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; public: + SwGrfExtPage(vcl::Window *pParent, const SfxItemSet &rSet); - 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; @@ -243,26 +244,26 @@ public: class SwFrmURLPage : public SfxTabPage { // hyperlink - Edit* pURLED; - PushButton* pSearchPB; - Edit* pNameED; - ComboBox* pFrameCB; + VclPtr<Edit> pURLED; + VclPtr<PushButton> pSearchPB; + VclPtr<Edit> pNameED; + VclPtr<ComboBox> pFrameCB; // image map - CheckBox* pServerCB; - CheckBox* pClientCB; + VclPtr<CheckBox> pServerCB; + VclPtr<CheckBox> pClientCB; DECL_LINK(InsertFileHdl, void *); - SwFrmURLPage(vcl::Window *pParent, const SfxItemSet &rSet); - virtual ~SwFrmURLPage(); - using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; public: + SwFrmURLPage(vcl::Window *pParent, const SfxItemSet &rSet); + virtual ~SwFrmURLPage(); + virtual void dispose() SAL_OVERRIDE; - 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; @@ -270,29 +271,29 @@ public: class SwFrmAddPage : public SfxTabPage { - VclContainer* pNameFrame; - FixedText* pNameFT; - Edit* pNameED; - FixedText* pAltNameFT; - Edit* pAltNameED; - FixedText* pPrevFT; - ListBox* pPrevLB; - FixedText* pNextFT; - ListBox* pNextLB; - - VclContainer* pProtectFrame; - CheckBox* pProtectContentCB; - CheckBox* pProtectFrameCB; - CheckBox* pProtectSizeCB; - - VclContainer* m_pContentAlignFrame; - ListBox* m_pVertAlignLB; - - VclContainer* pPropertiesFrame; - CheckBox* pEditInReadonlyCB; - CheckBox* pPrintFrameCB; - FixedText* pTextFlowFT; - ListBox* pTextFlowLB; + VclPtr<VclContainer> pNameFrame; + VclPtr<FixedText> pNameFT; + VclPtr<Edit> pNameED; + VclPtr<FixedText> pAltNameFT; + VclPtr<Edit> pAltNameED; + VclPtr<FixedText> pPrevFT; + VclPtr<ListBox> pPrevLB; + VclPtr<FixedText> pNextFT; + VclPtr<ListBox> pNextLB; + + VclPtr<VclContainer> pProtectFrame; + VclPtr<CheckBox> pProtectContentCB; + VclPtr<CheckBox> pProtectFrameCB; + VclPtr<CheckBox> pProtectSizeCB; + + VclPtr<VclContainer> m_pContentAlignFrame; + VclPtr<ListBox> m_pVertAlignLB; + + VclPtr<VclContainer> pPropertiesFrame; + VclPtr<CheckBox> pEditInReadonlyCB; + VclPtr<CheckBox> pPrintFrameCB; + VclPtr<FixedText> pTextFlowFT; + VclPtr<ListBox> pTextFlowLB; SwWrtShell* pWrtSh; @@ -304,14 +305,14 @@ class SwFrmAddPage : public SfxTabPage DECL_LINK(EditModifyHdl, void *); DECL_LINK(ChainModifyHdl, ListBox*); - SwFrmAddPage(vcl::Window *pParent, const SfxItemSet &rSet); - virtual ~SwFrmAddPage(); - static const sal_uInt16 aAddPgRg[]; public: + SwFrmAddPage(vcl::Window *pParent, const SfxItemSet &rSet); + virtual ~SwFrmAddPage(); + 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 aAddPgRg; } virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/glosbib.hxx b/sw/source/uibase/inc/glosbib.hxx index 622b3cb20692..bcfe4a229eae 100644 --- a/sw/source/uibase/inc/glosbib.hxx +++ b/sw/source/uibase/inc/glosbib.hxx @@ -70,13 +70,13 @@ public: class SwGlossaryGroupDlg : public SvxStandardDialog { - FEdit* m_pNameED; - ListBox* m_pPathLB; - SwGlossaryGroupTLB* m_pGroupTLB; + VclPtr<FEdit> m_pNameED; + VclPtr<ListBox> m_pPathLB; + VclPtr<SwGlossaryGroupTLB> m_pGroupTLB; - PushButton* m_pNewPB; - PushButton* m_pDelPB; - PushButton* m_pRenamePB; + VclPtr<PushButton> m_pNewPB; + VclPtr<PushButton> m_pDelPB; + VclPtr<PushButton> m_pRenamePB; typedef std::vector< OUString> OUVector_t; OUVector_t m_RemovedArr; @@ -102,6 +102,7 @@ public: std::vector<OUString> const& rPathArr, SwGlossaryHdl *pGlosHdl); virtual ~SwGlossaryGroupDlg(); + virtual void dispose() SAL_OVERRIDE; const OUString& GetCreatedGroupName() const {return sCreatedGroup;} }; diff --git a/sw/source/uibase/inc/glossary.hxx b/sw/source/uibase/inc/glossary.hxx index 7fad065d8bb9..62ae7b46198e 100644 --- a/sw/source/uibase/inc/glossary.hxx +++ b/sw/source/uibase/inc/glossary.hxx @@ -88,19 +88,19 @@ class SwGlossaryDlg : public SvxStandardDialog friend class SwNewGlosNameDlg; friend class SwGlTreeListBox; - CheckBox* m_pInsertTipCB; - Edit* m_pNameED; - FixedText* m_pShortNameLbl; + VclPtr<CheckBox> m_pInsertTipCB; + VclPtr<Edit> m_pNameED; + VclPtr<FixedText> m_pShortNameLbl; TextFilter m_aNoSpaceFilter; - Edit* m_pShortNameEdit; - SwGlTreeListBox* m_pCategoryBox; - CheckBox* m_pFileRelCB; - CheckBox* m_pNetRelCB; - vcl::Window* m_pExampleWIN; - PushButton* m_pInsertBtn; - MenuButton* m_pEditBtn; - PushButton* m_pBibBtn; - PushButton* m_pPathBtn; + VclPtr<Edit> m_pShortNameEdit; + VclPtr<SwGlTreeListBox> m_pCategoryBox; + VclPtr<CheckBox> m_pFileRelCB; + VclPtr<CheckBox> m_pNetRelCB; + VclPtr<vcl::Window> m_pExampleWIN; + VclPtr<PushButton> m_pInsertBtn; + VclPtr<MenuButton> m_pEditBtn; + VclPtr<PushButton> m_pBibBtn; + VclPtr<PushButton> m_pPathBtn; OUString sReadonlyPath; @@ -149,6 +149,7 @@ class SwGlossaryDlg : public SvxStandardDialog public: SwGlossaryDlg(SfxViewFrame* pViewFrame, SwGlossaryHdl* pGlosHdl, SwWrtShell *pWrtShell); virtual ~SwGlossaryDlg(); + virtual void dispose() SAL_OVERRIDE; OUString GetCurrGrpName() const; OUString GetCurrLongName() const { diff --git a/sw/source/uibase/inc/inpdlg.hxx b/sw/source/uibase/inc/inpdlg.hxx index bf42fa788cf6..260423a01ba4 100644 --- a/sw/source/uibase/inc/inpdlg.hxx +++ b/sw/source/uibase/inc/inpdlg.hxx @@ -42,17 +42,19 @@ class SwFldInputDlg: public SvxStandardDialog SwSetExpField* pSetFld; SwUserFieldType* pUsrType; - Edit* m_pLabelED; + VclPtr<Edit> m_pLabelED; - VclMultiLineEdit* m_pEditED; + VclPtr<VclMultiLineEdit> m_pEditED; - OKButton* m_pOKBT; - PushButton* m_pNextBT; + VclPtr<OKButton> m_pOKBT; + VclPtr<PushButton> m_pNextBT; DECL_LINK(NextHdl, void *); public: SwFldInputDlg( vcl::Window *pParent, SwWrtShell &rSh, SwField* pField, bool bNextButton = false ); + virtual ~SwFldInputDlg(); + virtual void dispose() SAL_OVERRIDE; }; #endif diff --git a/sw/source/uibase/inc/inputwin.hxx b/sw/source/uibase/inc/inputwin.hxx index f5a9e28d050b..fdb4a6f4fb69 100644 --- a/sw/source/uibase/inc/inputwin.hxx +++ b/sw/source/uibase/inc/inputwin.hxx @@ -47,8 +47,8 @@ class SwInputWindow : public ToolBox { friend class InputEdit; - Edit aPos; - InputEdit aEdit; + VclPtr<Edit> aPos; + VclPtr<InputEdit> aEdit; PopupMenu aPopMenu; SwFldMgr* pMgr; SwWrtShell* pWrtShell; @@ -82,6 +82,7 @@ protected: public: SwInputWindow( vcl::Window* pParent, SfxBindings* pBindings ); virtual ~SwInputWindow(); + virtual void dispose() SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; @@ -108,9 +109,9 @@ public: virtual ~SwInputChild(); SFX_DECL_CHILDWINDOW_WITHID( SwInputChild ); void SetFormula( const OUString& rFormula, bool bDelSel = true ) - { static_cast<SwInputWindow*>(pWindow)->SetFormula( + { static_cast<SwInputWindow*>(pWindow.get())->SetFormula( rFormula, bDelSel ); } - const SwView* GetView() const{return static_cast<SwInputWindow*>(pWindow)->GetView();} + const SwView* GetView() const{return static_cast<SwInputWindow*>(pWindow.get())->GetView();} }; diff --git a/sw/source/uibase/inc/insfnote.hxx b/sw/source/uibase/inc/insfnote.hxx index 39747588a997..8fee498f4022 100644 --- a/sw/source/uibase/inc/insfnote.hxx +++ b/sw/source/uibase/inc/insfnote.hxx @@ -40,19 +40,19 @@ class SwInsFootNoteDlg: public SvxStandardDialog bool bExtCharAvailable; bool bEdit; - VclFrame* m_pNumberFrame; - RadioButton* m_pNumberAutoBtn; - RadioButton* m_pNumberCharBtn; - Edit* m_pNumberCharEdit; - PushButton* m_pNumberExtChar; + VclPtr<VclFrame> m_pNumberFrame; + VclPtr<RadioButton> m_pNumberAutoBtn; + VclPtr<RadioButton> m_pNumberCharBtn; + VclPtr<Edit> m_pNumberCharEdit; + VclPtr<PushButton> m_pNumberExtChar; // everything for the selection footnote/endnote - RadioButton* m_pFtnBtn; - RadioButton* m_pEndNoteBtn; + VclPtr<RadioButton> m_pFtnBtn; + VclPtr<RadioButton> m_pEndNoteBtn; - PushButton* m_pOkBtn; - PushButton* m_pPrevBT; - PushButton* m_pNextBT; + VclPtr<PushButton> m_pOkBtn; + VclPtr<PushButton> m_pPrevBT; + VclPtr<PushButton> m_pNextBT; DECL_LINK(NumberCharHdl, void *); DECL_LINK(NumberEditHdl, void *); @@ -67,6 +67,7 @@ class SwInsFootNoteDlg: public SvxStandardDialog public: SwInsFootNoteDlg(vcl::Window * pParent, SwWrtShell &rSh, bool bEd = false); virtual ~SwInsFootNoteDlg(); + virtual void dispose() SAL_OVERRIDE; rtl_TextEncoding GetCharSet() { return eCharSet; } bool IsExtCharAvailable() { return bExtCharAvailable; } diff --git a/sw/source/uibase/inc/instable.hxx b/sw/source/uibase/inc/instable.hxx index d61de339f2b8..1e1178306d4c 100644 --- a/sw/source/uibase/inc/instable.hxx +++ b/sw/source/uibase/inc/instable.hxx @@ -34,22 +34,22 @@ struct SwInsertTableOptions; class SwInsTableDlg : public SfxModalDialog { - Edit* m_pNameEdit; + VclPtr<Edit> m_pNameEdit; TextFilter m_aTextFilter; - NumericField* m_pColNF; - NumericField* m_pRowNF; + VclPtr<NumericField> m_pColNF; + VclPtr<NumericField> m_pRowNF; - CheckBox* m_pHeaderCB; - CheckBox* m_pRepeatHeaderCB; - NumericField* m_pRepeatHeaderNF; - VclContainer* m_pRepeatGroup; + VclPtr<CheckBox> m_pHeaderCB; + VclPtr<CheckBox> m_pRepeatHeaderCB; + VclPtr<NumericField> m_pRepeatHeaderNF; + VclPtr<VclContainer> m_pRepeatGroup; - CheckBox* m_pDontSplitCB; - CheckBox* m_pBorderCB; + VclPtr<CheckBox> m_pDontSplitCB; + VclPtr<CheckBox> m_pBorderCB; - PushButton* m_pInsertBtn; - PushButton* m_pAutoFmtBtn; + VclPtr<PushButton> m_pInsertBtn; + VclPtr<PushButton> m_pAutoFmtBtn; SwWrtShell* pShell; SwTableAutoFmt* pTAutoFmt; @@ -66,6 +66,7 @@ class SwInsTableDlg : public SfxModalDialog public: SwInsTableDlg( SwView& rView ); virtual ~SwInsTableDlg(); + virtual void dispose() SAL_OVERRIDE; void GetValues( OUString& rName, sal_uInt16& rRow, sal_uInt16& rCol, SwInsertTableOptions& rInsTblOpts, OUString& rTableAutoFmtName, diff --git a/sw/source/uibase/inc/javaedit.hxx b/sw/source/uibase/inc/javaedit.hxx index 5649e5ea1e42..13b5295dc973 100644 --- a/sw/source/uibase/inc/javaedit.hxx +++ b/sw/source/uibase/inc/javaedit.hxx @@ -33,16 +33,16 @@ namespace sfx2 { class FileDialogHelper; } class SwJavaEditDialog : public SvxStandardDialog { private: - Edit* m_pTypeED; - RadioButton* m_pUrlRB; - RadioButton* m_pEditRB; - PushButton* m_pUrlPB; - Edit* m_pUrlED; - VclMultiLineEdit* m_pEditED; + VclPtr<Edit> m_pTypeED; + VclPtr<RadioButton> m_pUrlRB; + VclPtr<RadioButton> m_pEditRB; + VclPtr<PushButton> m_pUrlPB; + VclPtr<Edit> m_pUrlED; + VclPtr<VclMultiLineEdit> m_pEditED; - OKButton* m_pOKBtn; - PushButton* m_pPrevBtn; - PushButton* m_pNextBtn; + VclPtr<OKButton> m_pOKBtn; + VclPtr<PushButton> m_pPrevBtn; + VclPtr<PushButton> m_pNextBtn; OUString aText; OUString aType; @@ -54,7 +54,7 @@ private: SwFldMgr* pMgr; SwWrtShell* pSh; sfx2::FileDialogHelper* pFileDlg; - vcl::Window* pOldDefDlgParent; + VclPtr<vcl::Window> pOldDefDlgParent; DECL_LINK(OKHdl, void *); DECL_LINK(PrevHdl, void *); @@ -71,6 +71,7 @@ private: public: SwJavaEditDialog(vcl::Window* pParent, SwWrtShell* pWrtSh); virtual ~SwJavaEditDialog(); + virtual void dispose() SAL_OVERRIDE; OUString GetScriptText() const { return aText; } diff --git a/sw/source/uibase/inc/label.hxx b/sw/source/uibase/inc/label.hxx index 61b452d245d4..bb23e44c80e7 100644 --- a/sw/source/uibase/inc/label.hxx +++ b/sw/source/uibase/inc/label.hxx @@ -33,7 +33,7 @@ class SwLabDlg : public SfxTabDialog { SwLabelConfig aLabelsCfg; SwDBManager* pDBManager; - SwLabPrtPage* pPrtPage; + VclPtr<SwLabPrtPage> pPrtPage; std::vector<sal_uInt16> aTypeIds; std::vector<OUString> aMakes; @@ -56,6 +56,7 @@ public: SwLabDlg( vcl::Window* pParent, const SfxItemSet& rSet, SwDBManager* pDBManager, bool bLabel); virtual ~SwLabDlg(); + virtual void dispose() SAL_OVERRIDE; SwLabRec* GetRecord(const OUString &rRecName, bool bCont); void GetLabItem(SwLabItem &rItem); diff --git a/sw/source/uibase/inc/linenum.hxx b/sw/source/uibase/inc/linenum.hxx index 7b3f0734dee6..ef0cb2b8dbdd 100644 --- a/sw/source/uibase/inc/linenum.hxx +++ b/sw/source/uibase/inc/linenum.hxx @@ -33,21 +33,21 @@ class SwLineNumberingDlg : public SfxModalDialog { private: SwWrtShell* pSh; - VclContainer* m_pBodyContent; - vcl::Window* m_pDivIntervalFT; - NumericField* m_pDivIntervalNF; - vcl::Window* m_pDivRowsFT; - NumericField* m_pNumIntervalNF; - ListBox* m_pCharStyleLB; - SwNumberingTypeListBox* m_pFormatLB; - ListBox* m_pPosLB; - MetricField* m_pOffsetMF; - Edit* m_pDivisorED; - CheckBox* m_pCountEmptyLinesCB; - CheckBox* m_pCountFrameLinesCB; - CheckBox* m_pRestartEachPageCB; - CheckBox* m_pNumberingOnCB; - CheckBox* m_pNumberingOnFooterHeader; + VclPtr<VclContainer> m_pBodyContent; + VclPtr<vcl::Window> m_pDivIntervalFT; + VclPtr<NumericField> m_pDivIntervalNF; + VclPtr<vcl::Window> m_pDivRowsFT; + VclPtr<NumericField> m_pNumIntervalNF; + VclPtr<ListBox> m_pCharStyleLB; + VclPtr<SwNumberingTypeListBox> m_pFormatLB; + VclPtr<ListBox> m_pPosLB; + VclPtr<MetricField> m_pOffsetMF; + VclPtr<Edit> m_pDivisorED; + VclPtr<CheckBox> m_pCountEmptyLinesCB; + VclPtr<CheckBox> m_pCountFrameLinesCB; + VclPtr<CheckBox> m_pRestartEachPageCB; + VclPtr<CheckBox> m_pNumberingOnCB; + VclPtr<CheckBox> m_pNumberingOnFooterHeader; DECL_LINK(OKHdl, void *); DECL_LINK(LineOnOffHdl, void * = 0); DECL_LINK(ModifyHdl, void * = 0); @@ -56,6 +56,7 @@ public: SwWrtShell* GetWrtShell() const { return pSh; } SwLineNumberingDlg(SwView *pVw); virtual ~SwLineNumberingDlg(); + virtual void dispose() SAL_OVERRIDE; }; #endif diff --git a/sw/source/uibase/inc/mailconfigpage.hxx b/sw/source/uibase/inc/mailconfigpage.hxx index a343c30bf5eb..e502ea9fef8c 100644 --- a/sw/source/uibase/inc/mailconfigpage.hxx +++ b/sw/source/uibase/inc/mailconfigpage.hxx @@ -33,20 +33,20 @@ class SwMailConfigPage : public SfxTabPage { friend class SwTestAccountSettingsDialog; - Edit* m_pDisplayNameED; - Edit* m_pAddressED; + VclPtr<Edit> m_pDisplayNameED; + VclPtr<Edit> m_pAddressED; - CheckBox* m_pReplyToCB; - FixedText* m_pReplyToFT; - Edit* m_pReplyToED; + VclPtr<CheckBox> m_pReplyToCB; + VclPtr<FixedText> m_pReplyToFT; + VclPtr<Edit> m_pReplyToED; - Edit* m_pServerED; - NumericField* m_pPortNF; + VclPtr<Edit> m_pServerED; + VclPtr<NumericField> m_pPortNF; - CheckBox* m_pSecureCB; + VclPtr<CheckBox> m_pSecureCB; - PushButton* m_pServerAuthenticationPB; - PushButton* m_pTestPB; + VclPtr<PushButton> m_pServerAuthenticationPB; + VclPtr<PushButton> m_pTestPB; SwMailMergeConfigItem* m_pConfigItem; @@ -57,9 +57,10 @@ class SwMailConfigPage : public SfxTabPage public: SwMailConfigPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SwMailConfigPage(); + 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/sw/source/uibase/inc/mailmergechildwindow.hxx b/sw/source/uibase/inc/mailmergechildwindow.hxx index 35a76131c26f..742cb322437d 100644 --- a/sw/source/uibase/inc/mailmergechildwindow.hxx +++ b/sw/source/uibase/inc/mailmergechildwindow.hxx @@ -25,11 +25,13 @@ class SwMailMergeChildWin : public SfxFloatingWindow { - ToolBox* m_pBackTB; + VclPtr<ToolBox> m_pBackTB; DECL_LINK( BackHdl, void* ); public: SwMailMergeChildWin(SfxBindings*, SfxChildWindow*, vcl::Window *pParent); + virtual ~SwMailMergeChildWin(); + virtual void dispose() SAL_OVERRIDE; virtual void FillInfo(SfxChildWinInfo&) const SAL_OVERRIDE; }; diff --git a/sw/source/uibase/inc/mailmergehelper.hxx b/sw/source/uibase/inc/mailmergehelper.hxx index c6691af3dcc1..deb715c98e79 100644 --- a/sw/source/uibase/inc/mailmergehelper.hxx +++ b/sw/source/uibase/inc/mailmergehelper.hxx @@ -60,7 +60,7 @@ struct SwAddressPreview_Impl; // and also the resulting address filled with database data class SW_DLLPUBLIC SwAddressPreview : public vcl::Window { - ScrollBar aVScrollBar; + VclPtr<ScrollBar> aVScrollBar; SwAddressPreview_Impl* pImpl; Link m_aSelectHdl; @@ -77,6 +77,8 @@ class SW_DLLPUBLIC SwAddressPreview : public vcl::Window public: SwAddressPreview(vcl::Window* pParent, WinBits nStyle=WB_BORDER); + virtual ~SwAddressPreview(); + virtual void dispose() SAL_OVERRIDE; void positionScrollBar(); @@ -140,7 +142,7 @@ class SW_DLLPUBLIC SwAuthenticator : { OUString m_aUserName; OUString m_aPassword; - vcl::Window* m_pParentWindow; + VclPtr<vcl::Window> m_pParentWindow; public: SwAuthenticator() : m_pParentWindow(0) {} SwAuthenticator(const OUString& username, const OUString& password, vcl::Window* pParent) : diff --git a/sw/source/uibase/inc/mailmergewizard.hxx b/sw/source/uibase/inc/mailmergewizard.hxx index 5287ca3576d1..6bcfb25aebb7 100644 --- a/sw/source/uibase/inc/mailmergewizard.hxx +++ b/sw/source/uibase/inc/mailmergewizard.hxx @@ -58,7 +58,7 @@ class SwMailMergeWizard : public ::svt::RoadmapWizard using svt::OWizardMachine::skipUntil; protected: - virtual svt::OWizardPage* createPage(WizardState _nState) SAL_OVERRIDE; + virtual VclPtr<TabPage> createPage( WizardState _nState ) SAL_OVERRIDE; virtual void enterState( WizardState _nState ) SAL_OVERRIDE; // roadmap feature ?? diff --git a/sw/source/uibase/inc/mailmrge.hxx b/sw/source/uibase/inc/mailmrge.hxx index f3d67eeb831f..1ae4b78829de 100644 --- a/sw/source/uibase/inc/mailmrge.hxx +++ b/sw/source/uibase/inc/mailmrge.hxx @@ -51,46 +51,46 @@ class SwMailMergeDlg : public SvxStandardDialog { friend class SwXSelChgLstnr_Impl; - vcl::Window* m_pBeamerWin; - - RadioButton* m_pAllRB; - RadioButton* m_pMarkedRB; - RadioButton* m_pFromRB; - NumericField* m_pFromNF; - NumericField* m_pToNF; - - RadioButton* m_pPrinterRB; - RadioButton* m_pMailingRB; - RadioButton* m_pFileRB; - - CheckBox* m_pSingleJobsCB; - - FixedText* m_pSaveMergedDocumentFT; - RadioButton* m_pSaveSingleDocRB; - RadioButton* m_pSaveIndividualRB; - - CheckBox* m_pGenerateFromDataBaseCB; - - FixedText* m_pColumnFT; - ListBox* m_pColumnLB; - FixedText* m_pPathFT; - Edit* m_pPathED; - PushButton* m_pPathPB; - FixedText* m_pFilterFT; - ListBox* m_pFilterLB; - - ListBox* m_pAddressFldLB; - FixedText* m_pSubjectFT; - Edit* m_pSubjectED; - FixedText* m_pFormatFT; - FixedText* m_pAttachFT; - Edit* m_pAttachED; - PushButton* m_pAttachPB; - CheckBox* m_pFormatHtmlCB; - CheckBox* m_pFormatRtfCB; - CheckBox* m_pFormatSwCB; - - OKButton* m_pOkBTN; + VclPtr<vcl::Window> m_pBeamerWin; + + VclPtr<RadioButton> m_pAllRB; + VclPtr<RadioButton> m_pMarkedRB; + VclPtr<RadioButton> m_pFromRB; + VclPtr<NumericField> m_pFromNF; + VclPtr<NumericField> m_pToNF; + + VclPtr<RadioButton> m_pPrinterRB; + VclPtr<RadioButton> m_pMailingRB; + VclPtr<RadioButton> m_pFileRB; + + VclPtr<CheckBox> m_pSingleJobsCB; + + VclPtr<FixedText> m_pSaveMergedDocumentFT; + VclPtr<RadioButton> m_pSaveSingleDocRB; + VclPtr<RadioButton> m_pSaveIndividualRB; + + VclPtr<CheckBox> m_pGenerateFromDataBaseCB; + + VclPtr<FixedText> m_pColumnFT; + VclPtr<ListBox> m_pColumnLB; + VclPtr<FixedText> m_pPathFT; + VclPtr<Edit> m_pPathED; + VclPtr<PushButton> m_pPathPB; + VclPtr<FixedText> m_pFilterFT; + VclPtr<ListBox> m_pFilterLB; + + VclPtr<ListBox> m_pAddressFldLB; + VclPtr<FixedText> m_pSubjectFT; + VclPtr<Edit> m_pSubjectED; + VclPtr<FixedText> m_pFormatFT; + VclPtr<FixedText> m_pAttachFT; + VclPtr<Edit> m_pAttachED; + VclPtr<PushButton> m_pAttachPB; + VclPtr<CheckBox> m_pFormatHtmlCB; + VclPtr<CheckBox> m_pFormatRtfCB; + VclPtr<CheckBox> m_pFormatSwCB; + + VclPtr<OKButton> m_pOkBTN; SwMailMergeDlg_Impl* pImpl; @@ -122,6 +122,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& xConnection, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >* pSelection = 0); virtual ~SwMailMergeDlg(); + virtual void dispose() SAL_OVERRIDE; inline DBManagerOptions GetMergeType() { return nMergeType; } @@ -138,9 +139,11 @@ public: class SwMailMergeCreateFromDlg : public ModalDialog { - RadioButton* m_pThisDocRB; + VclPtr<RadioButton> m_pThisDocRB; public: SwMailMergeCreateFromDlg(vcl::Window* pParent); + virtual ~SwMailMergeCreateFromDlg(); + virtual void dispose() SAL_OVERRIDE; bool IsThisDocument() const { return m_pThisDocRB->IsChecked(); @@ -149,9 +152,12 @@ public: class SwMailMergeFieldConnectionsDlg : public ModalDialog { - RadioButton* m_pUseExistingRB; + VclPtr<RadioButton> m_pUseExistingRB; public: SwMailMergeFieldConnectionsDlg(vcl::Window* pParent); + virtual ~SwMailMergeFieldConnectionsDlg(); + virtual void dispose() SAL_OVERRIDE; + bool IsUseExistingConnections() const { return m_pUseExistingRB->IsChecked(); diff --git a/sw/source/uibase/inc/mergetbl.hxx b/sw/source/uibase/inc/mergetbl.hxx index fe9882a1429b..5bd7548ca358 100644 --- a/sw/source/uibase/inc/mergetbl.hxx +++ b/sw/source/uibase/inc/mergetbl.hxx @@ -26,7 +26,7 @@ class SwMergeTblDlg : public SvxStandardDialog { - RadioButton* m_pMergePrevRB; + VclPtr<RadioButton> m_pMergePrevRB; bool& m_rMergePrev; protected: @@ -34,6 +34,8 @@ protected: public: SwMergeTblDlg( vcl::Window *pParent, bool& rWithPrev ); + virtual ~SwMergeTblDlg(); + virtual void dispose() SAL_OVERRIDE; }; #endif diff --git a/sw/source/uibase/inc/multmrk.hxx b/sw/source/uibase/inc/multmrk.hxx index 62ab97399cd8..2e9c26abaf82 100644 --- a/sw/source/uibase/inc/multmrk.hxx +++ b/sw/source/uibase/inc/multmrk.hxx @@ -32,8 +32,8 @@ class SwTOXMgr; class SwMultiTOXMarkDlg : public SvxStandardDialog { DECL_LINK( SelectHdl, ListBox * ); - FixedText* m_pTextFT; - ListBox* m_pTOXLB; + VclPtr<FixedText> m_pTextFT; + VclPtr<ListBox> m_pTOXLB; SwTOXMgr& rMgr; sal_uInt16 nPos; @@ -42,6 +42,7 @@ class SwMultiTOXMarkDlg : public SvxStandardDialog public: SwMultiTOXMarkDlg( vcl::Window* pParent, SwTOXMgr &rTOXMgr ); virtual ~SwMultiTOXMarkDlg(); + virtual void dispose() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UIBASE_INC_MULTMRK_HXX diff --git a/sw/source/uibase/inc/navipi.hxx b/sw/source/uibase/inc/navipi.hxx index 074888e6f0ce..1cb6b9fe021d 100644 --- a/sw/source/uibase/inc/navipi.hxx +++ b/sw/source/uibase/inc/navipi.hxx @@ -55,12 +55,12 @@ class SwNavigationPI : public vcl::Window, friend class SwContentTree; friend class SwGlobalTree; - SwNavHelpToolBox aContentToolBox; - SwHelpToolBox aGlobalToolBox; - ImageList aContentImageList; - SwContentTree aContentTree; - SwGlobalTree aGlobalTree; - ListBox aDocListBox; + VclPtr<SwNavHelpToolBox> aContentToolBox; + VclPtr<SwHelpToolBox> aGlobalToolBox; + ImageList aContentImageList; + VclPtr<SwContentTree> aContentTree; + VclPtr<SwGlobalTree> aGlobalTree; + VclPtr<ListBox> aDocListBox; Idle aPageChgIdle; OUString sContentFileName; OUString aContextArr[3]; @@ -72,8 +72,8 @@ class SwNavigationPI : public vcl::Window, SwWrtShell *pContentWrtShell; SwView *pActContView; SwView *pCreateView; - SfxPopupWindow *pPopupWindow; - SfxPopupWindow *pFloatingWindow; + VclPtr<SfxPopupWindow> pPopupWindow; + VclPtr<SfxPopupWindow> pFloatingWindow; SfxChildWindowContext* pContextWin; @@ -137,6 +137,7 @@ public: SwNavigationPI(SfxBindings*, SfxChildWindowContext*, vcl::Window*); virtual ~SwNavigationPI(); + virtual void dispose() SAL_OVERRIDE; void GotoPage(); // jump to page; bindable function diff --git a/sw/source/uibase/inc/num.hxx b/sw/source/uibase/inc/num.hxx index ad1a9cdc0f22..1b712e3cc50e 100644 --- a/sw/source/uibase/inc/num.hxx +++ b/sw/source/uibase/inc/num.hxx @@ -49,43 +49,43 @@ struct SwBmpItemInfo class SwNumPositionTabPage : public SfxTabPage { - ListBox* m_pLevelLB; - VclFrame* m_pPositionFrame; + VclPtr<ListBox> m_pLevelLB; + VclPtr<VclFrame> m_pPositionFrame; // 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; - NumberingPreview* m_pPreviewWIN; + VclPtr<NumberingPreview> m_pPreviewWIN; SwNumRule* pActNum; SwNumRule* pSaveNum; SwWrtShell* pWrtSh; - SwOutlineTabDialog* pOutlineDlg; + VclPtr<SwOutlineTabDialog> pOutlineDlg; sal_uInt16 nActNumLvl; bool bModified : 1; @@ -117,14 +117,15 @@ public: SwNumPositionTabPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwNumPositionTabPage(); + 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, - const SfxItemSet* rAttrSet); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, + const SfxItemSet* rAttrSet); void SetOutlineTabDialog(SwOutlineTabDialog* pDlg){pOutlineDlg = pDlg;} void SetWrtShell(SwWrtShell* pSh); diff --git a/sw/source/uibase/inc/numberingtypelistbox.hxx b/sw/source/uibase/inc/numberingtypelistbox.hxx index bedbc7225f69..b1968d7f6857 100644 --- a/sw/source/uibase/inc/numberingtypelistbox.hxx +++ b/sw/source/uibase/inc/numberingtypelistbox.hxx @@ -37,6 +37,7 @@ class SW_DLLPUBLIC SwNumberingTypeListBox : public ListBox public: SwNumberingTypeListBox( vcl::Window* pWin, WinBits nStyle = WB_BORDER ); virtual ~SwNumberingTypeListBox(); + virtual void dispose() SAL_OVERRIDE; virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/numfmtlb.hxx b/sw/source/uibase/inc/numfmtlb.hxx index 8dd0394575a1..ede07317deb4 100644 --- a/sw/source/uibase/inc/numfmtlb.hxx +++ b/sw/source/uibase/inc/numfmtlb.hxx @@ -48,6 +48,7 @@ public: NumFormatListBox(vcl::Window* pWin, WinBits nStyle); virtual ~NumFormatListBox(); + virtual void dispose() SAL_OVERRIDE; void Clear(); diff --git a/sw/source/uibase/inc/numpara.hxx b/sw/source/uibase/inc/numpara.hxx index ab84db3e5cda..a5fe54a69458 100644 --- a/sw/source/uibase/inc/numpara.hxx +++ b/sw/source/uibase/inc/numpara.hxx @@ -29,23 +29,23 @@ // are performed. class SwParagraphNumTabPage : public SfxTabPage { - VclHBox* m_pOutlineStartBX; - ListBox* m_pOutlineLvLB; - VclHBox* m_pNumberStyleBX; - ListBox* m_pNumberStyleLB; - PushButton* m_pEditNumStyleBtn; + VclPtr<VclHBox> m_pOutlineStartBX; + VclPtr<ListBox> m_pOutlineLvLB; + VclPtr<VclHBox> m_pNumberStyleBX; + VclPtr<ListBox> m_pNumberStyleLB; + VclPtr<PushButton> m_pEditNumStyleBtn; - TriStateBox* m_pNewStartCB; - VclHBox* m_pNewStartBX; - TriStateBox* m_pNewStartNumberCB; - NumericField* m_pNewStartNF; + VclPtr<TriStateBox> m_pNewStartCB; + VclPtr<VclHBox> m_pNewStartBX; + VclPtr<TriStateBox> m_pNewStartNumberCB; + VclPtr<NumericField> m_pNewStartNF; - VclFrame* m_pCountParaFram; - TriStateBox* m_pCountParaCB; - TriStateBox* m_pRestartParaCountCB; + VclPtr<VclFrame> m_pCountParaFram; + VclPtr<TriStateBox> m_pCountParaCB; + VclPtr<TriStateBox> m_pRestartParaCountCB; - VclHBox* m_pRestartBX; - NumericField* m_pRestartNF; + VclPtr<VclHBox> m_pRestartBX; + VclPtr<NumericField> m_pRestartNF; // --> OD 2008-04-14 #outlinelevel# const OUString msOutlineNumbering; @@ -62,17 +62,18 @@ class SwParagraphNumTabPage : public SfxTabPage static const sal_uInt16 aPageRg[]; protected: - SwParagraphNumTabPage(vcl::Window* pParent, const SfxItemSet& rSet ); void aCountParaFL(); bool ExecuteEditNumStyle_Impl( sal_uInt16 nId, const OUString& rStr, const OUString& rRefStr, sal_uInt16 nFamily, sal_uInt16 nMask = 0, const sal_uInt16* pModifier = NULL ); public: - virtual ~SwParagraphNumTabPage(); + SwParagraphNumTabPage(vcl::Window* pParent, const SfxItemSet& rSet ); + virtual ~SwParagraphNumTabPage(); + 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 aPageRg; } virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/optcomp.hxx b/sw/source/uibase/inc/optcomp.hxx index 8a1675176575..d48bf227ef1c 100644 --- a/sw/source/uibase/inc/optcomp.hxx +++ b/sw/source/uibase/inc/optcomp.hxx @@ -34,10 +34,10 @@ class SwCompatibilityOptPage : public SfxTabPage { private: // controls - VclFrame* m_pMain; - ListBox* m_pFormattingLB; - SvxCheckListBox* m_pOptionsLB; - PushButton* m_pDefaultPB; + VclPtr<VclFrame> m_pMain; + VclPtr<ListBox> m_pFormattingLB; + VclPtr<SvxCheckListBox> m_pOptionsLB; + VclPtr<PushButton> m_pDefaultPB; // config item SvtCompatibilityOptions m_aConfigItem; // text of the user entry @@ -62,8 +62,9 @@ private: public: SwCompatibilityOptPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SwCompatibilityOptPage(); + 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/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx index 451b30c6b9b5..8c873f184bd0 100644 --- a/sw/source/uibase/inc/optload.hxx +++ b/sw/source/uibase/inc/optload.hxx @@ -39,21 +39,21 @@ class SwWrtShell; class SwLoadOptPage : public SfxTabPage { private: - RadioButton* m_pAlwaysRB; - RadioButton* m_pRequestRB; - RadioButton* m_pNeverRB; - - CheckBox* m_pAutoUpdateFields; - CheckBox* m_pAutoUpdateCharts; - - ListBox* m_pMetricLB; - FixedText* m_pTabFT; - MetricField* m_pTabMF; - CheckBox* m_pUseSquaredPageMode; - CheckBox* m_pUseCharUnit; - Edit* m_pWordCountED; - CheckBox* m_pShowStandardizedPageCount; - NumericField* m_pStandardizedPageSizeNF; + VclPtr<RadioButton> m_pAlwaysRB; + VclPtr<RadioButton> m_pRequestRB; + VclPtr<RadioButton> m_pNeverRB; + + VclPtr<CheckBox> m_pAutoUpdateFields; + VclPtr<CheckBox> m_pAutoUpdateCharts; + + VclPtr<ListBox> m_pMetricLB; + VclPtr<FixedText> m_pTabFT; + VclPtr<MetricField> m_pTabMF; + VclPtr<CheckBox> m_pUseSquaredPageMode; + VclPtr<CheckBox> m_pUseCharUnit; + VclPtr<Edit> m_pWordCountED; + VclPtr<CheckBox> m_pShowStandardizedPageCount; + VclPtr<NumericField> m_pStandardizedPageSizeNF; SwWrtShell* m_pWrtShell; sal_uInt16 m_nLastTab; @@ -64,9 +64,11 @@ private: public: SwLoadOptPage(vcl::Window* pParent, const SfxItemSet& rSet); + virtual ~SwLoadOptPage(); + 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; @@ -105,28 +107,28 @@ public: class SwCaptionOptPage : public SfxTabPage { private: - SvxCheckListBox* m_pCheckLB; - ListBox* m_pLbCaptionOrder; - SwCaptionPreview* m_pPreview; - - VclContainer* m_pSettingsGroup; - CaptionComboBox* m_pCategoryBox; - FixedText* m_pFormatText; - ListBox* m_pFormatBox; + VclPtr<SvxCheckListBox> m_pCheckLB; + VclPtr<ListBox> m_pLbCaptionOrder; + VclPtr<SwCaptionPreview> m_pPreview; + + VclPtr<VclContainer> m_pSettingsGroup; + VclPtr<CaptionComboBox> m_pCategoryBox; + VclPtr<FixedText> m_pFormatText; + VclPtr<ListBox> m_pFormatBox; //#i61007# order of captions - FixedText* m_pNumberingSeparatorFT; - Edit* m_pNumberingSeparatorED; - FixedText* m_pTextText; - Edit* m_pTextEdit; - ListBox* m_pPosBox; + VclPtr<FixedText> m_pNumberingSeparatorFT; + VclPtr<Edit> m_pNumberingSeparatorED; + VclPtr<FixedText> m_pTextText; + VclPtr<Edit> m_pTextEdit; + VclPtr<ListBox> m_pPosBox; - VclContainer* m_pNumCapt; - ListBox* m_pLbLevel; - Edit* m_pEdDelim; + VclPtr<VclContainer> m_pNumCapt; + VclPtr<ListBox> m_pLbLevel; + VclPtr<Edit> m_pEdDelim; - VclContainer* m_pCategory; - ListBox* m_pCharStyleLB; - CheckBox* m_pApplyBorderCB; + VclPtr<VclContainer> m_pCategory; + VclPtr<ListBox> m_pCharStyleLB; + VclPtr<CheckBox> m_pApplyBorderCB; OUString m_sSWTable; OUString m_sSWFrame; @@ -165,9 +167,10 @@ public: SwCaptionOptPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SwCaptionOptPage(); + 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/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx index ba424c9b596d..efe7ebda59e4 100644 --- a/sw/source/uibase/inc/optpage.hxx +++ b/sw/source/uibase/inc/optpage.hxx @@ -41,28 +41,28 @@ class FontList; // Tools->Options->Writer/Web->View class SwContentOptPage : public SfxTabPage { - CheckBox* m_pCrossCB; - - CheckBox* m_pHScrollBox; - CheckBox* m_pVScrollBox; - CheckBox* m_pAnyRulerCB; - CheckBox* m_pHRulerCBox; - ListBox* m_pHMetric; - CheckBox* m_pVRulerCBox; - CheckBox* m_pVRulerRightCBox; - ListBox* m_pVMetric; - CheckBox* m_pSmoothCBox; - - CheckBox* m_pGrfCB; - CheckBox* m_pTblCB; - CheckBox* m_pDrwCB; - CheckBox* m_pFldNameCB; - CheckBox* m_pPostItCB; - - VclFrame* m_pSettingsFrame; - FixedText* m_pSettingsLabel; - FixedText* m_pMetricLabel; - ListBox* m_pMetricLB; + VclPtr<CheckBox> m_pCrossCB; + + VclPtr<CheckBox> m_pHScrollBox; + VclPtr<CheckBox> m_pVScrollBox; + VclPtr<CheckBox> m_pAnyRulerCB; + VclPtr<CheckBox> m_pHRulerCBox; + VclPtr<ListBox> m_pHMetric; + VclPtr<CheckBox> m_pVRulerCBox; + VclPtr<CheckBox> m_pVRulerRightCBox; + VclPtr<ListBox> m_pVMetric; + VclPtr<CheckBox> m_pSmoothCBox; + + VclPtr<CheckBox> m_pGrfCB; + VclPtr<CheckBox> m_pTblCB; + VclPtr<CheckBox> m_pDrwCB; + VclPtr<CheckBox> m_pFldNameCB; + VclPtr<CheckBox> m_pPostItCB; + + VclPtr<VclFrame> m_pSettingsFrame; + VclPtr<FixedText> m_pSettingsLabel; + VclPtr<FixedText> m_pMetricLabel; + VclPtr<ListBox> m_pMetricLB; DECL_LINK(VertRulerHdl, CheckBox*); DECL_LINK(AnyRulerHdl, CheckBox*); @@ -70,8 +70,9 @@ public: SwContentOptPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SwContentOptPage(); + 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; @@ -82,29 +83,29 @@ public: // TabPage printer settings additions class SwAddPrinterTabPage : public SfxTabPage { - CheckBox* m_pGrfCB; - CheckBox* m_pCtrlFldCB; - CheckBox* m_pBackgroundCB; - CheckBox* m_pBlackFontCB; - CheckBox* m_pPrintHiddenTextCB; - CheckBox* m_pPrintTextPlaceholderCB; - - VclFrame* m_pPagesFrame; - CheckBox* m_pLeftPageCB; - CheckBox* m_pRightPageCB; - CheckBox* m_pProspectCB; - CheckBox* m_pProspectCB_RTL; - - VclFrame* m_pCommentsFrame; - RadioButton* m_pNoRB; - RadioButton* m_pOnlyRB; - RadioButton* m_pEndRB; - RadioButton* m_pEndPageRB; - RadioButton* m_pInMarginsRB; - - CheckBox* m_pPrintEmptyPagesCB; - CheckBox* m_pPaperFromSetupCB; - ListBox* m_pFaxLB; + VclPtr<CheckBox> m_pGrfCB; + VclPtr<CheckBox> m_pCtrlFldCB; + VclPtr<CheckBox> m_pBackgroundCB; + VclPtr<CheckBox> m_pBlackFontCB; + VclPtr<CheckBox> m_pPrintHiddenTextCB; + VclPtr<CheckBox> m_pPrintTextPlaceholderCB; + + VclPtr<VclFrame> m_pPagesFrame; + VclPtr<CheckBox> m_pLeftPageCB; + VclPtr<CheckBox> m_pRightPageCB; + VclPtr<CheckBox> m_pProspectCB; + VclPtr<CheckBox> m_pProspectCB_RTL; + + VclPtr<VclFrame> m_pCommentsFrame; + VclPtr<RadioButton> m_pNoRB; + VclPtr<RadioButton> m_pOnlyRB; + VclPtr<RadioButton> m_pEndRB; + VclPtr<RadioButton> m_pEndPageRB; + VclPtr<RadioButton> m_pInMarginsRB; + + VclPtr<CheckBox> m_pPrintEmptyPagesCB; + VclPtr<CheckBox> m_pPaperFromSetupCB; + VclPtr<ListBox> m_pFaxLB; OUString sNone; @@ -114,11 +115,13 @@ class SwAddPrinterTabPage : public SfxTabPage DECL_LINK(AutoClickHdl, void *); DECL_LINK(SelectHdl, void *); - SwAddPrinterTabPage( vcl::Window* pParent, - const SfxItemSet& rSet ); public: + SwAddPrinterTabPage( vcl::Window* pParent, + const SfxItemSet& rSet ); + virtual ~SwAddPrinterTabPage(); + 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; @@ -132,20 +135,20 @@ public: class SwStdFontTabPage : public SfxTabPage { - FixedText* pLabelFT; - - ComboBox* pStandardBox; - FontSizeBox* pStandardHeightLB; - ComboBox* pTitleBox ; - FontSizeBox* pTitleHeightLB; - ComboBox* pListBox ; - FontSizeBox* pListHeightLB; - ComboBox* pLabelBox ; - FontSizeBox* pLabelHeightLB; - ComboBox* pIdxBox ; - FontSizeBox* pIndexHeightLB; - CheckBox* pDocOnlyCB ; - PushButton* pStandardPB; + VclPtr<FixedText> pLabelFT; + + VclPtr<ComboBox> pStandardBox; + VclPtr<FontSizeBox> pStandardHeightLB; + VclPtr<ComboBox> pTitleBox ; + VclPtr<FontSizeBox> pTitleHeightLB; + VclPtr<ComboBox> pListBox ; + VclPtr<FontSizeBox> pListHeightLB; + VclPtr<ComboBox> pLabelBox ; + VclPtr<FontSizeBox> pLabelHeightLB; + VclPtr<ComboBox> pIdxBox ; + VclPtr<FontSizeBox> pIndexHeightLB; + VclPtr<CheckBox> pDocOnlyCB ; + VclPtr<PushButton> pStandardPB; OUString sShellStd; OUString sShellTitle; @@ -153,7 +156,7 @@ class SwStdFontTabPage : public SfxTabPage OUString sShellLabel; OUString sShellIndex; - SfxPrinter* pPrt; + VclPtr<SfxPrinter> pPrt; FontList* pFontList; SwStdFontConfig* pFontConfig; SwWrtShell* pWrtShell; @@ -185,12 +188,13 @@ class SwStdFontTabPage : public SfxTabPage DECL_LINK( ModifyHeightHdl, FontSizeBox * ); DECL_LINK( LoseFocusHdl, ComboBox * ); - SwStdFontTabPage( vcl::Window* pParent, - const SfxItemSet& rSet ); - virtual ~SwStdFontTabPage(); + SwStdFontTabPage( vcl::Window* pParent, + const SfxItemSet& rSet ); + virtual ~SwStdFontTabPage(); + virtual void dispose() SAL_OVERRIDE; public: - static SfxTabPage* Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -202,37 +206,37 @@ public: class SwTableOptionsTabPage : public SfxTabPage { - CheckBox* pHeaderCB; - CheckBox* pRepeatHeaderCB; - CheckBox* pDontSplitCB; - CheckBox* pBorderCB; + VclPtr<CheckBox> pHeaderCB; + VclPtr<CheckBox> pRepeatHeaderCB; + VclPtr<CheckBox> pDontSplitCB; + VclPtr<CheckBox> pBorderCB; - CheckBox* pNumFormattingCB; - CheckBox* pNumFmtFormattingCB; - CheckBox* pNumAlignmentCB; + VclPtr<CheckBox> pNumFormattingCB; + VclPtr<CheckBox> pNumFmtFormattingCB; + VclPtr<CheckBox> pNumAlignmentCB; - MetricField* pRowMoveMF; - MetricField* pColMoveMF; + VclPtr<MetricField> pRowMoveMF; + VclPtr<MetricField> pColMoveMF; - MetricField* pRowInsertMF; - MetricField* pColInsertMF; + VclPtr<MetricField> pRowInsertMF; + VclPtr<MetricField> pColInsertMF; - RadioButton* pFixRB; - RadioButton* pFixPropRB; - RadioButton* pVarRB; + VclPtr<RadioButton> pFixRB; + VclPtr<RadioButton> pFixPropRB; + VclPtr<RadioButton> pVarRB; SwWrtShell* pWrtShell; bool bHTMLMode; DECL_LINK(CheckBoxHdl, void *); - SwTableOptionsTabPage( vcl::Window* pParent, - const SfxItemSet& rSet ); - virtual ~SwTableOptionsTabPage(); - public: + SwTableOptionsTabPage( vcl::Window* pParent, + const SfxItemSet& rSet ); + virtual ~SwTableOptionsTabPage(); + 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; @@ -247,38 +251,38 @@ public: class SwShdwCrsrOptionsTabPage : public SfxTabPage { //nonprinting characters - CheckBox* m_pParaCB; - CheckBox* m_pSHyphCB; - CheckBox* m_pSpacesCB; - CheckBox* m_pHSpacesCB; - CheckBox* m_pTabCB; - CheckBox* m_pBreakCB; - CheckBox* m_pCharHiddenCB; - CheckBox* m_pFldHiddenCB; - CheckBox* m_pFldHiddenParaCB; - - VclFrame* m_pDirectCursorFrame; - CheckBox* m_pOnOffCB; - - RadioButton* m_pFillMarginRB; - RadioButton* m_pFillIndentRB; - RadioButton* m_pFillTabRB; - RadioButton* m_pFillSpaceRB; - - VclFrame* m_pCursorProtFrame; - CheckBox* m_pCrsrInProtCB; - CheckBox* m_pIgnoreProtCB; - - CheckBox* m_pMathBaselineAlignmentCB; + VclPtr<CheckBox> m_pParaCB; + VclPtr<CheckBox> m_pSHyphCB; + VclPtr<CheckBox> m_pSpacesCB; + VclPtr<CheckBox> m_pHSpacesCB; + VclPtr<CheckBox> m_pTabCB; + VclPtr<CheckBox> m_pBreakCB; + VclPtr<CheckBox> m_pCharHiddenCB; + VclPtr<CheckBox> m_pFldHiddenCB; + VclPtr<CheckBox> m_pFldHiddenParaCB; + + VclPtr<VclFrame> m_pDirectCursorFrame; + VclPtr<CheckBox> m_pOnOffCB; + + VclPtr<RadioButton> m_pFillMarginRB; + VclPtr<RadioButton> m_pFillIndentRB; + VclPtr<RadioButton> m_pFillTabRB; + VclPtr<RadioButton> m_pFillSpaceRB; + + VclPtr<VclFrame> m_pCursorProtFrame; + VclPtr<CheckBox> m_pCrsrInProtCB; + VclPtr<CheckBox> m_pIgnoreProtCB; + + VclPtr<CheckBox> m_pMathBaselineAlignmentCB; SwWrtShell * m_pWrtShell; +public: SwShdwCrsrOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SwShdwCrsrOptionsTabPage(); + virtual void dispose() SAL_OVERRIDE; -public: - - 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; @@ -328,28 +332,25 @@ public: // redlining options class SwRedlineOptionsTabPage : public SfxTabPage { - ListBox* pInsertLB; - ColorListBox* pInsertColorLB; - SvxFontPrevWindow* pInsertedPreviewWN; + VclPtr<ListBox> pInsertLB; + VclPtr<ColorListBox> pInsertColorLB; + VclPtr<SvxFontPrevWindow> pInsertedPreviewWN; - ListBox* pDeletedLB; - ColorListBox* pDeletedColorLB; - SvxFontPrevWindow* pDeletedPreviewWN; + VclPtr<ListBox> pDeletedLB; + VclPtr<ColorListBox> pDeletedColorLB; + VclPtr<SvxFontPrevWindow> pDeletedPreviewWN; - ListBox* pChangedLB; - ColorListBox* pChangedColorLB; - SvxFontPrevWindow* pChangedPreviewWN; + VclPtr<ListBox> pChangedLB; + VclPtr<ColorListBox> pChangedColorLB; + VclPtr<SvxFontPrevWindow> pChangedPreviewWN; - ListBox* pMarkPosLB; - ColorListBox* pMarkColorLB; - SwMarkPreview* pMarkPreviewWN; + VclPtr<ListBox> pMarkPosLB; + VclPtr<ColorListBox> pMarkColorLB; + VclPtr<SwMarkPreview> pMarkPreviewWN; OUString sAuthor; OUString sNone; - SwRedlineOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); - virtual ~SwRedlineOptionsTabPage(); - DECL_LINK( AttribHdl, ListBox *pLB ); DECL_LINK(ChangedMaskPrevHdl, void * = 0); DECL_LINK( ColorHdl, ColorListBox *pColorLB ); @@ -357,8 +358,11 @@ class SwRedlineOptionsTabPage : public SfxTabPage void InitFontStyle(SvxFontPrevWindow& rExampleWin); public: + SwRedlineOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); + virtual ~SwRedlineOptionsTabPage(); + 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; @@ -373,24 +377,26 @@ class SwTestTabPage : public SfxTabPage public: SwTestTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); + virtual ~SwTestTabPage(); + 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; private: - CheckBox* m_pTest1CBox; - CheckBox* m_pTest2CBox; - CheckBox* m_pTest3CBox; - CheckBox* m_pTest4CBox; - CheckBox* m_pTest5CBox; - CheckBox* m_pTest6CBox; - CheckBox* m_pTest7CBox; - CheckBox* m_pTest8CBox; - CheckBox* m_pTest9CBox; - CheckBox* m_pTest10CBox; + VclPtr<CheckBox> m_pTest1CBox; + VclPtr<CheckBox> m_pTest2CBox; + VclPtr<CheckBox> m_pTest3CBox; + VclPtr<CheckBox> m_pTest4CBox; + VclPtr<CheckBox> m_pTest5CBox; + VclPtr<CheckBox> m_pTest6CBox; + VclPtr<CheckBox> m_pTest7CBox; + VclPtr<CheckBox> m_pTest8CBox; + VclPtr<CheckBox> m_pTest9CBox; + VclPtr<CheckBox> m_pTest10CBox; bool bAttrModified; @@ -402,24 +408,24 @@ private: class SwCompareOptionsTabPage : public SfxTabPage { - RadioButton* m_pAutoRB; - RadioButton* m_pWordRB; - RadioButton* m_pCharRB; + VclPtr<RadioButton> m_pAutoRB; + VclPtr<RadioButton> m_pWordRB; + VclPtr<RadioButton> m_pCharRB; - CheckBox* m_pRsidCB; - CheckBox* m_pIgnoreCB; - NumericField* m_pLenNF; - CheckBox* m_pStoreRsidCB; - - SwCompareOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); - virtual ~SwCompareOptionsTabPage(); + VclPtr<CheckBox> m_pRsidCB; + VclPtr<CheckBox> m_pIgnoreCB; + VclPtr<NumericField> m_pLenNF; + VclPtr<CheckBox> m_pStoreRsidCB; DECL_LINK(ComparisonHdl, void *); DECL_LINK(IgnoreHdl, void *); public: + SwCompareOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); + virtual ~SwCompareOptionsTabPage(); + 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/sw/source/uibase/inc/outline.hxx b/sw/source/uibase/inc/outline.hxx index 0e1d24f4315e..d4ae3c69821e 100644 --- a/sw/source/uibase/inc/outline.hxx +++ b/sw/source/uibase/inc/outline.hxx @@ -58,7 +58,7 @@ class SwOutlineTabDialog : public SfxTabDialog bool bModified : 1; - protected: +protected: DECL_LINK(CancelHdl, void *); DECL_LINK( FormHdl, Button * ); DECL_LINK( MenuSelectHdl, Menu * ); @@ -66,33 +66,34 @@ class SwOutlineTabDialog : public SfxTabDialog virtual void PageCreated(sal_uInt16 nPageId, SfxTabPage& rPage) SAL_OVERRIDE; virtual short Ok() SAL_OVERRIDE; - public: +public: SwOutlineTabDialog(vcl::Window* pParent, const SfxItemSet* pSwItemSet, SwWrtShell &); virtual ~SwOutlineTabDialog(); + virtual void dispose() SAL_OVERRIDE; SwNumRule* GetNumRule() {return pNumRule;} - sal_uInt16 GetLevel(const OUString &rFmtName) const; + sal_uInt16 GetLevel(const OUString &rFmtName) const; OUString* GetCollNames() {return aCollNames;} - static sal_uInt16 GetActNumLevel() {return nNumLevel;} + static sal_uInt16 GetActNumLevel() {return nNumLevel;} static void SetActNumLevel(sal_uInt16 nSet) {nNumLevel = nSet;} }; class SwOutlineSettingsTabPage : public SfxTabPage { - ListBox* m_pLevelLB; - - ListBox* m_pCollBox; - SwNumberingTypeListBox* m_pNumberBox; - ListBox* m_pCharFmtLB; - FixedText* m_pAllLevelFT; - NumericField* m_pAllLevelNF; - Edit* m_pPrefixED; - Edit* m_pSuffixED; - NumericField* m_pStartEdit; - NumberingPreview* m_pPreviewWIN; + VclPtr<ListBox> m_pLevelLB; + + VclPtr<ListBox> m_pCollBox; + VclPtr<SwNumberingTypeListBox> m_pNumberBox; + VclPtr<ListBox> m_pCharFmtLB; + VclPtr<FixedText> m_pAllLevelFT; + VclPtr<NumericField> m_pAllLevelNF; + VclPtr<Edit> m_pPrefixED; + VclPtr<Edit> m_pSuffixED; + VclPtr<NumericField> m_pStartEdit; + VclPtr<NumberingPreview> m_pPreviewWIN; OUString aNoFmtName; OUString aSaveCollNames[MAXLEVEL]; @@ -121,6 +122,7 @@ class SwOutlineSettingsTabPage : public SfxTabPage public: SwOutlineSettingsTabPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwOutlineSettingsTabPage(); + virtual void dispose() SAL_OVERRIDE; void SetWrtShell(SwWrtShell* pShell); @@ -129,8 +131,8 @@ public: virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, - const SfxItemSet* rAttrSet); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, + const SfxItemSet* rAttrSet); }; #endif diff --git a/sw/source/uibase/inc/pgfnote.hxx b/sw/source/uibase/inc/pgfnote.hxx index a1ab9bf6df1a..49f1974b8c3e 100644 --- a/sw/source/uibase/inc/pgfnote.hxx +++ b/sw/source/uibase/inc/pgfnote.hxx @@ -32,28 +32,29 @@ class SwFootNotePage: public SfxTabPage { static const sal_uInt16 aPageRg[]; + SwFootNotePage(vcl::Window *pParent, const SfxItemSet &rSet); 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 aPageRg; } virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet *rSet) SAL_OVERRIDE; -private: - SwFootNotePage(vcl::Window *pParent, const SfxItemSet &rSet); virtual ~SwFootNotePage(); + virtual void dispose() SAL_OVERRIDE; +private: - RadioButton* m_pMaxHeightPageBtn; - RadioButton* m_pMaxHeightBtn; - MetricField* m_pMaxHeightEdit; - MetricField* m_pDistEdit; - - ListBox* m_pLinePosBox; - LineListBox* m_pLineTypeBox; - MetricField* m_pLineWidthEdit; - ColorListBox* m_pLineColorBox; - MetricField* m_pLineLengthEdit; - MetricField* m_pLineDistEdit; + VclPtr<RadioButton> m_pMaxHeightPageBtn; + VclPtr<RadioButton> m_pMaxHeightBtn; + VclPtr<MetricField> m_pMaxHeightEdit; + VclPtr<MetricField> m_pDistEdit; + + VclPtr<ListBox> m_pLinePosBox; + VclPtr<LineListBox> m_pLineTypeBox; + VclPtr<MetricField> m_pLineWidthEdit; + VclPtr<ColorListBox> m_pLineColorBox; + VclPtr<MetricField> m_pLineLengthEdit; + VclPtr<MetricField> m_pLineDistEdit; DECL_LINK(HeightPage, void *); DECL_LINK(HeightMetric, void *); diff --git a/sw/source/uibase/inc/pggrid.hxx b/sw/source/uibase/inc/pggrid.hxx index 62144bcbe8bd..8823b1d4099f 100644 --- a/sw/source/uibase/inc/pggrid.hxx +++ b/sw/source/uibase/inc/pggrid.hxx @@ -28,36 +28,36 @@ // TabPage Format/(Styles/)Page/Text grid class SwTextGridPage: public SfxTabPage { - RadioButton* m_pNoGridRB; - RadioButton* m_pLinesGridRB; - RadioButton* m_pCharsGridRB; - CheckBox* m_pSnapToCharsCB; + VclPtr<RadioButton> m_pNoGridRB; + VclPtr<RadioButton> m_pLinesGridRB; + VclPtr<RadioButton> m_pCharsGridRB; + VclPtr<CheckBox> m_pSnapToCharsCB; - SwPageGridExample* m_pExampleWN; + VclPtr<SwPageGridExample> m_pExampleWN; - VclFrame* m_pLayoutFL; - NumericField* m_pLinesPerPageNF; - FixedText* m_pLinesRangeFT; + VclPtr<VclFrame> m_pLayoutFL; + VclPtr<NumericField> m_pLinesPerPageNF; + VclPtr<FixedText> m_pLinesRangeFT; - MetricField* m_pTextSizeMF; + VclPtr<MetricField> m_pTextSizeMF; - FixedText* m_pCharsPerLineFT; - NumericField* m_pCharsPerLineNF; - FixedText* m_pCharsRangeFT; + VclPtr<FixedText> m_pCharsPerLineFT; + VclPtr<NumericField> m_pCharsPerLineNF; + VclPtr<FixedText> m_pCharsRangeFT; - FixedText* m_pCharWidthFT; - MetricField* m_pCharWidthMF; + VclPtr<FixedText> m_pCharWidthFT; + VclPtr<MetricField> m_pCharWidthMF; - FixedText* m_pRubySizeFT; - MetricField* m_pRubySizeMF; + VclPtr<FixedText> m_pRubySizeFT; + VclPtr<MetricField> m_pRubySizeMF; - CheckBox* m_pRubyBelowCB; + VclPtr<CheckBox> m_pRubyBelowCB; - VclFrame* m_pDisplayFL; + VclPtr<VclFrame> m_pDisplayFL; - CheckBox* m_pDisplayCB; - CheckBox* m_pPrintCB; - ColorListBox* m_pColorLB; + VclPtr<CheckBox> m_pDisplayCB; + VclPtr<CheckBox> m_pPrintCB; + VclPtr<ColorListBox> m_pColorLB; sal_Int32 m_nRubyUserValue; bool m_bRubyUserValue; @@ -67,9 +67,6 @@ class SwTextGridPage: public SfxTabPage bool m_bHRulerChanged; bool m_bVRulerChanged; - SwTextGridPage(vcl::Window *pParent, const SfxItemSet &rSet); - virtual ~SwTextGridPage(); - void UpdatePageSize(const SfxItemSet& rSet); void PutGridItem(SfxItemSet& rSet); void SetLinesOrCharsRanges(FixedText & rField, const sal_Int32 nValue ); @@ -84,7 +81,11 @@ class SwTextGridPage: public SfxTabPage using SfxTabPage::DeactivatePage; public: - static SfxTabPage *Create(vcl::Window *pParent, const SfxItemSet *rSet); + SwTextGridPage(vcl::Window *pParent, const SfxItemSet &rSet); + virtual ~SwTextGridPage(); + virtual void dispose() SAL_OVERRIDE; + + 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/sw/source/uibase/inc/prcntfld.hxx b/sw/source/uibase/inc/prcntfld.hxx index 6675290b20b0..314b0b624060 100644 --- a/sw/source/uibase/inc/prcntfld.hxx +++ b/sw/source/uibase/inc/prcntfld.hxx @@ -26,7 +26,7 @@ //Wraps a MetricField with extra features, preferred to PercentField class SW_DLLPUBLIC PercentField { - MetricField* m_pField; + VclPtr<MetricField> m_pField; sal_Int64 nRefValue; // 100% value for conversion (in Twips) sal_Int64 nOldMax; diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx index b33a4518b625..c4b154ca2869 100644 --- a/sw/source/uibase/inc/pview.hxx +++ b/sw/source/uibase/inc/pview.hxx @@ -150,7 +150,7 @@ class SW_DLLPUBLIC SwPagePreview: public SfxViewShell { // ViewWindow and handle to core // current dispatcher shell - SwPagePreviewWin* pViewWin; + VclPtr<SwPagePreviewWin> pViewWin; //viewdata of the previous SwView and the new crsrposition OUString sSwViewData; //and the new cursor position if the user double click in the PagePreview @@ -163,14 +163,14 @@ class SW_DLLPUBLIC SwPagePreview: public SfxViewShell Rectangle aVisArea; // MDI control elements - SwScrollbar *pHScrollbar; - SwScrollbar *pVScrollbar; + VclPtr<SwScrollbar> pHScrollbar; + VclPtr<SwScrollbar> pVScrollbar; bool mbHScrollbarEnabled; bool mbVScrollbarEnabled; - ImageButton *pPageUpBtn, - *pPageDownBtn; + VclPtr<ImageButton> pPageUpBtn, + pPageDownBtn; // dummy window for filling the lower right edge when both scrollbars are active - ::vcl::Window *pScrollFill; + VclPtr<::vcl::Window> pScrollFill; sal_uInt16 mnPageCount; bool bNormalPrint; @@ -192,7 +192,7 @@ class SW_DLLPUBLIC SwPagePreview: public SfxViewShell SAL_DLLPRIVATE virtual SfxPrinter* GetPrinter( bool bCreate = false ) SAL_OVERRIDE; SAL_DLLPRIVATE virtual sal_uInt16 SetPrinter( SfxPrinter *pNewPrinter, SfxPrinterChangeFlags nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false ) SAL_OVERRIDE; SAL_DLLPRIVATE virtual bool HasPrintOptionsPage() const SAL_OVERRIDE; - SAL_DLLPRIVATE virtual SfxTabPage* CreatePrintOptionsPage( vcl::Window *pParent, + SAL_DLLPRIVATE virtual VclPtr<SfxTabPage> CreatePrintOptionsPage( vcl::Window *pParent, const SfxItemSet &rOptions ) SAL_OVERRIDE; SAL_DLLPRIVATE void CalcAndSetBorderPixel( SvBorder &rToFill, bool bInner ); diff --git a/sw/source/uibase/inc/redlndlg.hxx b/sw/source/uibase/inc/redlndlg.hxx index 7cffc0bb366a..69121137d3e5 100644 --- a/sw/source/uibase/inc/redlndlg.hxx +++ b/sw/source/uibase/inc/redlndlg.hxx @@ -67,11 +67,11 @@ typedef std::vector<SvLBoxEntryPtr> SvLBoxEntryArr; class SW_DLLPUBLIC SwRedlineAcceptDlg { - vcl::Window* pParentDlg; + VclPtr<vcl::Window> pParentDlg; SwRedlineDataParentArr aRedlineParents; SwRedlineDataChildArr aRedlineChildren; SwRedlineDataParentSortArr aUsedSeqNo; - SvxAcceptChgCtr aTabPagesCTRL; + VclPtr<SvxAcceptChgCtr> aTabPagesCTRL; PopupMenu aPopup; Timer aDeselectTimer; Timer aSelectTimer; @@ -82,8 +82,8 @@ class SW_DLLPUBLIC SwRedlineAcceptDlg OUString sFmtCollSet; OUString sFilterAction; OUString sAutoFormat; - SvxTPView* pTPView; - SvxRedlinTable* pTable; // PB 2006/02/02 #i48648 now SvHeaderTabListBox + VclPtr<SvxTPView> pTPView; + VclPtr<SvxRedlinTable> pTable; // PB 2006/02/02 #i48648 now SvHeaderTabListBox Link aOldSelectHdl; Link aOldDeselectHdl; bool bOnlyFormatedRedlines; @@ -120,7 +120,7 @@ public: DECL_LINK( FilterChangedHdl, void *pDummy = 0 ); - inline SvxAcceptChgCtr& GetChgCtrl() { return aTabPagesCTRL; } + inline SvxAcceptChgCtr& GetChgCtrl() { return *aTabPagesCTRL.get(); } inline bool HasRedlineAutoFmt() const { return bRedlnAutoFmt; } void Init(sal_uInt16 nStart = 0); @@ -140,6 +140,7 @@ class SwModelessRedlineAcceptDlg : public SfxModelessDialog public: SwModelessRedlineAcceptDlg(SfxBindings*, SwChildWinWrapper*, vcl::Window *pParent); virtual ~SwModelessRedlineAcceptDlg(); + virtual void dispose() SAL_OVERRIDE; virtual void Activate() SAL_OVERRIDE; virtual void FillInfo(SfxChildWinInfo&) const SAL_OVERRIDE; @@ -166,6 +167,7 @@ class SwRedlineAcceptPanel : public PanelLayout, public SfxListener public: SwRedlineAcceptPanel(vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rFrame); virtual ~SwRedlineAcceptPanel(); + virtual void dispose() SAL_OVERRIDE; /// We need to be a SfxListener to be able to update the list of changes when we get SFX_HINT_DOCCHANGED. using Control::Notify; diff --git a/sw/source/uibase/inc/regionsw.hxx b/sw/source/uibase/inc/regionsw.hxx index e50a6d84cfbe..633362531f2c 100644 --- a/sw/source/uibase/inc/regionsw.hxx +++ b/sw/source/uibase/inc/regionsw.hxx @@ -61,41 +61,41 @@ typedef boost::ptr_set<SectRepr> SectReprArr; class SwEditRegionDlg : public SfxModalDialog { - Edit* m_pCurName; - SvTreeListBox* m_pTree; - - TriStateBox* m_pFileCB; - CheckBox* m_pDDECB; - VclContainer* m_pDDEFrame; - FixedText* m_pFileNameFT; - FixedText* m_pDDECommandFT; - Edit* m_pFileNameED; - PushButton* m_pFilePB; - FixedText* m_pSubRegionFT; - ComboBox* m_pSubRegionED; + VclPtr<Edit> m_pCurName; + VclPtr<SvTreeListBox> m_pTree; + + VclPtr<TriStateBox> m_pFileCB; + VclPtr<CheckBox> m_pDDECB; + VclPtr<VclContainer> m_pDDEFrame; + VclPtr<FixedText> m_pFileNameFT; + VclPtr<FixedText> m_pDDECommandFT; + VclPtr<Edit> m_pFileNameED; + VclPtr<PushButton> m_pFilePB; + VclPtr<FixedText> m_pSubRegionFT; + VclPtr<ComboBox> m_pSubRegionED; bool m_bSubRegionsFilled; - TriStateBox* m_pProtectCB; - CheckBox* m_pPasswdCB; - PushButton* m_pPasswdPB; + VclPtr<TriStateBox> m_pProtectCB; + VclPtr<CheckBox> m_pPasswdCB; + VclPtr<PushButton> m_pPasswdPB; - TriStateBox* m_pHideCB; - FixedText* m_pConditionFT; - ConditionEdit* m_pConditionED; + VclPtr<TriStateBox> m_pHideCB; + VclPtr<FixedText> m_pConditionFT; + VclPtr<ConditionEdit> m_pConditionED; // #114856# edit in readonly sections - TriStateBox* m_pEditInReadonlyCB; + VclPtr<TriStateBox> m_pEditInReadonlyCB; - OKButton* m_pOK; - PushButton* m_pOptionsPB; - PushButton* m_pDismiss; + VclPtr<OKButton> m_pOK; + VclPtr<PushButton> m_pOptionsPB; + VclPtr<PushButton> m_pDismiss; ImageList aImageIL; SwWrtShell& rSh; SectReprArr aSectReprArr; const SwSection* pCurrSect; sfx2::DocumentInserter* m_pDocInserter; - vcl::Window* m_pOldDefDlgParent; + VclPtr<vcl::Window> m_pOldDefDlgParent; bool bDontCheckPasswd :1; bool bWeb :1; @@ -131,6 +131,7 @@ class SwEditRegionDlg : public SfxModalDialog public: SwEditRegionDlg( vcl::Window* pParent, SwWrtShell& rWrtSh ); virtual ~SwEditRegionDlg(); + virtual void dispose() SAL_OVERRIDE; void SelectSection(const OUString& rSectionName); @@ -139,27 +140,27 @@ public: // dialog "insert region" class SwInsertSectionTabPage : public SfxTabPage { - ComboBox* m_pCurName; + VclPtr<ComboBox> m_pCurName; - CheckBox* m_pFileCB; - CheckBox* m_pDDECB; - FixedText* m_pDDECommandFT; - FixedText* m_pFileNameFT; - Edit* m_pFileNameED; - PushButton* m_pFilePB; - FixedText* m_pSubRegionFT; - ComboBox* m_pSubRegionED; + VclPtr<CheckBox> m_pFileCB; + VclPtr<CheckBox> m_pDDECB; + VclPtr<FixedText> m_pDDECommandFT; + VclPtr<FixedText> m_pFileNameFT; + VclPtr<Edit> m_pFileNameED; + VclPtr<PushButton> m_pFilePB; + VclPtr<FixedText> m_pSubRegionFT; + VclPtr<ComboBox> m_pSubRegionED; - CheckBox* m_pProtectCB; - CheckBox* m_pPasswdCB; - PushButton* m_pPasswdPB; + VclPtr<CheckBox> m_pProtectCB; + VclPtr<CheckBox> m_pPasswdCB; + VclPtr<PushButton> m_pPasswdPB; - CheckBox* m_pHideCB; - FixedText* m_pConditionFT; - ConditionEdit* m_pConditionED; + VclPtr<CheckBox> m_pHideCB; + VclPtr<FixedText> m_pConditionFT; + VclPtr<ConditionEdit> m_pConditionED; // #114856# edit in readonly sections - CheckBox* m_pEditInReadonlyCB; + VclPtr<CheckBox> m_pEditInReadonlyCB; OUString m_sFileName; OUString m_sFilterName; @@ -168,7 +169,7 @@ class SwInsertSectionTabPage : public SfxTabPage ::com::sun::star::uno::Sequence <sal_Int8 > m_aNewPasswd; SwWrtShell* m_pWrtSh; sfx2::DocumentInserter* m_pDocInserter; - vcl::Window* m_pOldDefDlgParent; + VclPtr<vcl::Window> m_pOldDefDlgParent; DECL_LINK( ChangeHideHdl, CheckBox * ); // #114856# edit in readonly sections @@ -184,43 +185,44 @@ class SwInsertSectionTabPage : public SfxTabPage public: SwInsertSectionTabPage(vcl::Window *pParent, const SfxItemSet &rAttrSet); virtual ~SwInsertSectionTabPage(); + virtual void dispose() SAL_OVERRIDE; void SetWrtShell(SwWrtShell& rSh); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); }; class SwSectionFtnEndTabPage : public SfxTabPage { - CheckBox* pFtnNtAtTextEndCB; + VclPtr<CheckBox> pFtnNtAtTextEndCB; - CheckBox* pFtnNtNumCB; - FixedText* pFtnOffsetLbl; - NumericField* pFtnOffsetFld; + VclPtr<CheckBox> pFtnNtNumCB; + VclPtr<FixedText> pFtnOffsetLbl; + VclPtr<NumericField> pFtnOffsetFld; - CheckBox* pFtnNtNumFmtCB; - FixedText* pFtnPrefixFT; - Edit* pFtnPrefixED; - SwNumberingTypeListBox* pFtnNumViewBox; - FixedText* pFtnSuffixFT; - Edit* pFtnSuffixED; + VclPtr<CheckBox> pFtnNtNumFmtCB; + VclPtr<FixedText> pFtnPrefixFT; + VclPtr<Edit> pFtnPrefixED; + VclPtr<SwNumberingTypeListBox> pFtnNumViewBox; + VclPtr<FixedText> pFtnSuffixFT; + VclPtr<Edit> pFtnSuffixED; - CheckBox* pEndNtAtTextEndCB; + VclPtr<CheckBox> pEndNtAtTextEndCB; - CheckBox* pEndNtNumCB; - FixedText* pEndOffsetLbl; - NumericField* pEndOffsetFld; + VclPtr<CheckBox> pEndNtNumCB; + VclPtr<FixedText> pEndOffsetLbl; + VclPtr<NumericField> pEndOffsetFld; - CheckBox* pEndNtNumFmtCB; - FixedText* pEndPrefixFT; - Edit* pEndPrefixED; - SwNumberingTypeListBox* pEndNumViewBox; - FixedText* pEndSuffixFT; - Edit* pEndSuffixED; + VclPtr<CheckBox> pEndNtNumFmtCB; + VclPtr<FixedText> pEndPrefixFT; + VclPtr<Edit> pEndPrefixED; + VclPtr<SwNumberingTypeListBox> pEndNumViewBox; + VclPtr<FixedText> pEndSuffixFT; + VclPtr<Edit> pEndSuffixED; DECL_LINK( FootEndHdl, CheckBox * ); void ResetState( bool bFtn, const SwFmtFtnEndAtTxtEnd& ); @@ -228,29 +230,31 @@ class SwSectionFtnEndTabPage : public SfxTabPage public: SwSectionFtnEndTabPage( vcl::Window *pParent, const SfxItemSet &rAttrSet ); virtual ~SwSectionFtnEndTabPage(); + virtual void dispose() SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); }; class SwSectionIndentTabPage : public SfxTabPage { - MetricField* m_pBeforeMF; - MetricField* m_pAfterMF; - SvxParaPrevWindow* m_pPreviewWin; + VclPtr<MetricField> m_pBeforeMF; + VclPtr<MetricField> m_pAfterMF; + VclPtr<SvxParaPrevWindow> m_pPreviewWin; DECL_LINK(IndentModifyHdl, void *); public: SwSectionIndentTabPage( vcl::Window *pParent, const SfxItemSet &rAttrSet ); virtual ~SwSectionIndentTabPage(); + virtual void dispose() SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); void SetWrtShell(SwWrtShell& rSh); diff --git a/sw/source/uibase/inc/rowht.hxx b/sw/source/uibase/inc/rowht.hxx index 25d9e7c918f3..9727c8d9d555 100644 --- a/sw/source/uibase/inc/rowht.hxx +++ b/sw/source/uibase/inc/rowht.hxx @@ -28,8 +28,8 @@ class SwWrtShell; class SwTableHeightDlg : public SvxStandardDialog { - MetricField* m_pHeightEdit; - CheckBox* m_pAutoHeightCB; + VclPtr<MetricField> m_pHeightEdit; + VclPtr<CheckBox> m_pAutoHeightCB; SwWrtShell &rSh; protected: @@ -37,6 +37,8 @@ protected: public: SwTableHeightDlg( vcl::Window *pParent, SwWrtShell &rS ); + virtual ~SwTableHeightDlg(); + virtual void dispose() SAL_OVERRIDE; }; #endif diff --git a/sw/source/uibase/inc/selglos.hxx b/sw/source/uibase/inc/selglos.hxx index 501af9a28200..e67f3788a2f2 100644 --- a/sw/source/uibase/inc/selglos.hxx +++ b/sw/source/uibase/inc/selglos.hxx @@ -29,11 +29,14 @@ class SwSelGlossaryDlg : public ModalDialog { protected: - ListBox* m_pGlosBox; + VclPtr<ListBox> m_pGlosBox; DECL_LINK(DoubleClickHdl, ListBox*); public: SwSelGlossaryDlg(vcl::Window * pParent, const OUString &rShortName); + virtual ~SwSelGlossaryDlg(); + virtual void dispose() SAL_OVERRIDE; + void InsertGlos(const OUString &rRegion, const OUString &rGlosName) { const OUString aTmp = rRegion + ":" + rGlosName; diff --git a/sw/source/uibase/inc/shdwcrsr.hxx b/sw/source/uibase/inc/shdwcrsr.hxx index 631fde3d7f5b..dcb38480dd16 100644 --- a/sw/source/uibase/inc/shdwcrsr.hxx +++ b/sw/source/uibase/inc/shdwcrsr.hxx @@ -27,7 +27,7 @@ namespace vcl { class Window; } class SwShadowCursor { - vcl::Window* pWin; + VclPtr<vcl::Window> pWin; Color aCol; Point aOldPt; long nOldHeight; diff --git a/sw/source/uibase/inc/splittbl.hxx b/sw/source/uibase/inc/splittbl.hxx index 3bcce8bb03bc..cc6a96d2c5f7 100644 --- a/sw/source/uibase/inc/splittbl.hxx +++ b/sw/source/uibase/inc/splittbl.hxx @@ -27,10 +27,10 @@ class SwWrtShell; class SwSplitTblDlg : public SvxStandardDialog { - RadioButton* mpCntntCopyRB; - RadioButton* mpBoxAttrCopyWithParaRB ; - RadioButton* mpBoxAttrCopyNoParaRB ; - RadioButton* mpBorderCopyRB; + VclPtr<RadioButton> mpCntntCopyRB; + VclPtr<RadioButton> mpBoxAttrCopyWithParaRB ; + VclPtr<RadioButton> mpBoxAttrCopyNoParaRB ; + VclPtr<RadioButton> mpBorderCopyRB; SwWrtShell &rShell; sal_uInt16 m_nSplit; @@ -40,6 +40,8 @@ protected: public: SwSplitTblDlg( vcl::Window *pParent, SwWrtShell &rSh ); + virtual ~SwSplitTblDlg(); + virtual void dispose() SAL_OVERRIDE; sal_uInt16 GetSplitMode() const { return m_nSplit; } }; diff --git a/sw/source/uibase/inc/srcedtw.hxx b/sw/source/uibase/inc/srcedtw.hxx index 153d9e17d09d..8e1a411c645a 100644 --- a/sw/source/uibase/inc/srcedtw.hxx +++ b/sw/source/uibase/inc/srcedtw.hxx @@ -69,9 +69,9 @@ private: ExtTextView* pTextView; ExtTextEngine* pTextEngine; - TextViewOutWin* pOutWin; - ScrollBar *pHScrollbar, - *pVScrollbar; + VclPtr<TextViewOutWin> pOutWin; + VclPtr<ScrollBar> pHScrollbar, + pVScrollbar; SwSrcView* pSrcView; @@ -118,6 +118,7 @@ protected: public: SwSrcEditWindow( vcl::Window* pParent, SwSrcView* pParentView ); virtual ~SwSrcEditWindow(); + virtual void dispose() SAL_OVERRIDE; void SetScrollBarRanges(); void InitScrollBars(); diff --git a/sw/source/uibase/inc/srcview.hxx b/sw/source/uibase/inc/srcview.hxx index ab37058fb371..5e0c4e5a5839 100644 --- a/sw/source/uibase/inc/srcview.hxx +++ b/sw/source/uibase/inc/srcview.hxx @@ -32,7 +32,7 @@ class SfxMedium; class SwSrcView: public SfxViewShell { - SwSrcEditWindow aEditWin; + VclPtr<SwSrcEditWindow> aEditWin; SvxSearchItem* pSearchItem; @@ -64,11 +64,11 @@ public: virtual ~SwSrcView(); SwDocShell* GetDocShell(); - SwSrcEditWindow& GetEditWin() {return aEditWin;} + SwSrcEditWindow& GetEditWin() { return *aEditWin.get(); } void SaveContent(const OUString& rTmpFile); void SaveContentTo(SfxMedium& rMed); - bool IsModified() {return aEditWin.IsModified();} + bool IsModified() {return aEditWin->IsModified();} void Execute(SfxRequest&); void GetState(SfxItemSet&); diff --git a/sw/source/uibase/inc/srtdlg.hxx b/sw/source/uibase/inc/srtdlg.hxx index a20fdeb6f04a..7facf548a45d 100644 --- a/sw/source/uibase/inc/srtdlg.hxx +++ b/sw/source/uibase/inc/srtdlg.hxx @@ -31,38 +31,38 @@ class CollatorResource; class SwSortDlg : public SvxStandardDialog { - FixedText* m_pColLbl; - FixedText* m_pTypLbl; + VclPtr<FixedText> m_pColLbl; + VclPtr<FixedText> m_pTypLbl; - CheckBox* m_pKeyCB1; - NumericField* m_pColEdt1; - ListBox* m_pTypDLB1; - RadioButton* m_pSortUp1RB; - RadioButton* m_pSortDn1RB; + VclPtr<CheckBox> m_pKeyCB1; + VclPtr<NumericField> m_pColEdt1; + VclPtr<ListBox> m_pTypDLB1; + VclPtr<RadioButton> m_pSortUp1RB; + VclPtr<RadioButton> m_pSortDn1RB; - CheckBox* m_pKeyCB2; - NumericField* m_pColEdt2; - ListBox* m_pTypDLB2; - RadioButton* m_pSortUp2RB; - RadioButton* m_pSortDn2RB; + VclPtr<CheckBox> m_pKeyCB2; + VclPtr<NumericField> m_pColEdt2; + VclPtr<ListBox> m_pTypDLB2; + VclPtr<RadioButton> m_pSortUp2RB; + VclPtr<RadioButton> m_pSortDn2RB; - CheckBox* m_pKeyCB3; - NumericField* m_pColEdt3; - ListBox* m_pTypDLB3; - RadioButton* m_pSortUp3RB; - RadioButton* m_pSortDn3RB; + VclPtr<CheckBox> m_pKeyCB3; + VclPtr<NumericField> m_pColEdt3; + VclPtr<ListBox> m_pTypDLB3; + VclPtr<RadioButton> m_pSortUp3RB; + VclPtr<RadioButton> m_pSortDn3RB; - RadioButton* m_pColumnRB; - RadioButton* m_pRowRB; + VclPtr<RadioButton> m_pColumnRB; + VclPtr<RadioButton> m_pRowRB; - RadioButton* m_pDelimTabRB; - RadioButton* m_pDelimFreeRB; - Edit* m_pDelimEdt; - PushButton* m_pDelimPB; + VclPtr<RadioButton> m_pDelimTabRB; + VclPtr<RadioButton> m_pDelimFreeRB; + VclPtr<Edit> m_pDelimEdt; + VclPtr<PushButton> m_pDelimPB; - SvxLanguageBox* m_pLangLB; + VclPtr<SvxLanguageBox> m_pLangLB; - CheckBox* m_pCaseCB; + VclPtr<CheckBox> m_pCaseCB; OUString aColTxt; OUString aRowTxt; @@ -85,6 +85,7 @@ class SwSortDlg : public SvxStandardDialog public: SwSortDlg(vcl::Window * pParent, SwWrtShell &rSh); virtual ~SwSortDlg(); + virtual void dispose() SAL_OVERRIDE; }; #endif diff --git a/sw/source/uibase/inc/swmessdialog.hxx b/sw/source/uibase/inc/swmessdialog.hxx index da9c8afe32fd..c8028265e616 100644 --- a/sw/source/uibase/inc/swmessdialog.hxx +++ b/sw/source/uibase/inc/swmessdialog.hxx @@ -20,14 +20,16 @@ class VclMultiLineEdit; class SwMessageAndEditDialog : public ModalDialog { protected: - OKButton* m_pOKPB; - FixedImage* m_pImageIM; - VclMultiLineEdit* m_pPrimaryMessage; - VclMultiLineEdit* m_pSecondaryMessage; - Edit* m_pEdit; + VclPtr<OKButton> m_pOKPB; + VclPtr<FixedImage> m_pImageIM; + VclPtr<VclMultiLineEdit> m_pPrimaryMessage; + VclPtr<VclMultiLineEdit> m_pSecondaryMessage; + VclPtr<Edit> m_pEdit; public: SwMessageAndEditDialog(vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription); + virtual ~SwMessageAndEditDialog(); + virtual void dispose() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UIBASE_INC_SWMESSDIALOG_HXX diff --git a/sw/source/uibase/inc/swmodalredlineacceptdlg.hxx b/sw/source/uibase/inc/swmodalredlineacceptdlg.hxx index 06ccac71cff0..2a4728a689e1 100644 --- a/sw/source/uibase/inc/swmodalredlineacceptdlg.hxx +++ b/sw/source/uibase/inc/swmodalredlineacceptdlg.hxx @@ -30,6 +30,7 @@ class SwModalRedlineAcceptDlg : public SfxModalDialog public: SwModalRedlineAcceptDlg(vcl::Window *pParent); virtual ~SwModalRedlineAcceptDlg(); + virtual void dispose() SAL_OVERRIDE; void AcceptAll( bool bAccept ); virtual void Activate() SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/swrenamexnameddlg.hxx b/sw/source/uibase/inc/swrenamexnameddlg.hxx index aefb1efe0e91..84967e6fd9df 100644 --- a/sw/source/uibase/inc/swrenamexnameddlg.hxx +++ b/sw/source/uibase/inc/swrenamexnameddlg.hxx @@ -32,9 +32,9 @@ class SwRenameXNamedDlg : public ModalDialog { - Edit* m_pNewNameED; + VclPtr<Edit> m_pNewNameED; TextFilter m_aTextFilter; - OKButton* m_pOk; + VclPtr<OKButton> m_pOk; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > & xNamed; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xNameAccess; @@ -48,6 +48,8 @@ public: SwRenameXNamedDlg( vcl::Window* pParent, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > & xNamed, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xNameAccess ); + virtual ~SwRenameXNamedDlg(); + virtual void dispose() SAL_OVERRIDE; void SetForbiddenChars(const OUString& rSet) { diff --git a/sw/source/uibase/inc/swruler.hxx b/sw/source/uibase/inc/swruler.hxx index 19b877f8253f..7e57c2abe0ae 100644 --- a/sw/source/uibase/inc/swruler.hxx +++ b/sw/source/uibase/inc/swruler.hxx @@ -34,6 +34,7 @@ public: SfxBindings& rBindings, WinBits nWinStyle); virtual ~SwCommentRuler (); + virtual void dispose() SAL_OVERRIDE; /** * Paint the ruler. @@ -43,11 +44,11 @@ public: protected: SwViewShell * mpViewShell; //< Shell to check if there is any comments on doc and their visibility - SwEditWin * mpSwWin; //< Used to get SwView to change the SideBar visibility + VclPtr<SwEditWin> mpSwWin; //< Used to get SwView to change the SideBar visibility bool mbIsHighlighted; //< If comment control is highlighted (mouse is over it) Timer maFadeTimer; //< Timer for high/'low'light fading int mnFadeRate; //< From 0 to 100. 0 means not highlighted. - VirtualDevice maVirDev; //< VirtualDevice of this window. Just for convenience. + ScopedVclPtr<VirtualDevice> maVirDev; //< VirtualDevice of this window. Just for convenience. /** * Callback function to handle a mouse button down event. diff --git a/sw/source/uibase/inc/swuiccoll.hxx b/sw/source/uibase/inc/swuiccoll.hxx index fc903b33627f..a66a468823d9 100644 --- a/sw/source/uibase/inc/swuiccoll.hxx +++ b/sw/source/uibase/inc/swuiccoll.hxx @@ -26,18 +26,18 @@ class SwFmt; class SwCondCollPage : public SfxTabPage { - CheckBox* m_pConditionCB; + VclPtr<CheckBox> m_pConditionCB; - FixedText* m_pContextFT; - FixedText* m_pUsedFT; - SvTabListBox* m_pTbLinks; + VclPtr<FixedText> m_pContextFT; + VclPtr<FixedText> m_pUsedFT; + VclPtr<SvTabListBox> m_pTbLinks; - FixedText* m_pStyleFT; - ListBox* m_pStyleLB; - ListBox* m_pFilterLB; + VclPtr<FixedText> m_pStyleFT; + VclPtr<ListBox> m_pStyleLB; + VclPtr<ListBox> m_pFilterLB; - PushButton* m_pRemovePB; - PushButton* m_pAssignPB; + VclPtr<PushButton> m_pRemovePB; + VclPtr<PushButton> m_pAssignPB; std::vector<OUString> m_aStrArr; @@ -47,8 +47,8 @@ class SwCondCollPage : public SfxTabPage bool bNewTemplate; - SwCondCollPage(vcl::Window *pParent, const SfxItemSet &rSet); virtual ~SwCondCollPage(); + virtual void dispose() SAL_OVERRIDE; virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; @@ -62,8 +62,9 @@ class SwCondCollPage : public SfxTabPage static const sal_uInt16 aPageRg[]; public: + SwCondCollPage(vcl::Window *pParent, const SfxItemSet &rSet); - 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 aPageRg; } virtual bool FillItemSet( SfxItemSet *rSet) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx index 41f57750c17a..a4af88ff19b1 100644 --- a/sw/source/uibase/inc/swuicnttab.hxx +++ b/sw/source/uibase/inc/swuicnttab.hxx @@ -61,8 +61,8 @@ struct SwIndexSections_Impl; class SwMultiTOXTabDialog : public SfxTabDialog { - vcl::Window* m_pExampleContainerWIN; - CheckBox* m_pShowExampleCB; + VclPtr<vcl::Window> m_pExampleContainerWIN; + VclPtr<CheckBox> m_pShowExampleCB; SwTOXMgr* pMgr; SwWrtShell& rSh; @@ -102,6 +102,7 @@ public: SwTOXBase* pCurTOX, sal_uInt16 nToxType = USHRT_MAX, bool bGlobal = false); virtual ~SwMultiTOXTabDialog(); + virtual void dispose() SAL_OVERRIDE; virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; @@ -130,65 +131,65 @@ class IndexEntrySupplierWrapper; class SwTOXSelectTabPage : public SfxTabPage { - Edit* m_pTitleED; - FixedText* m_pTypeFT; - ListBox* m_pTypeLB; - CheckBox* m_pReadOnlyCB; + VclPtr<Edit> m_pTitleED; + VclPtr<FixedText> m_pTypeFT; + VclPtr<ListBox> m_pTypeLB; + VclPtr<CheckBox> m_pReadOnlyCB; - VclContainer* m_pAreaFrame; - ListBox* m_pAreaLB; - FixedText* m_pLevelFT; //content, user - NumericField* m_pLevelNF; //content, user + VclPtr<VclContainer> m_pAreaFrame; + VclPtr<ListBox> m_pAreaLB; + VclPtr<FixedText> m_pLevelFT; //content, user + VclPtr<NumericField> m_pLevelNF; //content, user //content - VclContainer* m_pCreateFrame; // content, user, illustration - CheckBox* m_pFromHeadingsCB; - CheckBox* m_pAddStylesCB; - PushButton* m_pAddStylesPB; + VclPtr<VclContainer> m_pCreateFrame; // content, user, illustration + VclPtr<CheckBox> m_pFromHeadingsCB; + VclPtr<CheckBox> m_pAddStylesCB; + VclPtr<PushButton> m_pAddStylesPB; //user - CheckBox* m_pFromTablesCB; - CheckBox* m_pFromFramesCB; - CheckBox* m_pFromGraphicsCB; - CheckBox* m_pFromOLECB; - CheckBox* m_pLevelFromChapterCB; + VclPtr<CheckBox> m_pFromTablesCB; + VclPtr<CheckBox> m_pFromFramesCB; + VclPtr<CheckBox> m_pFromGraphicsCB; + VclPtr<CheckBox> m_pFromOLECB; + VclPtr<CheckBox> m_pLevelFromChapterCB; //illustration + table - RadioButton* m_pFromCaptionsRB; - RadioButton* m_pFromObjectNamesRB; + VclPtr<RadioButton> m_pFromCaptionsRB; + VclPtr<RadioButton> m_pFromObjectNamesRB; //illustration and tables - FixedText* m_pCaptionSequenceFT; - ListBox* m_pCaptionSequenceLB; - FixedText* m_pDisplayTypeFT; - ListBox* m_pDisplayTypeLB; + VclPtr<FixedText> m_pCaptionSequenceFT; + VclPtr<ListBox> m_pCaptionSequenceLB; + VclPtr<FixedText> m_pDisplayTypeFT; + VclPtr<ListBox> m_pDisplayTypeLB; //all but illustration and table - CheckBox* m_pTOXMarksCB; + VclPtr<CheckBox> m_pTOXMarksCB; //index only - VclContainer* m_pIdxOptionsFrame; - CheckBox* m_pCollectSameCB; - CheckBox* m_pUseFFCB; - CheckBox* m_pUseDashCB; - CheckBox* m_pCaseSensitiveCB; - CheckBox* m_pInitialCapsCB; - CheckBox* m_pKeyAsEntryCB; - CheckBox* m_pFromFileCB; - MenuButton* m_pAutoMarkPB; + VclPtr<VclContainer> m_pIdxOptionsFrame; + VclPtr<CheckBox> m_pCollectSameCB; + VclPtr<CheckBox> m_pUseFFCB; + VclPtr<CheckBox> m_pUseDashCB; + VclPtr<CheckBox> m_pCaseSensitiveCB; + VclPtr<CheckBox> m_pInitialCapsCB; + VclPtr<CheckBox> m_pKeyAsEntryCB; + VclPtr<CheckBox> m_pFromFileCB; + VclPtr<MenuButton> m_pAutoMarkPB; // object only SwOLENames aFromNames; - SvxCheckListBox* m_pFromObjCLB; - VclContainer* m_pFromObjFrame; + VclPtr<SvxCheckListBox> m_pFromObjCLB; + VclPtr<VclContainer> m_pFromObjFrame; - CheckBox* m_pSequenceCB; - ListBox* m_pBracketLB; - VclContainer* m_pAuthorityFrame; + VclPtr<CheckBox> m_pSequenceCB; + VclPtr<ListBox> m_pBracketLB; + VclPtr<VclContainer> m_pAuthorityFrame; //all - VclContainer* m_pSortFrame; - SvxLanguageBox* m_pLanguageLB; - ListBox* m_pSortAlgorithmLB; + VclPtr<VclContainer> m_pSortFrame; + VclPtr<SvxLanguageBox> m_pLanguageLB; + VclPtr<ListBox> m_pSortAlgorithmLB; IndexEntryResource* pIndexRes; @@ -221,6 +222,7 @@ class SwTOXSelectTabPage : public SfxTabPage public: SwTOXSelectTabPage(vcl::Window* pParent, const SfxItemSet& rAttrSet); virtual ~SwTOXSelectTabPage(); + virtual void dispose() SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; @@ -228,7 +230,7 @@ public: virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); void SelectType(TOXTypes eSet); //preset TOXType, GlobalDoc @@ -241,15 +243,15 @@ class SwTOXEntryTabPage; class SwTokenWindow : public VclHBox, public VclBuilderContainer { - typedef std::vector<Control*>::iterator ctrl_iterator; - typedef std::vector<Control*>::const_iterator ctrl_const_iterator; - typedef std::vector<Control*>::reverse_iterator ctrl_reverse_iterator; - typedef std::vector<Control*>::const_reverse_iterator ctrl_const_reverse_iterator; - - Button* m_pLeftScrollWin; - vcl::Window* m_pCtrlParentWin; - Button* m_pRightScrollWin; - std::vector<Control*> aControlList; + typedef std::vector<VclPtr<Control> >::iterator ctrl_iterator; + typedef std::vector<VclPtr<Control> >::const_iterator ctrl_const_iterator; + typedef std::vector<VclPtr<Control> >::reverse_iterator ctrl_reverse_iterator; + typedef std::vector<VclPtr<Control> >::const_reverse_iterator ctrl_const_reverse_iterator; + + VclPtr<Button> m_pLeftScrollWin; + VclPtr<vcl::Window> m_pCtrlParentWin; + VclPtr<Button> m_pRightScrollWin; + std::vector<VclPtr<Control> > aControlList; SwForm* pForm; sal_uInt16 nLevel; bool bValid; @@ -257,14 +259,14 @@ class SwTokenWindow : public VclHBox, public VclBuilderContainer OUString aButtonHelpTexts[TOKEN_END]; // QuickHelpText of the buttons OUString sCharStyle; Link aButtonSelectedHdl; - Control* pActiveCtrl; + VclPtr<Control> pActiveCtrl; Link aModifyHdl; OUString accessibleName; OUString sAdditionalAccnameString1; OUString sAdditionalAccnameString2; OUString sAdditionalAccnameString3; - SwTOXEntryTabPage* m_pParent; + VclPtr<SwTOXEntryTabPage> m_pParent; DECL_LINK(EditResize, Edit*); DECL_LINK(NextItemHdl, SwTOXEdit* ); @@ -283,6 +285,7 @@ class SwTokenWindow : public VclHBox, public VclBuilderContainer public: SwTokenWindow(vcl::Window* pParent); virtual ~SwTokenWindow(); + virtual void dispose() SAL_OVERRIDE; void SetTabPage(SwTOXEntryTabPage *pParent) { m_pParent = pParent; } @@ -325,76 +328,79 @@ class SwTOXEntryTabPage; class SwIdxTreeListBox : public SvTreeListBox { - SwTOXEntryTabPage* pParent; + VclPtr<SwTOXEntryTabPage> pParent; virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; public: SwIdxTreeListBox(vcl::Window* pPar, WinBits nStyle); + virtual ~SwIdxTreeListBox(); + virtual void dispose() SAL_OVERRIDE; + void SetTabPage(SwTOXEntryTabPage* pPar) { pParent = pPar; } }; class SwTOXEntryTabPage : public SfxTabPage { - FixedText* m_pLevelFT; - SwIdxTreeListBox* m_pLevelLB; + VclPtr<FixedText> m_pLevelFT; + VclPtr<SwIdxTreeListBox> m_pLevelLB; - SwTokenWindow* m_pTokenWIN; + VclPtr<SwTokenWindow> m_pTokenWIN; - PushButton* m_pAllLevelsPB; + VclPtr<PushButton> m_pAllLevelsPB; - PushButton* m_pEntryNoPB; - PushButton* m_pEntryPB; - PushButton* m_pTabPB; - PushButton* m_pChapterInfoPB; - PushButton* m_pPageNoPB; - PushButton* m_pHyperLinkPB; + VclPtr<PushButton> m_pEntryNoPB; + VclPtr<PushButton> m_pEntryPB; + VclPtr<PushButton> m_pTabPB; + VclPtr<PushButton> m_pChapterInfoPB; + VclPtr<PushButton> m_pPageNoPB; + VclPtr<PushButton> m_pHyperLinkPB; - ListBox* m_pAuthFieldsLB; - PushButton* m_pAuthInsertPB; - PushButton* m_pAuthRemovePB; + VclPtr<ListBox> m_pAuthFieldsLB; + VclPtr<PushButton> m_pAuthInsertPB; + VclPtr<PushButton> m_pAuthRemovePB; - ListBox* m_pCharStyleLB; // character style of the current token - PushButton* m_pEditStylePB; + VclPtr<ListBox> m_pCharStyleLB; // character style of the current token + VclPtr<PushButton> m_pEditStylePB; - FixedText* m_pChapterEntryFT; - ListBox* m_pChapterEntryLB; // type of chapter info + VclPtr<FixedText> m_pChapterEntryFT; + VclPtr<ListBox> m_pChapterEntryLB; // type of chapter info - FixedText* m_pNumberFormatFT; - ListBox* m_pNumberFormatLB; //!< format for numbering (E#) + VclPtr<FixedText> m_pNumberFormatFT; + VclPtr<ListBox> m_pNumberFormatLB; //!< format for numbering (E#) - FixedText* m_pEntryOutlineLevelFT; //!< Fixed text, for i53420 - NumericField* m_pEntryOutlineLevelNF; //!< level to evaluate outline level to, for i53420 + VclPtr<FixedText> m_pEntryOutlineLevelFT; //!< Fixed text, for i53420 + VclPtr<NumericField> m_pEntryOutlineLevelNF; //!< level to evaluate outline level to, for i53420 - FixedText* m_pFillCharFT; - ComboBox* m_pFillCharCB; // fill char for tab stop + VclPtr<FixedText> m_pFillCharFT; + VclPtr<ComboBox> m_pFillCharCB; // fill char for tab stop - FixedText* m_pTabPosFT; - MetricField* m_pTabPosMF; // tab stop position - CheckBox* m_pAutoRightCB; + VclPtr<FixedText> m_pTabPosFT; + VclPtr<MetricField> m_pTabPosMF; // tab stop position + VclPtr<CheckBox> m_pAutoRightCB; - VclContainer* m_pFormatFrame; - FixedText* m_pMainEntryStyleFT; - ListBox* m_pMainEntryStyleLB; // character style of main entries in indexes - CheckBox* m_pAlphaDelimCB; - CheckBox* m_pCommaSeparatedCB; - CheckBox* m_pRelToStyleCB; // position relative to the right margin of the para style + VclPtr<VclContainer> m_pFormatFrame; + VclPtr<FixedText> m_pMainEntryStyleFT; + VclPtr<ListBox> m_pMainEntryStyleLB; // character style of main entries in indexes + VclPtr<CheckBox> m_pAlphaDelimCB; + VclPtr<CheckBox> m_pCommaSeparatedCB; + VclPtr<CheckBox> m_pRelToStyleCB; // position relative to the right margin of the para style - VclContainer* m_pSortingFrame; - RadioButton* m_pSortDocPosRB; - RadioButton* m_pSortContentRB; + VclPtr<VclContainer> m_pSortingFrame; + VclPtr<RadioButton> m_pSortDocPosRB; + VclPtr<RadioButton> m_pSortContentRB; - VclContainer* m_pSortKeyFrame; - ListBox* m_pFirstKeyLB; - RadioButton* m_pFirstSortUpRB; - RadioButton* m_pFirstSortDownRB; + VclPtr<VclContainer> m_pSortKeyFrame; + VclPtr<ListBox> m_pFirstKeyLB; + VclPtr<RadioButton> m_pFirstSortUpRB; + VclPtr<RadioButton> m_pFirstSortDownRB; - ListBox* m_pSecondKeyLB; - RadioButton* m_pSecondSortUpRB; - RadioButton* m_pSecondSortDownRB; + VclPtr<ListBox> m_pSecondKeyLB; + VclPtr<RadioButton> m_pSecondSortUpRB; + VclPtr<RadioButton> m_pSecondSortDownRB; - ListBox* m_pThirdKeyLB; - RadioButton* m_pThirdSortUpRB; - RadioButton* m_pThirdSortDownRB; + VclPtr<ListBox> m_pThirdKeyLB; + VclPtr<RadioButton> m_pThirdSortUpRB; + VclPtr<RadioButton> m_pThirdSortDownRB; OUString sDelimStr; OUString sLevelStr; @@ -434,14 +440,15 @@ class SwTOXEntryTabPage : public SfxTabPage public: SwTOXEntryTabPage(vcl::Window* pParent, const SfxItemSet& rAttrSet); virtual ~SwTOXEntryTabPage(); + virtual void dispose() SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, - const SfxItemSet* rAttrSet); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, + const SfxItemSet* rAttrSet); void SetWrtShell(SwWrtShell& rSh); OUString GetLevelHelp(sal_uInt16 nLevel) const; @@ -453,11 +460,11 @@ public: class SwTOXStylesTabPage : public SfxTabPage { - ListBox* m_pLevelLB; - PushButton* m_pAssignBT; - ListBox* m_pParaLayLB; - PushButton* m_pStdBT; - PushButton* m_pEditStyleBT; + VclPtr<ListBox> m_pLevelLB; + VclPtr<PushButton> m_pAssignBT; + VclPtr<ListBox> m_pParaLayLB; + VclPtr<PushButton> m_pStdBT; + VclPtr<PushButton> m_pEditStyleBT; SwForm* m_pCurrentForm; @@ -480,6 +487,7 @@ class SwTOXStylesTabPage : public SfxTabPage public: SwTOXStylesTabPage(vcl::Window* pParent, const SfxItemSet& rAttrSet); virtual ~SwTOXStylesTabPage(); + virtual void dispose() SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; @@ -487,8 +495,8 @@ public: virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, - const SfxItemSet* rAttrSet); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, + const SfxItemSet* rAttrSet); }; diff --git a/sw/source/uibase/inc/swuiidxmrk.hxx b/sw/source/uibase/inc/swuiidxmrk.hxx index 0f559a63eb85..040c97d7628a 100644 --- a/sw/source/uibase/inc/swuiidxmrk.hxx +++ b/sw/source/uibase/inc/swuiidxmrk.hxx @@ -51,40 +51,40 @@ class SwIndexMarkPane friend class SwIndexMarkFloatDlg; friend class SwIndexMarkModalDlg; - VclFrame* m_pFrame; - FixedText* m_pTypeFT; - ListBox* m_pTypeDCB; - PushButton* m_pNewBT; - - Edit* m_pEntryED; - FixedText* m_pPhoneticFT0; - Edit* m_pPhoneticED0; - - FixedText* m_pKey1FT; - ComboBox* m_pKey1DCB; - FixedText* m_pPhoneticFT1; - Edit* m_pPhoneticED1; - - FixedText* m_pKey2FT; - ComboBox* m_pKey2DCB; - FixedText* m_pPhoneticFT2; - Edit* m_pPhoneticED2; - - FixedText* m_pLevelFT; - NumericField* m_pLevelNF; - CheckBox* m_pMainEntryCB; - CheckBox* m_pApplyToAllCB; - CheckBox* m_pSearchCaseSensitiveCB; - CheckBox* m_pSearchCaseWordOnlyCB; - - PushButton* m_pOKBT; - CloseButton* m_pCloseBT; - PushButton* m_pDelBT; - - PushButton* m_pPrevSameBT; - PushButton* m_pNextSameBT; - PushButton* m_pPrevBT; - PushButton* m_pNextBT; + VclPtr<VclFrame> m_pFrame; + VclPtr<FixedText> m_pTypeFT; + VclPtr<ListBox> m_pTypeDCB; + VclPtr<PushButton> m_pNewBT; + + VclPtr<Edit> m_pEntryED; + VclPtr<FixedText> m_pPhoneticFT0; + VclPtr<Edit> m_pPhoneticED0; + + VclPtr<FixedText> m_pKey1FT; + VclPtr<ComboBox> m_pKey1DCB; + VclPtr<FixedText> m_pPhoneticFT1; + VclPtr<Edit> m_pPhoneticED1; + + VclPtr<FixedText> m_pKey2FT; + VclPtr<ComboBox> m_pKey2DCB; + VclPtr<FixedText> m_pPhoneticFT2; + VclPtr<Edit> m_pPhoneticED2; + + VclPtr<FixedText> m_pLevelFT; + VclPtr<NumericField> m_pLevelNF; + VclPtr<CheckBox> m_pMainEntryCB; + VclPtr<CheckBox> m_pApplyToAllCB; + VclPtr<CheckBox> m_pSearchCaseSensitiveCB; + VclPtr<CheckBox> m_pSearchCaseWordOnlyCB; + + VclPtr<PushButton> m_pOKBT; + VclPtr<CloseButton> m_pCloseBT; + VclPtr<PushButton> m_pDelBT; + + VclPtr<PushButton> m_pPrevSameBT; + VclPtr<PushButton> m_pNextSameBT; + VclPtr<PushButton> m_pPrevBT; + VclPtr<PushButton> m_pNextBT; OUString aOrgStr; bool bDel; @@ -182,17 +182,17 @@ class SwAuthorMarkPane friend class SwAuthMarkModalDlg; friend class SwAuthMarkFloatDlg; - RadioButton* m_pFromComponentRB; - RadioButton* m_pFromDocContentRB; - FixedText* m_pAuthorFI; - FixedText* m_pTitleFI; - Edit* m_pEntryED; - ListBox* m_pEntryLB; - - PushButton* m_pActionBT; - CloseButton* m_pCloseBT; - PushButton* m_pCreateEntryPB; - PushButton* m_pEditEntryPB; + VclPtr<RadioButton> m_pFromComponentRB; + VclPtr<RadioButton> m_pFromDocContentRB; + VclPtr<FixedText> m_pAuthorFI; + VclPtr<FixedText> m_pTitleFI; + VclPtr<Edit> m_pEntryED; + VclPtr<ListBox> m_pEntryLB; + + VclPtr<PushButton> m_pActionBT; + VclPtr<CloseButton> m_pCloseBT; + VclPtr<PushButton> m_pCreateEntryPB; + VclPtr<PushButton> m_pEditEntryPB; bool bNewEntry; bool bBibAccessInitialized; diff --git a/sw/source/uibase/inc/syncbtn.hxx b/sw/source/uibase/inc/syncbtn.hxx index 76f8be74749a..83a16070a5d7 100644 --- a/sw/source/uibase/inc/syncbtn.hxx +++ b/sw/source/uibase/inc/syncbtn.hxx @@ -25,12 +25,14 @@ class SwSyncBtnDlg : public SfxFloatingWindow { - PushButton* m_pSyncBtn; + VclPtr<PushButton> m_pSyncBtn; DECL_LINK( BtnHdl, void* ); public: SwSyncBtnDlg(SfxBindings*, SfxChildWindow*, vcl::Window *pParent); + virtual ~SwSyncBtnDlg(); + virtual void dispose() SAL_OVERRIDE; }; class SwSyncChildWin : public SfxChildWindow diff --git a/sw/source/uibase/inc/tautofmt.hxx b/sw/source/uibase/inc/tautofmt.hxx index 603301b94ba4..fac2b1224840 100644 --- a/sw/source/uibase/inc/tautofmt.hxx +++ b/sw/source/uibase/inc/tautofmt.hxx @@ -39,18 +39,18 @@ enum AutoFmtLine { TOP_LINE, BOTTOM_LINE, LEFT_LINE, RIGHT_LINE }; class SwAutoFormatDlg : public SfxModalDialog { - ListBox* m_pLbFormat; - VclContainer* m_pFormatting; - CheckBox* m_pBtnNumFormat; - CheckBox* m_pBtnBorder; - CheckBox* m_pBtnFont; - CheckBox* m_pBtnPattern; - CheckBox* m_pBtnAlignment; - OKButton* m_pBtnOk; - CancelButton* m_pBtnCancel; - PushButton* m_pBtnAdd; - PushButton* m_pBtnRemove; - PushButton* m_pBtnRename; + VclPtr<ListBox> m_pLbFormat; + VclPtr<VclContainer> m_pFormatting; + VclPtr<CheckBox> m_pBtnNumFormat; + VclPtr<CheckBox> m_pBtnBorder; + VclPtr<CheckBox> m_pBtnFont; + VclPtr<CheckBox> m_pBtnPattern; + VclPtr<CheckBox> m_pBtnAlignment; + VclPtr<OKButton> m_pBtnOk; + VclPtr<CancelButton> m_pBtnCancel; + VclPtr<PushButton> m_pBtnAdd; + VclPtr<PushButton> m_pBtnRemove; + VclPtr<PushButton> m_pBtnRename; OUString aStrTitle; OUString aStrLabel; OUString aStrClose; @@ -58,7 +58,7 @@ class SwAutoFormatDlg : public SfxModalDialog OUString aStrDelMsg; OUString aStrRenameTitle; OUString aStrInvalidFmt; - AutoFmtPreview* m_pWndPreview; + VclPtr<AutoFmtPreview> m_pWndPreview; SwWrtShell* pShell; SwTableAutoFmtTbl* pTableTbl; @@ -82,6 +82,7 @@ public: bool bSetAutoFmt = true, const SwTableAutoFmt* pSelFmt = 0 ); virtual ~SwAutoFormatDlg(); + virtual void dispose() SAL_OVERRIDE; void FillAutoFmtOfIndex( SwTableAutoFmt*& rToFill ) const; }; diff --git a/sw/source/uibase/inc/tblctrl.hxx b/sw/source/uibase/inc/tblctrl.hxx index 33dad5f048fb..659591b4575d 100644 --- a/sw/source/uibase/inc/tblctrl.hxx +++ b/sw/source/uibase/inc/tblctrl.hxx @@ -31,7 +31,7 @@ public: virtual ~SwTableOptimizeCtrl(); virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE; - virtual SfxPopupWindow* CreatePopupWindow() SAL_OVERRIDE; + virtual VclPtr<SfxPopupWindow> CreatePopupWindow() SAL_OVERRIDE; }; diff --git a/sw/source/uibase/inc/tbxanchr.hxx b/sw/source/uibase/inc/tbxanchr.hxx index 64aebb711229..fcc6db520fe9 100644 --- a/sw/source/uibase/inc/tbxanchr.hxx +++ b/sw/source/uibase/inc/tbxanchr.hxx @@ -29,7 +29,7 @@ public: virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; virtual void Click() SAL_OVERRIDE; - virtual SfxPopupWindow* CreatePopupWindow() SAL_OVERRIDE; + virtual VclPtr<SfxPopupWindow> CreatePopupWindow() SAL_OVERRIDE; SFX_DECL_TOOLBOX_CONTROL(); diff --git a/sw/source/uibase/inc/titlepage.hxx b/sw/source/uibase/inc/titlepage.hxx index 598b5821d173..a881cc41ff6c 100644 --- a/sw/source/uibase/inc/titlepage.hxx +++ b/sw/source/uibase/inc/titlepage.hxx @@ -24,22 +24,22 @@ class SwPageDesc; class SwTitlePageDlg : public SfxModalDialog { private: - RadioButton* m_pUseExistingPagesRB; - NumericField* m_pPageCountNF; + VclPtr<RadioButton> m_pUseExistingPagesRB; + VclPtr<NumericField> m_pPageCountNF; - RadioButton* m_pDocumentStartRB; - RadioButton* m_pPageStartRB; - NumericField* m_pPageStartNF; + VclPtr<RadioButton> m_pDocumentStartRB; + VclPtr<RadioButton> m_pPageStartRB; + VclPtr<NumericField> m_pPageStartNF; - CheckBox* m_pRestartNumberingCB; - NumericField* m_pRestartNumberingNF; - CheckBox* m_pSetPageNumberCB; - NumericField* m_pSetPageNumberNF; + VclPtr<CheckBox> m_pRestartNumberingCB; + VclPtr<NumericField> m_pRestartNumberingNF; + VclPtr<CheckBox> m_pSetPageNumberCB; + VclPtr<NumericField> m_pSetPageNumberNF; - ListBox* m_pPagePropertiesLB; - PushButton* m_pPagePropertiesPB; + VclPtr<ListBox> m_pPagePropertiesLB; + VclPtr<PushButton> m_pPagePropertiesPB; - OKButton* m_pOkPB; + VclPtr<OKButton> m_pOkPB; SwWrtShell *mpSh; @@ -63,6 +63,7 @@ private: public: SwTitlePageDlg( vcl::Window *pParent ); virtual ~SwTitlePageDlg(); + virtual void dispose() SAL_OVERRIDE; }; #endif diff --git a/sw/source/uibase/inc/unotools.hxx b/sw/source/uibase/inc/unotools.hxx index 8d4220f20ffe..d4cd7078b685 100644 --- a/sw/source/uibase/inc/unotools.hxx +++ b/sw/source/uibase/inc/unotools.hxx @@ -73,7 +73,7 @@ class SW_DLLPUBLIC SwOneExampleFrame ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > _xController; ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > _xCursor; - SwFrmCtrlWindow aTopWindow; + VclPtr<SwFrmCtrlWindow> aTopWindow; Idle aLoadedIdle; Link aInitializedLink; diff --git a/sw/source/uibase/inc/view.hxx b/sw/source/uibase/inc/view.hxx index 8cd1d5cf01ca..1e76ee5a3398 100644 --- a/sw/source/uibase/inc/view.hxx +++ b/sw/source/uibase/inc/view.hxx @@ -187,7 +187,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell Size m_aDocSz; // current document size Rectangle m_aVisArea; // visible region - SwEditWin *m_pEditWin; + VclPtr<SwEditWin> m_pEditWin; SwWrtShell *m_pWrtShell; SfxShell *m_pShell; // current SubShell at the dispatcher @@ -195,21 +195,21 @@ class SW_DLLPUBLIC SwView: public SfxViewShell SwView_Impl *m_pViewImpl; // Impl-data for UNO + Basic - SwScrollbar *m_pHScrollbar, // MDI control elements - *m_pVScrollbar; + VclPtr<SwScrollbar> m_pHScrollbar, // MDI control elements + m_pVScrollbar; bool m_bHScrollbarEnabled; bool m_bVScrollbarEnabled; - ::vcl::Window *m_pScrollFill; // dummy window for filling the lower right edge + VclPtr<::vcl::Window> m_pScrollFill; // dummy window for filling the lower right edge // when both scrollbars are active - SvxRuler *m_pHRuler, - *m_pVRuler; - ImageButton *m_pTogglePageBtn; + VclPtr<SvxRuler> m_pHRuler, + m_pVRuler; + VclPtr<ImageButton> m_pTogglePageBtn; - SwHlpImageButton *m_pPageUpBtn, - *m_pPageDownBtn; + VclPtr<SwHlpImageButton> m_pPageUpBtn, + m_pPageDownBtn; SwGlossaryHdl *m_pGlosHdl; // handle text block SwDrawBase *m_pDrawActual; @@ -221,7 +221,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell SwPostItMgr *m_pPostItMgr; int m_nSelectionType; - FloatingWindow *m_pFieldPopup; + VclPtr<FloatingWindow> m_pFieldPopup; static const int m_nMASTERENUMCOMMANDS = 6; @@ -663,7 +663,7 @@ public: // methods for printing SAL_DLLPRIVATE virtual SfxPrinter* GetPrinter( bool bCreate = false ) SAL_OVERRIDE; SAL_DLLPRIVATE virtual bool HasPrintOptionsPage() const SAL_OVERRIDE; - SAL_DLLPRIVATE virtual SfxTabPage* CreatePrintOptionsPage( vcl::Window* pParent, + SAL_DLLPRIVATE virtual VclPtr<SfxTabPage> CreatePrintOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet) SAL_OVERRIDE; }; @@ -682,9 +682,9 @@ inline const SwDocShell *SwView::GetDocShell() const return const_cast<SwView*>(this)->GetDocShell(); } -SfxTabPage* CreatePrintOptionsPage( vcl::Window *pParent, - const SfxItemSet &rOptions, - bool bPreview); +VclPtr<SfxTabPage> CreatePrintOptionsPage( vcl::Window *pParent, + const SfxItemSet &rOptions, + bool bPreview); #endif diff --git a/sw/source/uibase/inc/wordcountdialog.hxx b/sw/source/uibase/inc/wordcountdialog.hxx index 6048a83d86be..63aa450f3aeb 100644 --- a/sw/source/uibase/inc/wordcountdialog.hxx +++ b/sw/source/uibase/inc/wordcountdialog.hxx @@ -33,22 +33,22 @@ class SwWordCountFloatDlg : public SfxModelessDialog void showCJK(bool bShowCJK); void showStandardizedPages(bool bShowStandardizedPages); - FixedText* m_pCurrentWordFT; - FixedText* m_pCurrentCharacterFT; - FixedText* m_pCurrentCharacterExcludingSpacesFT; - FixedText* m_pCurrentCjkcharsFT; - FixedText* m_pCurrentStandardizedPagesFT; + VclPtr<FixedText> m_pCurrentWordFT; + VclPtr<FixedText> m_pCurrentCharacterFT; + VclPtr<FixedText> m_pCurrentCharacterExcludingSpacesFT; + VclPtr<FixedText> m_pCurrentCjkcharsFT; + VclPtr<FixedText> m_pCurrentStandardizedPagesFT; - FixedText* m_pDocWordFT; - FixedText* m_pDocCharacterFT; - FixedText* m_pDocCharacterExcludingSpacesFT; - FixedText* m_pDocCjkcharsFT; - FixedText* m_pDocStandardizedPagesFT; + VclPtr<FixedText> m_pDocWordFT; + VclPtr<FixedText> m_pDocCharacterFT; + VclPtr<FixedText> m_pDocCharacterExcludingSpacesFT; + VclPtr<FixedText> m_pDocCjkcharsFT; + VclPtr<FixedText> m_pDocStandardizedPagesFT; - FixedText* m_pCjkcharsLabelFT; - FixedText* m_pStandardizedPagesLabelFT; + VclPtr<FixedText> m_pCjkcharsLabelFT; + VclPtr<FixedText> m_pStandardizedPagesLabelFT; - CloseButton* m_pClosePB; + VclPtr<CloseButton> m_pClosePB; DECL_LINK( CloseHdl, void* ); public: @@ -57,6 +57,7 @@ public: vcl::Window *pParent, SfxChildWinInfo* pInfo); virtual ~SwWordCountFloatDlg(); + virtual void dispose() SAL_OVERRIDE; void UpdateCounts(); void SetCounts(const SwDocStat &rCurrCnt, const SwDocStat &rDocStat); diff --git a/sw/source/uibase/inc/workctrl.hxx b/sw/source/uibase/inc/workctrl.hxx index 6bb9c1f5377c..85c45282e6eb 100644 --- a/sw/source/uibase/inc/workctrl.hxx +++ b/sw/source/uibase/inc/workctrl.hxx @@ -65,7 +65,7 @@ public: virtual ~SwTbxInsertCtrl(); virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE; - virtual SfxPopupWindow* CreatePopupWindow() SAL_OVERRIDE; + virtual VclPtr<SfxPopupWindow> CreatePopupWindow() SAL_OVERRIDE; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; @@ -85,7 +85,7 @@ public: virtual ~SwTbxAutoTextCtrl(); virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE; - virtual SfxPopupWindow* CreatePopupWindow() SAL_OVERRIDE; + virtual VclPtr<SfxPopupWindow> CreatePopupWindow() SAL_OVERRIDE; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; @@ -102,7 +102,7 @@ public: virtual ~SwTbxFieldCtrl(); virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE; - virtual SfxPopupWindow* CreatePopupWindow() SAL_OVERRIDE; + virtual VclPtr<SfxPopupWindow> CreatePopupWindow() SAL_OVERRIDE; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; @@ -114,7 +114,7 @@ class SwScrollNaviPopup; class SwScrollNaviToolBox : public ToolBox { - SwScrollNaviPopup *m_pNaviPopup; + VclPtr<SwScrollNaviPopup> m_pNaviPopup; virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; @@ -125,12 +125,14 @@ public: , m_pNaviPopup(pNaviPopup) { } + virtual ~SwScrollNaviToolBox(); + virtual void dispose() SAL_OVERRIDE; }; class SwScrollNaviPopup : public SfxPopupWindow { - SwScrollNaviToolBox* m_pToolBox; - FixedText* m_pInfoField; + VclPtr<SwScrollNaviToolBox> m_pToolBox; + VclPtr<FixedText> m_pInfoField; ImageList aIList; OUString sQuickHelp[2 * NID_COUNT]; @@ -146,10 +148,11 @@ protected: public: SwScrollNaviPopup( sal_uInt16 nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, vcl::Window *pParent ); virtual ~SwScrollNaviPopup(); + virtual void dispose() SAL_OVERRIDE; static OUString GetQuickHelpText(bool bNext); - virtual SfxPopupWindow* Clone() const SAL_OVERRIDE; + virtual VclPtr<SfxPopupWindow> Clone() const SAL_OVERRIDE; void GrabFocus() { m_pToolBox->GrabFocus(); } }; @@ -178,7 +181,7 @@ public: SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; - virtual vcl::Window* CreateItemWindow( vcl::Window *pParent ) SAL_OVERRIDE; + virtual VclPtr<vcl::Window> CreateItemWindow( vcl::Window *pParent ) SAL_OVERRIDE; }; #endif diff --git a/sw/source/uibase/inc/wrap.hxx b/sw/source/uibase/inc/wrap.hxx index cd69f5ca98d3..cf5eda21ee2b 100644 --- a/sw/source/uibase/inc/wrap.hxx +++ b/sw/source/uibase/inc/wrap.hxx @@ -43,24 +43,24 @@ public: class SwWrapTabPage: public SfxTabPage { // WRAPPING - RadioButton* m_pNoWrapRB; - RadioButton* m_pWrapLeftRB; - RadioButton* m_pWrapRightRB; - RadioButton* m_pWrapParallelRB; - RadioButton* m_pWrapThroughRB; - RadioButton* m_pIdealWrapRB; + VclPtr<RadioButton> m_pNoWrapRB; + VclPtr<RadioButton> m_pWrapLeftRB; + VclPtr<RadioButton> m_pWrapRightRB; + VclPtr<RadioButton> m_pWrapParallelRB; + VclPtr<RadioButton> m_pWrapThroughRB; + VclPtr<RadioButton> m_pIdealWrapRB; // MARGIN - MetricField* m_pLeftMarginED; - MetricField* m_pRightMarginED; - MetricField* m_pTopMarginED; - MetricField* m_pBottomMarginED; + VclPtr<MetricField> m_pLeftMarginED; + VclPtr<MetricField> m_pRightMarginED; + VclPtr<MetricField> m_pTopMarginED; + VclPtr<MetricField> m_pBottomMarginED; // OPTIONS - CheckBox* m_pWrapAnchorOnlyCB; - CheckBox* m_pWrapTransparentCB; - CheckBox* m_pWrapOutlineCB; - CheckBox* m_pWrapOutsideCB; + VclPtr<CheckBox> m_pWrapAnchorOnlyCB; + VclPtr<CheckBox> m_pWrapTransparentCB; + VclPtr<CheckBox> m_pWrapOutlineCB; + VclPtr<CheckBox> m_pWrapOutsideCB; sal_uInt16 nOldLeftMargin; sal_uInt16 nOldRightMargin; @@ -79,8 +79,8 @@ class SwWrapTabPage: public SfxTabPage bool bDrawMode; bool bContourImage; - SwWrapTabPage(vcl::Window *pParent, const SfxItemSet &rSet); virtual ~SwWrapTabPage(); + virtual void dispose() SAL_OVERRIDE; void ApplyImageList(); void EnableModes(const SfxItemSet& rSet); @@ -98,8 +98,9 @@ class SwWrapTabPage: public SfxTabPage static const sal_uInt16 aWrapPageRg[]; public: + SwWrapTabPage(vcl::Window *pParent, const SfxItemSet &rSet); - 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; |