second half of non-scriptable, Instance constructor conversion.

Change-Id: I616c8c28255e0d90ae90033a128bd34d7570530c

7 files changed, 24 insertions, 27 deletions

diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx
index d187795f43a6..655114e865c2 100644
--- a/sw/source/ui/config/optcomp.cxx
+++ b/sw/source/ui/config/optcomp.cxx
@@ -319,8 +319,8 @@ IMPL_LINK_NOARG(SwCompatibilityOptPage, SelectHdl)
 
 IMPL_LINK_NOARG(SwCompatibilityOptPage, UseAsDefaultHdl)
 {
-    ScopedVclPtr<MessageDialog> aQuery(new MessageDialog(this, "QueryDefaultCompatDialog",
-        "modules/swriter/ui/querydefaultcompatdialog.ui"));
+    ScopedVclPtrInstance<MessageDialog> aQuery(this, "QueryDefaultCompatDialog",
+                                               "modules/swriter/ui/querydefaultcompatdialog.ui");
     if (aQuery->Execute() == RET_YES)
     {
         for ( vector< CompatibilityItem >::iterator pItem = m_pImpl->m_aList.begin();
diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx
index 82f7116e43a9..bdb8992004c1 100644
--- a/sw/source/ui/dbui/mmoutputpage.cxx
+++ b/sw/source/ui/dbui/mmoutputpage.cxx
@@ -1077,8 +1077,8 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton)
 
     if(m_pSubjectED->GetText().isEmpty())
     {
-        ScopedVclPtr<SwSendQueryBox_Impl> aQuery(new SwSendQueryBox_Impl(pButton, "SubjectDialog",
-         "modules/swriter/ui/subjectdialog.ui"));
+        ScopedVclPtrInstance<SwSendQueryBox_Impl> aQuery(pButton, "SubjectDialog",
+                                                         "modules/swriter/ui/subjectdialog.ui");
         aQuery->SetIsEmptyTextAllowed(true);
         aQuery->SetValue(m_sNoSubjectST);
         if(RET_OK == aQuery->Execute())
@@ -1091,8 +1091,8 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton)
     }
     if(!bAsBody && m_pAttachmentED->GetText().isEmpty())
     {
-        ScopedVclPtr<SwSendQueryBox_Impl> aQuery(new SwSendQueryBox_Impl(pButton, "AttachNameDialog",
-         "modules/swriter/ui/attachnamedialog.ui"));
+        ScopedVclPtrInstance<SwSendQueryBox_Impl> aQuery(pButton, "AttachNameDialog",
+                                                         "modules/swriter/ui/attachnamedialog.ui");
         aQuery->SetIsEmptyTextAllowed(false);
         if(RET_OK == aQuery->Execute())
         {
diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx
index 3a4b9fdfb40b..ee31bc5d3841 100644
--- a/sw/source/ui/envelp/labfmt.cxx
+++ b/sw/source/ui/envelp/labfmt.cxx
@@ -649,8 +649,8 @@ IMPL_LINK_NOARG(SwSaveLabelDlg, OkHdl)
             return 0;
         }
 
-        ScopedVclPtr<MessageDialog> aQuery(new MessageDialog(this, "QuerySaveLabelDialog",
-            "modules/swriter/ui/querysavelabeldialog.ui"));
+        ScopedVclPtrInstance<MessageDialog> aQuery(this, "QuerySaveLabelDialog",
+                                                   "modules/swriter/ui/querysavelabeldialog.ui");
 
         aQuery->set_primary_text(aQuery->get_primary_text().
             replaceAll("%1", sMake).replaceAll("%2", sType));
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index e65a90414f75..ccf04859f8eb 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -1478,9 +1478,9 @@ IMPL_LINK(SwTOXSelectTabPage, LanguageHdl, ListBox*, pBox)
 
 IMPL_LINK(SwTOXSelectTabPage, AddStylesHdl, PushButton*, pButton)
 {
-    VclPtr<SwAddStylesDlg_Impl> pDlg(new SwAddStylesDlg_Impl(pButton,
-        static_cast<SwMultiTOXTabDialog*>(GetTabDialog())->GetWrtShell(),
-        aStyleArr));
+    VclPtr<SwAddStylesDlg_Impl> pDlg(pButton,
+                                     static_cast<SwMultiTOXTabDialog*>(GetTabDialog())->GetWrtShell(),
+                                     aStyleArr);
     pDlg->Execute();
     pDlg.reset();
     ModifyHdl(0);
@@ -1514,8 +1514,8 @@ IMPL_LINK(SwTOXSelectTabPage, MenuExecuteHdl, Menu*, pMenu)
                 return 0;
         }
 
-        VclPtr<SwAutoMarkDlg_Impl> pAutoMarkDlg(new SwAutoMarkDlg_Impl(
-                m_pAutoMarkPB, sAutoMarkURL, bNew ));
+        VclPtrInstance<SwAutoMarkDlg_Impl> pAutoMarkDlg(
+                m_pAutoMarkPB, sAutoMarkURL, bNew );
 
         if( RET_OK != pAutoMarkDlg->Execute() && bNew )
             sAutoMarkURL = sSaveAutoMarkURL;
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index 159d3310830f..34ca667d31be 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -1248,9 +1248,9 @@ IMPL_LINK(SwAuthorMarkPane, CreateEntryHdl, PushButton*, pButton)
     OUString sOldId = m_sCreatedEntry[0];
     for(int i = 0; i < AUTH_FIELD_END; i++)
         m_sCreatedEntry[i] = bCreate ? OUString() : m_sFields[i];
-    ScopedVclPtr<SwCreateAuthEntryDlg_Impl> aDlg(new SwCreateAuthEntryDlg_Impl(pButton,
+    ScopedVclPtrInstance<SwCreateAuthEntryDlg_Impl> aDlg(pButton,
                 bCreate ? m_sCreatedEntry : m_sFields,
-                *pSh, bNewEntry, bCreate));
+                *pSh, bNewEntry, bCreate);
     if(bNewEntry)
     {
         aDlg->SetCheckNameHdl(LINK(this, SwAuthorMarkPane, IsEntryAllowedHdl));
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index 985641c52f17..be6bf1546d8a 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -503,8 +503,8 @@ IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn )
     else if (sItemIdent == "rename")
     {
         m_pShortNameEdit->SetText(pGlossaryHdl->GetGlossaryShortName(m_pNameED->GetText()));
-        ScopedVclPtr<SwNewGlosNameDlg> pNewNameDlg(new SwNewGlosNameDlg(this, m_pNameED->GetText(),
-                                                                             m_pShortNameEdit->GetText() ));
+        ScopedVclPtrInstance<SwNewGlosNameDlg> pNewNameDlg(this, m_pNameED->GetText(),
+                                                           m_pShortNameEdit->GetText());
         if( RET_OK == pNewNameDlg->Execute() &&
             pGlossaryHdl->Rename( m_pShortNameEdit->GetText(),
                                     pNewNameDlg->GetNewShort(),
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx
index 977d25f6743d..d4d92db414c9 100644
--- a/sw/source/ui/table/tautofmt.cxx
+++ b/sw/source/ui/table/tautofmt.cxx
@@ -315,10 +315,8 @@ IMPL_LINK_NOARG(SwAutoFormatDlg, AddHdl)
     bool bOk = false, bFmtInserted = false;
     while( !bOk )
     {
-        VclPtr<SwStringInputDlg> pDlg(new SwStringInputDlg( this,
-                                                       aStrTitle,
-                                                       aStrLabel,
-                                                       OUString() ));
+        VclPtrInstance<SwStringInputDlg> pDlg( this, aStrTitle,
+                                               aStrLabel, OUString() );
         if( RET_OK == pDlg->Execute() )
         {
             const OUString aFormatName( pDlg->GetInputString() );
@@ -377,8 +375,8 @@ IMPL_LINK_NOARG(SwAutoFormatDlg, RemoveHdl)
     aMessage += m_pLbFormat->GetSelectEntry();
     aMessage += "\n";
 
-    VclPtr<MessBox> pBox(new MessBox( this, WinBits( WB_OK_CANCEL ),
-                                                 aStrDelTitle, aMessage));
+    VclPtrInstance<MessBox> pBox( this, WinBits( WB_OK_CANCEL ),
+                                  aStrDelTitle, aMessage );
 
     if ( pBox->Execute() == RET_OK )
     {
@@ -412,10 +410,9 @@ IMPL_LINK_NOARG(SwAutoFormatDlg, RenameHdl)
     bool bOk = false;
     while( !bOk )
     {
-        VclPtr<SwStringInputDlg> pDlg(new SwStringInputDlg( this,
-                                                       aStrRenameTitle,
-                                                       m_pLbFormat->GetSelectEntry(),
-                                                       OUString() ));
+        VclPtrInstance<SwStringInputDlg> pDlg( this, aStrRenameTitle,
+                                               m_pLbFormat->GetSelectEntry(),
+                                               OUString() );
         if( pDlg->Execute() == RET_OK )
         {
             bool bFmtRenamed = false;