Fix SfxTabPage creation to use VclPtr.

Change-Id: Ia0e8b666daec7b5eaba119c758b9ca1ec8276128

6 files changed, 15 insertions, 16 deletions

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() ||