From d46e0d9656670dcd7dcca2f32062606400ff6246 Mon Sep 17 00:00:00 2001
From: Michael Meeks <michael.meeks@collabora.com>
Date: Tue, 31 Mar 2015 21:06:51 +0100
Subject: second half of non-scriptable, Instance constructor conversion.

Change-Id: I616c8c28255e0d90ae90033a128bd34d7570530c
---
 sc/source/ui/view/cellsh1.cxx  | 4 ++--
 sc/source/ui/view/cellsh3.cxx  | 4 ++--
 sc/source/ui/view/dbfunc.cxx   | 4 ++--
 sc/source/ui/view/spelleng.cxx | 4 ++--
 sc/source/ui/view/viewfun2.cxx | 8 ++++----
 sc/source/ui/view/viewfun3.cxx | 4 ++--
 6 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'sc')

diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index bf81d0cb7a2d..cc5206614a33 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -2652,9 +2652,9 @@ void ScCellShell::ExecuteDataPilotDialog()
                     {
                         //  confirm selection if it contains SubTotal cells
 
-                        ScopedVclPtr<QueryBox> aBox(new QueryBox( pTabViewShell->GetDialogParent(),
+                        ScopedVclPtrInstance<QueryBox> aBox( pTabViewShell->GetDialogParent(),
                                         WinBits(WB_YES_NO | WB_DEF_YES),
-                                        ScGlobal::GetRscString(STR_DATAPILOT_SUBTOTAL) ) );
+                                        ScGlobal::GetRscString(STR_DATAPILOT_SUBTOTAL) );
                         if (aBox->Execute() == RET_NO)
                             bOK = false;
                     }
diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx
index 3e1c5f11cf51..dd1b2998eec5 100644
--- a/sc/source/ui/view/cellsh3.cxx
+++ b/sc/source/ui/view/cellsh3.cxx
@@ -422,8 +422,8 @@ void ScCellShell::Execute( SfxRequest& rReq )
                     }
                     else if( ! rReq.IsAPI() )
                     {
-                        ScopedVclPtr<MessageDialog> aErrorBox(new MessageDialog(pTabViewShell->GetDialogParent(),
-                                            ScGlobal::GetRscString(STR_NOAREASELECTED)));
+                        ScopedVclPtrInstance<MessageDialog> aErrorBox(pTabViewShell->GetDialogParent(),
+                                            ScGlobal::GetRscString(STR_NOAREASELECTED));
                         aErrorBox->Execute();
                     }
                 }
diff --git a/sc/source/ui/view/dbfunc.cxx b/sc/source/ui/view/dbfunc.cxx
index a24860873774..83224c957fbb 100644
--- a/sc/source/ui/view/dbfunc.cxx
+++ b/sc/source/ui/view/dbfunc.cxx
@@ -383,8 +383,8 @@ void ScDBFunc::ToggleAutoFilter()
         }
         else
         {
-            ScopedVclPtr<MessageDialog> aErrorBox(new MessageDialog(GetViewData().GetDialogParent(),
-                                ScGlobal::GetRscString(STR_ERR_AUTOFILTER)));
+            ScopedVclPtrInstance<MessageDialog> aErrorBox(GetViewData().GetDialogParent(),
+                                ScGlobal::GetRscString(STR_ERR_AUTOFILTER));
             aErrorBox->Execute();
         }
     }
diff --git a/sc/source/ui/view/spelleng.cxx b/sc/source/ui/view/spelleng.cxx
index 77b973186129..3ea3d0dfeafd 100644
--- a/sc/source/ui/view/spelleng.cxx
+++ b/sc/source/ui/view/spelleng.cxx
@@ -305,9 +305,9 @@ bool ScSpellingEngine::ShowTableWrapDialog()
 {
     vcl::Window* pParent = GetDialogParent();
     ScWaitCursorOff aWaitOff( pParent );
-    ScopedVclPtr<MessBox> aMsgBox(new MessBox( pParent, WinBits( WB_YES_NO | WB_DEF_YES ),
+    ScopedVclPtrInstance<MessBox> aMsgBox( pParent, WinBits( WB_YES_NO | WB_DEF_YES ),
         ScGlobal::GetRscString( STR_MSSG_DOSUBTOTALS_0 ),
-        ScGlobal::GetRscString( STR_SPELLING_BEGIN_TAB) ) );
+        ScGlobal::GetRscString( STR_SPELLING_BEGIN_TAB) );
     return aMsgBox->Execute() == RET_YES;
 }
 
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 563e8f232cf7..948a9744ab09 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -1074,10 +1074,10 @@ bool ScViewFunc::MergeCells( bool bApi, bool& rDoContents, bool bRecord, bool bC
     {
         if (!bApi)
         {
-            ScopedVclPtr<MessBox> aBox(new MessBox( GetViewData().GetDialogParent(),
+            ScopedVclPtrInstance<MessBox> aBox( GetViewData().GetDialogParent(),
                             WinBits(WB_YES_NO_CANCEL | WB_DEF_NO),
                             ScGlobal::GetRscString( STR_MSSG_DOSUBTOTALS_0 ),
-                            ScGlobal::GetRscString( STR_MERGE_NOTEMPTY ) ) );
+                            ScGlobal::GetRscString( STR_MERGE_NOTEMPTY ) );
             sal_uInt16 nRetVal = aBox->Execute();
 
             if ( nRetVal == RET_YES )
@@ -1771,9 +1771,9 @@ void ScViewFunc::Solve( const ScSolveParam& rParam )
             aMsgStr += ScGlobal::GetRscString( STR_MSSG_SOLVE_4 );
         }
 
-        ScopedVclPtr<MessBox> aBox(new MessBox( GetViewData().GetDialogParent(),
+        ScopedVclPtrInstance<MessBox> aBox( GetViewData().GetDialogParent(),
                         WinBits(WB_YES_NO | WB_DEF_NO),
-                        ScGlobal::GetRscString( STR_MSSG_DOSUBTOTALS_0 ), aMsgStr ) );
+                        ScGlobal::GetRscString( STR_MSSG_DOSUBTOTALS_0 ), aMsgStr );
         sal_uInt16 nRetVal = aBox->Execute();
 
         if ( RET_YES == nRetVal )
diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx
index f71c915da523..9f1549a4412d 100644
--- a/sc/source/ui/view/viewfun3.cxx
+++ b/sc/source/ui/view/viewfun3.cxx
@@ -1041,8 +1041,8 @@ bool ScViewFunc::PasteFromClip( InsertDeleteFlags nFlags, ScDocument* pClipDoc,
         {
             ScWaitCursorOff aWaitOff( GetFrameWin() );
             OUString aMessage = ScGlobal::GetRscString( STR_PASTE_BIGGER );
-            ScopedVclPtr<QueryBox> aBox(new QueryBox( GetViewData().GetDialogParent(),
-                            WinBits(WB_YES_NO | WB_DEF_NO), aMessage ) );
+            ScopedVclPtrInstance<QueryBox> aBox( GetViewData().GetDialogParent(),
+                            WinBits(WB_YES_NO | WB_DEF_NO), aMessage );
             if ( aBox->Execute() != RET_YES )
             {
                 return false;
-- 
cgit