sw: convert new to ::Create.

Change-Id: I1669be3e1dfdb6733952b2a801371da243fb94c2

25 files changed, 46 insertions, 51 deletions

diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx
index a05a7f23f7bc..4e1607937134 100644
--- a/sw/source/ui/fldui/flddb.cxx
+++ b/sw/source/ui/fldui/flddb.cxx
@@ -267,7 +267,7 @@ bool SwFldDBPage::FillItemSet(SfxItemSet* )
 SfxTabPage* SwFldDBPage::Create(    vcl::Window* pParent,
                         const SfxItemSet* rAttrSet )
 {
-    return ( new SwFldDBPage( pParent, *rAttrSet ) );
+    return VclPtr<SwFldDBPage>::Create( pParent, *rAttrSet );
 }
 
 sal_uInt16 SwFldDBPage::GetGroup()
diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx
index d5d41f3c9496..d77fdf605cf8 100644
--- a/sw/source/ui/fldui/flddinf.cxx
+++ b/sw/source/ui/fldui/flddinf.cxx
@@ -465,7 +465,7 @@ bool SwFldDokInfPage::FillItemSet(SfxItemSet* )
 SfxTabPage* SwFldDokInfPage::Create(    vcl::Window* pParent,
                         const SfxItemSet* rAttrSet )
 {
-    return ( new SwFldDokInfPage( pParent, *rAttrSet ) );
+    return VclPtr<SwFldDokInfPage>::Create( pParent, *rAttrSet );
 }
 
 sal_uInt16 SwFldDokInfPage::GetGroup()
diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx
index 274414181dab..cd0be8b3a5b6 100644
--- a/sw/source/ui/fldui/flddok.cxx
+++ b/sw/source/ui/fldui/flddok.cxx
@@ -656,7 +656,7 @@ bool SwFldDokPage::FillItemSet(SfxItemSet* )
 SfxTabPage* SwFldDokPage::Create(   vcl::Window* pParent,
                         const SfxItemSet* rAttrSet )
 {
-    return ( new SwFldDokPage( pParent, *rAttrSet ) );
+    return VclPtr<SwFldDokPage>::Create( pParent, *rAttrSet );
 }
 
 sal_uInt16 SwFldDokPage::GetGroup()
diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx
index 07d0fdda56eb..b2cfeb365c16 100644
--- a/sw/source/ui/fldui/fldfunc.cxx
+++ b/sw/source/ui/fldui/fldfunc.cxx
@@ -631,7 +631,7 @@ OUString SwFldFuncPage::TurnMacroString(const OUString &rMacro)
 SfxTabPage* SwFldFuncPage::Create(  vcl::Window* pParent,
                         const SfxItemSet* rAttrSet )
 {
-    return ( new SwFldFuncPage( pParent, *rAttrSet ) );
+    return VclPtr<SwFldFuncPage>::Create( pParent, *rAttrSet );
 }
 
 sal_uInt16 SwFldFuncPage::GetGroup()
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index 527e44c0bd74..e421f1f43932 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -953,7 +953,7 @@ bool SwFldRefPage::FillItemSet(SfxItemSet* )
 SfxTabPage* SwFldRefPage::Create(   vcl::Window* pParent,
                         const SfxItemSet* rAttrSet )
 {
-    return ( new SwFldRefPage( pParent, *rAttrSet ) );
+    return VclPtr<SwFldRefPage>::Create( pParent, *rAttrSet );
 }
 
 sal_uInt16 SwFldRefPage::GetGroup()
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index 1163e0ac5b43..257181ad6713 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -1250,7 +1250,7 @@ bool SwFldVarPage::FillItemSet(SfxItemSet* )
 SfxTabPage* SwFldVarPage::Create(   vcl::Window* pParent,
                         const SfxItemSet* rAttrSet )
 {
-    return ( new SwFldVarPage( pParent, *rAttrSet ) );
+    return VclPtr<SwFldVarPage>::Create( pParent, *rAttrSet );
 }
 
 sal_uInt16 SwFldVarPage::GetGroup()
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index 4f14a5e79ef7..f0ae9c4cf910 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -659,7 +659,7 @@ void SwColumnPage::Reset(const SfxItemSet *rSet)
 // create TabPage
 SfxTabPage* SwColumnPage::Create(vcl::Window *pParent, const SfxItemSet *rSet)
 {
-    return new SwColumnPage(pParent, *rSet);
+    return VclPtr<SwColumnPage>::Create(pParent, *rSet);
 }
 // 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 f5ca75f20e77..bc4afce72f72 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -860,7 +860,7 @@ void SwFrmPage::setOptimalRelWidth()
 
 SfxTabPage* SwFrmPage::Create(vcl::Window *pParent, const SfxItemSet *rSet)
 {
-    return new SwFrmPage( pParent, *rSet );
+    return VclPtr<SwFrmPage>::Create( pParent, *rSet );
 }
 
 void SwFrmPage::EnableGraficMode( void )
