vclwidget: fix more places that should be wrapping in VclPtr

Change-Id: I31c9115662da2f81e1b22be91ee58e2862076b8e

5 files changed, 14 insertions, 17 deletions

diff --git a/uui/source/iahndl-authentication.cxx b/uui/source/iahndl-authentication.cxx
index fc5ea18bf85c..89847aa41be3 100644
--- a/uui/source/iahndl-authentication.cxx
+++ b/uui/source/iahndl-authentication.cxx
@@ -88,7 +88,7 @@ executeLoginDialog(
         if (!bCanUseSysCreds)
             nFlags |= LF_NO_USESYSCREDS;
 
-        boost::scoped_ptr< LoginDialog > xDialog(
+        VclPtr< LoginDialog > xDialog(
                 new LoginDialog(pParent, nFlags, rInfo.GetServer(), rRealm));
         if (!rInfo.GetErrorText().isEmpty())
             xDialog->SetErrorText(rInfo.GetErrorText());
@@ -417,7 +417,7 @@ executeMasterPasswordDialog(
         boost::scoped_ptr< ResMgr > xManager(ResMgr::CreateResMgr("uui"));
         if( nMode == task::PasswordRequestMode_PASSWORD_CREATE )
         {
-            boost::scoped_ptr< MasterPasswordCreateDialog > xDialog(
+            VclPtr< MasterPasswordCreateDialog > xDialog(
                 new MasterPasswordCreateDialog(pParent, xManager.get()));
             rInfo.SetResult(xDialog->Execute()
                 == RET_OK ? ERRCODE_BUTTON_OK : ERRCODE_BUTTON_CANCEL);
@@ -426,7 +426,7 @@ executeMasterPasswordDialog(
         }
         else
         {
-            boost::scoped_ptr< MasterPasswordDialog > xDialog(
+            VclPtr< MasterPasswordDialog > xDialog(
                 new MasterPasswordDialog(pParent, nMode, xManager.get()));
             rInfo.SetResult(xDialog->Execute()
                 == RET_OK ? ERRCODE_BUTTON_OK : ERRCODE_BUTTON_CANCEL);
@@ -517,7 +517,7 @@ executePasswordDialog(
         {
             if (bIsSimplePasswordRequest)
             {
-                boost::scoped_ptr< PasswordDialog > pDialog(
+                VclPtr< PasswordDialog > pDialog(
                     new PasswordDialog( pParent, nMode, xManager.get(), aDocName,
                     bIsPasswordToModify, bIsSimplePasswordRequest ) );
                 pDialog->SetMinLen(0);
@@ -541,7 +541,7 @@ executePasswordDialog(
         }
         else // enter password or reenter password
         {
-            boost::scoped_ptr< PasswordDialog > pDialog(
+            VclPtr< PasswordDialog > pDialog(
                 new PasswordDialog( pParent, nMode, xManager.get(), aDocName,
                 bIsPasswordToModify, bIsSimplePasswordRequest ) );
             pDialog->SetMinLen(0);
diff --git a/uui/source/iahndl-errorhandler.cxx b/uui/source/iahndl-errorhandler.cxx
index 68b09382baed..db209cb8a665 100644
--- a/uui/source/iahndl-errorhandler.cxx
+++ b/uui/source/iahndl-errorhandler.cxx
@@ -55,7 +55,7 @@ executeErrorDialog(
             //TODO! must be internationalized
     aText.append(rMessage);
 
-    boost::scoped_ptr< MessBox > xBox;
+    VclPtr< MessBox > xBox;
     try
     {
         switch (eClassification)
diff --git a/uui/source/iahndl-filter.cxx b/uui/source/iahndl-filter.cxx
index 6291553f7203..0ad263319cd4 100644
--- a/uui/source/iahndl-filter.cxx
+++ b/uui/source/iahndl-filter.cxx
@@ -55,8 +55,7 @@ executeFilterDialog(
     {
         SolarMutexGuard aGuard;
 
-        boost::scoped_ptr< uui::FilterDialog > xDialog(
-            new uui::FilterDialog(pParent));
+        VclPtr< uui::FilterDialog > xDialog(new uui::FilterDialog(pParent));
 
         xDialog->SetURL(rURL);
         xDialog->ChangeFilters(&rFilters);
diff --git a/uui/source/iahndl-locking.cxx b/uui/source/iahndl-locking.cxx
index e7e911bb8aef..1dd10cbe64b3 100644
--- a/uui/source/iahndl-locking.cxx
+++ b/uui/source/iahndl-locking.cxx
@@ -93,7 +93,7 @@ handleLockedDocumentRequest_(
             aMessage = UUIInteractionHelper::replaceMessageWithArguments(
                 aMessage, aArguments );
 
-            boost::scoped_ptr< OpenLockedQueryBox > xDialog(new OpenLockedQueryBox(
+            VclPtr< OpenLockedQueryBox > xDialog(new OpenLockedQueryBox(
                             pParent, xManager.get(), aMessage ) );
             nResult = xDialog->Execute();
         }
@@ -107,7 +107,7 @@ handleLockedDocumentRequest_(
             aMessage = UUIInteractionHelper::replaceMessageWithArguments(
                 aMessage, aArguments );
 
-            boost::scoped_ptr< TryLaterQueryBox > xDialog(
+            VclPtr< TryLaterQueryBox > xDialog(
                 new TryLaterQueryBox( pParent, xManager.get(), aMessage ) );
             nResult = xDialog->Execute();
         }
@@ -122,7 +122,7 @@ handleLockedDocumentRequest_(
             aMessage = UUIInteractionHelper::replaceMessageWithArguments(
                 aMessage, aArguments );
 
-            boost::scoped_ptr< AlreadyOpenQueryBox > xDialog(
+            VclPtr< AlreadyOpenQueryBox > xDialog(
                 new AlreadyOpenQueryBox( pParent,
                                          xManager.get(),
                                          aMessage,
@@ -163,7 +163,7 @@ handleChangedByOthersRequest_(
         if (!xManager.get())
             return;
 
-        boost::scoped_ptr< FileChangedQueryBox > xDialog(
+        VclPtr< FileChangedQueryBox > xDialog(
             new FileChangedQueryBox( pParent, xManager.get() ) );
         sal_Int32 nResult = xDialog->Execute();
 
@@ -198,7 +198,7 @@ handleLockFileIgnoreRequest_(
         if (!xManager.get())
             return;
 
-        boost::scoped_ptr< LockFailedQueryBox > xDialog(
+        VclPtr< LockFailedQueryBox > xDialog(
             new LockFailedQueryBox( pParent, xManager.get() ) );
         sal_Int32 nResult = xDialog->Execute();
 
diff --git a/uui/source/iahndl-ssl.cxx b/uui/source/iahndl-ssl.cxx
index 47969699e0de..a747a9753366 100644
--- a/uui/source/iahndl-ssl.cxx
+++ b/uui/source/iahndl-ssl.cxx
@@ -145,8 +145,7 @@ executeUnknownAuthDialog(
     {
         SolarMutexGuard aGuard;
 
-        boost::scoped_ptr< UnknownAuthDialog > xDialog(
-            new UnknownAuthDialog(pParent, rXCert, xContext));
+        VclPtr< UnknownAuthDialog > xDialog(new UnknownAuthDialog(pParent, rXCert, xContext));
 
         // Get correct resource string
         OUString aMessage;
@@ -187,8 +186,7 @@ executeSSLWarnDialog(
     {
         SolarMutexGuard aGuard;
 
-        boost::scoped_ptr< SSLWarnDialog > xDialog(
-           new SSLWarnDialog(pParent, rXCert, xContext));
+        VclPtr< SSLWarnDialog > xDialog(new SSLWarnDialog(pParent, rXCert, xContext));
 
         // Get correct resource string
         OUString aMessage_1;