1 files changed, 6 insertions, 8 deletions
diff --git a/fpicker/source/office/PlacesListBox.cxx b/fpicker/source/office/PlacesListBox.cxx
index 23dfa0f185b1..eef7e27a6be8 100644
--- a/fpicker/source/office/PlacesListBox.cxx
+++ b/fpicker/source/office/PlacesListBox.cxx
@@ -48,8 +48,8 @@ PlacesListBox_Impl::~PlacesListBox_Impl( )
 
 void PlacesListBox_Impl::dispose()
 {
-    delete mpHeaderBar;
-    mpParent = NULL;
+    mpHeaderBar.clear();
+    mpParent.clear();
     SvHeaderTabListBox::dispose();
 }
 
@@ -93,12 +93,10 @@ PlacesListBox::~PlacesListBox( )
 
 void PlacesListBox::dispose()
 {
-    delete mpImpl;
-    mpImpl = NULL;
-    delete mpAddBtn;
-    mpAddBtn = NULL;
-    delete mpDelBtn;
-    mpDelBtn = NULL;
+    mpImpl.clear();
+    mpAddBtn.clear();
+    mpDelBtn.clear();
+    mpDlg.clear();
     Control::dispose();
 }