@@ -2423,7 +2423,7 @@ void SwGrfExtPage::dispose()
 
 SfxTabPage* SwGrfExtPage::Create( vcl::Window *pParent, const SfxItemSet *rSet )
 {
-    return new SwGrfExtPage( pParent, *rSet );
+    return VclPtr<SwGrfExtPage>::Create( pParent, *rSet );
 }
 
 void SwGrfExtPage::Reset(const SfxItemSet *rSet)
@@ -2849,7 +2849,7 @@ bool SwFrmURLPage::FillItemSet(SfxItemSet *rSet)
 
 SfxTabPage* SwFrmURLPage::Create(vcl::Window *pParent, const SfxItemSet *rSet)
 {
-    return new SwFrmURLPage( pParent, *rSet );
+    return VclPtr<SwFrmURLPage>::Create( pParent, *rSet );
 }
 
 IMPL_LINK_NOARG(SwFrmURLPage, InsertFileHdl)
@@ -2941,7 +2941,7 @@ void SwFrmAddPage::dispose()
 
 SfxTabPage* SwFrmAddPage::Create(vcl::Window *pParent, const SfxItemSet *rSet)
 {
-    return new SwFrmAddPage(pParent, *rSet);
+    return VclPtr<SwFrmAddPage>::Create(pParent, *rSet);
 }
 
 void SwFrmAddPage::Reset(const SfxItemSet *rSet )
diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx
index 56ab5d9d0d3d..6eab290c166e 100644
--- a/sw/source/ui/frmdlg/wrap.cxx
+++ b/sw/source/ui/frmdlg/wrap.cxx
@@ -157,7 +157,7 @@ void SwWrapTabPage::dispose()
 
 SfxTabPage* SwWrapTabPage::Create(vcl::Window *pParent, const SfxItemSet *rSet)
 {
-    return new SwWrapTabPage(pParent, *rSet);
+    return VclPtr<SwWrapTabPage>::Create(pParent, *rSet);
 }
 
 void SwWrapTabPage::Reset(const SfxItemSet *rSet)
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index be99a7ddacc5..90e1c73e06bf 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -660,7 +660,7 @@ SwAddStylesDlg_Impl::SwAddStylesDlg_Impl(vcl::Window* pParent,
     Size aSize = pHeaderTreeContainer->LogicToPixel(Size(273, 164), MAP_APPFONT);
     pHeaderTreeContainer->set_width_request(aSize.Width());
     pHeaderTreeContainer->set_height_request(aSize.Height());
-    m_pHeaderTree = new SwIndexTreeLB(*pHeaderTreeContainer);
+    m_pHeaderTree = VclPtr<SwIndexTreeLB>::Create(*pHeaderTreeContainer);
 
     m_pOk->SetClickHdl(LINK(this, SwAddStylesDlg_Impl, OkHdl));
     m_pLeftPB->SetClickHdl(LINK(this, SwAddStylesDlg_Impl, LeftRightHdl));
@@ -1315,7 +1315,7 @@ int SwTOXSelectTabPage::DeactivatePage( SfxItemSet* _pSet )
 
 SfxTabPage* SwTOXSelectTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet)
 {
-    return new SwTOXSelectTabPage(pParent, *rAttrSet);
+    return VclPtr<SwTOXSelectTabPage>::Create(pParent, *rAttrSet);
 }
 
 IMPL_LINK(SwTOXSelectTabPage, TOXTypeHdl,   ListBox*, pBox)
