Automated conversion of VclPtr construction to use Instance template.

Change-Id: I8be9141b9653e73ebd23a5a3d810f240c376f97e

8 files changed, 16 insertions, 16 deletions

diff --git a/extensions/source/abpilot/typeselectionpage.cxx b/extensions/source/abpilot/typeselectionpage.cxx
index 542e88221b2b..f732eff901b4 100644
--- a/extensions/source/abpilot/typeselectionpage.cxx
+++ b/extensions/source/abpilot/typeselectionpage.cxx
@@ -243,7 +243,7 @@ namespace abp
 
         if (AST_INVALID == getSelectedType( ))
         {
-            ScopedVclPtr<MessageDialog> aError(new MessageDialog(this, ModuleRes(RID_STR_NEEDTYPESELECTION)));
+            ScopedVclPtrInstance< MessageDialog > aError(this, ModuleRes(RID_STR_NEEDTYPESELECTION));
             aError->Execute();
             return false;
         }
diff --git a/extensions/source/bibliography/bibview.cxx b/extensions/source/bibliography/bibview.cxx
index f91b60e6ba89..668e691d5a97 100644
--- a/extensions/source/bibliography/bibview.cxx
+++ b/extensions/source/bibliography/bibview.cxx
@@ -141,7 +141,7 @@ namespace bib
             {
                 sErrorString += "\n";
                 sErrorString += BIB_RESSTR(RID_MAP_QUESTION);
-                ScopedVclPtr<QueryBox> aQuery(new QueryBox(this, WB_YES_NO, sErrorString) );
+                ScopedVclPtrInstance< QueryBox > aQuery(this, WB_YES_NO, sErrorString);
                 aQuery->SetDefaultCheckBoxText();
                 short nResult = aQuery->Execute();
                 BibModul::GetConfig()->SetShowColumnAssignmentWarning(
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index 285d20ed6732..889a61032980 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -1484,7 +1484,7 @@ void BibDataManager::RemoveMeAsUidListener()
 
 void BibDataManager::CreateMappingDialog(vcl::Window* pParent)
 {
-    VclPtr<MappingDialog_Impl> pDlg(new MappingDialog_Impl(pParent, this));
+    VclPtrInstance< MappingDialog_Impl > pDlg(pParent, this);
     if(RET_OK == pDlg->Execute() && pBibView)
     {
         reload();
@@ -1494,7 +1494,7 @@ void BibDataManager::CreateMappingDialog(vcl::Window* pParent)
 OUString BibDataManager::CreateDBChangeDialog(vcl::Window* pParent)
 {
     OUString uRet;
-    VclPtr<DBChangeDialog_Impl> pDlg(new DBChangeDialog_Impl(pParent, this ));
+    VclPtrInstance< DBChangeDialog_Impl > pDlg(pParent, this );
     if(RET_OK == pDlg->Execute())
     {
         OUString sNewURL = pDlg->GetCurrentURL();
diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx
index 6c84e4601f77..f343e7503293 100644
--- a/extensions/source/propctrlr/browserlistbox.cxx
+++ b/extensions/source/propctrlr/browserlistbox.cxx
@@ -357,7 +357,7 @@ namespace pcr
             ,m_bUpdate(true)
             ,m_pControlContextImpl( new PropertyControlContext_Impl( *this ) )
     {
-        ScopedVclPtr<ListBox> aListBox(new ListBox(this,WB_DROPDOWN));
+        ScopedVclPtrInstance< ListBox > aListBox(this,WB_DROPDOWN);
         aListBox->SetPosSizePixel(Point(0,0),Size(100,100));
         m_nRowHeight = aListBox->GetSizePixel().Height()+2;
         SetBackground( pParent->GetBackground() );
diff --git a/extensions/source/propctrlr/commoncontrol.cxx b/extensions/source/propctrlr/commoncontrol.cxx
index 96fd15c12e9b..fa223eefff64 100644
--- a/extensions/source/propctrlr/commoncontrol.cxx
+++ b/extensions/source/propctrlr/commoncontrol.cxx
@@ -98,7 +98,7 @@ namespace pcr
         if ( !m_pControlWindow )
             return;
 
-        ScopedVclPtr<ComboBox> aComboBox(new ComboBox(m_pControlWindow, WB_DROPDOWN));
+        ScopedVclPtrInstance< ComboBox > aComboBox(m_pControlWindow, WB_DROPDOWN);
         aComboBox->SetPosSizePixel(Point(0,0), Size(100,100));
         m_pControlWindow->SetSizePixel(aComboBox->GetSizePixel());
 
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index 5fb6c116df7b..d8c7185bceb3 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -2608,7 +2608,7 @@ namespace pcr
         OSL_PRECOND( m_pInfoService.get(), "FormComponentPropertyHandler::impl_dialogListSelection_nothrow: no property meta data!" );
 
         OUString sPropertyUIName( m_pInfoService->getPropertyTranslation( m_pInfoService->getPropertyId( _rProperty ) ) );
-        ScopedVclPtr<ListSelectionDialog> aDialog(new ListSelectionDialog( impl_getDefaultDialogParent_nothrow(), m_xComponent, _rProperty, sPropertyUIName ) );
+        ScopedVclPtrInstance< ListSelectionDialog > aDialog( impl_getDefaultDialogParent_nothrow(), m_xComponent, _rProperty, sPropertyUIName );
         _rClearBeforeDialog.clear();
         return ( RET_OK == aDialog->Execute() );
     }
@@ -2685,7 +2685,7 @@ namespace pcr
             return false;
 
 
-        ScopedVclPtr<FormLinkDialog> aDialog(new FormLinkDialog( impl_getDefaultDialogParent_nothrow(), m_xComponent, xMasterProp, m_xContext ) );
+        ScopedVclPtrInstance< FormLinkDialog > aDialog( impl_getDefaultDialogParent_nothrow(), m_xComponent, xMasterProp, m_xContext );
         _rClearBeforeDialog.clear();
         return ( RET_OK == aDialog->Execute() );
     }
@@ -2871,7 +2871,7 @@ namespace pcr
 
         {   // do this in an own block. The dialog needs to be destroyed before we call
             // destroyItemSet
-            ScopedVclPtr<ControlCharacterDialog> aDlg(new ControlCharacterDialog( impl_getDefaultDialogParent_nothrow(), *pSet ) );
+            ScopedVclPtrInstance< ControlCharacterDialog > aDlg( impl_getDefaultDialogParent_nothrow(), *pSet );
             _rClearBeforeDialog.clear();
             if ( RET_OK == aDlg->Execute() )
             {
@@ -2942,7 +2942,7 @@ namespace pcr
 
     bool FormComponentPropertyHandler::impl_dialogChooseLabelControl_nothrow( Any& _out_rNewValue, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const
     {
-        ScopedVclPtr<OSelectLabelDialog> dlgSelectLabel(new OSelectLabelDialog( impl_getDefaultDialogParent_nothrow(), m_xComponent ) );
+        ScopedVclPtrInstance< OSelectLabelDialog > dlgSelectLabel( impl_getDefaultDialogParent_nothrow(), m_xComponent );
         _rClearBeforeDialog.clear();
         bool bSuccess = ( RET_OK == dlgSelectLabel->Execute() );
         if ( bSuccess )
diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx
index a212c56c4028..b6edcb05face 100644
--- a/extensions/source/scanner/sanedlg.cxx
+++ b/extensions/source/scanner/sanedlg.cxx
@@ -292,7 +292,7 @@ short SaneDlg::Execute()
 {
     if( ! Sane::IsSane() )
     {
-        ScopedVclPtr<MessageDialog> aErrorBox(new MessageDialog(NULL, SaneResId(STR_COULD_NOT_BE_INIT)));
+        ScopedVclPtrInstance< MessageDialog > aErrorBox(nullptr, SaneResId(STR_COULD_NOT_BE_INIT));
         aErrorBox->Execute();
         return sal_False;
     }
@@ -575,7 +575,7 @@ IMPL_LINK( SaneDlg, ClickBtnHdl, Button*, pButton )
             aString = aString.replaceFirst( "%s", Sane::GetVendor( mrSane.GetDeviceNumber() ) );
             aString = aString.replaceFirst( "%s", Sane::GetModel( mrSane.GetDeviceNumber() ) );
             aString = aString.replaceFirst( "%s", Sane::GetType( mrSane.GetDeviceNumber() ) );
-            ScopedVclPtr<MessageDialog> aInfoBox(new MessageDialog(this, aString, VCL_MESSAGE_INFO));
+            ScopedVclPtrInstance< MessageDialog > aInfoBox(this, aString, VCL_MESSAGE_INFO);
             aInfoBox->Execute();
         }
         else if( pButton == mpPreviewButton )
@@ -604,7 +604,7 @@ IMPL_LINK( SaneDlg, ClickBtnHdl, Button*, pButton )
                         x[ i ] = (double)i;
                     mrSane.GetOptionValue( mnCurrentOption, y.get() );
 
-                    ScopedVclPtr<GridDialog> aGrid(new GridDialog( x.get(), y.get(), nElements, this ) );
+                    ScopedVclPtrInstance< GridDialog > aGrid( x.get(), y.get(), nElements, this );
                     aGrid->SetText( mrSane.GetOptionName( mnCurrentOption ) );
                     aGrid->setBoundings( 0, mfMin, nElements, mfMax );
                     if( aGrid->Execute() && aGrid->getNewYValues() )
@@ -856,7 +856,7 @@ void SaneDlg::AcquirePreview()
     if( nOption == -1 )
     {
         OUString aString(SaneResId(STR_SLOW_PREVIEW));
-        ScopedVclPtr<MessageDialog> aBox(new MessageDialog(this, aString, VCL_MESSAGE_WARNING, VCL_BUTTONS_OK_CANCEL));
+        ScopedVclPtrInstance< MessageDialog > aBox(this, aString, VCL_MESSAGE_WARNING, VCL_BUTTONS_OK_CANCEL);
         if (aBox->Execute() == RET_CANCEL)
             return;
     }
@@ -866,7 +866,7 @@ void SaneDlg::AcquirePreview()
     BitmapTransporter aTransporter;
     if( ! mrSane.Start( aTransporter ) )
     {
-        ScopedVclPtr<MessageDialog> aErrorBox(new MessageDialog(this, SaneResId(STR_ERROR_SCAN)));
+        ScopedVclPtrInstance< MessageDialog > aErrorBox(this, SaneResId(STR_ERROR_SCAN));
         aErrorBox->Execute();
     }
     else
diff --git a/extensions/source/scanner/scanunx.cxx b/extensions/source/scanner/scanunx.cxx
index 7a1895608d3a..7d4da1f523fe 100644
--- a/extensions/source/scanner/scanunx.cxx
+++ b/extensions/source/scanner/scanunx.cxx
@@ -299,7 +299,7 @@ sal_Bool ScannerManager::configureScannerAndScan( ScannerContext& scanner_contex
             );
 
         pHolder->m_bBusy = true;
-        ScopedVclPtr<SaneDlg> aDlg(new SaneDlg(NULL, pHolder->m_aSane, listener.is()) );
+        ScopedVclPtrInstance< SaneDlg > aDlg(nullptr, pHolder->m_aSane, listener.is());
         bRet = aDlg->Execute();
         bScan = aDlg->getDoScan();
         pHolder->m_bBusy = false;