10 files changed, 15 insertions, 16 deletions
diff --git a/extensions/source/abpilot/unodialogabp.cxx b/extensions/source/abpilot/unodialogabp.cxx
index 8a0714eb17be..f21ac3198be3 100644
--- a/extensions/source/abpilot/unodialogabp.cxx
+++ b/extensions/source/abpilot/unodialogabp.cxx
@@ -152,9 +152,9 @@ namespace abp
     }
 
 
-    Dialog* OABSPilotUno::createDialog(vcl::Window* _pParent)
+    VclPtr<Dialog> OABSPilotUno::createDialog(vcl::Window* _pParent)
     {
-        return new OAddessBookSourcePilot(_pParent, m_aContext );
+        return VclPtr<OAddessBookSourcePilot>::Create(_pParent, m_aContext );
     }
 
 
diff --git a/extensions/source/abpilot/unodialogabp.hxx b/extensions/source/abpilot/unodialogabp.hxx
index ff58b6e9a456..2f07630094de 100644
--- a/extensions/source/abpilot/unodialogabp.hxx
+++ b/extensions/source/abpilot/unodialogabp.hxx
@@ -84,7 +84,7 @@ namespace abp
         using OABSPilotUno_DBase::execute;
     protected:
     // OGenericUnoDialog overridables
-        virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE;
+        virtual VclPtr<Dialog> createDialog(vcl::Window* _pParent) SAL_OVERRIDE;
         virtual void executedDialog(sal_Int16 _nExecutionResult) SAL_OVERRIDE;
     };
 
diff --git a/extensions/source/dbpilots/unoautopilot.hxx b/extensions/source/dbpilots/unoautopilot.hxx
index d176321acacf..67a48aa799e5 100644
--- a/extensions/source/dbpilots/unoautopilot.hxx
+++ b/extensions/source/dbpilots/unoautopilot.hxx
@@ -85,7 +85,7 @@ namespace dbp
 
     protected:
     // OGenericUnoDialog overridables
-        virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE;
+        virtual VclPtr<Dialog> createDialog(vcl::Window* _pParent) SAL_OVERRIDE;
         virtual void implInitialize(const com::sun::star::uno::Any& _rValue) SAL_OVERRIDE;
     };
 
diff --git a/extensions/source/dbpilots/unoautopilot.inl b/extensions/source/dbpilots/unoautopilot.inl
index 77f3cf6e795d..55e5861f3595 100644
--- a/extensions/source/dbpilots/unoautopilot.inl
+++ b/extensions/source/dbpilots/unoautopilot.inl
@@ -96,9 +96,9 @@ template <class TYPE, class SERVICEINFO>
 
 
 template <class TYPE, class SERVICEINFO>
-Dialog* OUnoAutoPilot<TYPE, SERVICEINFO>::createDialog(::vcl::Window* _pParent)
+VclPtr<Dialog> OUnoAutoPilot<TYPE, SERVICEINFO>::createDialog(::vcl::Window* _pParent)
 {
-    return new TYPE(_pParent, m_xObjectModel, m_aContext);
+    return VclPtr<TYPE>::Create(_pParent, m_xObjectModel, m_aContext);
 }
 
 
diff --git a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx
index 351669a95d57..1a9c1d69f3a1 100644
--- a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx
+++ b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx
@@ -103,9 +103,9 @@ namespace pcr
     }
 
 