@@ -2212,7 +2212,7 @@ int SwTOXEntryTabPage::DeactivatePage( SfxItemSet* /*pSet*/)
 
 SfxTabPage* SwTOXEntryTabPage::Create( vcl::Window* pParent,     const SfxItemSet* rAttrSet)
 {
-    return new SwTOXEntryTabPage(pParent, *rAttrSet);
+    return VclPtr<SwTOXEntryTabPage>::Create(pParent, *rAttrSet);
 }
 
 IMPL_LINK(SwTOXEntryTabPage, EditStyleHdl, PushButton*, pBtn)
@@ -2902,7 +2902,7 @@ Control*    SwTokenWindow::InsertItem(const OUString& rText, const SwFormToken&
 
     if(TOKEN_TEXT == rToken.eTokenType)
     {
-        SwTOXEdit* pEdit = new SwTOXEdit(m_pCtrlParentWin, this, rToken);
+        VclPtr<SwTOXEdit> pEdit = VclPtr<SwTOXEdit>::Create(m_pCtrlParentWin, this, rToken);
         pEdit->SetPosPixel(aControlPos);
 
         aControlList.push_back(pEdit);
@@ -2931,7 +2931,7 @@ Control*    SwTokenWindow::InsertItem(const OUString& rText, const SwFormToken&
     }
     else
     {
-        SwTOXButton* pButton = new SwTOXButton(m_pCtrlParentWin, this, rToken);
+        VclPtr<SwTOXButton> pButton = VclPtr<SwTOXButton>::Create(m_pCtrlParentWin, this, rToken);
         pButton->SetPosPixel(aControlPos);
 
         aControlList.push_back(pButton);
@@ -3109,7 +3109,7 @@ void SwTokenWindow::InsertAtSelection(const OUString& rText, const SwFormToken&
         static_cast<SwTOXEdit*>(pActiveCtrl.get())->AdjustSize();
 
         SwFormToken aTmpToken(TOKEN_TEXT);
-        SwTOXEdit* pEdit = new SwTOXEdit(m_pCtrlParentWin, this, aTmpToken);
+        VclPtr<SwTOXEdit> pEdit = VclPtr<SwTOXEdit>::Create(m_pCtrlParentWin, this, aTmpToken);
 
         iterActive = aControlList.insert(iterActive, pEdit);
 
@@ -3141,7 +3141,7 @@ void SwTokenWindow::InsertAtSelection(const OUString& rText, const SwFormToken&
     }
 
     //now the new button
-    SwTOXButton* pButton = new SwTOXButton(m_pCtrlParentWin, this, aToInsertToken);
+    VclPtr<SwTOXButton> pButton = VclPtr<SwTOXButton>::Create(m_pCtrlParentWin, this, aToInsertToken);
 
     aControlList.insert(iterActive, pButton);
 
@@ -3754,7 +3754,7 @@ int SwTOXStylesTabPage::DeactivatePage( SfxItemSet* /*pSet*/  )
 SfxTabPage* SwTOXStylesTabPage::Create( vcl::Window* pParent,
                                 const SfxItemSet* rAttrSet)
 {
-    return new SwTOXStylesTabPage(pParent, *rAttrSet);
+    return VclPtr<SwTOXStylesTabPage>::Create(pParent, *rAttrSet);
 }
 
 IMPL_LINK( SwTOXStylesTabPage, EditStyleHdl, Button *, pBtn )
@@ -3866,7 +3866,7 @@ SwEntryBrowseBox::SwEntryBrowseBox(vcl::Window* pParent, VclBuilderContainer* pB
                            BROWSER_VLINESFULL |
                            BROWSER_AUTO_VSCROLL|
                            BROWSER_HIDECURSOR   )
-    , aCellEdit(new Edit(&GetDataWindow(), 0))
+    , aCellEdit(VclPtr<Edit>::Create(&GetDataWindow(), 0))
     , aCellCheckBox(new ::svt::CheckBoxControl(&GetDataWindow()))
     , nCurrentRow(0)
     , bModified(false)
@@ -4191,7 +4191,7 @@ SwAutoMarkDlg_Impl::SwAutoMarkDlg_Impl(vcl::Window* pParent, const OUString& rAu
     , bCreateMode(bCreate)
 {
     get(m_pOKPB, "ok");
-    m_pEntriesBB = new SwEntryBrowseBox(get<VclContainer>("area"), this);
+    m_pEntriesBB = VclPtr<SwEntryBrowseBox>::Create(get<VclContainer>("area"), this);
     m_pEntriesBB->set_expand(true);
     m_pEntriesBB->Show();
     m_pOKPB->SetClickHdl(LINK(this, SwAutoMarkDlg_Impl, OkHdl));
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index bb595bf5d737..26549c5d880a 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -1446,7 +1446,7 @@ SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(vcl::Window* pParent,
     {
         const TextInfo aCurInfo = aTextInfoArr[nIndex];
 
-        pFixedTexts[nIndex] = new FixedText(bLeft ? pLeft : pRight, WB_VCENTER);
+        pFixedTexts[nIndex] = VclPtr<FixedText>::Create(bLeft ? pLeft : pRight, WB_VCENTER);
 
         pFixedTexts[nIndex]->set_grid_left_attach(0);
         pFixedTexts[nIndex]->set_grid_top_attach(bLeft ? nLeftRow : nRightRow);
@@ -1455,7 +1455,7 @@ SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(vcl::Window* pParent,
         pEdits[nIndex] = 0;
         if( AUTH_FIELD_AUTHORITY_TYPE == aCurInfo.nToxField )
         {
-            pTypeListBox = new ListBox(bLeft ? pLeft : pRight, WB_DROPDOWN|WB_BORDER|WB_VCENTER);
+            pTypeListBox = VclPtr<ListBox>::Create(bLeft ? pLeft : pRight, WB_DROPDOWN|WB_BORDER|WB_VCENTER);
             for(int j = 0; j < AUTH_TYPE_END; j++)
                 pTypeListBox->InsertEntry(SW_RESSTR(STR_AUTH_TYPE_START + j));
             if(!pFields[aCurInfo.nToxField].isEmpty())
@@ -1472,7 +1472,7 @@ SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(vcl::Window* pParent,
         }
         else if(AUTH_FIELD_IDENTIFIER == aCurInfo.nToxField && !m_bNewEntryMode)
         {
-            pIdentifierBox = new ComboBox(bLeft ? pLeft : pRight, WB_BORDER|WB_DROPDOWN|WB_VCENTER);
+            pIdentifierBox = VclPtr<ComboBox>::Create(bLeft ? pLeft : pRight, WB_BORDER|WB_DROPDOWN|WB_VCENTER);
 
             pIdentifierBox->SetSelectHdl(LINK(this,
                                     SwCreateAuthEntryDlg_Impl, IdentifierHdl));
@@ -1496,7 +1496,7 @@ SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(vcl::Window* pParent,
         }
         else
         {
-            pEdits[nIndex] = new Edit(bLeft ? pLeft : pRight, WB_BORDER|WB_VCENTER);
+            pEdits[nIndex] = VclPtr<Edit>::Create(bLeft ? pLeft : pRight, WB_BORDER|WB_VCENTER);
             pEdits[nIndex]->SetWidthInChars(14);
             pEdits[nIndex]->set_grid_left_attach(1);
             pEdits[nIndex]->set_grid_top_attach(bLeft ? nLeftRow : nRightRow);
diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx
index 73fb01038128..5717b44ab3c8 100644
--- a/sw/source/ui/misc/docfnote.cxx
+++ b/sw/source/ui/misc/docfnote.cxx
@@ -248,7 +248,7 @@ void SwEndNoteOptionPage::Reset( const SfxItemSet* )
 
 SfxTabPage *SwEndNoteOptionPage::Create( vcl::Window *pParent, const SfxItemSet *rSet )
 {
-    return new SwEndNoteOptionPage( pParent, true, *rSet );
+    return VclPtr<SwEndNoteOptionPage>::Create( pParent, true, *rSet );
 }
 
 // Different kinds of numbering; because the Listbox has varying numbers of
@@ -424,7 +424,7 @@ SwFootNoteOptionPage::~SwFootNoteOptionPage()
 
 SfxTabPage *SwFootNoteOptionPage::Create(vcl::Window *pParent, const SfxItemSet *rSet )
 {
-    return new SwFootNoteOptionPage( pParent, *rSet );
+    return VclPtr<SwFootNoteOptionPage>::Create( pParent, *rSet );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/misc/impfnote.hxx b/sw/source/ui/misc/impfnote.hxx
index 02f4c076bb05..666db76ab7fc 100644
--- a/sw/source/ui/misc/impfnote.hxx
+++ b/sw/source/ui/misc/impfnote.hxx
@@ -81,10 +81,10 @@ 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);
 };
 
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index 2d347ba8eb42..40cc6c5dc9c5 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -545,7 +545,7 @@ void SwNumPositionTabPage::ShowControlsDependingOnPosAndSpaceMode()
 SfxTabPage* SwNumPositionTabPage::Create( vcl::Window* pParent,
                                 const SfxItemSet* rAttrSet)
 {
-    return new SwNumPositionTabPage(pParent, *rAttrSet);
+    return VclPtr<SwNumPositionTabPage>::Create(pParent, *rAttrSet);
 }
 
 void SwNumPositionTabPage::SetWrtShell(SwWrtShell* pSh)
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index c648fb635cb1..343a8de3c44a 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -868,7 +868,7 @@ void SwOutlineSettingsTabPage::Reset( const SfxItemSet* rSet )
 SfxTabPage* SwOutlineSettingsTabPage::Create( vcl::Window* pParent,
                                 const SfxItemSet* rAttrSet)
 {
-    return new SwOutlineSettingsTabPage(pParent, *rAttrSet);
+    return VclPtr<SwOutlineSettingsTabPage>::Create(pParent, *rAttrSet);
 }
 
 void SwOutlineSettingsTabPage::CheckForStartValue_Impl(sal_uInt16 nNumberingType)
diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx
index 8f1551cecc7e..b1a6a207ffea 100644
--- a/sw/source/ui/misc/pgfnote.cxx
+++ b/sw/source/ui/misc/pgfnote.cxx
@@ -156,7 +156,7 @@ void SwFootNotePage::dispose()
 
 SfxTabPage* SwFootNotePage::Create(vcl::Window *pParent, const SfxItemSet *rSet)
 {
-    return new SwFootNotePage(pParent, *rSet);
+    return VclPtr<SwFootNotePage>::Create(pParent, *rSet);
 }
 
 void SwFootNotePage::Reset(const SfxItemSet *rSet)
diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx
index df7cbcd2a4ed..8b90b64fc5a8 100644
--- a/sw/source/ui/misc/pggrid.cxx
+++ b/sw/source/ui/misc/pggrid.cxx
@@ -182,7 +182,7 @@ void SwTextGridPage::dispose()
 
 SfxTabPage *SwTextGridPage::Create(vcl::Window *pParent, const SfxItemSet *rSet)
 {
-    return new SwTextGridPage(pParent, *rSet);
+    return VclPtr<SwTextGridPage>::Create(pParent, *rSet);
 }
 
 bool    SwTextGridPage::FillItemSet(SfxItemSet *rSet)
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index 23103b1b195f..f444029735dc 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -399,7 +399,7 @@ void  SwFormatTablePage::ModifyHdl(const Edit * pEdit)
 SfxTabPage*  SwFormatTablePage::Create( vcl::Window* pParent,
                                    const SfxItemSet* rAttrSet)
 {
-    return new SwFormatTablePage( pParent, *rAttrSet );
+    return VclPtr<SwFormatTablePage>::Create( pParent, *rAttrSet );
 }
 
 bool  SwFormatTablePage::FillItemSet( SfxItemSet* rCoreSet )
@@ -796,7 +796,7 @@ void SwTableColumnPage::dispose()
 SfxTabPage*   SwTableColumnPage::Create( vcl::Window* pParent,
                                 const SfxItemSet* rAttrSet)
 {
-    return new SwTableColumnPage( pParent, *rAttrSet );
+    return VclPtr<SwTableColumnPage>::Create( pParent, *rAttrSet );
 }
 
 void  SwTableColumnPage::Reset( const SfxItemSet* )
@@ -1380,7 +1380,7 @@ void SwTextFlowPage::dispose()
 SfxTabPage*   SwTextFlowPage::Create( vcl::Window* pParent,
                                 const SfxItemSet* rAttrSet)
 {
-    return new SwTextFlowPage(pParent, *rAttrSet);
+    return VclPtr<SwTextFlowPage>::Create(pParent, *rAttrSet);
 }
 
 bool  SwTextFlowPage::FillItemSet( SfxItemSet* rSet )
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx
index d4d92db414c9..36a0cccf0061 100644
--- a/sw/source/ui/table/tautofmt.cxx
+++ b/sw/source/ui/table/tautofmt.cxx
@@ -514,7 +514,7 @@ IMPL_LINK_NOARG_INLINE_END(SwAutoFormatDlg, OkHdl)
 AutoFmtPreview::AutoFmtPreview(vcl::Window* pParent, WinBits nStyle) :
         Window          ( pParent, nStyle ),
         aCurData        ( OUString() ),
-        aVD             ( new VirtualDevice(*this) ),
+        aVD             ( VclPtr<VirtualDevice>::Create(*this) ),
         aScriptedText   ( *aVD.get() ),
         bFitWidth       ( false ),
         mbRTL           ( false ),
diff --git a/sw/source/uibase/inc/column.hxx b/sw/source/uibase/inc/column.hxx
index 19d3f72dd20b..f35470899810 100644
--- a/sw/source/uibase/inc/column.hxx
+++ b/sw/source/uibase/inc/column.hxx
@@ -164,8 +164,6 @@ class SwColumnPage : public SfxTabPage
     virtual void    ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
     virtual int     DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
 
-    SwColumnPage(vcl::Window *pParent, const SfxItemSet &rSet);
-
     void connectPercentField(PercentField &rWrap, const OString &rName);
 
     bool isLineNotNone() const;
@@ -173,6 +171,7 @@ class SwColumnPage : public SfxTabPage
     static const sal_uInt16 aPageRg[];
 
 public:
+    SwColumnPage(vcl::Window *pParent, const SfxItemSet &rSet);
     virtual ~SwColumnPage();
     virtual void dispose() SAL_OVERRIDE;
 
diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx
index f87adb2f073c..d1d81e0bdb2b 100644
--- a/sw/source/uibase/inc/frmpage.hxx
+++ b/sw/source/uibase/inc/frmpage.hxx
@@ -174,8 +174,6 @@ class SwFrmPage: public SfxTabPage
 
     void            EnableGraficMode( void );   // hides auto check boxes and re-org controls for "Real Size" button
 
-    SwFrmPage(vcl::Window *pParent, const SfxItemSet &rSet);
-
     SwWrtShell *getFrmDlgParentShell();
 
     using SfxTabPage::ActivatePage;
@@ -184,6 +182,7 @@ class SwFrmPage: public SfxTabPage
     static const sal_uInt16 aPageRg[];
 
 public:
+    SwFrmPage(vcl::Window *pParent, const SfxItemSet &rSet);
     virtual ~SwFrmPage();
     virtual void dispose() SAL_OVERRIDE;
 
@@ -226,7 +225,6 @@ class SwGrfExtPage: public SfxTabPage
     DECL_LINK(BrowseHdl, void *);
 
     virtual void    ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
-    SwGrfExtPage(vcl::Window *pParent, const SfxItemSet &rSet);
     virtual ~SwGrfExtPage();
     virtual void dispose() SAL_OVERRIDE;
 
@@ -234,6 +232,7 @@ class SwGrfExtPage: public SfxTabPage
     using SfxTabPage::DeactivatePage;
 
 public:
+    SwGrfExtPage(vcl::Window *pParent, const SfxItemSet &rSet);
 
     static SfxTabPage *Create(vcl::Window *pParent, const SfxItemSet *rSet);
 
@@ -256,12 +255,11 @@ class SwFrmURLPage : public SfxTabPage
 
     DECL_LINK(InsertFileHdl, void *);
 
-    SwFrmURLPage(vcl::Window *pParent, const SfxItemSet &rSet);
-
     using SfxTabPage::ActivatePage;
     using SfxTabPage::DeactivatePage;
 
 public:
+    SwFrmURLPage(vcl::Window *pParent, const SfxItemSet &rSet);
     virtual ~SwFrmURLPage();
     virtual void dispose() SAL_OVERRIDE;
 
@@ -307,11 +305,10 @@ class SwFrmAddPage : public SfxTabPage
     DECL_LINK(EditModifyHdl, void *);
     DECL_LINK(ChainModifyHdl, ListBox*);
 
-    SwFrmAddPage(vcl::Window *pParent, const SfxItemSet &rSet);
-
     static const sal_uInt16 aAddPgRg[];
 
 public:
+    SwFrmAddPage(vcl::Window *pParent, const SfxItemSet &rSet);
     virtual ~SwFrmAddPage();
     virtual void dispose() SAL_OVERRIDE;
 
diff --git a/sw/source/uibase/inc/pgfnote.hxx b/sw/source/uibase/inc/pgfnote.hxx
index 90e850fbce10..9f298eb91dd3 100644
--- a/sw/source/uibase/inc/pgfnote.hxx
+++ b/sw/source/uibase/inc/pgfnote.hxx
@@ -33,6 +33,7 @@ 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);
     static const sal_uInt16* GetRanges() { return aPageRg; }
 
@@ -42,7 +43,6 @@ public:
     virtual ~SwFootNotePage();
     virtual void dispose() SAL_OVERRIDE;
 private:
-    SwFootNotePage(vcl::Window *pParent, const SfxItemSet &rSet);
 
     VclPtr<RadioButton>    m_pMaxHeightPageBtn;
     VclPtr<RadioButton>    m_pMaxHeightBtn;
diff --git a/sw/source/uibase/inc/pggrid.hxx b/sw/source/uibase/inc/pggrid.hxx
index a70dccfc3315..39a4d80f0061 100644
--- a/sw/source/uibase/inc/pggrid.hxx
+++ b/sw/source/uibase/inc/pggrid.hxx
@@ -67,8 +67,6 @@ class SwTextGridPage: public SfxTabPage
     bool        m_bHRulerChanged;
     bool        m_bVRulerChanged;
 
-    SwTextGridPage(vcl::Window *pParent, const SfxItemSet &rSet);
-
     void UpdatePageSize(const SfxItemSet& rSet);
     void PutGridItem(SfxItemSet& rSet);
     void SetLinesOrCharsRanges(FixedText & rField, const sal_Int32 nValue );
@@ -83,6 +81,7 @@ class SwTextGridPage: public SfxTabPage
     using SfxTabPage::DeactivatePage;
 
 public:
+    SwTextGridPage(vcl::Window *pParent, const SfxItemSet &rSet);
     virtual ~SwTextGridPage();
     virtual void dispose() SAL_OVERRIDE;
 
diff --git a/sw/source/uibase/inc/wrap.hxx b/sw/source/uibase/inc/wrap.hxx
index 34002c9ea35b..b01ede1c1696 100644
--- a/sw/source/uibase/inc/wrap.hxx
+++ b/sw/source/uibase/inc/wrap.hxx
@@ -79,7 +79,6 @@ class SwWrapTabPage: public SfxTabPage
     bool bDrawMode;
     bool bContourImage;
 
-    SwWrapTabPage(vcl::Window *pParent, const SfxItemSet &rSet);
     virtual ~SwWrapTabPage();
     virtual void dispose() SAL_OVERRIDE;
 
@@ -99,6 +98,7 @@ class SwWrapTabPage: public SfxTabPage
     static const sal_uInt16 aWrapPageRg[];
 
 public:
+    SwWrapTabPage(vcl::Window *pParent, const SfxItemSet &rSet);
 
     static SfxTabPage *Create(vcl::Window *pParent, const SfxItemSet *rSet);
 
diff --git a/sw/source/uibase/table/tablepg.hxx b/sw/source/uibase/table/tablepg.hxx
index b0ca2e5b815d..ef7c9ad90553 100644
--- a/sw/source/uibase/table/tablepg.hxx
+++ b/sw/source/uibase/table/tablepg.hxx
@@ -180,8 +180,8 @@ class SwTextFlowPage : public SfxTabPage
     DECL_LINK( SplitRowHdl_Impl, TriStateBox* );
     DECL_LINK( HeadLineCBClickHdl, void* p = 0 );
 
-    SwTextFlowPage( vcl::Window* pParent, const SfxItemSet& rSet );
 public:
+    SwTextFlowPage( vcl::Window* pParent, const SfxItemSet& rSet );
     virtual ~SwTextFlowPage();
     virtual void dispose() SAL_OVERRIDE;
     static SfxTabPage*  Create( vcl::Window* pParent, const SfxItemSet* rAttrSet);