4 files changed, 9 insertions, 7 deletions
diff --git a/svx/inc/extrusiondepthdialog.hxx b/svx/inc/extrusiondepthdialog.hxx
index 46362d7ff4c5..48b932e44e18 100644
--- a/svx/inc/extrusiondepthdialog.hxx
+++ b/svx/inc/extrusiondepthdialog.hxx
@@ -31,10 +31,12 @@ namespace svx {
 
 class ExtrusionDepthDialog : public ModalDialog
 {
-    MetricField* m_pMtrDepth;
+    VclPtr<MetricField> m_pMtrDepth;
 
 public:
     ExtrusionDepthDialog( vcl::Window* pParent, double fDepth, FieldUnit eDefaultUnit );
+    virtual ~ExtrusionDepthDialog();
+    virtual void dispose() SAL_OVERRIDE;
 
     double getDepth() const;
 };
diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx
index 5d1b8a90c469..299d03de1ff8 100644
--- a/svx/inc/galbrws2.hxx
+++ b/svx/inc/galbrws2.hxx
@@ -109,9 +109,9 @@ private:
     SvtMiscOptions      maMiscOptions;
     Gallery*            mpGallery;
     GalleryTheme*       mpCurTheme;
-    GalleryIconView*    mpIconView;
-    GalleryListView*    mpListView;
-    GalleryPreview*     mpPreview;
+    VclPtr<GalleryIconView>    mpIconView;
+    VclPtr<GalleryListView>    mpListView;
+    VclPtr<GalleryPreview> mpPreview;
     VclPtr<GalleryToolBox> maViewBox;
     VclPtr<FixedLine>   maSeparator;
     VclPtr<FixedText>   maInfoBar;
diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx
index 9583d43f018e..f1b8aabb9b34 100644
--- a/svx/inc/svdibrow.hxx
+++ b/svx/inc/svdibrow.hxx
@@ -34,7 +34,7 @@ class _SdrItemBrowserControl: public BrowseBox
 friend class ImpItemEdit;
     std::vector<ImpItemListRow*> aList;
     long nAktPaintRow;
-    Edit* pEditControl;
+    VclPtr<Edit> pEditControl;
     OUString aWNamMerk;
     Link aEntryChangedHdl;
     Link aSetDirtyHdl;
diff --git a/svx/inc/tbunosearchcontrollers.hxx b/svx/inc/tbunosearchcontrollers.hxx
index dd97162222cb..8aa95e1e99f0 100644
--- a/svx/inc/tbunosearchcontrollers.hxx
+++ b/svx/inc/tbunosearchcontrollers.hxx
@@ -118,7 +118,7 @@ public:
 
 private:
 
-    FindTextFieldControl* m_pFindTextFieldControl;
+    VclPtr<FindTextFieldControl> m_pFindTextFieldControl;
 
     sal_uInt16 m_nDownSearchId; // item position of findbar
     sal_uInt16 m_nUpSearchId;   // item position of findbar
@@ -220,7 +220,7 @@ public:
     virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
 private:
-    CheckBox* m_pMatchCaseControl;
+    VclPtr<CheckBox> m_pMatchCaseControl;
 };
 
 class FindAllToolboxController   : public svt::ToolboxController,