4 files changed, 13 insertions, 3 deletions
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index 644430352873..fcaf4f377781 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -330,6 +330,7 @@ void MediaWindow::executeFormatErrorBox( vcl::Window* pParent )
     VclPtr<MessageDialog> aErrBox(new MessageDialog( pParent, AVMEDIA_RESID( AVMEDIA_STR_ERR_URL ) ) );
 
     aErrBox->Execute();
+    aErrBox.disposeAndClear();
 }
 
 
diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx
index 0b5638d06897..a01d9c4679f3 100644
--- a/sc/source/ui/view/tabview5.cxx
+++ b/sc/source/ui/view/tabview5.cxx
@@ -176,7 +176,7 @@ ScTabView::~ScTabView()
     delete pSelEngine;
 
     // Delete this before the grid windows, since it's a child window of one of them.
-    mpInputHintWindow.reset();
+    mpInputHintWindow.disposeAndClear();
     for (i=0; i<4; i++)
         pGridWin[i].disposeAndClear();
 
@@ -190,6 +190,14 @@ ScTabView::~ScTabView()
         pRowOutline[i].disposeAndClear();
     }
 
+    aScrollBarBox.disposeAndClear();
+    aCornerButton.disposeAndClear();
+    aTopButton.disposeAndClear();
+    aHScrollLeft.disposeAndClear();
+    aHScrollRight.disposeAndClear();
+    aVScrollTop.disposeAndClear();
+    aVScrollBottom.disposeAndClear();
+
     pHSplitter.disposeAndClear();
     pVSplitter.disposeAndClear();
     pTabControl.disposeAndClear();
diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx
index 1cc8abaecd88..05deb3ee0163 100644
--- a/sd/source/ui/view/ViewTabBar.cxx
+++ b/sd/source/ui/view/ViewTabBar.cxx
@@ -167,8 +167,8 @@ void ViewTabBar::disposing (void)
         // Set all references to the one tab page to NULL and delete the page.
         for (sal_uInt16 nIndex=0; nIndex<mpTabControl->GetPageCount(); ++nIndex)
             mpTabControl->SetTabPage(nIndex, NULL);
-        mpTabPage.reset();
-        mpTabControl.reset();
+        mpTabPage.disposeAndClear();
+        mpTabControl.disposeAndClear();
     }
 
     mxController = NULL;
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 63511fd855a4..4ab221fccc07 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -2786,6 +2786,7 @@ Size Edit::GetMinimumEditSize()
     vcl::Window* pDefWin = ImplGetDefaultWindow();
     VclPtr<Edit> aEdit(new Edit( pDefWin, WB_BORDER ) );
     Size aSize( aEdit->CalcMinimumSize() );
+    aEdit.disposeAndClear();
     return aSize;
 }