diff options
Diffstat (limited to 'sw')
68 files changed, 200 insertions, 198 deletions
diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx index dfcc4b189a30..f016ac3cdfca 100644 --- a/sw/inc/swmodule.hxx +++ b/sw/inc/swmodule.hxx @@ -219,7 +219,7 @@ public: // Virtual methods for options dialog. virtual SfxItemSet* CreateItemSet( sal_uInt16 nId ) SAL_OVERRIDE; virtual void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual SfxTabPage* CreateTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual VclPtr<SfxTabPage> CreateTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet ) SAL_OVERRIDE; // Pool is created here and set at SfxShell. void InitAttrPool(); diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx index 01e76c739a4f..9e461fc14622 100644 --- a/sw/source/ui/chrdlg/chardlg.cxx +++ b/sw/source/ui/chrdlg/chardlg.cxx @@ -295,8 +295,8 @@ bool SwCharURLPage::FillItemSet(SfxItemSet* rSet) return bModified; } -SfxTabPage* SwCharURLPage::Create( vcl::Window* pParent, - const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> SwCharURLPage::Create( vcl::Window* pParent, + const SfxItemSet* rAttrSet ) { return VclPtr<SwCharURLPage>::Create( pParent, *rAttrSet ); } diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index d8534b63d867..9f302ba5f292 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -520,7 +520,7 @@ void SwDropCapsPict::_InitPrinter() SwDropCapsDlg::SwDropCapsDlg(vcl::Window *pParent, const SfxItemSet &rSet ) : SfxSingleTabDialog(pParent, rSet) { - SwDropCapsPage* pNewPage = static_cast<SwDropCapsPage*>( SwDropCapsPage::Create(get_content_area(), &rSet)); + VclPtr<SwDropCapsPage> pNewPage( static_cast<SwDropCapsPage*>( SwDropCapsPage::Create(get_content_area(), &rSet).get() ) ); pNewPage->SetFormat(false); SetTabPage(pNewPage); } @@ -605,10 +605,10 @@ int SwDropCapsPage::DeactivatePage(SfxItemSet * _pSet) return LEAVE_PAGE; } -SfxTabPage* SwDropCapsPage::Create(vcl::Window *pParent, - const SfxItemSet *rSet) +VclPtr<SfxTabPage> SwDropCapsPage::Create(vcl::Window *pParent, + const SfxItemSet *rSet) { - return VclPtr<SwDropCapsPage>::Create(pParent, *rSet); + return VclPtr<SfxTabPage>(new SwDropCapsPage(pParent, *rSet), SAL_NO_ACQUIRE); } bool SwDropCapsPage::FillItemSet(SfxItemSet *rSet) diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx index 2f606124f179..659ad559640e 100644 --- a/sw/source/ui/chrdlg/numpara.cxx +++ b/sw/source/ui/chrdlg/numpara.cxx @@ -123,13 +123,14 @@ void SwParagraphNumTabPage::dispose() SfxTabPage::dispose(); } -SfxTabPage* SwParagraphNumTabPage::Create( vcl::Window* pParent, - const SfxItemSet* rSet ) +VclPtr<SfxTabPage> SwParagraphNumTabPage::Create( vcl::Window* pParent, + const SfxItemSet* rSet ) { - return VclPtr<SwParagraphNumTabPage>::Create(pParent, *rSet); + return VclPtr<SfxTabPage>( new SwParagraphNumTabPage(pParent, *rSet), + SAL_NO_ACQUIRE ); } -bool SwParagraphNumTabPage::FillItemSet( SfxItemSet* rSet ) +bool SwParagraphNumTabPage::FillItemSet( SfxItemSet* rSet ) { if( m_pOutlineLvLB->IsValueChangedFromSaved()) { diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx index 0da72c2f1086..8ce7206a4dc9 100644 --- a/sw/source/ui/chrdlg/swuiccoll.cxx +++ b/sw/source/ui/chrdlg/swuiccoll.cxx @@ -153,9 +153,10 @@ int SwCondCollPage::DeactivatePage(SfxItemSet * _pSet) return LEAVE_PAGE; } -SfxTabPage* SwCondCollPage::Create(vcl::Window *pParent, const SfxItemSet *rSet) +VclPtr<SfxTabPage> SwCondCollPage::Create(vcl::Window *pParent, const SfxItemSet *rSet) { - return VclPtr<SwCondCollPage>::Create(pParent, *rSet); + return VclPtr<SfxTabPage>(new SwCondCollPage(pParent, *rSet), + SAL_NO_ACQUIRE); } bool SwCondCollPage::FillItemSet(SfxItemSet *rSet) diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx index 62905425b2c7..13464804fa21 100644 --- a/sw/source/ui/config/mailconfigpage.cxx +++ b/sw/source/ui/config/mailconfigpage.cxx @@ -157,7 +157,7 @@ void SwMailConfigPage::dispose() SfxTabPage::dispose(); } -SfxTabPage* SwMailConfigPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) +VclPtr<SfxTabPage> SwMailConfigPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return VclPtr<SwMailConfigPage>::Create(pParent, *rAttrSet); } diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx index 526f587b7d5b..f60ab8839d86 100644 --- a/sw/source/ui/config/optcomp.cxx +++ b/sw/source/ui/config/optcomp.cxx @@ -410,7 +410,7 @@ void SwCompatibilityOptPage::WriteOptions() pItem->m_bExpandWordSpace ); } -SfxTabPage* SwCompatibilityOptPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> SwCompatibilityOptPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return VclPtr<SwCompatibilityOptPage>::Create( pParent, *rAttrSet ); } diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index 518252b55e68..0ce66ad8b874 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -149,8 +149,8 @@ void SwLoadOptPage::dispose() } -SfxTabPage* SwLoadOptPage::Create( vcl::Window* pParent, - const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> SwLoadOptPage::Create( vcl::Window* pParent, + const SfxItemSet* rAttrSet ) { return VclPtr<SwLoadOptPage>::Create(pParent, *rAttrSet ); } @@ -569,13 +569,13 @@ void SwCaptionOptPage::dispose() SfxTabPage::dispose(); } -SfxTabPage* SwCaptionOptPage::Create( vcl::Window* pParent, - const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> SwCaptionOptPage::Create( vcl::Window* pParent, + const SfxItemSet* rAttrSet ) { - return VclPtr<SwCaptionOptPage>::Create(pParent, *rAttrSet ); + return VclPtr<SwCaptionOptPage>::Create( pParent, *rAttrSet ); } -bool SwCaptionOptPage::FillItemSet( SfxItemSet* ) +bool SwCaptionOptPage::FillItemSet( SfxItemSet* ) { bool bRet = false; SwModuleOptions* pModOpt = SW_MOD()->GetModuleConfig(); diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index fa096c34a478..7aa839db224a 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -184,8 +184,8 @@ void SwContentOptPage::dispose() } -SfxTabPage* SwContentOptPage::Create( vcl::Window* pParent, - const SfxItemSet* rAttrSet) +VclPtr<SfxTabPage> SwContentOptPage::Create( vcl::Window* pParent, + const SfxItemSet* rAttrSet) { return VclPtr<SwContentOptPage>::Create(pParent, *rAttrSet); } @@ -415,10 +415,11 @@ void SwAddPrinterTabPage::SetPreview(bool bPrev) m_pPagesFrame->Enable(!bPreview); } -SfxTabPage* SwAddPrinterTabPage::Create( vcl::Window* pParent, - const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> SwAddPrinterTabPage::Create( vcl::Window* pParent, + const SfxItemSet* rAttrSet ) { - return VclPtr<SwAddPrinterTabPage>::Create( pParent, *rAttrSet ); + return VclPtr<SfxTabPage>(new SwAddPrinterTabPage( pParent, *rAttrSet ), + SAL_NO_ACQUIRE); } bool SwAddPrinterTabPage::FillItemSet( SfxItemSet* rCoreSet ) @@ -653,10 +654,11 @@ void SwStdFontTabPage::dispose() SfxTabPage::dispose(); } -SfxTabPage* SwStdFontTabPage::Create( vcl::Window* pParent, - const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> SwStdFontTabPage::Create( vcl::Window* pParent, + const SfxItemSet* rAttrSet ) { - return VclPtr<SwStdFontTabPage>::Create(pParent, *rAttrSet); + return VclPtr<SfxTabPage>(new SwStdFontTabPage(pParent, *rAttrSet), + SAL_NO_ACQUIRE); } static void lcl_SetColl(SwWrtShell* pWrtShell, sal_uInt16 nType, @@ -1177,10 +1179,11 @@ void SwTableOptionsTabPage::dispose() SfxTabPage::dispose(); } -SfxTabPage* SwTableOptionsTabPage::Create( vcl::Window* pParent, - const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> SwTableOptionsTabPage::Create( vcl::Window* pParent, + const SfxItemSet* rAttrSet ) { - return VclPtr<SwTableOptionsTabPage>::Create(pParent, *rAttrSet ); + return VclPtr<SfxTabPage>( new SwTableOptionsTabPage(pParent, *rAttrSet ), + SAL_NO_ACQUIRE ); } bool SwTableOptionsTabPage::FillItemSet( SfxItemSet* ) @@ -1438,9 +1441,9 @@ void SwShdwCrsrOptionsTabPage::dispose() SfxTabPage::dispose(); } -SfxTabPage* SwShdwCrsrOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) +VclPtr<SfxTabPage> SwShdwCrsrOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { - return VclPtr<SwShdwCrsrOptionsTabPage>::Create( pParent, *rSet ); + return VclPtr<SfxTabPage>(new SwShdwCrsrOptionsTabPage( pParent, *rSet ), SAL_NO_ACQUIRE); } void SwShdwCrsrOptionsTabPage::PageCreated( const SfxAllItemSet& aSet ) @@ -1777,7 +1780,7 @@ namespace } SwRedlineOptionsTabPage::SwRedlineOptionsTabPage( vcl::Window* pParent, - const SfxItemSet& rSet ) + const SfxItemSet& rSet ) : SfxTabPage(pParent, "OptRedLinePage", "modules/swriter/ui/optredlinepage.ui" , &rSet) , sNone(SW_RESSTR(SW_STR_NONE)) @@ -1869,9 +1872,9 @@ void SwRedlineOptionsTabPage::dispose() SfxTabPage::dispose(); } -SfxTabPage* SwRedlineOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet) +VclPtr<SfxTabPage> SwRedlineOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet) { - return VclPtr<SwRedlineOptionsTabPage>::Create( pParent, *rSet ); + return VclPtr<SfxTabPage>( new SwRedlineOptionsTabPage( pParent, *rSet ), SAL_NO_ACQUIRE ); } bool SwRedlineOptionsTabPage::FillItemSet( SfxItemSet* ) @@ -2383,9 +2386,9 @@ void SwCompareOptionsTabPage::dispose() SfxTabPage::dispose(); } -SfxTabPage* SwCompareOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> SwCompareOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { - return VclPtr<SwCompareOptionsTabPage>::Create( pParent, *rAttrSet ); + return VclPtr<SfxTabPage>(new SwCompareOptionsTabPage( pParent, *rAttrSet ), SAL_NO_ACQUIRE); } bool SwCompareOptionsTabPage::FillItemSet( SfxItemSet* ) @@ -2536,8 +2539,8 @@ void SwTestTabPage::dispose() SfxTabPage::dispose(); } -SfxTabPage* SwTestTabPage::Create( vcl::Window* pParent, - const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> SwTestTabPage::Create( vcl::Window* pParent, + const SfxItemSet* rAttrSet ) { return VclPtr<SwTestTabPage>::Create(pParent, *rAttrSet); } diff --git a/sw/source/ui/dialog/docstdlg.cxx b/sw/source/ui/dialog/docstdlg.cxx index 3477d250a4de..de1d3d6abcd8 100644 --- a/sw/source/ui/dialog/docstdlg.cxx +++ b/sw/source/ui/dialog/docstdlg.cxx @@ -36,7 +36,7 @@ #include <unotools/localedatawrapper.hxx> #include <vcl/settings.hxx> -SfxTabPage * SwDocStatPage::Create(vcl::Window *pParent, const SfxItemSet *rSet) +VclPtr<SfxTabPage> SwDocStatPage::Create(vcl::Window *pParent, const SfxItemSet *rSet) { return VclPtr<SwDocStatPage>::Create(pParent, *rSet); } diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 199183e3b3ac..d6f6bd6a0567 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -1686,8 +1686,8 @@ void SwInsertSectionTabPage::Reset( const SfxItemSet* ) { } -SfxTabPage* SwInsertSectionTabPage::Create( vcl::Window* pParent, - const SfxItemSet* rAttrSet) +VclPtr<SfxTabPage> SwInsertSectionTabPage::Create( vcl::Window* pParent, + const SfxItemSet* rAttrSet) { return VclPtr<SwInsertSectionTabPage>::Create(pParent, *rAttrSet); } @@ -2052,8 +2052,8 @@ void SwSectionFtnEndTabPage::Reset( const SfxItemSet* rSet ) RES_END_AT_TXTEND, false ))); } -SfxTabPage* SwSectionFtnEndTabPage::Create( vcl::Window* pParent, - const SfxItemSet* rAttrSet) +VclPtr<SfxTabPage> SwSectionFtnEndTabPage::Create( vcl::Window* pParent, + const SfxItemSet* rAttrSet) { return VclPtr<SwSectionFtnEndTabPage>::Create(pParent, *rAttrSet); } @@ -2223,7 +2223,7 @@ void SwSectionIndentTabPage::Reset( const SfxItemSet* rSet) IndentModifyHdl(0); } -SfxTabPage* SwSectionIndentTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) +VclPtr<SfxTabPage> SwSectionIndentTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return VclPtr<SwSectionIndentTabPage>::Create(pParent, *rAttrSet); } diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx index 2288a06f3ca1..50840271cc2c 100644 --- a/sw/source/ui/envelp/envfmt.cxx +++ b/sw/source/ui/envelp/envfmt.cxx @@ -461,9 +461,9 @@ void SwEnvFmtPage::SetMinMax() m_pSizeHeightField->Reformat(); } -SfxTabPage* SwEnvFmtPage::Create(vcl::Window* pParent, const SfxItemSet* rSet) +VclPtr<SfxTabPage> SwEnvFmtPage::Create(vcl::Window* pParent, const SfxItemSet* rSet) { - return VclPtr<SwEnvFmtPage>::Create(pParent, *rSet); + return VclPtr<SfxTabPage>(new SwEnvFmtPage(pParent, *rSet), SAL_NO_ACQUIRE); } void SwEnvFmtPage::ActivatePage(const SfxItemSet& rSet) diff --git a/sw/source/ui/envelp/envfmt.hxx b/sw/source/ui/envelp/envfmt.hxx index f8a4e3124acc..74fec7279fa9 100644 --- a/sw/source/ui/envelp/envfmt.hxx +++ b/sw/source/ui/envelp/envfmt.hxx @@ -61,7 +61,7 @@ public: virtual ~SwEnvFmtPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rSet); + static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx index 2d9f861832fd..17974f183d8d 100644 --- a/sw/source/ui/envelp/envlop1.cxx +++ b/sw/source/ui/envelp/envlop1.cxx @@ -323,9 +323,9 @@ void SwEnvPage::InitDatabaseBox() } } -SfxTabPage* SwEnvPage::Create(vcl::Window* pParent, const SfxItemSet* rSet) +VclPtr<SfxTabPage> SwEnvPage::Create(vcl::Window* pParent, const SfxItemSet* rSet) { - return VclPtr<SwEnvPage>::Create(pParent, *rSet); + return VclPtr<SfxTabPage>(new SwEnvPage(pParent, *rSet), SAL_NO_ACQUIRE); } void SwEnvPage::ActivatePage(const SfxItemSet& rSet) diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx index 42b65bc1ca3c..02d8b9020914 100644 --- a/sw/source/ui/envelp/envprt.cxx +++ b/sw/source/ui/envelp/envprt.cxx @@ -144,9 +144,9 @@ IMPL_LINK_NOARG(SwEnvPrtPage, AlignHdl) return 0; } -SfxTabPage* SwEnvPrtPage::Create(vcl::Window* pParent, const SfxItemSet* rSet) +VclPtr<SfxTabPage> SwEnvPrtPage::Create(vcl::Window* pParent, const SfxItemSet* rSet) { - return VclPtr<SwEnvPrtPage>::Create(pParent, *rSet); + return VclPtr<SfxTabPage>(new SwEnvPrtPage(pParent, *rSet), SAL_NO_ACQUIRE); } void SwEnvPrtPage::ActivatePage(const SfxItemSet&) diff --git a/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx index a81983247a4a..ea09f71c5d06 100644 --- a/sw/source/ui/envelp/envprt.hxx +++ b/sw/source/ui/envelp/envprt.hxx @@ -61,7 +61,7 @@ public: virtual ~SwEnvPrtPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rSet); + static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index dfd415ed26d6..829616d666be 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -488,9 +488,9 @@ void SwLabPage::InitDatabaseBox() } } -SfxTabPage* SwLabPage::Create(vcl::Window* pParent, const SfxItemSet* rSet) +VclPtr<SfxTabPage> SwLabPage::Create(vcl::Window* pParent, const SfxItemSet* rSet) { - return VclPtr<SwLabPage>::Create(pParent, *rSet); + return VclPtr<SfxTabPage>(new SwLabPage(pParent, *rSet), SAL_NO_ACQUIRE); } void SwLabPage::ActivatePage(const SfxItemSet& rSet) @@ -633,9 +633,9 @@ void SwVisitingCardPage::dispose() SfxTabPage::dispose(); } -SfxTabPage* SwVisitingCardPage::Create(vcl::Window* pParent, const SfxItemSet* rSet) +VclPtr<SfxTabPage> SwVisitingCardPage::Create(vcl::Window* pParent, const SfxItemSet* rSet) { - return VclPtr<SwVisitingCardPage>::Create(pParent, *rSet); + return VclPtr<SfxTabPage>(new SwVisitingCardPage(pParent, *rSet), SAL_NO_ACQUIRE); } void SwVisitingCardPage::ActivatePage(const SfxItemSet& rSet) @@ -794,9 +794,9 @@ void SwPrivateDataPage::dispose() SfxTabPage::dispose(); } -SfxTabPage* SwPrivateDataPage::Create(vcl::Window* pParent, const SfxItemSet* rSet) +VclPtr<SfxTabPage> SwPrivateDataPage::Create(vcl::Window* pParent, const SfxItemSet* rSet) { - return VclPtr<SwPrivateDataPage>::Create(pParent, *rSet); + return VclPtr<SfxTabPage>(new SwPrivateDataPage(pParent, *rSet), SAL_NO_ACQUIRE); } void SwPrivateDataPage::ActivatePage(const SfxItemSet& rSet) @@ -907,9 +907,9 @@ void SwBusinessDataPage::dispose() } -SfxTabPage* SwBusinessDataPage::Create(vcl::Window* pParent, const SfxItemSet* rSet) +VclPtr<SfxTabPage> SwBusinessDataPage::Create(vcl::Window* pParent, const SfxItemSet* rSet) { - return VclPtr<SwBusinessDataPage>::Create(pParent, *rSet); + return VclPtr<SfxTabPage>(new SwBusinessDataPage(pParent, *rSet), SAL_NO_ACQUIRE); } void SwBusinessDataPage::ActivatePage(const SfxItemSet& rSet) diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx index 95ac892b51bf..7b75b26e35e3 100644 --- a/sw/source/ui/envelp/labfmt.cxx +++ b/sw/source/ui/envelp/labfmt.cxx @@ -485,9 +485,9 @@ void SwLabFmtPage::ChangeMinMax() m_pPHeightField->Reformat(); } -SfxTabPage* SwLabFmtPage::Create(vcl::Window* pParent, const SfxItemSet* rSet) +VclPtr<SfxTabPage> SwLabFmtPage::Create(vcl::Window* pParent, const SfxItemSet* rSet) { - return VclPtr<SwLabFmtPage>::Create(pParent, *rSet); + return VclPtr<SfxTabPage>(new SwLabFmtPage(pParent, *rSet), SAL_NO_ACQUIRE); } void SwLabFmtPage::ActivatePage(const SfxItemSet& rSet) diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx index 4fbad4864c71..e235ab774508 100644 --- a/sw/source/ui/envelp/labfmt.hxx +++ b/sw/source/ui/envelp/labfmt.hxx @@ -104,7 +104,7 @@ public: virtual ~SwLabFmtPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rSet); + static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx index 9c62af337760..34c6c7011b77 100644 --- a/sw/source/ui/envelp/labprt.cxx +++ b/sw/source/ui/envelp/labprt.cxx @@ -108,9 +108,9 @@ IMPL_LINK( SwLabPrtPage, CountHdl, Button *, pButton ) return 0; } -SfxTabPage* SwLabPrtPage::Create(vcl::Window* pParent, const SfxItemSet* rSet) +VclPtr<SfxTabPage> SwLabPrtPage::Create(vcl::Window* pParent, const SfxItemSet* rSet) { - return VclPtr<SwLabPrtPage>::Create( pParent, *rSet ); + return VclPtr<SfxTabPage>(new SwLabPrtPage( pParent, *rSet ), SAL_NO_ACQUIRE); } void SwLabPrtPage::ActivatePage( const SfxItemSet& rSet ) diff --git a/sw/source/ui/envelp/labprt.hxx b/sw/source/ui/envelp/labprt.hxx index 99b1649be2a8..be499b404624 100644 --- a/sw/source/ui/envelp/labprt.hxx +++ b/sw/source/ui/envelp/labprt.hxx @@ -56,7 +56,7 @@ public: virtual ~SwLabPrtPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rSet); + static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx index a7ca3eaed532..152529c53264 100644 --- a/sw/source/ui/envelp/swuilabimp.hxx +++ b/sw/source/ui/envelp/swuilabimp.hxx @@ -66,7 +66,7 @@ public: virtual ~SwLabPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rSet); + static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; @@ -119,7 +119,7 @@ class SwVisitingCardPage : public SfxTabPage public: SwVisitingCardPage(vcl::Window* pParent, const SfxItemSet& rSet); - static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rSet); + static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; @@ -158,7 +158,7 @@ public: virtual ~SwPrivateDataPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rSet); + static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; @@ -195,7 +195,7 @@ public: virtual ~SwBusinessDataPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rSet); + static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx index 4e1607937134..edde37524594 100644 --- a/sw/source/ui/fldui/flddb.cxx +++ b/sw/source/ui/fldui/flddb.cxx @@ -264,8 +264,8 @@ bool SwFldDBPage::FillItemSet(SfxItemSet* ) return false; } -SfxTabPage* SwFldDBPage::Create( vcl::Window* pParent, - const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> SwFldDBPage::Create( vcl::Window* pParent, + const SfxItemSet* rAttrSet ) { return VclPtr<SwFldDBPage>::Create( pParent, *rAttrSet ); } diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx index a54efb90095d..bb18eb27fe82 100644 --- a/sw/source/ui/fldui/flddb.hxx +++ b/sw/source/ui/fldui/flddb.hxx @@ -73,7 +73,7 @@ public: virtual ~SwFldDBPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rAttrSet); + static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index d77fdf605cf8..8814ceb3c3f9 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -462,8 +462,8 @@ bool SwFldDokInfPage::FillItemSet(SfxItemSet* ) return false; } -SfxTabPage* SwFldDokInfPage::Create( vcl::Window* pParent, - const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> SwFldDokInfPage::Create( vcl::Window* pParent, + const SfxItemSet* rAttrSet ) { return VclPtr<SwFldDokInfPage>::Create( pParent, *rAttrSet ); } diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx index 5b7f44451a4d..fc9452075b4a 100644 --- a/sw/source/ui/fldui/flddinf.hxx +++ b/sw/source/ui/fldui/flddinf.hxx @@ -64,7 +64,7 @@ public: virtual ~SwFldDokInfPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rAttrSet); + static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx index cd0be8b3a5b6..f8dc98f74e6a 100644 --- a/sw/source/ui/fldui/flddok.cxx +++ b/sw/source/ui/fldui/flddok.cxx @@ -653,8 +653,8 @@ bool SwFldDokPage::FillItemSet(SfxItemSet* ) return false; } -SfxTabPage* SwFldDokPage::Create( vcl::Window* pParent, - const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> SwFldDokPage::Create( vcl::Window* pParent, + const SfxItemSet* rAttrSet ) { return VclPtr<SwFldDokPage>::Create( pParent, *rAttrSet ); } diff --git a/sw/source/ui/fldui/flddok.hxx b/sw/source/ui/fldui/flddok.hxx index ab98dc558cd3..3beb6a7c0a1b 100644 --- a/sw/source/ui/fldui/flddok.hxx +++ b/sw/source/ui/fldui/flddok.hxx @@ -66,7 +66,7 @@ public: virtual ~SwFldDokPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rAttrSet); + static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx index 2bcc08d16209..1b7906b02368 100644 --- a/sw/source/ui/fldui/fldedt.cxx +++ b/sw/source/ui/fldui/fldedt.cxx @@ -124,7 +124,7 @@ SwFldEditDlg::SwFldEditDlg(SwView& rVw) // initialise controls void SwFldEditDlg::Init() { - SwFldPage* pTabPage = static_cast<SwFldPage*>(GetTabPage()); + VclPtr<SwFldPage> pTabPage = static_cast<SwFldPage*>(GetTabPage()); if( pTabPage ) { @@ -159,10 +159,10 @@ void SwFldEditDlg::Init() !pSh->HasReadonlySel() ); } -SfxTabPage* SwFldEditDlg::CreatePage(sal_uInt16 nGroup) +VclPtr<SfxTabPage> SwFldEditDlg::CreatePage(sal_uInt16 nGroup) { // create TabPage - SfxTabPage* pTabPage = 0; + VclPtr<SfxTabPage> pTabPage; switch (nGroup) { @@ -193,7 +193,7 @@ SfxTabPage* SwFldEditDlg::CreatePage(sal_uInt16 nGroup) } case GRP_DB: pTabPage = SwFldDBPage::Create(get_content_area(), 0); - static_cast<SwFldDBPage*>(pTabPage)->SetWrtShell(*pSh); + static_cast<SwFldDBPage*>(pTabPage.get())->SetWrtShell(*pSh); break; case GRP_VAR: pTabPage = SwFldVarPage::Create(get_content_area(), 0); @@ -205,7 +205,7 @@ SfxTabPage* SwFldEditDlg::CreatePage(sal_uInt16 nGroup) if (pTabPage) { - static_cast<SwFldPage*>(pTabPage)->SetWrtShell(pSh); + static_cast<SwFldPage*>(pTabPage.get())->SetWrtShell(pSh); SetTabPage(pTabPage); } @@ -244,12 +244,9 @@ IMPL_LINK_NOARG(SwFldEditDlg, OKHdl) { if (GetOKButton()->IsEnabled()) { - SfxTabPage* pTabPage = GetTabPage(); + VclPtr<SfxTabPage> pTabPage = GetTabPage(); if (pTabPage) - { pTabPage->FillItemSet(0); - - } EndDialog( RET_OK ); } @@ -270,7 +267,7 @@ IMPL_LINK( SwFldEditDlg, NextPrevHdl, Button *, pButton ) pSh->EnterStdMode(); SwFieldType *pOldTyp = 0; - SwFldPage* pTabPage = static_cast<SwFldPage*>(GetTabPage()); + VclPtr<SwFldPage> pTabPage = static_cast<SwFldPage*>(GetTabPage()); //#112462# FillItemSet may delete the current field //that's why it has to be called before accessing the current field @@ -290,7 +287,7 @@ IMPL_LINK( SwFldEditDlg, NextPrevHdl, Button *, pButton ) sal_uInt16 nGroup = rMgr.GetGroup(false, pCurFld->GetTypeId(), pCurFld->GetSubType()); if (nGroup != pTabPage->GetGroup()) - pTabPage = static_cast<SwFldPage*>(CreatePage(nGroup)); + pTabPage = static_cast<SwFldPage*>(CreatePage(nGroup).get()); pTabPage->EditNewField(); diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx index b2cfeb365c16..f079e8787d90 100644 --- a/sw/source/ui/fldui/fldfunc.cxx +++ b/sw/source/ui/fldui/fldfunc.cxx @@ -628,8 +628,8 @@ OUString SwFldFuncPage::TurnMacroString(const OUString &rMacro) return rMacro; } -SfxTabPage* SwFldFuncPage::Create( vcl::Window* pParent, - const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> SwFldFuncPage::Create( vcl::Window* pParent, + const SfxItemSet* rAttrSet ) { return VclPtr<SwFldFuncPage>::Create( pParent, *rAttrSet ); } diff --git a/sw/source/ui/fldui/fldfunc.hxx b/sw/source/ui/fldui/fldfunc.hxx index 6ec851baa848..fefc9db21ac4 100644 --- a/sw/source/ui/fldui/fldfunc.hxx +++ b/sw/source/ui/fldui/fldfunc.hxx @@ -88,7 +88,7 @@ public: virtual ~SwFldFuncPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rAttrSet); + static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index e421f1f43932..f704afcf1bd3 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -950,8 +950,8 @@ bool SwFldRefPage::FillItemSet(SfxItemSet* ) return false; } -SfxTabPage* SwFldRefPage::Create( vcl::Window* pParent, - const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> SwFldRefPage::Create( vcl::Window* pParent, + const SfxItemSet* rAttrSet ) { return VclPtr<SwFldRefPage>::Create( pParent, *rAttrSet ); } diff --git a/sw/source/ui/fldui/fldref.hxx b/sw/source/ui/fldui/fldref.hxx index 959c1e00382f..24c540f181f7 100644 --- a/sw/source/ui/fldui/fldref.hxx +++ b/sw/source/ui/fldui/fldref.hxx @@ -79,7 +79,7 @@ public: virtual ~SwFldRefPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rAttrSet); + static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index 257181ad6713..27c60f81e1f9 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -1247,8 +1247,8 @@ bool SwFldVarPage::FillItemSet(SfxItemSet* ) return false; } -SfxTabPage* SwFldVarPage::Create( vcl::Window* pParent, - const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> SwFldVarPage::Create( vcl::Window* pParent, + const SfxItemSet* rAttrSet ) { return VclPtr<SwFldVarPage>::Create( pParent, *rAttrSet ); } diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx index bac7fc733d46..a37aa5809fda 100644 --- a/sw/source/ui/fldui/fldvar.hxx +++ b/sw/source/ui/fldui/fldvar.hxx @@ -95,7 +95,7 @@ public: virtual ~SwFldVarPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rAttrSet); + static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index f0ae9c4cf910..12bcb52a52ed 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -161,7 +161,7 @@ SwColumnDlg::SwColumnDlg(vcl::Window* pParent, SwWrtShell& rSh) assert(pColPgSet); // create TabPage - pTabPage = static_cast<SwColumnPage*>( SwColumnPage::Create(get_content_area(), pColPgSet) ); + pTabPage = static_cast<SwColumnPage*>( SwColumnPage::Create(get_content_area(), pColPgSet).get() ); pTabPage->get<vcl::Window>("applytoft")->Show(); pTabPage->get(m_pApplyToLB, "applytolb"); m_pApplyToLB->Show(); @@ -657,10 +657,11 @@ void SwColumnPage::Reset(const SfxItemSet *rSet) } // create TabPage -SfxTabPage* SwColumnPage::Create(vcl::Window *pParent, const SfxItemSet *rSet) +VclPtr<SfxTabPage> SwColumnPage::Create(vcl::Window *pParent, const SfxItemSet *rSet) { - return VclPtr<SwColumnPage>::Create(pParent, *rSet); + return VclPtr<SfxTabPage>(new SwColumnPage(pParent, *rSet), SAL_NO_ACQUIRE); } + // stuff attributes into the Set when OK bool SwColumnPage::FillItemSet(SfxItemSet *rSet) { diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index bc4afce72f72..7a36a36a7e22 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -858,9 +858,9 @@ void SwFrmPage::setOptimalRelWidth() m_pHoriRelationLB->Clear(); } -SfxTabPage* SwFrmPage::Create(vcl::Window *pParent, const SfxItemSet *rSet) +VclPtr<SfxTabPage> SwFrmPage::Create(vcl::Window *pParent, const SfxItemSet *rSet) { - return VclPtr<SwFrmPage>::Create( pParent, *rSet ); + return VclPtr<SfxTabPage>(new SwFrmPage( pParent, *rSet ), SAL_NO_ACQUIRE); } void SwFrmPage::EnableGraficMode( void ) @@ -2421,9 +2421,9 @@ void SwGrfExtPage::dispose() SfxTabPage::dispose(); } -SfxTabPage* SwGrfExtPage::Create( vcl::Window *pParent, const SfxItemSet *rSet ) +VclPtr<SfxTabPage> SwGrfExtPage::Create( vcl::Window *pParent, const SfxItemSet *rSet ) { - return VclPtr<SwGrfExtPage>::Create( pParent, *rSet ); + return VclPtr<SfxTabPage>(new SwGrfExtPage( pParent, *rSet ), SAL_NO_ACQUIRE); } void SwGrfExtPage::Reset(const SfxItemSet *rSet) @@ -2847,9 +2847,9 @@ bool SwFrmURLPage::FillItemSet(SfxItemSet *rSet) return bModified; } -SfxTabPage* SwFrmURLPage::Create(vcl::Window *pParent, const SfxItemSet *rSet) +VclPtr<SfxTabPage> SwFrmURLPage::Create(vcl::Window *pParent, const SfxItemSet *rSet) { - return VclPtr<SwFrmURLPage>::Create( pParent, *rSet ); + return VclPtr<SfxTabPage>(new SwFrmURLPage( pParent, *rSet ), SAL_NO_ACQUIRE); } IMPL_LINK_NOARG(SwFrmURLPage, InsertFileHdl) @@ -2939,9 +2939,9 @@ void SwFrmAddPage::dispose() } -SfxTabPage* SwFrmAddPage::Create(vcl::Window *pParent, const SfxItemSet *rSet) +VclPtr<SfxTabPage> SwFrmAddPage::Create(vcl::Window *pParent, const SfxItemSet *rSet) { - return VclPtr<SwFrmAddPage>::Create(pParent, *rSet); + return VclPtr<SfxTabPage>(new SwFrmAddPage(pParent, *rSet), SAL_NO_ACQUIRE); } void SwFrmAddPage::Reset(const SfxItemSet *rSet ) diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx index 6eab290c166e..666cd82234a0 100644 --- a/sw/source/ui/frmdlg/wrap.cxx +++ b/sw/source/ui/frmdlg/wrap.cxx @@ -57,7 +57,7 @@ SwWrapDlg::SwWrapDlg(vcl::Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, bo { // create TabPage - SwWrapTabPage* pNewPage = static_cast<SwWrapTabPage*>( SwWrapTabPage::Create(get_content_area(), &rSet) ); + VclPtr<SwWrapTabPage> pNewPage = static_cast<SwWrapTabPage*>( SwWrapTabPage::Create(get_content_area(), &rSet).get() ); pNewPage->SetFormatUsed(false, bDrawMode); pNewPage->SetShell(pWrtShell); SetTabPage(pNewPage); @@ -155,9 +155,9 @@ void SwWrapTabPage::dispose() SfxTabPage::dispose(); } -SfxTabPage* SwWrapTabPage::Create(vcl::Window *pParent, const SfxItemSet *rSet) +VclPtr<SfxTabPage> SwWrapTabPage::Create(vcl::Window *pParent, const SfxItemSet *rSet) { - return VclPtr<SwWrapTabPage>::Create(pParent, *rSet); + return VclPtr<SfxTabPage>(new SwWrapTabPage(pParent, *rSet), SAL_NO_ACQUIRE); } void SwWrapTabPage::Reset(const SfxItemSet *rSet) diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 90e1c73e06bf..e6f19935e290 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -1313,7 +1313,7 @@ int SwTOXSelectTabPage::DeactivatePage( SfxItemSet* _pSet ) return LEAVE_PAGE; } -SfxTabPage* SwTOXSelectTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) +VclPtr<SfxTabPage> SwTOXSelectTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return VclPtr<SwTOXSelectTabPage>::Create(pParent, *rAttrSet); } @@ -2210,7 +2210,7 @@ int SwTOXEntryTabPage::DeactivatePage( SfxItemSet* /*pSet*/) return LEAVE_PAGE; } -SfxTabPage* SwTOXEntryTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) +VclPtr<SfxTabPage> SwTOXEntryTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return VclPtr<SwTOXEntryTabPage>::Create(pParent, *rAttrSet); } @@ -3751,8 +3751,8 @@ int SwTOXStylesTabPage::DeactivatePage( SfxItemSet* /*pSet*/ ) return LEAVE_PAGE; } -SfxTabPage* SwTOXStylesTabPage::Create( vcl::Window* pParent, - const SfxItemSet* rAttrSet) +VclPtr<SfxTabPage> SwTOXStylesTabPage::Create( vcl::Window* pParent, + const SfxItemSet* rAttrSet) { return VclPtr<SwTOXStylesTabPage>::Create(pParent, *rAttrSet); } diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx index 5717b44ab3c8..04467a339ca4 100644 --- a/sw/source/ui/misc/docfnote.cxx +++ b/sw/source/ui/misc/docfnote.cxx @@ -246,7 +246,7 @@ void SwEndNoteOptionPage::Reset( const SfxItemSet* ) m_pPageTemplBox->SelectEntry( pInf->GetPageDesc( *pSh->GetDoc() )->GetName()); } -SfxTabPage *SwEndNoteOptionPage::Create( vcl::Window *pParent, const SfxItemSet *rSet ) +VclPtr<SfxTabPage> SwEndNoteOptionPage::Create( vcl::Window *pParent, const SfxItemSet *rSet ) { return VclPtr<SwEndNoteOptionPage>::Create( pParent, true, *rSet ); } @@ -422,9 +422,9 @@ SwFootNoteOptionPage::~SwFootNoteOptionPage() { } -SfxTabPage *SwFootNoteOptionPage::Create(vcl::Window *pParent, const SfxItemSet *rSet ) +VclPtr<SfxTabPage> SwFootNoteOptionPage::Create(vcl::Window *pParent, const SfxItemSet *rSet ) { - return VclPtr<SwFootNoteOptionPage>::Create( pParent, *rSet ); + return VclPtr<SfxTabPage>(new SwFootNoteOptionPage( pParent, *rSet ), SAL_NO_ACQUIRE); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/misc/impfnote.hxx b/sw/source/ui/misc/impfnote.hxx index 666db76ab7fc..31b5f8a920d0 100644 --- a/sw/source/ui/misc/impfnote.hxx +++ b/sw/source/ui/misc/impfnote.hxx @@ -72,7 +72,7 @@ public: virtual ~SwEndNoteOptionPage(); 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* ) SAL_OVERRIDE; @@ -81,11 +81,11 @@ public: class SwFootNoteOptionPage : public SwEndNoteOptionPage { + SwFootNoteOptionPage( vcl::Window *pParent, const SfxItemSet &rSet ); virtual ~SwFootNoteOptionPage(); public: - SwFootNoteOptionPage( vcl::Window *pParent, const SfxItemSet &rSet ); - static SfxTabPage *Create(vcl::Window *pParent, const SfxItemSet *rSet); + static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet); }; #endif diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index 40cc6c5dc9c5..dee150bc354b 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -542,8 +542,8 @@ void SwNumPositionTabPage::ShowControlsDependingOnPosAndSpaceMode() m_pIndentAtMF->Show( bLabelAlignmentPosAndSpaceModeActive ); } -SfxTabPage* SwNumPositionTabPage::Create( vcl::Window* pParent, - const SfxItemSet* rAttrSet) +VclPtr<SfxTabPage> SwNumPositionTabPage::Create( vcl::Window* pParent, + const SfxItemSet* rAttrSet) { return VclPtr<SwNumPositionTabPage>::Create(pParent, *rAttrSet); } diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index 343a8de3c44a..b46ffe4b6630 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -865,8 +865,8 @@ void SwOutlineSettingsTabPage::Reset( const SfxItemSet* rSet ) ActivatePage(*rSet); } -SfxTabPage* SwOutlineSettingsTabPage::Create( vcl::Window* pParent, - const SfxItemSet* rAttrSet) +VclPtr<SfxTabPage> SwOutlineSettingsTabPage::Create( vcl::Window* pParent, + const SfxItemSet* rAttrSet) { return VclPtr<SwOutlineSettingsTabPage>::Create(pParent, *rAttrSet); } diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx index b1a6a207ffea..2780aa8f7914 100644 --- a/sw/source/ui/misc/pgfnote.cxx +++ b/sw/source/ui/misc/pgfnote.cxx @@ -153,10 +153,9 @@ void SwFootNotePage::dispose() SfxTabPage::dispose(); } - -SfxTabPage* SwFootNotePage::Create(vcl::Window *pParent, const SfxItemSet *rSet) +VclPtr<SfxTabPage> SwFootNotePage::Create(vcl::Window *pParent, const SfxItemSet *rSet) { - return VclPtr<SwFootNotePage>::Create(pParent, *rSet); + return VclPtr<SfxTabPage>(new SwFootNotePage(pParent, *rSet), SAL_NO_ACQUIRE); } void SwFootNotePage::Reset(const SfxItemSet *rSet) diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx index 8b90b64fc5a8..15f9b39cd22a 100644 --- a/sw/source/ui/misc/pggrid.cxx +++ b/sw/source/ui/misc/pggrid.cxx @@ -180,12 +180,12 @@ void SwTextGridPage::dispose() SfxTabPage::dispose(); } -SfxTabPage *SwTextGridPage::Create(vcl::Window *pParent, const SfxItemSet *rSet) +VclPtr<SfxTabPage> SwTextGridPage::Create(vcl::Window *pParent, const SfxItemSet *rSet) { - return VclPtr<SwTextGridPage>::Create(pParent, *rSet); + return VclPtr<SfxTabPage>(new SwTextGridPage(pParent, *rSet), SAL_NO_ACQUIRE); } -bool SwTextGridPage::FillItemSet(SfxItemSet *rSet) +bool SwTextGridPage::FillItemSet(SfxItemSet *rSet) { bool bRet = false; if(m_pNoGridRB->IsValueChangedFromSaved() || diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index f444029735dc..61c01e2084ec 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -396,8 +396,8 @@ void SwFormatTablePage::ModifyHdl(const Edit * pEdit) bModified = true; } -SfxTabPage* SwFormatTablePage::Create( vcl::Window* pParent, - const SfxItemSet* rAttrSet) +VclPtr<SfxTabPage> SwFormatTablePage::Create( vcl::Window* pParent, + const SfxItemSet* rAttrSet) { return VclPtr<SwFormatTablePage>::Create( pParent, *rAttrSet ); } @@ -793,8 +793,8 @@ void SwTableColumnPage::dispose() SfxTabPage::dispose(); } -SfxTabPage* SwTableColumnPage::Create( vcl::Window* pParent, - const SfxItemSet* rAttrSet) +VclPtr<SfxTabPage> SwTableColumnPage::Create( vcl::Window* pParent, + const SfxItemSet* rAttrSet) { return VclPtr<SwTableColumnPage>::Create( pParent, *rAttrSet ); } @@ -1377,10 +1377,10 @@ void SwTextFlowPage::dispose() SfxTabPage::dispose(); } -SfxTabPage* SwTextFlowPage::Create( vcl::Window* pParent, - const SfxItemSet* rAttrSet) +VclPtr<SfxTabPage> SwTextFlowPage::Create( vcl::Window* pParent, + const SfxItemSet* rAttrSet) { - return VclPtr<SwTextFlowPage>::Create(pParent, *rAttrSet); + return VclPtr<SfxTabPage>(new SwTextFlowPage(pParent, *rAttrSet), SAL_NO_ACQUIRE); } bool SwTextFlowPage::FillItemSet( SfxItemSet* rSet ) diff --git a/sw/source/uibase/app/appopt.cxx b/sw/source/uibase/app/appopt.cxx index db3aeb30865d..4d4af5cf1b2a 100644 --- a/sw/source/uibase/app/appopt.cxx +++ b/sw/source/uibase/app/appopt.cxx @@ -418,9 +418,9 @@ void SwModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) ApplyUsrPref( aViewOpt, pAppView, bTextDialog? VIEWOPT_DEST_TEXT : VIEWOPT_DEST_WEB); } -SfxTabPage* SwModule::CreateTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet ) +VclPtr<SfxTabPage> SwModule::CreateTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet ) { - SfxTabPage* pRet = NULL; + VclPtr<SfxTabPage> pRet; SfxAllItemSet aSet(*(rSet.GetPool())); switch( nId ) { diff --git a/sw/source/uibase/inc/chrdlg.hxx b/sw/source/uibase/inc/chrdlg.hxx index 66914be44690..ff6f91b3a516 100644 --- a/sw/source/uibase/inc/chrdlg.hxx +++ b/sw/source/uibase/inc/chrdlg.hxx @@ -83,8 +83,8 @@ public: virtual ~SwCharURLPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, - const SfxItemSet* rAttrSet); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, + const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/column.hxx b/sw/source/uibase/inc/column.hxx index f35470899810..1b2482665ea2 100644 --- a/sw/source/uibase/inc/column.hxx +++ b/sw/source/uibase/inc/column.hxx @@ -175,7 +175,7 @@ public: virtual ~SwColumnPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage *Create(vcl::Window *pParent, const SfxItemSet *rSet); + static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet); static const sal_uInt16* GetRanges() { return aPageRg; } virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/docstdlg.hxx b/sw/source/uibase/inc/docstdlg.hxx index 67c5d5484e6a..ce769478e3b2 100644 --- a/sw/source/uibase/inc/docstdlg.hxx +++ b/sw/source/uibase/inc/docstdlg.hxx @@ -34,7 +34,7 @@ public: virtual ~SwDocStatPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage *Create(vcl::Window *pParent, const SfxItemSet *rSet); + static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet); protected: virtual bool FillItemSet( SfxItemSet *rSet) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/drpcps.hxx b/sw/source/uibase/inc/drpcps.hxx index 3657ecbcca39..d9dc4da12509 100644 --- a/sw/source/uibase/inc/drpcps.hxx +++ b/sw/source/uibase/inc/drpcps.hxx @@ -84,7 +84,7 @@ public: virtual ~SwDropCapsPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage *Create(vcl::Window *pParent, const SfxItemSet *rSet); + static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet); static const sal_uInt16* GetRanges() { return aPageRg; } diff --git a/sw/source/uibase/inc/envlop.hxx b/sw/source/uibase/inc/envlop.hxx index f87db92b2b2b..aad23d8c3c65 100644 --- a/sw/source/uibase/inc/envlop.hxx +++ b/sw/source/uibase/inc/envlop.hxx @@ -106,7 +106,7 @@ public: virtual ~SwEnvPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rSet); + static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/fldedt.hxx b/sw/source/uibase/inc/fldedt.hxx index cb7bd4f718f7..626dc917c8fa 100644 --- a/sw/source/uibase/inc/fldedt.hxx +++ b/sw/source/uibase/inc/fldedt.hxx @@ -36,7 +36,7 @@ class SwFldEditDlg : public SfxSingleTabDialog DECL_LINK(NextPrevHdl, Button *pBt = 0); void Init(); - SfxTabPage* CreatePage(sal_uInt16 nGroup); + VclPtr<SfxTabPage> CreatePage(sal_uInt16 nGroup); void EnsureSelection(SwField *pCurFld, SwFldMgr &rMgr); public: diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx index d1d81e0bdb2b..cc335ca755b5 100644 --- a/sw/source/uibase/inc/frmpage.hxx +++ b/sw/source/uibase/inc/frmpage.hxx @@ -186,7 +186,7 @@ public: virtual ~SwFrmPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage *Create(vcl::Window *pParent, const SfxItemSet *rSet); + static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet); static const sal_uInt16* GetRanges() { return aPageRg; } virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; @@ -234,7 +234,7 @@ class SwGrfExtPage: public SfxTabPage public: SwGrfExtPage(vcl::Window *pParent, const SfxItemSet &rSet); - static SfxTabPage *Create(vcl::Window *pParent, const SfxItemSet *rSet); + static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet); virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet *rSet) SAL_OVERRIDE; @@ -263,7 +263,7 @@ public: virtual ~SwFrmURLPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage *Create(vcl::Window *pParent, const SfxItemSet *rSet); + static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet); virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet *rSet) SAL_OVERRIDE; @@ -312,7 +312,7 @@ public: virtual ~SwFrmAddPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create(vcl::Window *pParent, const SfxItemSet *rSet); + static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet); static const sal_uInt16* GetRanges() { return aAddPgRg; } virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/mailconfigpage.hxx b/sw/source/uibase/inc/mailconfigpage.hxx index 96ecd2436217..e502ea9fef8c 100644 --- a/sw/source/uibase/inc/mailconfigpage.hxx +++ b/sw/source/uibase/inc/mailconfigpage.hxx @@ -59,8 +59,8 @@ public: virtual ~SwMailConfigPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, - const SfxItemSet* rAttrSet); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, + const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/num.hxx b/sw/source/uibase/inc/num.hxx index 6e565c1b4431..fa1965feb08c 100644 --- a/sw/source/uibase/inc/num.hxx +++ b/sw/source/uibase/inc/num.hxx @@ -124,8 +124,8 @@ public: virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, - const SfxItemSet* rAttrSet); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, + const SfxItemSet* rAttrSet); void SetOutlineTabDialog(SwOutlineTabDialog* pDlg){pOutlineDlg = pDlg;} void SetWrtShell(SwWrtShell* pSh); diff --git a/sw/source/uibase/inc/numpara.hxx b/sw/source/uibase/inc/numpara.hxx index 60e4ff24dc34..a5fe54a69458 100644 --- a/sw/source/uibase/inc/numpara.hxx +++ b/sw/source/uibase/inc/numpara.hxx @@ -72,8 +72,8 @@ public: virtual ~SwParagraphNumTabPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, - const SfxItemSet* rSet ); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, + const SfxItemSet* rSet ); static const sal_uInt16* GetRanges() { return aPageRg; } virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/optcomp.hxx b/sw/source/uibase/inc/optcomp.hxx index 7e486c22d3a4..d48bf227ef1c 100644 --- a/sw/source/uibase/inc/optcomp.hxx +++ b/sw/source/uibase/inc/optcomp.hxx @@ -64,7 +64,7 @@ public: virtual ~SwCompatibilityOptPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx index 6b1e53880ce1..8c873f184bd0 100644 --- a/sw/source/uibase/inc/optload.hxx +++ b/sw/source/uibase/inc/optload.hxx @@ -67,8 +67,8 @@ public: virtual ~SwLoadOptPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, - const SfxItemSet* rAttrSet); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, + const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; @@ -169,8 +169,8 @@ public: virtual ~SwCaptionOptPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, - const SfxItemSet* rAttrSet); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, + const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx index e324ab75bd1e..8fa453236c3a 100644 --- a/sw/source/uibase/inc/optpage.hxx +++ b/sw/source/uibase/inc/optpage.hxx @@ -72,7 +72,7 @@ public: virtual ~SwContentOptPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -121,7 +121,7 @@ public: virtual ~SwAddPrinterTabPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -188,13 +188,13 @@ class SwStdFontTabPage : public SfxTabPage DECL_LINK( ModifyHeightHdl, FontSizeBox * ); DECL_LINK( LoseFocusHdl, ComboBox * ); - virtual ~SwStdFontTabPage(); - virtual void dispose() SAL_OVERRIDE; + SwStdFontTabPage( vcl::Window* pParent, + const SfxItemSet& rSet ); + virtual ~SwStdFontTabPage(); + virtual void dispose() SAL_OVERRIDE; public: - SwStdFontTabPage( vcl::Window* pParent, - const SfxItemSet& rSet ); - static SfxTabPage* Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -236,7 +236,7 @@ public: virtual ~SwTableOptionsTabPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -282,7 +282,7 @@ public: virtual ~SwShdwCrsrOptionsTabPage(); 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; @@ -362,7 +362,7 @@ public: virtual ~SwRedlineOptionsTabPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; @@ -380,8 +380,8 @@ public: virtual ~SwTestTabPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, - const SfxItemSet* rAttrSet ); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, + const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; @@ -425,7 +425,7 @@ public: virtual ~SwCompareOptionsTabPage(); virtual void dispose() SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/outline.hxx b/sw/source/uibase/inc/outline.hxx index 36e564e11241..9d89706e0e9b 100644 --- a/sw/source/uibase/inc/outline.hxx +++ b/sw/source/uibase/inc/outline.hxx @@ -131,8 +131,8 @@ public: virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, - const SfxItemSet* rAttrSet); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, + const SfxItemSet* rAttrSet); }; #endif diff --git a/sw/source/uibase/inc/pgfnote.hxx b/sw/source/uibase/inc/pgfnote.hxx index 9f298eb91dd3..fa28122e8242 100644 --- a/sw/source/uibase/inc/pgfnote.hxx +++ b/sw/source/uibase/inc/pgfnote.hxx @@ -32,9 +32,9 @@ class SwFootNotePage: public SfxTabPage { static const sal_uInt16 aPageRg[]; -public: SwFootNotePage(vcl::Window *pParent, const SfxItemSet &rSet); - static SfxTabPage *Create(vcl::Window *pParent, const SfxItemSet *rSet); +public: + static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet); static const sal_uInt16* GetRanges() { return aPageRg; } virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/pggrid.hxx b/sw/source/uibase/inc/pggrid.hxx index 39a4d80f0061..b0b07c7d31dd 100644 --- a/sw/source/uibase/inc/pggrid.hxx +++ b/sw/source/uibase/inc/pggrid.hxx @@ -85,7 +85,7 @@ public: virtual ~SwTextGridPage(); 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/sw/source/uibase/inc/regionsw.hxx b/sw/source/uibase/inc/regionsw.hxx index 5344404b3f22..633362531f2c 100644 --- a/sw/source/uibase/inc/regionsw.hxx +++ b/sw/source/uibase/inc/regionsw.hxx @@ -192,7 +192,7 @@ public: virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); }; @@ -235,7 +235,7 @@ public: virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); }; @@ -254,7 +254,7 @@ public: virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); void SetWrtShell(SwWrtShell& rSh); diff --git a/sw/source/uibase/inc/swuiccoll.hxx b/sw/source/uibase/inc/swuiccoll.hxx index a1bc1e19969a..565fa51af956 100644 --- a/sw/source/uibase/inc/swuiccoll.hxx +++ b/sw/source/uibase/inc/swuiccoll.hxx @@ -64,7 +64,7 @@ class SwCondCollPage : public SfxTabPage public: SwCondCollPage(vcl::Window *pParent, const SfxItemSet &rSet); - static SfxTabPage *Create(vcl::Window *pParent, const SfxItemSet *rSet); + static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet); static const sal_uInt16* GetRanges() { return aPageRg; } virtual bool FillItemSet( SfxItemSet *rSet) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx index 27e0430578f3..927b7d4cfd8c 100644 --- a/sw/source/uibase/inc/swuicnttab.hxx +++ b/sw/source/uibase/inc/swuicnttab.hxx @@ -230,7 +230,7 @@ public: virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); void SelectType(TOXTypes eSet); //preset TOXType, GlobalDoc @@ -447,8 +447,8 @@ public: virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, - const SfxItemSet* rAttrSet); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, + const SfxItemSet* rAttrSet); void SetWrtShell(SwWrtShell& rSh); OUString GetLevelHelp(sal_uInt16 nLevel) const; @@ -495,8 +495,8 @@ public: virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; - static SfxTabPage* Create( vcl::Window* pParent, - const SfxItemSet* rAttrSet); + static VclPtr<SfxTabPage> Create( vcl::Window* pParent, + const SfxItemSet* rAttrSet); }; diff --git a/sw/source/uibase/inc/wrap.hxx b/sw/source/uibase/inc/wrap.hxx index b01ede1c1696..2de03506d97b 100644 --- a/sw/source/uibase/inc/wrap.hxx +++ b/sw/source/uibase/inc/wrap.hxx @@ -100,7 +100,7 @@ class SwWrapTabPage: public SfxTabPage public: SwWrapTabPage(vcl::Window *pParent, const SfxItemSet &rSet); - static SfxTabPage *Create(vcl::Window *pParent, const SfxItemSet *rSet); + static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet); virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet *rSet) SAL_OVERRIDE; diff --git a/sw/source/uibase/table/tablepg.hxx b/sw/source/uibase/table/tablepg.hxx index ef7c9ad90553..7d3916b4ee13 100644 --- a/sw/source/uibase/table/tablepg.hxx +++ b/sw/source/uibase/table/tablepg.hxx @@ -84,7 +84,7 @@ public: virtual ~SwFormatTablePage(); 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; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; @@ -135,7 +135,7 @@ public: virtual ~SwTableColumnPage(); 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; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; @@ -184,7 +184,7 @@ public: SwTextFlowPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SwTextFlowPage(); 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; |