-    Dialog* MasterDetailLinkDialog::createDialog(vcl::Window* _pParent)
+    VclPtr<Dialog> MasterDetailLinkDialog::createDialog(vcl::Window* _pParent)
     {
-        return new FormLinkDialog(_pParent,m_xDetail,m_xMaster, m_aContext
+        return VclPtr<FormLinkDialog>::Create(_pParent,m_xDetail,m_xMaster, m_aContext
             ,m_sExplanation,m_sDetailLabel,m_sMasterLabel);
     }
 
diff --git a/extensions/source/propctrlr/MasterDetailLinkDialog.hxx b/extensions/source/propctrlr/MasterDetailLinkDialog.hxx
index 3ff5f64ec0cf..c09ca1db99f7 100644
--- a/extensions/source/propctrlr/MasterDetailLinkDialog.hxx
+++ b/extensions/source/propctrlr/MasterDetailLinkDialog.hxx
@@ -60,7 +60,7 @@ namespace pcr
         virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE;
 
         // OGenericUnoDialog overridables
-        virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE;
+        virtual VclPtr<Dialog> createDialog(vcl::Window* _pParent) SAL_OVERRIDE;
         virtual void implInitialize(const com::sun::star::uno::Any& _rValue) SAL_OVERRIDE;
 
         ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xDetail;
diff --git a/extensions/source/propctrlr/controlfontdialog.cxx b/extensions/source/propctrlr/controlfontdialog.cxx
index c06fc1f880ae..21ec3d27006c 100644
--- a/extensions/source/propctrlr/controlfontdialog.cxx
+++ b/extensions/source/propctrlr/controlfontdialog.cxx
@@ -141,7 +141,7 @@ namespace pcr
     }
 
 
-    Dialog* OControlFontDialog::createDialog(vcl::Window* _pParent)
+    VclPtr<Dialog> OControlFontDialog::createDialog(vcl::Window* _pParent)
     {
         ControlCharacterDialog::createItemSet(m_pFontItems, m_pItemPool, m_pItemPoolDefaults);
 
@@ -152,8 +152,7 @@ namespace pcr
         // sets a new introspectee and re-executes us. In this case, the dialog returned here (upon the first
         // execute) will be re-used upon the second execute, and thus it won't be initialized correctly.
 
-        ControlCharacterDialog* pDialog = new ControlCharacterDialog(_pParent, *m_pFontItems);
-        return pDialog;
+        return VclPtr<ControlCharacterDialog>::Create(_pParent, *m_pFontItems);
     }
 
 
diff --git a/extensions/source/propctrlr/controlfontdialog.hxx b/extensions/source/propctrlr/controlfontdialog.hxx
index a5bd97d45b81..1a2fa3b867b2 100644
--- a/extensions/source/propctrlr/controlfontdialog.hxx
+++ b/extensions/source/propctrlr/controlfontdialog.hxx
@@ -82,7 +82,7 @@ namespace pcr
 
     protected:
     // OGenericUnoDialog overridables
-        virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE;
+        virtual VclPtr<Dialog> createDialog(vcl::Window* _pParent) SAL_OVERRIDE;
         virtual void    destroyDialog() SAL_OVERRIDE;
         virtual void    executedDialog(sal_Int16 _nExecutionResult) SAL_OVERRIDE;
     };
diff --git a/extensions/source/propctrlr/pcrunodialogs.cxx b/extensions/source/propctrlr/pcrunodialogs.cxx
index 9c26eb5465d6..518ebbbe5064 100644
--- a/extensions/source/propctrlr/pcrunodialogs.cxx
+++ b/extensions/source/propctrlr/pcrunodialogs.cxx
@@ -130,9 +130,9 @@ namespace pcr
     }
 
 
-    Dialog* OTabOrderDialog::createDialog( vcl::Window* _pParent )
+    VclPtr<Dialog> OTabOrderDialog::createDialog( vcl::Window* _pParent )
     {
-        return new TabOrderDialog( _pParent, m_xTabbingModel, m_xControlContext, m_aContext );
+        return VclPtr<TabOrderDialog>::Create( _pParent, m_xTabbingModel, m_xControlContext, m_aContext );
     }
 
     void OTabOrderDialog::initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException, std::exception)
diff --git a/extensions/source/propctrlr/pcrunodialogs.hxx b/extensions/source/propctrlr/pcrunodialogs.hxx
index 61a76bf24f4c..19ac76cff393 100644
--- a/extensions/source/propctrlr/pcrunodialogs.hxx
+++ b/extensions/source/propctrlr/pcrunodialogs.hxx
@@ -78,7 +78,7 @@ namespace pcr
 
     protected:
     // OGenericUnoDialog overridables
-        virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE;
+        virtual VclPtr<Dialog> createDialog(vcl::Window* _pParent) SAL_OVERRIDE;
     };