diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-04-17 13:51:33 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-17 19:58:30 +0100 |
| commit | 85b01322b6384ae13818c22659b99bfcc94e06fe (patch) | |
| tree | d69cf3ae28f24e7b4075771dd61ca879fe72d0aa /cui | |
| parent | d8ebd9044177e1269c8c81c4c0e3ff53d875247a (diff) | |
Fix SfxTabPage creation to use VclPtr.
Change-Id: Ia0e8b666daec7b5eaba119c758b9ca1ec8276128
Diffstat (limited to 'cui')
104 files changed, 316 insertions, 358 deletions
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 89a79b7a7309..05bbcd50e2a5 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -735,24 +735,24 @@ ConvertToolbarEntry( return aPropSeq; } -SfxTabPage *CreateSvxMenuConfigPage( vcl::Window *pParent, const SfxItemSet* rSet ) +VclPtr<SfxTabPage> CreateSvxMenuConfigPage( vcl::Window *pParent, const SfxItemSet* rSet ) { - return new SvxMenuConfigPage( pParent, *rSet ); + return VclPtr<SvxMenuConfigPage>::Create( pParent, *rSet ); } -SfxTabPage *CreateKeyboardConfigPage( vcl::Window *pParent, const SfxItemSet* rSet ) +VclPtr<SfxTabPage> CreateKeyboardConfigPage( vcl::Window *pParent, const SfxItemSet* rSet ) { - return new SfxAcceleratorConfigPage( pParent, *rSet ); + return VclPtr<SfxAcceleratorConfigPage>::Create( pParent, *rSet ); } -SfxTabPage *CreateSvxToolbarConfigPage( vcl::Window *pParent, const SfxItemSet* rSet ) +VclPtr<SfxTabPage> CreateSvxToolbarConfigPage( vcl::Window *pParent, const SfxItemSet* rSet ) { - return new SvxToolbarConfigPage( pParent, *rSet ); + return VclPtr<SvxToolbarConfigPage>::Create( pParent, *rSet ); } -SfxTabPage *CreateSvxEventConfigPage( vcl::Window *pParent, const SfxItemSet* rSet ) +VclPtr<SfxTabPage> CreateSvxEventConfigPage( vcl::Window *pParent, const SfxItemSet* rSet ) { - return new SvxEventConfigPage( pParent, *rSet, SvxEventConfigPage::EarlyInit() ); + return VclPtr<SvxEventConfigPage>::Create( pParent, *rSet, SvxEventConfigPage::EarlyInit() ); } namespace { diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index 45d1a9301dfd..f2e62e784e78 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -525,8 +525,8 @@ void SpellDialog::StartSpellOptDlg_Impl() aSet.Put(SfxSpellCheckItem( xSpell, SID_ATTR_SPELL )); VclPtr<SfxSingleTabDialog> pDlg( new SfxSingleTabDialog(this, aSet, "SpellOptionsDialog", "cui/ui/spelloptionsdialog.ui")); - SfxTabPage* pPage = SvxLinguTabPage::Create( pDlg->get_content_area(), &aSet ); - static_cast<SvxLinguTabPage*>(pPage)->HideGroups( GROUP_MODULES ); + VclPtr<SfxTabPage> pPage = SvxLinguTabPage::Create( pDlg->get_content_area(), &aSet ); + static_cast<SvxLinguTabPage*>(pPage.get())->HideGroups( GROUP_MODULES ); pDlg->SetTabPage( pPage ); if(RET_OK == pDlg->Execute()) { diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index 1683bdb79a3c..34a64c9e4f65 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -757,9 +757,9 @@ bool TPGalleryThemeGeneral::FillItemSet( SfxItemSet* /*rSet*/ ) -SfxTabPage* TPGalleryThemeGeneral::Create( vcl::Window* pParent, const SfxItemSet* rSet ) +VclPtr<SfxTabPage> TPGalleryThemeGeneral::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { - return new TPGalleryThemeGeneral( pParent, *rSet ); + return VclPtr<TPGalleryThemeGeneral>::Create( pParent, *rSet ); } // - TPGalleryThemeProperties - @@ -854,13 +854,11 @@ void TPGalleryThemeProperties::dispose() SfxTabPage::dispose(); } -SfxTabPage* TPGalleryThemeProperties::Create( vcl::Window* pParent, const SfxItemSet* rSet ) +VclPtr<SfxTabPage> TPGalleryThemeProperties::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { - return new TPGalleryThemeProperties( pParent, *rSet ); + return VclPtr<TPGalleryThemeProperties>::Create( pParent, *rSet ); } - - OUString TPGalleryThemeProperties::addExtension( const OUString& _rDisplayText, const OUString& _rExtension ) { OUString sAllFilter( "(*.*)" ); diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx index 0be6bc61d698..31613bab486b 100644 --- a/cui/source/inc/align.hxx +++ b/cui/source/inc/align.hxx @@ -60,7 +60,7 @@ public: virtual ~AlignmentTabPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); static const sal_uInt16* GetRanges() { return s_pRanges; } virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index bed9ffc9b533..2d8eb1f933aa 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -112,7 +112,7 @@ public: virtual ~OfaAutocorrOptionsPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -170,7 +170,7 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage 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; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; @@ -264,7 +264,7 @@ public: virtual ~OfaAutocorrReplacePage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; @@ -323,7 +323,7 @@ public: virtual ~OfaAutocorrExceptPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -390,7 +390,7 @@ public: virtual ~OfaQuoteTabPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -442,7 +442,7 @@ private: public: virtual ~OfaAutoCompleteTabPage(); 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; @@ -470,9 +470,6 @@ private: VclPtr<SvxCheckListBox> m_pSmartTagTypesLB; VclPtr<PushButton> m_pPropertiesPB; - /// construction via Create() - OfaSmartTagOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); - /** Inserts items into m_aSmartTagTypesLB Reads out the smart tag types supported by the SmartTagMgr and @@ -506,10 +503,12 @@ private: DECL_LINK(SelectHdl, void *); public: + /// construction via Create() + OfaSmartTagOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~OfaSmartTagOptionsTabPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx index 57142af5ebf0..9aeb9063ba54 100644 --- a/cui/source/inc/backgrnd.hxx +++ b/cui/source/inc/backgrnd.hxx @@ -47,7 +47,7 @@ class SvxBackgroundTabPage : public SvxTabPage using TabPage::DeactivatePage; static const sal_uInt16 pPageRanges[]; public: - static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); // returns the area of the which-values static const sal_uInt16* GetRanges() { return pPageRanges; } diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx index ff4b48ab3c7b..3c3a79b206ec 100644 --- a/cui/source/inc/border.hxx +++ b/cui/source/inc/border.hxx @@ -47,7 +47,7 @@ class SvxBorderTabPage : public SfxTabPage public: virtual ~SvxBorderTabPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); static const sal_uInt16* GetRanges() { return pRanges; } diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index f1075a93dfd7..8b185cdf29cf 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -155,7 +155,7 @@ public: virtual ~SvxCharNamePage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges() { return pNameRanges; } virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; @@ -236,7 +236,7 @@ public: virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; public: - static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges() { return pEffectsRanges; } virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; @@ -319,7 +319,7 @@ public: virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; public: - static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges() { return pPositionRanges; } virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; @@ -364,7 +364,7 @@ public: virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet = 0 ) 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 pTwoLinesRanges; } virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/cui/source/inc/connect.hxx b/cui/source/inc/connect.hxx index aae2744538ce..875ff89baf9b 100644 --- a/cui/source/inc/connect.hxx +++ b/cui/source/inc/connect.hxx @@ -65,7 +65,7 @@ public: virtual ~SvxConnectionPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); + static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pRanges; } virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx index e02d6a1b5094..a1855b1a1fdd 100644 --- a/cui/source/inc/cuigaldlg.hxx +++ b/cui/source/inc/cuigaldlg.hxx @@ -235,7 +235,7 @@ public: void SetXChgData( ExchangeData* pData ); const ExchangeData* GetXChgData() const { return pData; } - static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); }; typedef ::std::vector< FilterEntry* > FilterEntryList_impl; @@ -303,7 +303,7 @@ public: void StartSearchFiles( const OUString& _rFolderURL, short _nDlgResult ); - static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); }; #endif // INCLUDED_CUI_SOURCE_INC_CUIGALDLG_HXX diff --git a/cui/source/inc/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx index 2a4c295d60e4..15406bbdbaf8 100644 --- a/cui/source/inc/cuioptgenrl.hxx +++ b/cui/source/inc/cuioptgenrl.hxx @@ -67,7 +67,7 @@ public: virtual ~SvxGeneralTabPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/cui/source/inc/cuisrchdlg.hxx b/cui/source/inc/cuisrchdlg.hxx index 376f9196a2d1..be75242a8238 100644 --- a/cui/source/inc/cuisrchdlg.hxx +++ b/cui/source/inc/cuisrchdlg.hxx @@ -36,8 +36,8 @@ class SvxJSearchOptionsPage; class SvxJSearchOptionsDialog : public SfxSingleTabDialog { - sal_Int32 nInitialTlFlags; - VclPtr<SvxJSearchOptionsPage> pPage; + sal_Int32 nInitialTlFlags; + VclPtr<SvxJSearchOptionsPage> pPage; SvxJSearchOptionsDialog( const SvxJSearchOptionsDialog & ) SAL_DELETED_FUNCTION; SvxJSearchOptionsDialog & operator == ( const SvxJSearchOptionsDialog & ) SAL_DELETED_FUNCTION; diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index 42e668c31563..c2512596ae4d 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -163,7 +163,7 @@ public: virtual ~SvxTransparenceTabPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create(vcl::Window*, const SfxItemSet*); + static VclPtr<SfxTabPage> Create(vcl::Window*, const SfxItemSet*); static const sal_uInt16* GetRanges() { return pTransparenceRanges; } virtual bool FillItemSet(SfxItemSet*) SAL_OVERRIDE; @@ -295,7 +295,7 @@ public: void Construct(); - static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); + static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pAreaRanges; } virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; @@ -363,7 +363,7 @@ public: virtual void dispose() SAL_OVERRIDE; void Construct(); - static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); + static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pShadowRanges; } virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; @@ -445,7 +445,7 @@ public: void Construct(); - static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); + static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; @@ -523,7 +523,7 @@ public: void Construct(); - static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); + static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; @@ -610,7 +610,7 @@ public: void Construct(); - static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); + static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; @@ -745,7 +745,7 @@ public: void Construct(); - static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); + static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx index 6f19fb7eed04..3aac79334e39 100644 --- a/cui/source/inc/cuitabline.hxx +++ b/cui/source/inc/cuitabline.hxx @@ -208,7 +208,7 @@ public: void Construct(); - static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); + static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pLineRanges; } virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; @@ -308,7 +308,7 @@ public: void Construct(); - static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); + static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; @@ -379,7 +379,7 @@ public: void Construct(); - static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); + static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx index fa714753bd14..cf0142120532 100644 --- a/cui/source/inc/dbregister.hxx +++ b/cui/source/inc/dbregister.hxx @@ -93,7 +93,7 @@ namespace svx virtual ~DbRegistrationOptionsPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/cui/source/inc/dstribut.hxx b/cui/source/inc/dstribut.hxx index 0d07317c98ec..46e18129968f 100644 --- a/cui/source/inc/dstribut.hxx +++ b/cui/source/inc/dstribut.hxx @@ -47,7 +47,7 @@ public: virtual ~SvxDistributePage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create(vcl::Window*, const SfxItemSet&, + static VclPtr<SfxTabPage> Create(vcl::Window*, const SfxItemSet&, SvxDistributeHorizontal eHor, SvxDistributeVertical eVer); virtual bool FillItemSet(SfxItemSet*) SAL_OVERRIDE; virtual void Reset(const SfxItemSet*) SAL_OVERRIDE; diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx index e52d39c92a01..165bd5dcd4db 100644 --- a/cui/source/inc/grfpage.hxx +++ b/cui/source/inc/grfpage.hxx @@ -112,7 +112,7 @@ class SvxGrfCropPage : public SfxTabPage Size GetGrfOrigSize( const Graphic& ) const; public: - static SfxTabPage *Create( vcl::Window *pParent, const SfxItemSet *rSet ); + static VclPtr<SfxTabPage> Create( vcl::Window *pParent, const SfxItemSet *rSet ); virtual bool FillItemSet( SfxItemSet *rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet *rSet ) SAL_OVERRIDE; diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx index 7b20283f2ebc..610c63b2f2f9 100644 --- a/cui/source/inc/labdlg.hxx +++ b/cui/source/inc/labdlg.hxx @@ -78,7 +78,7 @@ public: virtual ~SvxCaptionTabPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); + static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pCaptionRanges; } virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx index f05f6d5d75b3..696c8bf55711 100644 --- a/cui/source/inc/macroass.hxx +++ b/cui/source/inc/macroass.hxx @@ -97,7 +97,7 @@ public: ); // --------- inherit from the base ------------- - static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); }; class SfxMacroAssignDlg : public SfxSingleTabDialog diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx index 18b0fc6ce20d..28dbdfdc7c28 100644 --- a/cui/source/inc/measure.hxx +++ b/cui/source/inc/measure.hxx @@ -69,7 +69,7 @@ public: virtual ~SvxMeasurePage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); + static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pRanges; } virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx index 552f59249a3e..518feaf4b153 100644 --- a/cui/source/inc/numfmt.hxx +++ b/cui/source/inc/numfmt.hxx @@ -72,7 +72,7 @@ public: virtual ~SvxNumberFormatTabPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); // Returns area information. static const sal_uInt16* GetRanges() { return pRanges; } diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index f2cb95c9c112..f9963056b562 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -111,7 +111,7 @@ public: virtual ~SvxSingleNumPickTabPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; @@ -148,7 +148,7 @@ public: virtual ~SvxBulletPickTabPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; @@ -192,7 +192,7 @@ public: virtual ~SvxNumPickTabPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; @@ -238,7 +238,7 @@ public: virtual ~SvxBitmapPickTabPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; @@ -351,7 +351,7 @@ public: virtual ~SvxNumOptionsTabPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; @@ -460,7 +460,7 @@ public: virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); void SetMetric(FieldUnit eSet); diff --git a/cui/source/inc/optasian.hxx b/cui/source/inc/optasian.hxx index 5be6d8034a51..39d18ef48976 100644 --- a/cui/source/inc/optasian.hxx +++ b/cui/source/inc/optasian.hxx @@ -52,13 +52,12 @@ class SvxAsianLayoutPage : public SfxTabPage DECL_LINK(ChangeStandardHdl, CheckBox*); DECL_LINK(ModifyHdl, Edit*); - SvxAsianLayoutPage( vcl::Window* pParent, const SfxItemSet& rSet ); public: - + SvxAsianLayoutPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxAsianLayoutPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx index 0dea8bc01149..f99e3bb7ba46 100644 --- a/cui/source/inc/optlingu.hxx +++ b/cui/source/inc/optlingu.hxx @@ -149,7 +149,7 @@ private: public: virtual ~SvxLinguTabPage(); 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; diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx index 3e0ff7e7dc71..df078cec88b8 100644 --- a/cui/source/inc/optpath.hxx +++ b/cui/source/inc/optpath.hxx @@ -73,7 +73,7 @@ public: virtual ~SvxPathTabPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx index 0b759591dd3f..24e14ce186f0 100644 --- a/cui/source/inc/page.hxx +++ b/cui/source/inc/page.hxx @@ -188,7 +188,7 @@ protected: virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; public: - static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); // returns the range of the Which values static const sal_uInt16* GetRanges() { return pRanges; } diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx index 401158ead1da..7f7bf66431e5 100644 --- a/cui/source/inc/paragrph.hxx +++ b/cui/source/inc/paragrph.hxx @@ -103,7 +103,7 @@ public: DECL_LINK(ELRLoseFocusHdl, void *); - static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges() { return pStdRanges; } virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -165,7 +165,7 @@ public: virtual ~SvxParaAlignTabPage(); 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 pAlignRanges; } virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -198,7 +198,7 @@ public: virtual ~SvxExtParagraphTabPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges() { return pExtRanges; } @@ -278,7 +278,7 @@ public: virtual ~SvxAsianTabPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx index 5ed3ad77df18..0b614899033d 100644 --- a/cui/source/inc/swpossizetabpage.hxx +++ b/cui/source/inc/swpossizetabpage.hxx @@ -126,7 +126,7 @@ public: virtual ~SvxSwPosSizeTabPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); + static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx index 4a67cd9cd008..3590a17fa5bf 100644 --- a/cui/source/inc/tabstpge.hxx +++ b/cui/source/inc/tabstpge.hxx @@ -51,7 +51,7 @@ class SvxTabulatorTabPage : public SfxTabPage public: virtual ~SvxTabulatorTabPage(); 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 pRanges; } virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx index 8ba2ad2ff956..875b4d2a087f 100644 --- a/cui/source/inc/textanim.hxx +++ b/cui/source/inc/textanim.hxx @@ -79,7 +79,7 @@ public: virtual ~SvxTextAnimationPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); + static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pRanges; } virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx index eacc8265d4ab..9846f0d6b148 100644 --- a/cui/source/inc/textattr.hxx +++ b/cui/source/inc/textattr.hxx @@ -80,7 +80,7 @@ public: virtual ~SvxTextAttrPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); + static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pRanges; } virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx index e2a516303b3d..b3a56b2dbde2 100644 --- a/cui/source/inc/transfrm.hxx +++ b/cui/source/inc/transfrm.hxx @@ -149,7 +149,7 @@ public: virtual ~SvxPositionSizeTabPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); + static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pPosSizeRanges; } virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; @@ -207,7 +207,7 @@ public: virtual ~SvxAngleTabPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); + static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pAngleRanges; } virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; @@ -254,7 +254,7 @@ public: virtual ~SvxSlantTabPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); + static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pSlantRanges; } virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx index a8ae9c686c9d..562c762aaecf 100644 --- a/cui/source/options/connpooloptions.cxx +++ b/cui/source/options/connpooloptions.cxx @@ -343,12 +343,11 @@ namespace offapp SfxTabPage::dispose(); } - SfxTabPage* ConnectionPoolOptionsPage::Create(vcl::Window* _pParent, const SfxItemSet* _rAttrSet) + VclPtr<SfxTabPage> ConnectionPoolOptionsPage::Create(vcl::Window* _pParent, const SfxItemSet* _rAttrSet) { - return new ConnectionPoolOptionsPage(_pParent, *_rAttrSet); + return VclPtr<ConnectionPoolOptionsPage>::Create(_pParent, *_rAttrSet); } - void ConnectionPoolOptionsPage::implInitControls(const SfxItemSet& _rSet, bool /*_bFromReset*/) { // the enabled flag diff --git a/cui/source/options/connpooloptions.hxx b/cui/source/options/connpooloptions.hxx index 8650d121ce16..d8e4c2556df8 100644 --- a/cui/source/options/connpooloptions.hxx +++ b/cui/source/options/connpooloptions.hxx @@ -47,13 +47,11 @@ namespace offapp VclPtr<FixedText> m_pTimeoutLabel; VclPtr<NumericField> m_pTimeout; - protected: - ConnectionPoolOptionsPage(vcl::Window* _pParent, const SfxItemSet& _rAttrSet); - public: + ConnectionPoolOptionsPage(vcl::Window* _pParent, const SfxItemSet& _rAttrSet); virtual ~ConnectionPoolOptionsPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create(vcl::Window* _pParent, const SfxItemSet* _rAttrSet); + static VclPtr<SfxTabPage> Create(vcl::Window* _pParent, const SfxItemSet* _rAttrSet); protected: virtual bool Notify( NotifyEvent& _rNEvt ) SAL_OVERRIDE; diff --git a/cui/source/options/cuisrchdlg.cxx b/cui/source/options/cuisrchdlg.cxx index 805c8da68f70..bff4d1a74c8e 100644 --- a/cui/source/options/cuisrchdlg.cxx +++ b/cui/source/options/cuisrchdlg.cxx @@ -54,8 +54,9 @@ SvxJSearchOptionsDialog::SvxJSearchOptionsDialog(vcl::Window *pParent, { // pPage will be implicitly destroyed by the // SfxSingleTabDialog destructor - pPage = static_cast<SvxJSearchOptionsPage *>( - SvxJSearchOptionsPage::Create(get_content_area(), &rOptionsSet )); + pPage.reset( static_cast<SvxJSearchOptionsPage *>( + SvxJSearchOptionsPage::Create( + get_content_area(), &rOptionsSet ).get() ) ); SetTabPage( pPage ); //! implicitly calls pPage->Reset(...)! pPage->EnableSaveOptions(false); } diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index aa90f37c9ae6..679e313a7eb3 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -78,7 +78,7 @@ DatabaseRegistrationDialog::DatabaseRegistrationDialog( vcl::Window* pParent, co : RegistrationItemSetHolder(rInAttrs) , SfxSingleTabDialog(pParent, getRegistrationItems()) { - SfxTabPage* page = DbRegistrationOptionsPage::Create(get_content_area(), &getRegistrationItems()); + VclPtr<SfxTabPage> page = DbRegistrationOptionsPage::Create(get_content_area(), &getRegistrationItems()); SetTabPage(page); SetText(page->get<VclFrame>("frame1")->get_label()); } @@ -180,10 +180,10 @@ void DbRegistrationOptionsPage::dispose() -SfxTabPage* DbRegistrationOptionsPage::Create( vcl::Window* pParent, +VclPtr<SfxTabPage> DbRegistrationOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { - return ( new DbRegistrationOptionsPage( pParent, *rAttrSet ) ); + return VclPtr<DbRegistrationOptionsPage>::Create( pParent, *rAttrSet ); } diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index ae6a02c5fe54..5fc134c5afa3 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -160,10 +160,10 @@ void SvxFontSubstTabPage::dispose() SfxTabPage::dispose(); } -SfxTabPage* SvxFontSubstTabPage::Create( vcl::Window* pParent, - const SfxItemSet* rAttrSet) +VclPtr<SfxTabPage> SvxFontSubstTabPage::Create( vcl::Window* pParent, + const SfxItemSet* rAttrSet) { - return new SvxFontSubstTabPage(pParent, *rAttrSet); + return VclPtr<SvxFontSubstTabPage>::Create(pParent, *rAttrSet); } bool SvxFontSubstTabPage::FillItemSet( SfxItemSet* ) diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx index 3a5b967a3908..27847da31464 100644 --- a/cui/source/options/fontsubs.hxx +++ b/cui/source/options/fontsubs.hxx @@ -91,12 +91,12 @@ class SvxFontSubstTabPage : public SfxTabPage void CheckEnable(); - SvxFontSubstTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxFontSubstTabPage(); virtual void dispose() SAL_OVERRIDE; public: - static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); + SvxFontSubstTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; diff --git a/cui/source/options/optaccessibility.cxx b/cui/source/options/optaccessibility.cxx index d6b78b86555c..d781ed26dd54 100644 --- a/cui/source/options/optaccessibility.cxx +++ b/cui/source/options/optaccessibility.cxx @@ -77,9 +77,9 @@ void SvxAccessibilityOptionsTabPage::dispose() SfxTabPage::dispose(); } -SfxTabPage* SvxAccessibilityOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> SvxAccessibilityOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { - return new SvxAccessibilityOptionsTabPage(pParent, *rAttrSet); + return VclPtr<SvxAccessibilityOptionsTabPage>::Create(pParent, *rAttrSet); } bool SvxAccessibilityOptionsTabPage::FillItemSet( SfxItemSet* ) diff --git a/cui/source/options/optaccessibility.hxx b/cui/source/options/optaccessibility.hxx index 0a33851b6f56..16e4c3a97bd3 100644 --- a/cui/source/options/optaccessibility.hxx +++ b/cui/source/options/optaccessibility.hxx @@ -40,13 +40,12 @@ class SvxAccessibilityOptionsTabPage : public SfxTabPage SvxAccessibilityOptionsTabPage_Impl* m_pImpl; - SvxAccessibilityOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); public: - + SvxAccessibilityOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxAccessibilityOptionsTabPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx index fb2dc014918a..c16711f621a4 100644 --- a/cui/source/options/optasian.cxx +++ b/cui/source/options/optasian.cxx @@ -174,9 +174,9 @@ void SvxAsianLayoutPage::dispose() SfxTabPage::dispose(); } -SfxTabPage* SvxAsianLayoutPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> SvxAsianLayoutPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { - return new SvxAsianLayoutPage(pParent, *rAttrSet); + return VclPtr<SvxAsianLayoutPage>::Create(pParent, *rAttrSet); } bool SvxAsianLayoutPage::FillItemSet( SfxItemSet* ) diff --git a/cui/source/options/optbasic.cxx b/cui/source/options/optbasic.cxx index fdc362a0c14c..913b8a230f0f 100644 --- a/cui/source/options/optbasic.cxx +++ b/cui/source/options/optbasic.cxx @@ -148,9 +148,9 @@ void SvxBasicIDEOptionsPage::Reset( const SfxItemSet* /*rSet*/ ) pUseExtendedTypesChk->SaveValue(); } -SfxTabPage* SvxBasicIDEOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> SvxBasicIDEOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { - return ( new SvxBasicIDEOptionsPage( pParent, *rAttrSet ) ); + return VclPtr<SvxBasicIDEOptionsPage>::Create( pParent, *rAttrSet ); } void SvxBasicIDEOptionsPage::FillUserData() diff --git a/cui/source/options/optbasic.hxx b/cui/source/options/optbasic.hxx index 9aaced3eb2a9..dc617b1fea3a 100644 --- a/cui/source/options/optbasic.hxx +++ b/cui/source/options/optbasic.hxx @@ -41,7 +41,7 @@ public: virtual ~SvxBasicIDEOptionsPage(); 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; virtual void FillUserData() SAL_OVERRIDE; diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx index 68fe0181527f..f9e3c0e22d40 100644 --- a/cui/source/options/optchart.cxx +++ b/cui/source/options/optchart.cxx @@ -119,9 +119,9 @@ void SvxDefaultColorOptPage::Construct() } -SfxTabPage* SvxDefaultColorOptPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrs ) +VclPtr<SfxTabPage> SvxDefaultColorOptPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrs ) { - return new SvxDefaultColorOptPage( pParent, *rAttrs ); + return VclPtr<SvxDefaultColorOptPage>::Create( pParent, *rAttrs ); } bool SvxDefaultColorOptPage::FillItemSet( SfxItemSet* rOutAttrs ) diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx index ff6970627113..506b9c87f1a0 100644 --- a/cui/source/options/optchart.hxx +++ b/cui/source/options/optchart.hxx @@ -59,7 +59,7 @@ public: void Construct(); - static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rInAttrs ); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rInAttrs ); virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rInAttrs ) SAL_OVERRIDE; }; diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index 59ba76fd614a..4c5834d463d7 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -1102,9 +1102,9 @@ void SvxColorOptionsTabPage::dispose() SfxTabPage::dispose(); } -SfxTabPage* SvxColorOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> SvxColorOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { - return ( new SvxColorOptionsTabPage( pParent, *rAttrSet ) ); + return VclPtr<SvxColorOptionsTabPage>::Create( pParent, *rAttrSet ); } bool SvxColorOptionsTabPage::FillItemSet( SfxItemSet* ) diff --git a/cui/source/options/optcolor.hxx b/cui/source/options/optcolor.hxx index f5c31bdb1ac1..7ce24b8770d5 100644 --- a/cui/source/options/optcolor.hxx +++ b/cui/source/options/optcolor.hxx @@ -51,7 +51,7 @@ public: virtual ~SvxColorOptionsTabPage( ); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx index ab25dfd141e9..652bba938bf9 100644 --- a/cui/source/options/optctl.cxx +++ b/cui/source/options/optctl.cxx @@ -73,9 +73,9 @@ void SvxCTLOptionsPage::dispose() SfxTabPage::dispose(); } -SfxTabPage* SvxCTLOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> SvxCTLOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { - return new SvxCTLOptionsPage( pParent, *rAttrSet ); + return VclPtr<SvxCTLOptionsPage>::Create( pParent, *rAttrSet ); } bool SvxCTLOptionsPage::FillItemSet( SfxItemSet* ) diff --git a/cui/source/options/optctl.hxx b/cui/source/options/optctl.hxx index 4c086eb90726..ac2544d47c27 100644 --- a/cui/source/options/optctl.hxx +++ b/cui/source/options/optctl.hxx @@ -41,12 +41,11 @@ private: DECL_LINK( SequenceCheckingCB_Hdl, void* ); - SvxCTLOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ); - public: + SvxCTLOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxCTLOptionsPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index 13d81a999d76..4b56daa9145f 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -85,10 +85,10 @@ IMPL_LINK_NOARG(OfaMSFilterTabPage, LoadExcelBasicCheckHdl_Impl) return 0; } -SfxTabPage* OfaMSFilterTabPage::Create( vcl::Window* pParent, - const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> OfaMSFilterTabPage::Create( vcl::Window* pParent, + const SfxItemSet* rAttrSet ) { - return new OfaMSFilterTabPage( pParent, *rAttrSet ); + return VclPtr<OfaMSFilterTabPage>::Create( pParent, *rAttrSet ); } bool OfaMSFilterTabPage::FillItemSet( SfxItemSet* ) @@ -193,10 +193,10 @@ void OfaMSFilterTabPage2::dispose() SfxTabPage::dispose(); } -SfxTabPage* OfaMSFilterTabPage2::Create( vcl::Window* pParent, - const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> OfaMSFilterTabPage2::Create( vcl::Window* pParent, + const SfxItemSet* rAttrSet ) { - return new OfaMSFilterTabPage2( pParent, *rAttrSet ); + return VclPtr<OfaMSFilterTabPage2>::Create( pParent, *rAttrSet ); } bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet* ) diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx index 8a38d43de0ce..221c705f3ae1 100644 --- a/cui/source/options/optfltr.hxx +++ b/cui/source/options/optfltr.hxx @@ -36,15 +36,15 @@ class OfaMSFilterTabPage : public SfxTabPage VclPtr<CheckBox> aPBasicCodeCB; VclPtr<CheckBox> aPBasicStgCB; - OfaMSFilterTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); DECL_LINK(LoadWordBasicCheckHdl_Impl, void *); DECL_LINK(LoadExcelBasicCheckHdl_Impl, void *); public: + OfaMSFilterTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~OfaMSFilterTabPage(); 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; @@ -87,7 +87,6 @@ class OfaMSFilterTabPage2 : public SfxTabPage VclPtr<RadioButton> aHighlightingRB; VclPtr<RadioButton> aShadingRB; - OfaMSFilterTabPage2( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~OfaMSFilterTabPage2(); virtual void dispose() SAL_OVERRIDE; @@ -97,8 +96,8 @@ class OfaMSFilterTabPage2 : public SfxTabPage SvTreeListEntry* GetEntry4Type( sal_IntPtr _nType ) const; public: - - static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); + OfaMSFilterTabPage2( vcl::Window* pParent, const SfxItemSet& rSet ); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index e33ee969dee3..421fa06c33af 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -328,9 +328,9 @@ void OfaMiscTabPage::dispose() SfxTabPage::dispose(); } -SfxTabPage* OfaMiscTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> OfaMiscTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { - return new OfaMiscTabPage( pParent, *rAttrSet ); + return VclPtr<OfaMiscTabPage>::Create( pParent, *rAttrSet ); } bool OfaMiscTabPage::FillItemSet( SfxItemSet* rSet ) @@ -757,9 +757,9 @@ IMPL_LINK( OfaViewTabPage, OnSelectionToggled, void*, NOTINTERESTEDIN ) return 0; } -SfxTabPage* OfaViewTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> OfaViewTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { - return new OfaViewTabPage(pParent, *rAttrSet); + return VclPtr<OfaViewTabPage>::Create(pParent, *rAttrSet); } bool OfaViewTabPage::FillItemSet( SfxItemSet* ) @@ -1274,9 +1274,9 @@ void OfaLanguagesTabPage::dispose() SfxTabPage::dispose(); } -SfxTabPage* OfaLanguagesTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> OfaLanguagesTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { - return new OfaLanguagesTabPage(pParent, *rAttrSet); + return VclPtr<OfaLanguagesTabPage>::Create(pParent, *rAttrSet); } static void lcl_UpdateAndDelete(SfxVoidItem* pInvalidItems[], SfxBoolItem* pBoolItems[], sal_uInt16 nCount) diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index 19ec2a06ef56..dd9fe86db86f 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -77,7 +77,7 @@ public: virtual ~OfaMiscTabPage(); 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; @@ -135,7 +135,7 @@ public: virtual ~OfaViewTabPage(); 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; @@ -180,7 +180,7 @@ public: virtual ~OfaLanguagesTabPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx index 5986df31380e..aca396d94ba9 100644 --- a/cui/source/options/optgenrl.cxx +++ b/cui/source/options/optgenrl.cxx @@ -301,9 +301,9 @@ void SvxGeneralTabPage::SetLinks () -SfxTabPage* SvxGeneralTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> SvxGeneralTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { - return ( new SvxGeneralTabPage( pParent, *rAttrSet ) ); + return VclPtr<SvxGeneralTabPage>::Create( pParent, *rAttrSet ); } diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx index 8860af692b7d..8298bd6c6e6b 100644 --- a/cui/source/options/opthtml.cxx +++ b/cui/source/options/opthtml.cxx @@ -110,10 +110,10 @@ void OfaHtmlTabPage::dispose() SfxTabPage::dispose(); } -SfxTabPage* OfaHtmlTabPage::Create( vcl::Window* pParent, - const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> OfaHtmlTabPage::Create( vcl::Window* pParent, + const SfxItemSet* rAttrSet ) { - return new OfaHtmlTabPage(pParent, *rAttrSet); + return VclPtr<OfaHtmlTabPage>::Create(pParent, *rAttrSet); } bool OfaHtmlTabPage::FillItemSet( SfxItemSet* ) diff --git a/cui/source/options/opthtml.hxx b/cui/source/options/opthtml.hxx index 0e17f48330e6..6977795feb65 100644 --- a/cui/source/options/opthtml.hxx +++ b/cui/source/options/opthtml.hxx @@ -52,13 +52,13 @@ class OfaHtmlTabPage : public SfxTabPage DECL_LINK(ExportHdl_Impl, ListBox*); DECL_LINK(CheckBoxHdl_Impl, CheckBox*); - OfaHtmlTabPage(vcl::Window* pParent, const SfxItemSet& rSet); public: virtual ~OfaHtmlTabPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, - const SfxItemSet* rAttrSet ); + OfaHtmlTabPage(vcl::Window* pParent, const SfxItemSet& rSet); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, + const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index 53b1ee22c127..766a4748f44c 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -241,9 +241,9 @@ void SvxProxyTabPage::dispose() SfxTabPage::dispose(); } -SfxTabPage* SvxProxyTabPage::Create(vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> SvxProxyTabPage::Create(vcl::Window* pParent, const SfxItemSet* rAttrSet ) { - return new SvxProxyTabPage(pParent, *rAttrSet); + return VclPtr<SvxProxyTabPage>::Create(pParent, *rAttrSet); } void SvxProxyTabPage::ReadConfigData_Impl() @@ -914,9 +914,9 @@ void SvxSecurityTabPage::InitControls() } } -SfxTabPage* SvxSecurityTabPage::Create(vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> SvxSecurityTabPage::Create(vcl::Window* pParent, const SfxItemSet* rAttrSet ) { - return new SvxSecurityTabPage(pParent, *rAttrSet); + return VclPtr<SfxTabPage>(new SvxSecurityTabPage(pParent, *rAttrSet), SAL_NO_ACQUIRE); } void SvxSecurityTabPage::ActivatePage( const SfxItemSet& ) @@ -1030,9 +1030,9 @@ void SvxEMailTabPage::dispose() /* -------------------------------------------------------------------------*/ -SfxTabPage* SvxEMailTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> SvxEMailTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { - return new SvxEMailTabPage(pParent, *rAttrSet); + return VclPtr<SvxEMailTabPage>::Create(pParent, *rAttrSet); } /* -------------------------------------------------------------------------*/ diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx index 6aa6d4c8afc4..ee9b46a9c69d 100644 --- a/cui/source/options/optinet2.hxx +++ b/cui/source/options/optinet2.hxx @@ -98,12 +98,11 @@ private: DECL_LINK( ProxyHdl_Impl, ListBox * ); DECL_LINK( LoseFocusHdl_Impl, Edit * ); - SvxProxyTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); - public: + SvxProxyTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxProxyTabPage(); 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; }; @@ -176,7 +175,7 @@ protected: virtual int DeactivatePage( SfxItemSet* pSet = 0 ) 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; }; @@ -203,7 +202,7 @@ public: virtual ~SvxEMailTabPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 3e050b12873d..98eb903ba218 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -651,9 +651,9 @@ void SvxJavaOptionsPage::AddFolder( const OUString& _rFolder ) -SfxTabPage* SvxJavaOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> SvxJavaOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { - return ( new SvxJavaOptionsPage( pParent, *rAttrSet ) ); + return VclPtr<SvxJavaOptionsPage>::Create( pParent, *rAttrSet ); } diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx index 68ed24427d85..ffe299b7c628 100644 --- a/cui/source/options/optjava.hxx +++ b/cui/source/options/optjava.hxx @@ -109,7 +109,7 @@ public: virtual ~SvxJavaOptionsPage(); 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; diff --git a/cui/source/options/optjsearch.cxx b/cui/source/options/optjsearch.cxx index 4b1696fbeb54..2bd5401acac5 100644 --- a/cui/source/options/optjsearch.cxx +++ b/cui/source/options/optjsearch.cxx @@ -84,9 +84,9 @@ void SvxJSearchOptionsPage::dispose() SfxTabPage::dispose(); } -SfxTabPage* SvxJSearchOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) +VclPtr<SfxTabPage> SvxJSearchOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { - return new SvxJSearchOptionsPage( pParent, *rSet ); + return VclPtr<SvxJSearchOptionsPage>::Create( pParent, *rSet ); } diff --git a/cui/source/options/optjsearch.hxx b/cui/source/options/optjsearch.hxx index 70d03acb2b2f..26fed46c9c3a 100644 --- a/cui/source/options/optjsearch.hxx +++ b/cui/source/options/optjsearch.hxx @@ -58,13 +58,11 @@ private: sal_Int32 GetTransliterationFlags_Impl(); -protected: - SvxJSearchOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ); - public: + SvxJSearchOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxJSearchOptionsPage(); 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 Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 48a326be2a5e..54d4fe51598f 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -1152,10 +1152,11 @@ void SvxLinguTabPage::dispose() SfxTabPage::dispose(); } -SfxTabPage* SvxLinguTabPage::Create( vcl::Window* pParent, - const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> SvxLinguTabPage::Create( vcl::Window* pParent, + const SfxItemSet* rAttrSet ) { - return ( new SvxLinguTabPage( pParent, *rAttrSet ) ); + return VclPtr<SfxTabPage>( new SvxLinguTabPage( pParent, *rAttrSet ), + SAL_NO_ACQUIRE ); } diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx index 0dc00ee33168..cfc0cbe1a9ca 100644 --- a/cui/source/options/optmemory.cxx +++ b/cui/source/options/optmemory.cxx @@ -158,9 +158,9 @@ void OfaMemoryOptionsPage::dispose() SfxTabPage::dispose(); } -SfxTabPage* OfaMemoryOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> OfaMemoryOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { - return new OfaMemoryOptionsPage( pParent, *rAttrSet ); + return VclPtr<OfaMemoryOptionsPage>::Create( pParent, *rAttrSet ); } bool OfaMemoryOptionsPage::FillItemSet( SfxItemSet* rSet ) diff --git a/cui/source/options/optmemory.hxx b/cui/source/options/optmemory.hxx index 91559d99da1e..74f2859cfb80 100644 --- a/cui/source/options/optmemory.hxx +++ b/cui/source/options/optmemory.hxx @@ -60,7 +60,7 @@ public: virtual ~OfaMemoryOptionsPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx index c98ce9a4a76b..e83dcde59a61 100644 --- a/cui/source/options/optopencl.cxx +++ b/cui/source/options/optopencl.cxx @@ -136,9 +136,9 @@ void SvxOpenCLTabPage::dispose() SfxTabPage::dispose(); } -SfxTabPage* SvxOpenCLTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> SvxOpenCLTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { - return new SvxOpenCLTabPage(pParent, *rAttrSet); + return VclPtr<SvxOpenCLTabPage>::Create(pParent, *rAttrSet); } bool SvxOpenCLTabPage::FillItemSet( SfxItemSet* ) diff --git a/cui/source/options/optopencl.hxx b/cui/source/options/optopencl.hxx index 067b038e22d7..09eb097609fd 100644 --- a/cui/source/options/optopencl.hxx +++ b/cui/source/options/optopencl.hxx @@ -73,7 +73,7 @@ public: virtual ~SvxOpenCLTabPage(); 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; diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index 8b1e967136d4..dd87bbc7eca0 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -266,14 +266,12 @@ void SvxPathTabPage::dispose() SfxTabPage::dispose(); } -SfxTabPage* SvxPathTabPage::Create( vcl::Window* pParent, - const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> SvxPathTabPage::Create( vcl::Window* pParent, + const SfxItemSet* rAttrSet ) { - return ( new SvxPathTabPage( pParent, *rAttrSet ) ); + return VclPtr<SvxPathTabPage>::Create( pParent, *rAttrSet ); } - - bool SvxPathTabPage::FillItemSet( SfxItemSet* ) { for ( sal_uInt16 i = 0; i < pPathBox->GetEntryCount(); ++i ) diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index a8a9280b7dd3..a57f3e0dca35 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -226,13 +226,12 @@ void SvxSaveTabPage::dispose() SfxTabPage::dispose(); } -SfxTabPage* SfxSaveTabPage::Create( vcl::Window* pParent, - const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> SfxSaveTabPage::Create( vcl::Window* pParent, + const SfxItemSet* rAttrSet ) { - return ( new SfxSaveTabPage( pParent, *rAttrSet ) ); + return VclPtr<SfxSaveTabPage>::Create( pParent, *rAttrSet ); } - void SfxSaveTabPage::DetectHiddenControls() { SvtOptionsDialogOptions aOptionsDlgOpt; diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx index 0cb7526de828..f64dc0a82495 100644 --- a/cui/source/options/optsave.hxx +++ b/cui/source/options/optsave.hxx @@ -75,7 +75,7 @@ public: virtual ~SvxSaveTabPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx index 536e444c85e5..5f66f5bbbd43 100644 --- a/cui/source/options/optupdt.cxx +++ b/cui/source/options/optupdt.cxx @@ -160,17 +160,12 @@ void SvxOnlineUpdateTabPage::UpdateLastCheckedText() m_pLastChecked->SetText( aText ); } - - -SfxTabPage* +VclPtr<SfxTabPage> SvxOnlineUpdateTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { - return new SvxOnlineUpdateTabPage( pParent, *rAttrSet ); + return VclPtr<SvxOnlineUpdateTabPage>::Create( pParent, *rAttrSet ); } - - - bool SvxOnlineUpdateTabPage::FillItemSet( SfxItemSet* ) { bool bModified = false; diff --git a/cui/source/options/optupdt.hxx b/cui/source/options/optupdt.hxx index 4324cafe34fe..ec749adc16c8 100644 --- a/cui/source/options/optupdt.hxx +++ b/cui/source/options/optupdt.hxx @@ -55,7 +55,7 @@ public: virtual ~SvxOnlineUpdateTabPage(); 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; diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx index eeabbcdeb84e..f19cfb4589d9 100644 --- a/cui/source/options/personalization.cxx +++ b/cui/source/options/personalization.cxx @@ -330,9 +330,9 @@ void SvxPersonalizationTabPage::dispose() } -SfxTabPage* SvxPersonalizationTabPage::Create( vcl::Window *pParent, const SfxItemSet *rSet ) +VclPtr<SfxTabPage> SvxPersonalizationTabPage::Create( vcl::Window *pParent, const SfxItemSet *rSet ) { - return new SvxPersonalizationTabPage( pParent, *rSet ); + return VclPtr<SvxPersonalizationTabPage>::Create( pParent, *rSet ); } bool SvxPersonalizationTabPage::FillItemSet( SfxItemSet * ) diff --git a/cui/source/options/personalization.hxx b/cui/source/options/personalization.hxx index e491d8b1853e..0ec920db2704 100644 --- a/cui/source/options/personalization.hxx +++ b/cui/source/options/personalization.hxx @@ -44,7 +44,7 @@ public: virtual ~SvxPersonalizationTabPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window *pParent, const SfxItemSet *rSet ); + static VclPtr<SfxTabPage> Create( vcl::Window *pParent, const SfxItemSet *rSet ); /// Apply the settings ([OK] button). virtual bool FillItemSet( SfxItemSet *rSet ) SAL_OVERRIDE; diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index ab31348d2479..02e2f17c82da 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -291,7 +291,7 @@ void MailMergeCfg_Impl::Notify( const com::sun::star::uno::Sequence< OUString >& } //typedef SfxTabPage* (*FNCreateTabPage)( vcl::Window *pParent, const SfxItemSet &rAttrSet ); -SfxTabPage* CreateGeneralTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet ) +VclPtr<SfxTabPage> CreateGeneralTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet ) { CreateTabPage fnCreate = 0; switch(nId) @@ -332,7 +332,7 @@ SfxTabPage* CreateGeneralTabPage( sal_uInt16 nId, vcl::Window* pParent, const Sf #endif } - SfxTabPage* pRet = fnCreate ? (*fnCreate)( pParent, &rSet ) : NULL; + VclPtr<SfxTabPage> pRet = fnCreate ? (*fnCreate)( pParent, &rSet ) : nullptr; return pRet; } @@ -1050,17 +1050,17 @@ void OfaTreeOptionsDialog::SelectHdl_Impl() if(pPageInfo->m_nPageId == RID_SVXPAGE_COLOR) { - pPageInfo->m_pPage = ::CreateGeneralTabPage( - pPageInfo->m_nPageId, pTabBox, *pColorPageItemSet ); + pPageInfo->m_pPage.reset( ::CreateGeneralTabPage( + pPageInfo->m_nPageId, pTabBox, *pColorPageItemSet ) ); mpColorPage = static_cast<SvxColorTabPage*>(pPageInfo->m_pPage.get()); mpColorPage->SetupForViewFrame( SfxViewFrame::Current() ); } else { - pPageInfo->m_pPage = ::CreateGeneralTabPage(pPageInfo->m_nPageId, pTabBox, *pGroupInfo->m_pInItemSet ); + pPageInfo->m_pPage.reset( ::CreateGeneralTabPage(pPageInfo->m_nPageId, pTabBox, *pGroupInfo->m_pInItemSet ) ); if(!pPageInfo->m_pPage && pGroupInfo->m_pModule) - pPageInfo->m_pPage = pGroupInfo->m_pModule->CreateTabPage(pPageInfo->m_nPageId, pTabBox, *pGroupInfo->m_pInItemSet); + pPageInfo->m_pPage.reset( pGroupInfo->m_pModule->CreateTabPage(pPageInfo->m_nPageId, pTabBox, *pGroupInfo->m_pInItemSet) ); } diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index 9c0f52d6789b..479913f3d157 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -284,9 +284,10 @@ void AlignmentTabPage::dispose() SfxTabPage::dispose(); } -SfxTabPage* AlignmentTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> AlignmentTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { - return new AlignmentTabPage( pParent, *rAttrSet ); + return VclPtr<SfxTabPage>( new AlignmentTabPage( pParent, *rAttrSet ), + SAL_NO_ACQUIRE ); } bool AlignmentTabPage::FillItemSet( SfxItemSet* rSet ) diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 7a7373bcb260..e7aaccf48bba 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -215,10 +215,10 @@ void OfaAutocorrOptionsPage::dispose() SfxTabPage::dispose(); } -SfxTabPage* OfaAutocorrOptionsPage::Create( vcl::Window* pParent, - const SfxItemSet* rSet) +VclPtr<SfxTabPage> OfaAutocorrOptionsPage::Create( vcl::Window* pParent, + const SfxItemSet* rSet) { - return new OfaAutocorrOptionsPage(pParent, *rSet); + return VclPtr<OfaAutocorrOptionsPage>::Create(pParent, *rSet); } bool OfaAutocorrOptionsPage::FillItemSet( SfxItemSet* ) @@ -513,10 +513,10 @@ void OfaSwAutoFmtOptionsPage::dispose() SfxTabPage::dispose(); } -SfxTabPage* OfaSwAutoFmtOptionsPage::Create( vcl::Window* pParent, - const SfxItemSet* rAttrSet) +VclPtr<SfxTabPage> OfaSwAutoFmtOptionsPage::Create( vcl::Window* pParent, + const SfxItemSet* rAttrSet) { - return new OfaSwAutoFmtOptionsPage(pParent, *rAttrSet); + return VclPtr<SfxTabPage>( new OfaSwAutoFmtOptionsPage(pParent, *rAttrSet), SAL_NO_ACQUIRE ); } bool OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet* ) @@ -956,9 +956,9 @@ void OfaAutocorrReplacePage::dispose() SfxTabPage::dispose(); } -SfxTabPage* OfaAutocorrReplacePage::Create( vcl::Window* pParent, const SfxItemSet* rSet) +VclPtr<SfxTabPage> OfaAutocorrReplacePage::Create( vcl::Window* pParent, const SfxItemSet* rSet) { - return new OfaAutocorrReplacePage(pParent, *rSet); + return VclPtr<OfaAutocorrReplacePage>::Create(pParent, *rSet); } void OfaAutocorrReplacePage::ActivatePage( const SfxItemSet& ) @@ -1472,10 +1472,10 @@ void OfaAutocorrExceptPage::dispose() SfxTabPage::dispose(); } -SfxTabPage* OfaAutocorrExceptPage::Create( vcl::Window* pParent, - const SfxItemSet* rSet) +VclPtr<SfxTabPage> OfaAutocorrExceptPage::Create( vcl::Window* pParent, + const SfxItemSet* rSet) { - return new OfaAutocorrExceptPage(pParent, *rSet); + return VclPtr<OfaAutocorrExceptPage>::Create(pParent, *rSet); } void OfaAutocorrExceptPage::ActivatePage( const SfxItemSet& ) @@ -1909,10 +1909,11 @@ void OfaQuoteTabPage::dispose() SfxTabPage::dispose(); } -SfxTabPage* OfaQuoteTabPage::Create( vcl::Window* pParent, - const SfxItemSet* rAttrSet) +VclPtr<SfxTabPage> OfaQuoteTabPage::Create( vcl::Window* pParent, + const SfxItemSet* rAttrSet) { - return new OfaQuoteTabPage(pParent, *rAttrSet); + return VclPtr<SfxTabPage>( new OfaQuoteTabPage(pParent, *rAttrSet), + SAL_NO_ACQUIRE ); } bool OfaQuoteTabPage::FillItemSet( SfxItemSet* ) @@ -2249,10 +2250,10 @@ void OfaAutoCompleteTabPage::dispose() SfxTabPage::dispose(); } -SfxTabPage* OfaAutoCompleteTabPage::Create( vcl::Window* pParent, - const SfxItemSet* rSet) +VclPtr<SfxTabPage> OfaAutoCompleteTabPage::Create( vcl::Window* pParent, + const SfxItemSet* rSet) { - return new OfaAutoCompleteTabPage( pParent, *rSet ); + return VclPtr<SfxTabPage>( new OfaAutoCompleteTabPage( pParent, *rSet ), SAL_NO_ACQUIRE ); } bool OfaAutoCompleteTabPage::FillItemSet( SfxItemSet* ) @@ -2507,9 +2508,9 @@ void OfaSmartTagOptionsTabPage::dispose() SfxTabPage::dispose(); } -SfxTabPage* OfaSmartTagOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet) +VclPtr<SfxTabPage> OfaSmartTagOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet) { - return new OfaSmartTagOptionsTabPage( pParent, *rSet ); + return VclPtr<OfaSmartTagOptionsTabPage>::Create( pParent, *rSet ); } /** This struct is used to associate list box entries with smart tag data diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 13d7a2d8a883..285618e637ba 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -492,16 +492,10 @@ void SvxBackgroundTabPage::dispose() -SfxTabPage* SvxBackgroundTabPage::Create( vcl::Window* pParent, - const SfxItemSet* rAttrSet ) - -/* [Description] - - create method for the TabDialog -*/ - +VclPtr<SfxTabPage> SvxBackgroundTabPage::Create( vcl::Window* pParent, + const SfxItemSet* rAttrSet ) { - return ( new SvxBackgroundTabPage( pParent, *rAttrSet ) ); + return VclPtr<SfxTabPage>( new SvxBackgroundTabPage( pParent, *rAttrSet ), SAL_NO_ACQUIRE ); } diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index 8fbd975a026f..724fb244e1a7 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -369,15 +369,13 @@ void SvxBorderTabPage::dispose() SfxTabPage::dispose(); } - -SfxTabPage* SvxBorderTabPage::Create( vcl::Window* pParent, - const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> SvxBorderTabPage::Create( vcl::Window* pParent, + const SfxItemSet* rAttrSet ) { - return ( new SvxBorderTabPage( pParent, *rAttrSet ) ); + return VclPtr<SfxTabPage>(new SvxBorderTabPage( pParent, *rAttrSet ), + SAL_NO_ACQUIRE); } - - void SvxBorderTabPage::ResetFrameLine_Impl( svx::FrameBorderType eBorder, const SvxBorderLine* pCoreLine, bool bValid ) { if( m_pFrameSel->IsBorderEnabled( eBorder ) ) diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index fd8e5dd0904c..2f445d3b559c 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -1219,9 +1219,10 @@ int SvxCharNamePage::DeactivatePage( SfxItemSet* _pSet ) -SfxTabPage* SvxCharNamePage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) +VclPtr<SfxTabPage> SvxCharNamePage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { - return new SvxCharNamePage( pParent, *rSet ); + return VclPtr<SfxTabPage>( new SvxCharNamePage( pParent, *rSet ), + SAL_NO_ACQUIRE ); } @@ -1784,9 +1785,10 @@ int SvxCharEffectsPage::DeactivatePage( SfxItemSet* _pSet ) -SfxTabPage* SvxCharEffectsPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) +VclPtr<SfxTabPage> SvxCharEffectsPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { - return new SvxCharEffectsPage( pParent, *rSet ); + return VclPtr<SfxTabPage>( new SvxCharEffectsPage( pParent, *rSet ), + SAL_NO_ACQUIRE ); } @@ -2974,9 +2976,10 @@ int SvxCharPositionPage::DeactivatePage( SfxItemSet* _pSet ) -SfxTabPage* SvxCharPositionPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) +VclPtr<SfxTabPage> SvxCharPositionPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { - return new SvxCharPositionPage( pParent, *rSet ); + return VclPtr<SfxTabPage>( new SvxCharPositionPage( pParent, *rSet ), + SAL_NO_ACQUIRE ); } @@ -3546,9 +3549,10 @@ int SvxCharTwoLinesPage::DeactivatePage( SfxItemSet* _pSet ) -SfxTabPage* SvxCharTwoLinesPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) +VclPtr<SfxTabPage> SvxCharTwoLinesPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { - return new SvxCharTwoLinesPage( pParent, *rSet ); + return VclPtr<SfxTabPage>( new SvxCharTwoLinesPage( pParent, *rSet ), + SAL_NO_ACQUIRE ); } void SvxCharTwoLinesPage::Reset( const SfxItemSet* rSet ) diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx index fdde38596d96..ba48baac7944 100644 --- a/cui/source/tabpages/connect.cxx +++ b/cui/source/tabpages/connect.cxx @@ -390,10 +390,10 @@ void SvxConnectionPage::Construct() |* \************************************************************************/ -SfxTabPage* SvxConnectionPage::Create( vcl::Window* pWindow, - const SfxItemSet* rAttrs ) +VclPtr<SfxTabPage> SvxConnectionPage::Create( vcl::Window* pWindow, + const SfxItemSet* rAttrs ) { - return new SvxConnectionPage( pWindow, *rAttrs ); + return VclPtr<SvxConnectionPage>::Create( pWindow, *rAttrs ); } IMPL_LINK( SvxConnectionPage, ChangeAttrHdl_Impl, void *, p ) diff --git a/cui/source/tabpages/dstribut.cxx b/cui/source/tabpages/dstribut.cxx index 3a001d109cd4..61d4c9b7458a 100644 --- a/cui/source/tabpages/dstribut.cxx +++ b/cui/source/tabpages/dstribut.cxx @@ -106,10 +106,10 @@ void SvxDistributePage::dispose() |* \************************************************************************/ -SfxTabPage* SvxDistributePage::Create(vcl::Window* pWindow, const SfxItemSet& rAttrs, +VclPtr<SfxTabPage> SvxDistributePage::Create(vcl::Window* pWindow, const SfxItemSet& rAttrs, SvxDistributeHorizontal eHor, SvxDistributeVertical eVer) { - return new SvxDistributePage(pWindow, rAttrs, eHor, eVer); + return VclPtr<SvxDistributePage>::Create(pWindow, rAttrs, eHor, eVer); } void SvxDistributePage::PointChanged(vcl::Window* /*pWindow*/, RECT_POINT /*eRP*/) diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index 9d1a6626b0ac..8f4ddcd35ecb 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -154,9 +154,10 @@ void SvxGrfCropPage::dispose() SfxTabPage::dispose(); } -SfxTabPage* SvxGrfCropPage::Create(vcl::Window *pParent, const SfxItemSet *rSet) +VclPtr<SfxTabPage> SvxGrfCropPage::Create(vcl::Window *pParent, const SfxItemSet *rSet) { - return new SvxGrfCropPage( pParent, *rSet ); + return VclPtr<SfxTabPage>( new SvxGrfCropPage( pParent, *rSet ), + SAL_NO_ACQUIRE ); } void SvxGrfCropPage::Reset( const SfxItemSet *rSet ) diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx index b2ffa267d3c0..d57e180245d1 100644 --- a/cui/source/tabpages/labdlg.cxx +++ b/cui/source/tabpages/labdlg.cxx @@ -356,10 +356,10 @@ void SvxCaptionTabPage::Reset( const SfxItemSet* ) -SfxTabPage* SvxCaptionTabPage::Create( vcl::Window* pWindow, - const SfxItemSet* rOutAttrs ) +VclPtr<SfxTabPage> SvxCaptionTabPage::Create( vcl::Window* pWindow, + const SfxItemSet* rOutAttrs ) { - return new SvxCaptionTabPage( pWindow, *rOutAttrs ); + return VclPtr<SvxCaptionTabPage>::Create( pWindow, *rOutAttrs ); } diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index 17a3930edaed..ced57182cea9 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -460,13 +460,13 @@ SfxMacroTabPage::SfxMacroTabPage(vcl::Window* pParent, const Reference< XFrame > namespace { - SfxMacroTabPage* CreateSfxMacroTabPage( vcl::Window* pParent, const SfxItemSet& rAttrSet ) + VclPtr<SfxMacroTabPage> CreateSfxMacroTabPage( vcl::Window* pParent, const SfxItemSet& rAttrSet ) { - return new SfxMacroTabPage( pParent, NULL, rAttrSet ); + return VclPtr<SfxMacroTabPage>( new SfxMacroTabPage( pParent, NULL, rAttrSet ), SAL_NO_ACQUIRE ); } } -SfxTabPage* SfxMacroTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> SfxMacroTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return CreateSfxMacroTabPage(pParent, *rAttrSet); } diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx index 05f690c2b3b4..c9a54d9a3fbd 100644 --- a/cui/source/tabpages/measure.cxx +++ b/cui/source/tabpages/measure.cxx @@ -602,16 +602,10 @@ void SvxMeasurePage::Construct() m_pCtlPreview->Invalidate(); } -/************************************************************************* -|* -|* create the tabpage -|* -\************************************************************************/ - -SfxTabPage* SvxMeasurePage::Create( vcl::Window* pWindow, - const SfxItemSet* rAttrs ) +VclPtr<SfxTabPage> SvxMeasurePage::Create( vcl::Window* pWindow, + const SfxItemSet* rAttrs ) { - return new SvxMeasurePage( pWindow, *rAttrs ); + return VclPtr<SvxMeasurePage>::Create( pWindow, *rAttrs ); } void SvxMeasurePage::PointChanged( vcl::Window* pWindow, RECT_POINT /*eRP*/ ) diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 15edecd1dc9a..c362ece30b01 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -380,21 +380,10 @@ void SvxNumberFormatTabPage::Init_Impl() } } -/************************************************************************* -#* Method: Create -#*------------------------------------------------------------------------ -#* -#* Class: SvxNumberFormatTabPage -#* Function: Creates a new number format page. -#* Input: Window, SfxItemSet -#* Output: new TabPage -#* -#************************************************************************/ - -SfxTabPage* SvxNumberFormatTabPage::Create( vcl::Window* pParent, - const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> SvxNumberFormatTabPage::Create( vcl::Window* pParent, + const SfxItemSet* rAttrSet ) { - return ( new SvxNumberFormatTabPage( pParent, *rAttrSet ) ); + return VclPtr<SfxTabPage>( new SvxNumberFormatTabPage( pParent, *rAttrSet ), SAL_NO_ACQUIRE ); } diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 5e7ee8706f84..12b1311214ae 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -232,10 +232,10 @@ void SvxSingleNumPickTabPage::dispose() SfxTabPage::dispose(); } -SfxTabPage* SvxSingleNumPickTabPage::Create( vcl::Window* pParent, - const SfxItemSet* rAttrSet) +VclPtr<SfxTabPage> SvxSingleNumPickTabPage::Create( vcl::Window* pParent, + const SfxItemSet* rAttrSet) { - return new SvxSingleNumPickTabPage(pParent, *rAttrSet); + return VclPtr<SvxSingleNumPickTabPage>::Create(pParent, *rAttrSet); } bool SvxSingleNumPickTabPage::FillItemSet( SfxItemSet* rSet ) @@ -402,10 +402,10 @@ void SvxBulletPickTabPage::dispose() SfxTabPage::dispose(); } -SfxTabPage* SvxBulletPickTabPage::Create( vcl::Window* pParent, - const SfxItemSet* rAttrSet) +VclPtr<SfxTabPage> SvxBulletPickTabPage::Create( vcl::Window* pParent, + const SfxItemSet* rAttrSet) { - return new SvxBulletPickTabPage(pParent, *rAttrSet); + return VclPtr<SvxBulletPickTabPage>::Create(pParent, *rAttrSet); } bool SvxBulletPickTabPage::FillItemSet( SfxItemSet* rSet ) @@ -608,10 +608,10 @@ void SvxNumPickTabPage::dispose() SfxTabPage::dispose(); } -SfxTabPage* SvxNumPickTabPage::Create( vcl::Window* pParent, - const SfxItemSet* rAttrSet) +VclPtr<SfxTabPage> SvxNumPickTabPage::Create( vcl::Window* pParent, + const SfxItemSet* rAttrSet) { - return new SvxNumPickTabPage(pParent, *rAttrSet); + return VclPtr<SvxNumPickTabPage>::Create(pParent, *rAttrSet); } bool SvxNumPickTabPage::FillItemSet( SfxItemSet* rSet ) @@ -859,10 +859,10 @@ void SvxBitmapPickTabPage::dispose() SfxTabPage::dispose(); } -SfxTabPage* SvxBitmapPickTabPage::Create( vcl::Window* pParent, - const SfxItemSet* rAttrSet) +VclPtr<SfxTabPage> SvxBitmapPickTabPage::Create( vcl::Window* pParent, + const SfxItemSet* rAttrSet) { - return new SvxBitmapPickTabPage(pParent, *rAttrSet); + return VclPtr<SvxBitmapPickTabPage>::Create(pParent, *rAttrSet); } void SvxBitmapPickTabPage::ActivatePage(const SfxItemSet& rSet) @@ -1222,10 +1222,10 @@ void SvxNumOptionsTabPage::SetMetric(FieldUnit eMetric) m_pHeightMF->SetUnit( eMetric ); } -SfxTabPage* SvxNumOptionsTabPage::Create( vcl::Window* pParent, - const SfxItemSet* rAttrSet) +VclPtr<SfxTabPage> SvxNumOptionsTabPage::Create( vcl::Window* pParent, + const SfxItemSet* rAttrSet) { - return new SvxNumOptionsTabPage(pParent, *rAttrSet); + return VclPtr<SvxNumOptionsTabPage>::Create(pParent, *rAttrSet); }; void SvxNumOptionsTabPage::ActivatePage(const SfxItemSet& rSet) @@ -3220,10 +3220,10 @@ void SvxNumPositionTabPage::ShowControlsDependingOnPosAndSpaceMode() m_pIndentAtMF->Show( bLabelAlignmentPosAndSpaceModeActive ); } -SfxTabPage* SvxNumPositionTabPage::Create( vcl::Window* pParent, - const SfxItemSet* rAttrSet) +VclPtr<SfxTabPage> SvxNumPositionTabPage::Create( vcl::Window* pParent, + const SfxItemSet* rAttrSet) { - return new SvxNumPositionTabPage(pParent, *rAttrSet); + return VclPtr<SvxNumPositionTabPage>::Create(pParent, *rAttrSet); } void SvxNumPositionTabPage::SetMetric(FieldUnit eMetric) diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index c9ecb88fcec0..80c627db1f83 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -164,9 +164,9 @@ bool IsEqualSize_Impl( const SvxSizeItem* pSize, const Size& rSize ) // class SvxPageDescPage -------------------------------------------------- -SfxTabPage* SvxPageDescPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) +VclPtr<SfxTabPage> SvxPageDescPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { - return new SvxPageDescPage( pParent, *rSet ); + return VclPtr<SfxTabPage>(new SvxPageDescPage( pParent, *rSet ), SAL_NO_ACQUIRE ); } SvxPageDescPage::SvxPageDescPage( vcl::Window* pParent, const SfxItemSet& rAttr ) : diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index 7bff769be6e8..e84a6e1315f4 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -194,9 +194,9 @@ IMPL_LINK_NOARG(SvxStdParagraphTabPage, ELRLoseFocusHdl) return 0; } -SfxTabPage* SvxStdParagraphTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet) +VclPtr<SfxTabPage> SvxStdParagraphTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet) { - return new SvxStdParagraphTabPage( pParent, *rSet ); + return VclPtr<SfxTabPage>( new SvxStdParagraphTabPage( pParent, *rSet ), SAL_NO_ACQUIRE ); } bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet* rOutSet ) @@ -1071,9 +1071,9 @@ int SvxParaAlignTabPage::DeactivatePage( SfxItemSet* _pSet ) return LEAVE_PAGE; } -SfxTabPage* SvxParaAlignTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) +VclPtr<SfxTabPage> SvxParaAlignTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { - return new SvxParaAlignTabPage(pParent, *rSet); + return VclPtr<SfxTabPage>( new SvxParaAlignTabPage(pParent, *rSet), SAL_NO_ACQUIRE ); } bool SvxParaAlignTabPage::FillItemSet( SfxItemSet* rOutSet ) @@ -1344,10 +1344,10 @@ void SvxParaAlignTabPage::PageCreated (const SfxAllItemSet& aSet) EnableJustifyExt(); } -SfxTabPage* SvxExtParagraphTabPage::Create( vcl::Window* pParent, +VclPtr<SfxTabPage> SvxExtParagraphTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { - return new SvxExtParagraphTabPage( pParent, *rSet ); + return VclPtr<SfxTabPage>( new SvxExtParagraphTabPage( pParent, *rSet ), SAL_NO_ACQUIRE ); } bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet* rOutSet ) @@ -2192,9 +2192,9 @@ void SvxAsianTabPage::dispose() SfxTabPage::dispose(); } -SfxTabPage* SvxAsianTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) +VclPtr<SfxTabPage> SvxAsianTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { - return new SvxAsianTabPage(pParent, *rSet); + return VclPtr<SfxTabPage>(new SvxAsianTabPage(pParent, *rSet), SAL_NO_ACQUIRE ); } const sal_uInt16* SvxAsianTabPage::GetRanges() diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index bbe6bcbb4fff..9434db815b31 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -726,9 +726,9 @@ void SvxSwPosSizeTabPage::setOptimalRelWidth() m_pHoriLB->Clear(); } -SfxTabPage* SvxSwPosSizeTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet) +VclPtr<SfxTabPage> SvxSwPosSizeTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet) { - return new SvxSwPosSizeTabPage(pParent, *rSet); + return VclPtr<SvxSwPosSizeTabPage>::Create(pParent, *rSet); } const sal_uInt16* SvxSwPosSizeTabPage::GetRanges() diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index 56591202b702..c0183bb32018 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -278,10 +278,11 @@ bool SvxTabulatorTabPage::FillItemSet( SfxItemSet* rSet ) -SfxTabPage* SvxTabulatorTabPage::Create( vcl::Window* pParent, +VclPtr<SfxTabPage> SvxTabulatorTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet) { - return ( new SvxTabulatorTabPage( pParent, *rSet ) ); + return VclPtr<SfxTabPage>( new SvxTabulatorTabPage( pParent, *rSet ), + SAL_NO_ACQUIRE ); } diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx index 05bc698b3caa..b2f2980de258 100644 --- a/cui/source/tabpages/textanim.cxx +++ b/cui/source/tabpages/textanim.cxx @@ -461,10 +461,10 @@ bool SvxTextAnimationPage::FillItemSet( SfxItemSet* rAttrs) |* \************************************************************************/ -SfxTabPage* SvxTextAnimationPage::Create( vcl::Window* pWindow, - const SfxItemSet* rAttrs ) +VclPtr<SfxTabPage> SvxTextAnimationPage::Create( vcl::Window* pWindow, + const SfxItemSet* rAttrs ) { - return new SvxTextAnimationPage( pWindow, *rAttrs ); + return VclPtr<SvxTextAnimationPage>::Create( pWindow, *rAttrs ); } IMPL_LINK_NOARG(SvxTextAnimationPage, SelectEffectHdl_Impl) diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index 6345e4593ed1..78df0184126c 100644 --- a/cui/source/tabpages/textattr.cxx +++ b/cui/source/tabpages/textattr.cxx @@ -529,16 +529,10 @@ void SvxTextAttrPage::Construct() m_pTsbWordWrapText->Enable( bWordWrapTextEnabled ); } -/************************************************************************* -|* -|* creates the page -|* -\************************************************************************/ - -SfxTabPage* SvxTextAttrPage::Create( vcl::Window* pWindow, - const SfxItemSet* rAttrs ) +VclPtr<SfxTabPage> SvxTextAttrPage::Create( vcl::Window* pWindow, + const SfxItemSet* rAttrs ) { - return new SvxTextAttrPage( pWindow, *rAttrs ); + return VclPtr<SvxTextAttrPage>::Create( pWindow, *rAttrs ); } /** Check whether we have to uncheck the "Full width" check box. diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index 7c2090ded426..c6d568cea597 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -314,9 +314,9 @@ SvxTransparenceTabPage::SvxTransparenceTabPage(vcl::Window* pParent, const SfxIt SetExchangeSupport(); } -SfxTabPage* SvxTransparenceTabPage::Create(vcl::Window* pWindow, const SfxItemSet* rAttrs) +VclPtr<SfxTabPage> SvxTransparenceTabPage::Create(vcl::Window* pWindow, const SfxItemSet* rAttrs) { - return new SvxTransparenceTabPage(pWindow, *rAttrs); + return VclPtr<SvxTransparenceTabPage>::Create(pWindow, *rAttrs); } bool SvxTransparenceTabPage::FillItemSet(SfxItemSet* rAttrs) @@ -1821,10 +1821,10 @@ void SvxAreaTabPage::Reset( const SfxItemSet* rAttrs ) -SfxTabPage* SvxAreaTabPage::Create( vcl::Window* pWindow, - const SfxItemSet* rAttrs ) +VclPtr<SfxTabPage> SvxAreaTabPage::Create( vcl::Window* pWindow, + const SfxItemSet* rAttrs ) { - return new SvxAreaTabPage( pWindow, *rAttrs ); + return VclPtr<SvxAreaTabPage>::Create( pWindow, *rAttrs ); } diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 315ad1bdfdf2..11c3464871f5 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -310,10 +310,10 @@ void SvxBitmapTabPage::Reset( const SfxItemSet* ) -SfxTabPage* SvxBitmapTabPage::Create( vcl::Window* pWindow, - const SfxItemSet* rSet ) +VclPtr<SfxTabPage> SvxBitmapTabPage::Create( vcl::Window* pWindow, + const SfxItemSet* rSet ) { - return new SvxBitmapTabPage( pWindow, *rSet ); + return VclPtr<SvxBitmapTabPage>::Create( pWindow, *rSet ); } diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index ff8d23a850af..13bb93b10198 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -647,10 +647,10 @@ void SvxColorTabPage::Reset( const SfxItemSet* rSet ) -SfxTabPage* SvxColorTabPage::Create( vcl::Window* pWindow, - const SfxItemSet* rOutAttrs ) +VclPtr<SfxTabPage> SvxColorTabPage::Create( vcl::Window* pWindow, + const SfxItemSet* rOutAttrs ) { - return new SvxColorTabPage( pWindow, *rOutAttrs ); + return VclPtr<SvxColorTabPage>::Create( pWindow, *rOutAttrs ); } // is called when the content of the MtrFields is changed for color values diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index 36a33184c3cc..3a7228871d5e 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -394,10 +394,10 @@ void SvxGradientTabPage::Reset( const SfxItemSet* ) -SfxTabPage* SvxGradientTabPage::Create( vcl::Window* pWindow, - const SfxItemSet* rOutAttrs ) +VclPtr<SfxTabPage> SvxGradientTabPage::Create( vcl::Window* pWindow, + const SfxItemSet* rOutAttrs ) { - return new SvxGradientTabPage( pWindow, *rOutAttrs ); + return VclPtr<SvxGradientTabPage>::Create( pWindow, *rOutAttrs ); } diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index cf939b82b004..3fecfd8effac 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -360,10 +360,10 @@ void SvxHatchTabPage::Reset( const SfxItemSet* rSet ) -SfxTabPage* SvxHatchTabPage::Create( vcl::Window* pWindow, - const SfxItemSet* rSet ) +VclPtr<SfxTabPage> SvxHatchTabPage::Create( vcl::Window* pWindow, + const SfxItemSet* rSet ) { - return new SvxHatchTabPage( pWindow, *rSet ); + return VclPtr<SvxHatchTabPage>::Create( pWindow, *rSet ); } diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 79ec9d3ad198..b2225d067075 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -1529,10 +1529,10 @@ void SvxLineTabPage::Reset( const SfxItemSet* rAttrs ) -SfxTabPage* SvxLineTabPage::Create( vcl::Window* pWindow, - const SfxItemSet* rAttrs ) +VclPtr<SfxTabPage> SvxLineTabPage::Create( vcl::Window* pWindow, + const SfxItemSet* rAttrs ) { - return new SvxLineTabPage( pWindow, *rAttrs ); + return VclPtr<SvxLineTabPage>::Create( pWindow, *rAttrs ); } diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index 81c0fdb70f75..b6ca76d3b17b 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -350,9 +350,9 @@ void SvxLineDefTabPage::Reset( const SfxItemSet* rAttrs ) -SfxTabPage* SvxLineDefTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) +VclPtr<SfxTabPage> SvxLineDefTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) { - return new SvxLineDefTabPage( pWindow, *rOutAttrs ); + return VclPtr<SvxLineDefTabPage>::Create( pWindow, *rOutAttrs ); } diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index 6b43ba93e4c1..b66c5f7cc11f 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -280,9 +280,9 @@ void SvxLineEndDefTabPage::Reset( const SfxItemSet* ) -SfxTabPage* SvxLineEndDefTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rSet ) +VclPtr<SfxTabPage> SvxLineEndDefTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rSet ) { - return new SvxLineEndDefTabPage( pWindow, *rSet ); + return VclPtr<SvxLineEndDefTabPage>::Create( pWindow, *rSet ); } diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx index 945f8f0a424d..8f37b100e60c 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.cxx @@ -479,10 +479,10 @@ void SvxShadowTabPage::Reset( const SfxItemSet* rAttrs ) -SfxTabPage* SvxShadowTabPage::Create( vcl::Window* pWindow, - const SfxItemSet* rAttrs ) +VclPtr<SfxTabPage> SvxShadowTabPage::Create( vcl::Window* pWindow, + const SfxItemSet* rAttrs ) { - return new SvxShadowTabPage( pWindow, *rAttrs ); + return VclPtr<SvxShadowTabPage>::Create( pWindow, *rAttrs ); } diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index e820692cee8f..acf51ba5be2a 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -324,9 +324,9 @@ void SvxAngleTabPage::Reset(const SfxItemSet* rAttrs) -SfxTabPage* SvxAngleTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rSet) +VclPtr<SfxTabPage> SvxAngleTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rSet) { - return new SvxAngleTabPage(pWindow, *rSet); + return VclPtr<SvxAngleTabPage>::Create(pWindow, *rSet); } @@ -565,9 +565,9 @@ void SvxSlantTabPage::Reset(const SfxItemSet* rAttrs) -SfxTabPage* SvxSlantTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) +VclPtr<SfxTabPage> SvxSlantTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) { - return new SvxSlantTabPage( pWindow, *rOutAttrs ); + return VclPtr<SvxSlantTabPage>::Create( pWindow, *rOutAttrs ); } @@ -1024,9 +1024,9 @@ void SvxPositionSizeTabPage::Reset( const SfxItemSet* ) -SfxTabPage* SvxPositionSizeTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) +VclPtr<SfxTabPage> SvxPositionSizeTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) { - return new SvxPositionSizeTabPage( pWindow, *rOutAttrs ); + return VclPtr<SvxPositionSizeTabPage>::Create( pWindow, *rOutAttrs ); } |