vclwidget: fix more places that should be wrapping in VclPtr

Change-Id: I31c9115662da2f81e1b22be91ee58e2862076b8e

7 files changed, 2 insertions, 28 deletions

diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index 84d51f92f08f..8d5ae4c037c8 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -309,9 +309,7 @@ OApplicationController::~OApplicationController()
         osl_atomic_increment( &m_refCount );
         dispose();
     }
-    ::std::unique_ptr< vcl::Window> aTemp( getView() );
     clearView();
-
 }
 
 IMPLEMENT_FORWARD_XTYPEPROVIDER2(OApplicationController,OApplicationController_CBASE,OApplicationController_Base)
@@ -447,7 +445,6 @@ bool OApplicationController::Construct(vcl::Window* _pParent)
 
     if ( !bSuccess )
     {
-        ::std::unique_ptr< vcl::Window> aTemp( getView() );
         clearView();
         return false;
     }
@@ -2048,7 +2045,7 @@ void OApplicationController::renameEntry()
         if ( xContainer.is() )
         {
             ::std::unique_ptr< IObjectNameCheck > pNameChecker;
-            ::std::unique_ptr< OSaveAsDlg > aDialog;
+            VclPtr< OSaveAsDlg > aDialog;
 
             Reference<XRename> xRename;
             const ElementType eType = getContainer()->getElementType();
diff --git a/dbaccess/source/ui/app/AppTitleWindow.cxx b/dbaccess/source/ui/app/AppTitleWindow.cxx
index d347023e2855..f6b91270a888 100644
--- a/dbaccess/source/ui/app/AppTitleWindow.cxx
+++ b/dbaccess/source/ui/app/AppTitleWindow.cxx
@@ -55,7 +55,6 @@ void OTitleWindow::dispose()
     if ( m_pChild )
     {
         m_pChild->Hide();
-        boost::scoped_ptr<vcl::Window> aTemp(m_pChild);
     }
     m_pChild.clear();
     m_aSpace1.disposeAndClear();
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index 64522f299b4a..40802205aec0 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -312,7 +312,6 @@ void SAL_CALL OGenericUnoController::initialize( const Sequence< Any >& aArgumen
     catch(Exception&)
     {
         // no one clears my view if I won't
-        boost::scoped_ptr<vcl::Window> aTemp(m_pView);
         m_pView = NULL;
         throw;
     }
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index 02110126c844..a83aef20dd51 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -164,17 +164,8 @@ OFieldDescControl::~OFieldDescControl()
 
 void OFieldDescControl::dispose()
 {
-    {
-        boost::scoped_ptr<vcl::Window> aTemp(m_pVertScroll);
-        m_pVertScroll    = NULL;
-    }
-    {
-        boost::scoped_ptr<vcl::Window> aTemp(m_pHorzScroll);
-        m_pHorzScroll    = NULL;
-    }
     if ( m_bAdded )
         ::dbaui::notifySystemWindow(this,this,::comphelper::mem_fun(&TaskPaneList::RemoveWindow));
-    pLastFocusWindow = NULL;
 
     // Destroy children
     DeactivateAggregate( tpDefault );
diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx
index 9aab0ceccfbf..c5a3cadbb791 100644
--- a/dbaccess/source/ui/querydesign/JoinController.cxx
+++ b/dbaccess/source/ui/querydesign/JoinController.cxx
@@ -170,10 +170,7 @@ OJoinDesignView* OJoinController::getJoinView()
 
 void OJoinController::disposing()
 {
-    {
-        boost::scoped_ptr< vcl::Window > pEnsureDelete( m_pAddTableDialog );
-        m_pAddTableDialog   = NULL;
-    }
+    m_pAddTableDialog   = NULL;
 
     OJoinController_BASE::disposing();
 
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index ca539c8e76b8..5a858e9fe394 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -1530,7 +1530,6 @@ void OJoinTableView::clearLayoutInformation()
     {
         if ( aIter->second )
             aIter->second->clearListBox();
-        boost::scoped_ptr<vcl::Window> aTemp(aIter->second);
         aIter->second = NULL;
     }
 
diff --git a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
index cdc16fd0dea1..101a9ab6f5fd 100644
--- a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
+++ b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
@@ -42,14 +42,6 @@ OQueryViewSwitch::OQueryViewSwitch(OQueryContainerWindow* _pParent, OQueryContro
 
 OQueryViewSwitch::~OQueryViewSwitch()
 {
-    {
-        boost::scoped_ptr<vcl::Window> aTemp(m_pTextView);
-        m_pTextView = NULL;
-    }
-    {
-        boost::scoped_ptr<vcl::Window> aTemp(m_pDesignView);
-        m_pDesignView = NULL;
-    }
 }
 
 void OQueryViewSwitch::Construct()