[Libreoffice-commits] core.git: 2 commits - basctl/source basic/source chart2/source cui/source dbaccess/source desktop/source editeng/source extensions/source scripting/source sc/source sd/source sfx2/source starmath/source svtools/source svx/source sw/source xmlsecurity/source xmlsecurity/workben
Caolán McNamara
caolanm at redhat.com
Tue Jul 26 10:27:27 UTC 2016
basctl/source/basicide/baside2.cxx | 6 +-
basctl/source/basicide/baside2b.cxx | 2
basctl/source/basicide/baside3.cxx | 2
basctl/source/basicide/basides1.cxx | 6 +-
basctl/source/basicide/basidesh.cxx | 2
basctl/source/basicide/basobj2.cxx | 4 -
basctl/source/basicide/bastypes.cxx | 2
basctl/source/basicide/macrodlg.cxx | 6 +-
basctl/source/basicide/moduldl2.cxx | 28 ++++++-------
basctl/source/basicide/moduldlg.cxx | 6 +-
basic/source/runtime/basrdll.cxx | 2
basic/source/runtime/iosys.cxx | 8 +--
chart2/source/controller/dialogs/DataBrowser.cxx | 4 -
chart2/source/controller/dialogs/tp_Scale.cxx | 2
chart2/source/controller/main/ChartController_Window.cxx | 2
cui/source/customize/cfg.cxx | 10 ++--
cui/source/dialogs/cuifmsearch.cxx | 2
cui/source/dialogs/cuigaldlg.cxx | 2
cui/source/dialogs/insdlg.cxx | 6 +-
cui/source/dialogs/multipat.cxx | 4 -
cui/source/options/optdict.cxx | 2
cui/source/options/optinet2.cxx | 2
cui/source/options/optjava.cxx | 4 -
cui/source/options/treeopt.cxx | 2
cui/source/tabpages/page.cxx | 2
cui/source/tabpages/tparea.cxx | 2
cui/source/tabpages/tpcolor.cxx | 6 +-
cui/source/tabpages/tplnedef.cxx | 6 +-
cui/source/tabpages/tplneend.cxx | 6 +-
dbaccess/source/ui/browser/brwctrlr.cxx | 2
dbaccess/source/ui/dlg/ConnectionHelper.cxx | 2
dbaccess/source/ui/dlg/TextConnectionHelper.cxx | 2
dbaccess/source/ui/dlg/paramdialog.cxx | 2
dbaccess/source/ui/misc/UITools.cxx | 2
dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx | 2
dbaccess/source/ui/querydesign/QueryDesignView.cxx | 4 -
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 12 ++---
dbaccess/source/ui/querydesign/querycontroller.cxx | 4 -
dbaccess/source/ui/relationdesign/RelationController.cxx | 2
desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx | 4 -
editeng/source/editeng/editdbg.cxx | 2
editeng/source/editeng/editeng.cxx | 2
editeng/source/misc/unolingu.cxx | 2
extensions/source/abpilot/abspilot.cxx | 2
extensions/source/propctrlr/propcontroller.cxx | 2
extensions/source/update/ui/updatecheckui.cxx | 2
sc/source/ui/dbgui/consdlg.cxx | 2
sc/source/ui/dbgui/dbnamdlg.cxx | 2
sc/source/ui/dbgui/filtdlg.cxx | 2
sc/source/ui/dbgui/scendlg.cxx | 4 -
sc/source/ui/dbgui/sfiltdlg.cxx | 2
sc/source/ui/dbgui/tpsort.cxx | 2
sc/source/ui/docshell/dbdocfun.cxx | 2
sc/source/ui/docshell/docfunc.cxx | 4 -
sc/source/ui/miscdlgs/crnrdlg.cxx | 4 -
sc/source/ui/miscdlgs/filldlg.cxx | 2
sc/source/ui/miscdlgs/instbdlg.cxx | 2
sc/source/ui/miscdlgs/optsolver.cxx | 2
sc/source/ui/miscdlgs/scuiautofmt.cxx | 6 +-
sc/source/ui/miscdlgs/solvrdlg.cxx | 2
sc/source/ui/miscdlgs/tabopdlg.cxx | 2
sc/source/ui/navipi/scenwnd.cxx | 2
sc/source/ui/optdlg/tpcalc.cxx | 2
sc/source/ui/optdlg/tpusrlst.cxx | 8 +--
sc/source/ui/pagedlg/areasdlg.cxx | 2
sc/source/ui/view/cellsh2.cxx | 2
sc/source/ui/view/cellsh3.cxx | 2
sc/source/ui/view/dbfunc.cxx | 2
sc/source/ui/view/dbfunc3.cxx | 2
sc/source/ui/view/spelleng.cxx | 4 -
sc/source/ui/view/tabvwshf.cxx | 4 -
sc/source/ui/view/viewfunc.cxx | 2
scripting/source/dlgprov/dlgevtatt.cxx | 2
sd/source/core/drawdoc3.cxx | 2
sd/source/ui/app/sdmod1.cxx | 2
sd/source/ui/dlg/custsdlg.cxx | 2
sd/source/ui/func/fudraw.cxx | 2
sd/source/ui/func/futhes.cxx | 4 -
sd/source/ui/view/drawview.cxx | 2
sd/source/ui/view/drviews2.cxx | 26 ++++++------
sd/source/ui/view/drviews4.cxx | 2
sd/source/ui/view/drviewse.cxx | 14 +++---
sd/source/ui/view/sdview4.cxx | 2
sfx2/source/appl/appserv.cxx | 2
sfx2/source/appl/linkmgr2.cxx | 2
sfx2/source/appl/lnkbase2.cxx | 2
sfx2/source/bastyp/fltfnc.cxx | 4 -
sfx2/source/control/templatelocalview.cxx | 2
sfx2/source/dialog/dinfdlg.cxx | 2
sfx2/source/dialog/newstyle.cxx | 2
sfx2/source/dialog/securitypage.cxx | 2
sfx2/source/doc/objserv.cxx | 12 ++---
sfx2/source/doc/saveastemplatedlg.cxx | 2
sfx2/source/doc/templatedlg.cxx | 18 ++++----
sfx2/source/view/classificationhelper.cxx | 4 -
sfx2/source/view/viewprn.cxx | 8 +--
starmath/source/dialog.cxx | 9 +---
starmath/source/view.cxx | 2
svtools/source/dialogs/restartdialog.cxx | 2
svtools/source/filter/SvFilterOptionsDialog.cxx | 2
svx/source/dialog/hdft.cxx | 4 -
svx/source/dialog/imapdlg.cxx | 4 -
svx/source/dialog/passwd.cxx | 4 -
svx/source/form/fmshimp.cxx | 4 -
svx/source/gallery2/galbrws1.cxx | 2
svx/source/gallery2/galbrws2.cxx | 2
svx/source/svdraw/svdedtv1.cxx | 2
svx/source/svdraw/svdedxv.cxx | 2
svx/source/svdraw/svdpntv.cxx | 2
sw/source/core/crsr/viscrs.cxx | 2
sw/source/ui/chrdlg/break.cxx | 2
sw/source/ui/config/mailconfigpage.cxx | 2
sw/source/ui/dbui/mmaddressblockpage.cxx | 2
sw/source/ui/dialog/uiregionsw.cxx | 10 ++--
sw/source/ui/envelp/labfmt.cxx | 2
sw/source/ui/misc/bookmark.cxx | 2
sw/source/ui/misc/glossary.cxx | 6 +-
sw/source/ui/misc/srtdlg.cxx | 2
sw/source/ui/table/tabledlg.cxx | 2
sw/source/ui/table/tautofmt.cxx | 4 -
sw/source/uibase/app/docsh.cxx | 5 --
sw/source/uibase/app/docsh2.cxx | 2
sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx | 4 -
sw/source/uibase/dochdl/gloshdl.cxx | 4 -
sw/source/uibase/dochdl/swdtflvr.cxx | 12 ++---
sw/source/uibase/docvw/SidebarTxtControl.cxx | 2
sw/source/uibase/docvw/edtwin.cxx | 6 +-
sw/source/uibase/lingu/hyp.cxx | 2
sw/source/uibase/uiview/srcview.cxx | 8 +--
sw/source/uibase/uiview/uivwimp.cxx | 2
sw/source/uibase/uiview/view2.cxx | 2
sw/source/uibase/uiview/viewling.cxx | 2
sw/source/uibase/uiview/viewprt.cxx | 2
sw/source/uibase/utlui/unotools.cxx | 2
sw/source/uibase/wrtsh/wrtsh1.cxx | 4 -
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 2
xmlsecurity/workben/signaturetest.cxx | 2
137 files changed, 260 insertions(+), 262 deletions(-)
New commits:
commit bfb8b56e1d8e1241045b435c42856f5606faad4f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jul 26 10:54:36 2016 +0100
this can be a ScopedVclPtrInstance
Change-Id: Ia500b2901c6c89ca8755d6b7515d88c18182bb3b
diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index e85e369..eacbe87 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -850,7 +850,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
}
// cell range picker
- ScopedVclPtr<ScValidationDlg> pDlg(VclPtr<ScValidationDlg>::Create(nullptr, &aArgSet, pTabViewShell));
+ ScopedVclPtrInstance<ScValidationDlg> pDlg(nullptr, &aArgSet, pTabViewShell);
short nResult = pDlg->Execute();
if ( nResult == RET_OK )
commit a860df25dd7bf62ecb6b3d3ed38803b981f56d52
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jul 26 10:21:41 2016 +0100
masses of MessBoxes not being disposed promptly
since...
commit ba81e5c6bd420b41a84ade6ccd774011a8089f7f
Date: Thu May 28 21:35:43 2015 +0100
tdf#91702 - fix stack-based MessBox allocation.
There is no special ScopedVclPtr<X>::Create or
ScopedVclPtrInstance<X>::Create just
VclPtr<X>::Create and a raw VclPtr<X>::Create()->foo
doesn't call dispose on the owned X
Change-Id: Ifacc8d5e742820701307c3c37b9b86487667d84f
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index 90e33ae..dcbbb3f 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -304,7 +304,7 @@ void ModulWindow::BasicExecute()
{
if ( !aDocument.allowMacros() )
{
- ScopedVclPtrInstance<MessageDialog>::Create(this, IDE_RESSTR(RID_STR_CANNOTRUNMACRO), VclMessageType::Warning)->Execute();
+ ScopedVclPtrInstance<MessageDialog>(this, IDE_RESSTR(RID_STR_CANNOTRUNMACRO), VclMessageType::Warning)->Execute();
return;
}
}
@@ -434,7 +434,7 @@ void ModulWindow::LoadBasic()
ErrorHandler::HandleError( nError );
}
else
- ScopedVclPtrInstance<MessageDialog>::Create(this, IDE_RESSTR(RID_STR_COULDNTREAD))->Execute();
+ ScopedVclPtrInstance<MessageDialog>(this, IDE_RESSTR(RID_STR_COULDNTREAD))->Execute();
}
}
@@ -475,7 +475,7 @@ void ModulWindow::SaveBasicSource()
ErrorHandler::HandleError( nError );
}
else
- ScopedVclPtrInstance<MessageDialog>::Create(this, IDEResId(RID_STR_COULDNTWRITE))->Execute();
+ ScopedVclPtrInstance<MessageDialog>(this, IDEResId(RID_STR_COULDNTWRITE))->Execute();
}
}
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 431cf60..8c86398 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -480,7 +480,7 @@ bool EditorWindow::ImpCanModify()
{
// If in Trace-mode, abort the trace or refuse input
// Remove markers in the modules in Notify at Basic::Stoped
- if ( ScopedVclPtr<QueryBox>::Create( nullptr, WB_OK_CANCEL, IDEResId(RID_STR_WILLSTOPPRG).toString() )->Execute() == RET_OK )
+ if (ScopedVclPtrInstance<QueryBox>(nullptr, WB_OK_CANCEL, IDEResId(RID_STR_WILLSTOPPRG).toString())->Execute() == RET_OK)
{
rModulWindow.GetBasicStatus().bIsRunning = false;
StopBasic();
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index 5fe3403..185dba4 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -827,7 +827,7 @@ void DialogWindow::SaveDialog()
}
}
else
- ScopedVclPtrInstance<MessageDialog>::Create(this, IDE_RESSTR(RID_STR_COULDNTWRITE))->Execute();
+ ScopedVclPtrInstance<MessageDialog>(this, IDE_RESSTR(RID_STR_COULDNTWRITE))->Execute();
}
}
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index 50ea0d6..6819a7c 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -97,7 +97,7 @@ void Shell::ExecuteCurrent( SfxRequest& rReq )
nActModWindows++;
}
- if ( nActModWindows <= 1 || ( !rSearchItem.GetSelection() && ScopedVclPtr<QueryBox>::Create( pCurWin, WB_YES_NO|WB_DEF_YES, IDEResId(RID_STR_SEARCHALLMODULES).toString() )->Execute() == RET_YES ) )
+ if ( nActModWindows <= 1 || ( !rSearchItem.GetSelection() && ScopedVclPtrInstance<QueryBox>(pCurWin, WB_YES_NO|WB_DEF_YES, IDEResId(RID_STR_SEARCHALLMODULES).toString())->Execute() == RET_YES ) )
{
for (WindowTableIt it = aWindowTable.begin(); it != aWindowTable.end(); ++it)
{
@@ -110,7 +110,7 @@ void Shell::ExecuteCurrent( SfxRequest& rReq )
OUString aReplStr(IDE_RESSTR(RID_STR_SEARCHREPLACES));
aReplStr = aReplStr.replaceAll("XX", OUString::number(nFound));
- ScopedVclPtr<InfoBox>::Create( pCurWin, aReplStr )->Execute();
+ ScopedVclPtrInstance<InfoBox>(pCurWin, aReplStr)->Execute();
}
else
{
@@ -177,7 +177,7 @@ void Shell::ExecuteCurrent( SfxRequest& rReq )
SetCurWindow( pWin, true );
}
if ( !nFound && !bCanceled )
- ScopedVclPtr<InfoBox>::Create( pCurWin, IDEResId(RID_STR_SEARCHNOTFOUND).toString() )->Execute();
+ ScopedVclPtrInstance<InfoBox>(pCurWin, IDEResId(RID_STR_SEARCHNOTFOUND).toString())->Execute();
}
rReq.Done();
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index 7619e56..66c7be6 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -383,7 +383,7 @@ bool Shell::PrepareClose( bool bUI )
if( bUI )
{
vcl::Window *pParent = &GetViewFrame()->GetWindow();
- ScopedVclPtr<InfoBox>::Create( pParent, IDE_RESSTR(RID_STR_CANNOTCLOSE))->Execute();
+ ScopedVclPtrInstance<InfoBox>(pParent, IDE_RESSTR(RID_STR_CANNOTCLOSE))->Execute();
}
return false;
}
diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx
index d344710..82a7ea2 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -69,7 +69,7 @@ void Organize( sal_Int16 tabId )
aDesc = pCurWin->CreateEntryDescriptor();
vcl::Window* pParent = Application::GetDefDialogParent();
- ScopedVclPtrInstance<OrganizeDialog>::Create(pParent, tabId, aDesc)->Execute();
+ ScopedVclPtrInstance<OrganizeDialog>(pParent, tabId, aDesc)->Execute();
}
bool IsValidSbxName( const OUString& rName )
@@ -324,7 +324,7 @@ OUString ChooseMacro( const uno::Reference< frame::XModel >& rxLimitToDocument,
{
// error
bError = true;
- ScopedVclPtrInstance<MessageDialog>::Create(nullptr, IDEResId(RID_STR_ERRORCHOOSEMACRO))->Execute();
+ ScopedVclPtrInstance<MessageDialog>(nullptr, IDEResId(RID_STR_ERRORCHOOSEMACRO))->Execute();
}
}
}
diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx
index be7e136..fb57bc7 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -541,7 +541,7 @@ TabBarAllowRenamingReturnCode TabBar::AllowRenaming()
bool const bValid = IsValidSbxName(GetEditText());
if ( !bValid )
- ScopedVclPtrInstance<MessageDialog>::Create(this, IDEResId(RID_STR_BADSBXNAME))->Execute();
+ ScopedVclPtrInstance<MessageDialog>(this, IDEResId(RID_STR_BADSBXNAME))->Execute();
return bValid ? TABBAR_RENAMING_YES : TABBAR_RENAMING_NO;
}
diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx
index 3c15cbc..c10aab9 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -609,7 +609,7 @@ IMPL_LINK_TYPED( MacroChooser, ButtonHdl, Button *, pButton, void )
ScriptDocument aDocument( ScriptDocument::getDocumentForBasicManager( pBasMgr ) );
if ( aDocument.isDocument() && !aDocument.allowMacros() )
{
- ScopedVclPtrInstance<MessageDialog>::Create(this, IDEResId(RID_STR_CANNOTRUNMACRO), VclMessageType::Warning)->Execute();
+ ScopedVclPtrInstance<MessageDialog>(this, IDEResId(RID_STR_CANNOTRUNMACRO), VclMessageType::Warning)->Execute();
return;
}
}
@@ -618,7 +618,7 @@ IMPL_LINK_TYPED( MacroChooser, ButtonHdl, Button *, pButton, void )
{
if ( !IsValidSbxName(m_pMacroNameEdit->GetText()) )
{
- ScopedVclPtrInstance<MessageDialog>::Create(this, IDEResId(RID_STR_BADSBXNAME))->Execute();
+ ScopedVclPtrInstance<MessageDialog>(this, IDEResId(RID_STR_BADSBXNAME))->Execute();
m_pMacroNameEdit->SetSelection( Selection( 0, m_pMacroNameEdit->GetText().getLength() ) );
m_pMacroNameEdit->GrabFocus();
return;
@@ -691,7 +691,7 @@ IMPL_LINK_TYPED( MacroChooser, ButtonHdl, Button *, pButton, void )
{
if ( !IsValidSbxName(m_pMacroNameEdit->GetText()) )
{
- ScopedVclPtrInstance<MessageDialog>::Create(this, IDEResId(RID_STR_BADSBXNAME))->Execute();
+ ScopedVclPtrInstance<MessageDialog>(this, IDEResId(RID_STR_BADSBXNAME))->Execute();
m_pMacroNameEdit->SetSelection( Selection( 0, m_pMacroNameEdit->GetText().getLength() ) );
m_pMacroNameEdit->GrabFocus();
return;
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index de29b82..a513944 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -271,7 +271,7 @@ bool CheckBox::EditingEntry( SvTreeListEntry* pEntry, Selection& )
OUString aLibName = GetEntryText( pEntry, 0 );
if ( aLibName.equalsIgnoreAsciiCase( "Standard" ) )
{
- ScopedVclPtrInstance<MessageDialog>::Create(this, IDE_RESSTR(RID_STR_CANNOTCHANGENAMESTDLIB))->Execute();
+ ScopedVclPtrInstance<MessageDialog>(this, IDE_RESSTR(RID_STR_CANNOTCHANGENAMESTDLIB))->Execute();
return false;
}
@@ -281,7 +281,7 @@ bool CheckBox::EditingEntry( SvTreeListEntry* pEntry, Selection& )
if ( ( xModLibContainer.is() && xModLibContainer->hasByName( aLibName ) && xModLibContainer->isLibraryReadOnly( aLibName ) && !xModLibContainer->isLibraryLink( aLibName ) ) ||
( xDlgLibContainer.is() && xDlgLibContainer->hasByName( aLibName ) && xDlgLibContainer->isLibraryReadOnly( aLibName ) && !xDlgLibContainer->isLibraryLink( aLibName ) ) )
{
- ScopedVclPtrInstance<MessageDialog>::Create(this, IDE_RESSTR(RID_STR_LIBISREADONLY))->Execute();
+ ScopedVclPtrInstance<MessageDialog>(this, IDE_RESSTR(RID_STR_LIBISREADONLY))->Execute();
return false;
}
@@ -331,7 +331,7 @@ bool CheckBox::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewName )
}
catch (const container::ElementExistException& )
{
- ScopedVclPtrInstance<MessageDialog>::Create(this, IDE_RESSTR(RID_STR_SBXNAMEALLREADYUSED))->Execute();
+ ScopedVclPtrInstance<MessageDialog>(this, IDE_RESSTR(RID_STR_SBXNAMEALLREADYUSED))->Execute();
return false;
}
catch (const container::NoSuchElementException& )
@@ -344,9 +344,9 @@ bool CheckBox::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewName )
if ( !bValid )
{
if ( rNewName.getLength() > 30 )
- ScopedVclPtrInstance<MessageDialog>::Create(this, IDE_RESSTR(RID_STR_LIBNAMETOLONG))->Execute();
+ ScopedVclPtrInstance<MessageDialog>(this, IDE_RESSTR(RID_STR_LIBNAMETOLONG))->Execute();
else
- ScopedVclPtrInstance<MessageDialog>::Create(this, IDE_RESSTR(RID_STR_BADSBXNAME))->Execute();
+ ScopedVclPtrInstance<MessageDialog>(this, IDE_RESSTR(RID_STR_BADSBXNAME))->Execute();
}
return bValid;
@@ -359,7 +359,7 @@ IMPL_LINK_NOARG_TYPED(NewObjectDialog, OkButtonHandler, Button*, void)
EndDialog(1);
else
{
- ScopedVclPtrInstance<MessageDialog>::Create(this, IDE_RESSTR(RID_STR_BADSBXNAME))->Execute();
+ ScopedVclPtrInstance<MessageDialog>(this, IDE_RESSTR(RID_STR_BADSBXNAME))->Execute();
m_pEdit->GrabFocus();
}
}
@@ -847,7 +847,7 @@ void LibPage::InsertLib()
}
if ( !pLibDlg )
- ScopedVclPtrInstance<MessageDialog>::Create(this, IDE_RESSTR(RID_STR_NOLIBINSTORAGE), VclMessageType::Info)->Execute();
+ ScopedVclPtrInstance<MessageDialog>(this, IDE_RESSTR(RID_STR_NOLIBINSTORAGE), VclMessageType::Info)->Execute();
else
{
bool bChanges = false;
@@ -884,7 +884,7 @@ void LibPage::InsertLib()
// check, if the library is the Standard library
if ( aLibName == "Standard" )
{
- ScopedVclPtrInstance<MessageDialog>::Create(this, IDE_RESSTR(RID_STR_REPLACESTDLIB))->Execute();
+ ScopedVclPtrInstance<MessageDialog>(this, IDE_RESSTR(RID_STR_REPLACESTDLIB))->Execute();
continue;
}
@@ -894,7 +894,7 @@ void LibPage::InsertLib()
{
OUString aErrStr( IDE_RESSTR(RID_STR_REPLACELIB) );
aErrStr = aErrStr.replaceAll("XX", aLibName) + "\n" + IDE_RESSTR(RID_STR_LIBISREADONLY);
- ScopedVclPtrInstance<MessageDialog>::Create(this, aErrStr)->Execute();
+ ScopedVclPtrInstance<MessageDialog>(this, aErrStr)->Execute();
continue;
}
@@ -909,7 +909,7 @@ void LibPage::InsertLib()
else
aErrStr = IDE_RESSTR(RID_STR_IMPORTNOTPOSSIBLE);
aErrStr = aErrStr.replaceAll("XX", aLibName) + "\n" +IDE_RESSTR(RID_STR_SBXNAMEALLREADYUSED);
- ScopedVclPtrInstance<MessageDialog>::Create(this, aErrStr)->Execute();
+ ScopedVclPtrInstance<MessageDialog>(this, aErrStr)->Execute();
continue;
}
}
@@ -928,7 +928,7 @@ void LibPage::InsertLib()
{
OUString aErrStr( IDE_RESSTR(RID_STR_NOIMPORT) );
aErrStr = aErrStr.replaceAll("XX", aLibName);
- ScopedVclPtrInstance<MessageDialog>::Create(this, aErrStr)->Execute();
+ ScopedVclPtrInstance<MessageDialog>(this, aErrStr)->Execute();
continue;
}
}
@@ -1494,15 +1494,15 @@ void createLibImpl( vcl::Window* pWin, const ScriptDocument& rDocument,
if ( aLibName.getLength() > 30 )
{
- ScopedVclPtrInstance<MessageDialog>::Create(pWin, IDEResId(RID_STR_LIBNAMETOLONG).toString())->Execute();
+ ScopedVclPtrInstance<MessageDialog>(pWin, IDEResId(RID_STR_LIBNAMETOLONG).toString())->Execute();
}
else if ( !IsValidSbxName( aLibName ) )
{
- ScopedVclPtrInstance<MessageDialog>::Create(pWin, IDEResId(RID_STR_BADSBXNAME).toString())->Execute();
+ ScopedVclPtrInstance<MessageDialog>(pWin, IDEResId(RID_STR_BADSBXNAME).toString())->Execute();
}
else if ( rDocument.hasLibrary( E_SCRIPTS, aLibName ) || rDocument.hasLibrary( E_DIALOGS, aLibName ) )
{
- ScopedVclPtrInstance<MessageDialog>::Create(pWin, IDEResId(RID_STR_SBXNAMEALLREADYUSED2).toString())->Execute();
+ ScopedVclPtrInstance<MessageDialog>(pWin, IDEResId(RID_STR_SBXNAMEALLREADYUSED2).toString())->Execute();
}
else
{
diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx
index a1eafce..cf4e557 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -92,7 +92,7 @@ bool ExtTreeListBox::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewT
{
if ( !IsValidSbxName(rNewText) )
{
- ScopedVclPtrInstance<MessageDialog>::Create(this, IDE_RESSTR(RID_STR_BADSBXNAME))->Execute();
+ ScopedVclPtrInstance<MessageDialog>(this, IDE_RESSTR(RID_STR_BADSBXNAME))->Execute();
return false;
}
@@ -828,7 +828,7 @@ void ObjectPage::NewDialog()
if ( aDocument.hasDialog( aLibName, aDlgName ) )
{
- ScopedVclPtrInstance<MessageDialog>::Create(this, IDE_RESSTR(RID_STR_SBXNAMEALLREADYUSED2))->Execute();
+ ScopedVclPtrInstance<MessageDialog>(this, IDE_RESSTR(RID_STR_SBXNAMEALLREADYUSED2))->Execute();
}
else
{
@@ -1043,7 +1043,7 @@ SbModule* createModImpl( vcl::Window* pWin, const ScriptDocument& rDocument,
}
catch (const container::ElementExistException& )
{
- ScopedVclPtrInstance<MessageDialog>::Create(pWin, IDE_RESSTR(RID_STR_SBXNAMEALLREADYUSED2))->Execute();
+ ScopedVclPtrInstance<MessageDialog>(pWin, IDE_RESSTR(RID_STR_SBXNAMEALLREADYUSED2))->Execute();
}
catch (const container::NoSuchElementException& )
{
diff --git a/basic/source/runtime/basrdll.cxx b/basic/source/runtime/basrdll.cxx
index e10b7b3..a9ceda6 100644
--- a/basic/source/runtime/basrdll.cxx
+++ b/basic/source/runtime/basrdll.cxx
@@ -103,7 +103,7 @@ void BasicDLL::BasicBreak()
{
bJustStopping = true;
StarBASIC::Stop();
- ScopedVclPtr<InfoBox>::Create( nullptr, BasResId(IDS_SBERR_TERMINATED).toString() )->Execute();
+ ScopedVclPtrInstance<InfoBox>(nullptr, BasResId(IDS_SBERR_TERMINATED).toString())->Execute();
bJustStopping = false;
}
}
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index b9b6823..c6c1390 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -742,9 +742,9 @@ void SbiIoSystem::Shutdown()
{
#if defined __GNUC__
vcl::Window* pParent = Application::GetDefDialogParent();
- ScopedVclPtrInstance<MessBox>::Create( pParent, WinBits( WB_OK ), OUString(), aOut )->Execute();
+ ScopedVclPtrInstance<MessBox>( pParent, WinBits( WB_OK ), OUString(), aOut )->Execute();
#else
- ScopedVclPtrInstance<MessBox>::Create( GetpApp()->GetDefDialogParent(), WinBits( WB_OK ), OUString(), aOut )->Execute();
+ ScopedVclPtrInstance<MessBox>( GetpApp()->GetDefDialogParent(), WinBits( WB_OK ), OUString(), aOut )->Execute();
#endif
}
aOut.clear();
@@ -887,10 +887,10 @@ void SbiIoSystem::WriteCon(const OUString& rText)
}
{
SolarMutexGuard aSolarGuard;
- if( !ScopedVclPtr<MessBox>::Create(
+ if( !ScopedVclPtrInstance<MessBox>(
Application::GetDefDialogParent(),
WinBits( WB_OK_CANCEL | WB_DEF_OK ),
- OUString(), s )->Execute() )
+ OUString(), s)->Execute() )
{
nError = ERRCODE_BASIC_USER_ABORT;
}
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index 6187109..d71dfa7 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -131,7 +131,7 @@ void SeriesHeaderEdit::MouseButtonDown( const MouseEvent& rMEvt )
Edit::MouseButtonDown( rMEvt );
if( m_bShowWarningBox )
- ScopedVclPtr<WarningBox>::Create(this, WinBits( WB_OK ),
+ ScopedVclPtrInstance<WarningBox>(this, WinBits( WB_OK ),
SCH_RESSTR(STR_INVALID_NUMBER))->Execute();
}
@@ -746,7 +746,7 @@ void DataBrowser::MouseButtonDown( const BrowserMouseEvent& rEvt )
void DataBrowser::ShowWarningBox()
{
- ScopedVclPtr<WarningBox>::Create(this, WinBits( WB_OK ),
+ ScopedVclPtrInstance<WarningBox>(this, WinBits( WB_OK ),
SCH_RESSTR(STR_INVALID_NUMBER))->Execute();
}
diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx
index d53ba44..cdf8c64 100644
--- a/chart2/source/controller/dialogs/tp_Scale.cxx
+++ b/chart2/source/controller/dialogs/tp_Scale.cxx
@@ -619,7 +619,7 @@ bool ScaleTabPage::ShowWarning( sal_uInt16 nResIdMessage, Control* pControl /* =
if( nResIdMessage == 0 )
return false;
- ScopedVclPtr<WarningBox>::Create( this, WinBits( WB_OK ), SCH_RESSTR( nResIdMessage ) )->Execute();
+ ScopedVclPtrInstance<WarningBox>(this, WinBits( WB_OK ), SCH_RESSTR(nResIdMessage))->Execute();
if( pControl )
{
pControl->GrabFocus();
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index dfe6811..41c6ef8 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -1516,7 +1516,7 @@ bool ChartController::execute_KeyInput( const KeyEvent& rKEvt )
if( ! bReturn )
{
SolarMutexGuard aGuard;
- ScopedVclPtr<InfoBox>::Create( m_pChartWindow, SCH_RESSTR( STR_ACTION_NOTPOSSIBLE ))->Execute();
+ ScopedVclPtrInstance<InfoBox>(m_pChartWindow, SCH_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
}
}
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 5595e6b..ada85af 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -2346,9 +2346,9 @@ SvTreeListEntry* SvxConfigPage::InsertEntryIntoUI(
IMPL_LINK_NOARG_TYPED( SvxConfigPage, AsyncInfoMsg, void*, void )
{
// Asynchronous msg because of D&D
- ScopedVclPtr<MessageDialog>::Create( this,
+ ScopedVclPtrInstance<MessageDialog>(this,
CUI_RES( RID_SVXSTR_MNUCFG_ALREADY_INCLUDED ),
- VclMessageType::Info )->Execute();
+ VclMessageType::Info)->Execute();
}
IMPL_LINK_TYPED( SvxConfigPage, MoveHdl, Button *, pButton, void )
@@ -5233,7 +5233,7 @@ IMPL_LINK_NOARG_TYPED( SvxIconSelectorDialog, ImportHdl, Button *, void)
IMPL_LINK_NOARG_TYPED( SvxIconSelectorDialog, DeleteHdl, Button *, void )
{
OUString message = CUI_RES( RID_SVXSTR_DELETE_ICON_CONFIRM );
- if ( ScopedVclPtr<WarningBox>::Create( this, WinBits(WB_OK_CANCEL), message )->Execute() == RET_OK )
+ if (ScopedVclPtrInstance<WarningBox>(this, WinBits(WB_OK_CANCEL), message)->Execute() == RET_OK)
{
sal_uInt16 nCount = pTbSymbol->GetItemCount();
@@ -5355,7 +5355,7 @@ void SvxIconSelectorDialog::ImportGraphics(
{
aIndex = rPaths[0].lastIndexOf( '/' );
aIconName = rPaths[0].copy( aIndex+1 );
- ret = ScopedVclPtr<SvxIconReplacementDialog>::Create( this, aIconName )->ShowDialog();
+ ret = ScopedVclPtrInstance<SvxIconReplacementDialog>(this, aIconName)->ShowDialog();
if ( ret == 2 )
{
ReplaceGraphicItem( rPaths[0] );
@@ -5383,7 +5383,7 @@ void SvxIconSelectorDialog::ImportGraphics(
{
aIndex = rPaths[i].lastIndexOf( '/' );
aIconName = rPaths[i].copy( aIndex+1 );
- ret = ScopedVclPtr<SvxIconReplacementDialog>::Create( this, aIconName, true )->ShowDialog();
+ ret = ScopedVclPtrInstance<SvxIconReplacementDialog>(this, aIconName, true)->ShowDialog();
if ( ret == 2 )
{
ReplaceGraphicItem( aPath );
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index e0b9444..7fcc943 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -736,7 +736,7 @@ IMPL_LINK_TYPED(FmSearchDialog, OnSearchProgress, const FmSearchProgress*, pProg
sal_uInt16 nErrorId = (FmSearchProgress::STATE_ERROR == pProgress->aSearchState)
? RID_STR_SEARCH_GENERAL_ERROR
: RID_STR_SEARCH_NORECORD;
- ScopedVclPtrInstance<MessageDialog>::Create(this, CUI_RES(nErrorId))->Execute();
+ ScopedVclPtrInstance<MessageDialog>(this, CUI_RES(nErrorId))->Execute();
SAL_FALLTHROUGH;
}
case FmSearchProgress::STATE_CANCELED:
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index ca99ba8..9e6c715 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -986,7 +986,7 @@ IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, SelectFileTypeHdl, ComboBox&, vo
{
aLastFilterName = aText;
- if( ScopedVclPtrInstance<MessageDialog>::Create( this, "QueryUpdateFileListDialog","cui/ui/queryupdategalleryfilelistdialog.ui" )->Execute() == RET_YES )
+ if( ScopedVclPtrInstance<MessageDialog>( this, "QueryUpdateFileListDialog","cui/ui/queryupdategalleryfilelistdialog.ui" )->Execute() == RET_YES )
SearchFiles();
}
}
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index c98baa8..9c0b5a5 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -284,7 +284,7 @@ short SvInsertOleDlg::Execute()
// global Resource from svtools (former so3 resource)
OUString aErr( impl_getSvtResString( STR_ERROR_OBJNOCREATE_FROM_FILE ) );
aErr = aErr.replaceFirst( "%", aFileName );
- ScopedVclPtrInstance<MessageDialog>::Create(this, aErr)->Execute();
+ ScopedVclPtrInstance<MessageDialog>(this, aErr)->Execute();
}
else
{
@@ -292,7 +292,7 @@ short SvInsertOleDlg::Execute()
// global Resource from svtools (former so3 resource)
OUString aErr( impl_getSvtResString( STR_ERROR_OBJNOCREATE ) );
aErr = aErr.replaceFirst( "%", aServerName );
- ScopedVclPtrInstance<MessageDialog>::Create(this, aErr)->Execute();
+ ScopedVclPtrInstance<MessageDialog>(this, aErr)->Execute();
}
}
}
@@ -333,7 +333,7 @@ short SvInsertOleDlg::Execute()
// global Resource from svtools (former so3 resource)
OUString aErr( impl_getSvtResString( STR_ERROR_OBJNOCREATE_FROM_FILE ) );
aErr = aErr.replaceFirst( "%", aFileName );
- ScopedVclPtrInstance<MessageDialog>::Create(this, aErr)->Execute();
+ ScopedVclPtrInstance<MessageDialog>(this, aErr)->Execute();
}
}
}
diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx
index 3962413..bd4e9ad 100644
--- a/cui/source/dialogs/multipat.cxx
+++ b/cui/source/dialogs/multipat.cxx
@@ -92,7 +92,7 @@ IMPL_LINK_NOARG_TYPED(SvxMultiPathDialog, AddHdl_Impl, Button*, void)
{
OUString sMsg( CUI_RES( RID_MULTIPATH_DBL_ERR ) );
sMsg = sMsg.replaceFirst( "%1", sInsPath );
- ScopedVclPtr<InfoBox>::Create( this, sMsg )->Execute();
+ ScopedVclPtrInstance<InfoBox>(this, sMsg)->Execute();
}
SelectHdl_Impl( nullptr );
@@ -116,7 +116,7 @@ IMPL_LINK_NOARG_TYPED(SvxPathSelectDialog, AddHdl_Impl, Button*, void)
{
OUString sMsg( CUI_RES( RID_MULTIPATH_DBL_ERR ) );
sMsg = sMsg.replaceFirst( "%1", sInsPath );
- ScopedVclPtr<InfoBox>::Create( this, sMsg )->Execute();
+ ScopedVclPtrInstance<InfoBox>(this, sMsg)->Execute();
}
else
{
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index a4d6b79..40ab495 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -152,7 +152,7 @@ IMPL_LINK_NOARG_TYPED(SvxNewDictionaryDialog, OKHdl_Impl, Button*, void)
if ( bFound )
{
// duplicate names?
- ScopedVclPtrInstance<MessageDialog>::Create(this, CUI_RESSTR(RID_SVXSTR_OPT_DOUBLE_DICTS), VclMessageType::Info)->Execute();
+ ScopedVclPtrInstance<MessageDialog>(this, CUI_RESSTR(RID_SVXSTR_OPT_DOUBLE_DICTS), VclMessageType::Info)->Execute();
pNameEdit->GrabFocus();
return;
}
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index b52418d..fc817a3 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -132,7 +132,7 @@ void SvxNoSpaceEdit::Modify()
if ( !comphelper::string::isdigitAsciiString(aValue) || (long)aValue.toInt32() > USHRT_MAX )
// the maximum value of a port number is USHRT_MAX
- ScopedVclPtrInstance<MessageDialog>::Create( this, CUI_RES( RID_SVXSTR_OPT_PROXYPORTS ) )->Execute();
+ ScopedVclPtrInstance<MessageDialog>(this, CUI_RES( RID_SVXSTR_OPT_PROXYPORTS))->Execute();
}
}
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 20a651b..9fba0a9 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -1024,7 +1024,7 @@ IMPL_LINK_NOARG_TYPED(SvxJavaClassPathDlg, AddArchiveHdl_Impl, Button*, void)
{
OUString sMsg( CUI_RES( RID_SVXSTR_MULTIFILE_DBL_ERR ) );
sMsg = sMsg.replaceFirst( "%1", sFile );
- ScopedVclPtrInstance<MessageDialog>::Create(this, sMsg)->Execute();
+ ScopedVclPtrInstance<MessageDialog>(this, sMsg)->Execute();
}
}
EnableRemoveButton();
@@ -1059,7 +1059,7 @@ IMPL_LINK_NOARG_TYPED(SvxJavaClassPathDlg, AddPathHdl_Impl, Button*, void)
{
OUString sMsg( CUI_RES( RID_SVXSTR_MULTIFILE_DBL_ERR ) );
sMsg = sMsg.replaceFirst( "%1", sNewFolder );
- ScopedVclPtrInstance<MessageDialog>::Create(this, sMsg)->Execute();
+ ScopedVclPtrInstance<MessageDialog>(this, sMsg)->Execute();
}
}
EnableRemoveButton();
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index d61a661..4c4c62f 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -1008,7 +1008,7 @@ void OfaTreeOptionsDialog::SelectHdl_Impl()
if(!pGroupInfo->m_pModule)
{
pGroupInfo->m_bLoadError = true;
- ScopedVclPtr<InfoBox>::Create(pBox, sNotLoadedError)->Execute();
+ ScopedVclPtrInstance<InfoBox>(pBox, sNotLoadedError)->Execute();
return;
}
if(bIdentical)
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 65bc2d1..f6fea29 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -1429,7 +1429,7 @@ DeactivateRC SvxPageDescPage::DeactivatePage( SfxItemSet* _pSet )
if ( ePaper != PAPER_SCREEN_4_3 && ePaper != PAPER_SCREEN_16_9 && ePaper != PAPER_SCREEN_16_10 && IsMarginOutOfRange() )
{
- if ( ScopedVclPtr<QueryBox>::Create( this, WB_YES_NO | WB_DEF_NO, m_pPrintRangeQueryText->GetText() )->Execute() == RET_NO )
+ if (ScopedVclPtrInstance<QueryBox>(this, WB_YES_NO | WB_DEF_NO, m_pPrintRangeQueryText->GetText())->Execute() == RET_NO)
{
MetricField* pField = nullptr;
if ( IsPrinterRangeOverflow( *m_pLeftMarginEdit, nFirstLeftMargin, nLastLeftMargin, MARGIN_LEFT ) )
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 87155bc..6f42552 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -1468,7 +1468,7 @@ IMPL_LINK_NOARG_TYPED( SvxAreaTabPage, ClickImportHdl_Impl, Button*, void )
else
{
// graphic could not be loaded
- ScopedVclPtrInstance<MessageDialog>::Create (this, OUString(ResId(RID_SVXSTR_READ_DATA_ERROR, rMgr)))->Execute();
+ ScopedVclPtrInstance<MessageDialog>(this, OUString(ResId(RID_SVXSTR_READ_DATA_ERROR, rMgr)))->Execute();
}
}
}
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 00d1a7b..82599b0 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -125,7 +125,7 @@ IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickLoadHdl_Impl, Button*, void)
if( IsModified() && GetList()->Count() > 0 )
{
- nReturn = ScopedVclPtrInstance<MessageDialog>::Create( GetParentDialog()
+ nReturn = ScopedVclPtrInstance<MessageDialog>(GetParentDialog()
,"AskSaveList"
,"cui/ui/querysavelistdialog.ui")->Execute();
@@ -179,7 +179,7 @@ IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickLoadHdl_Impl, Button*, void)
}
else
{
- ScopedVclPtrInstance<MessageDialog>::Create( mpTopDlg
+ ScopedVclPtrInstance<MessageDialog>(mpTopDlg
,"NoLoadedFileDialog"
,"cui/ui/querynoloadedfiledialog.ui")->Execute();
}
@@ -247,7 +247,7 @@ IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickSaveHdl_Impl, Button*, void)
}
else
{
- ScopedVclPtrInstance<MessageDialog>::Create( mpTopDlg
+ ScopedVclPtrInstance<MessageDialog>(mpTopDlg
,"NoSaveFileDialog"
,"cui/ui/querynosavefiledialog.ui")->Execute();
}
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 52ea9dd..499dfb5 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -726,7 +726,7 @@ IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickLoadHdl_Impl, Button*, void)
if ( *pnDashListState & ChangeType::MODIFIED )
{
- nReturn = ScopedVclPtrInstance<MessageDialog>::Create( GetParentDialog()
+ nReturn = ScopedVclPtrInstance<MessageDialog>(GetParentDialog()
,"AskSaveList"
,"cui/ui/querysavelistdialog.ui")->Execute();
@@ -778,7 +778,7 @@ IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickLoadHdl_Impl, Button*, void)
}
else
//aIStream.Close();
- ScopedVclPtrInstance<MessageDialog>::Create( GetParentDialog()
+ ScopedVclPtrInstance<MessageDialog>(GetParentDialog()
,"NoLoadedFileDialog"
,"cui/ui/querynoloadedfiledialog.ui")->Execute();
}
@@ -845,7 +845,7 @@ IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickSaveHdl_Impl, Button*, void)
}
else
{
- ScopedVclPtrInstance<MessageDialog>::Create( GetParentDialog()
+ ScopedVclPtrInstance<MessageDialog>(GetParentDialog()
,"NoSaveFileDialog"
,"cui/ui/querynosavefiledialog.ui")->Execute();
}
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index e2d039e..511b973 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -540,7 +540,7 @@ IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickLoadHdl_Impl, Button*, void)
if ( *pnLineEndListState & ChangeType::MODIFIED )
{
- nReturn = ScopedVclPtrInstance<MessageDialog>::Create( GetParentDialog()
+ nReturn = ScopedVclPtrInstance<MessageDialog>(GetParentDialog()
,"AskSaveList"
,"cui/ui/querysavelistdialog.ui")->Execute();
@@ -593,7 +593,7 @@ IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickLoadHdl_Impl, Button*, void)
*pnLineEndListState &= ~ChangeType::MODIFIED;
}
else
- ScopedVclPtrInstance<MessageDialog>::Create( GetParentDialog()
+ ScopedVclPtrInstance<MessageDialog>(GetParentDialog()
,"NoLoadedFileDialog"
,"cui/ui/querynoloadedfiledialog.ui")->Execute();
}
@@ -660,7 +660,7 @@ IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickSaveHdl_Impl, Button*, void)
}
else
{
- ScopedVclPtrInstance<MessageDialog>::Create( GetParentDialog()
+ ScopedVclPtrInstance<MessageDialog>(GetParentDialog()
,"NoSaveFileDialog"
,"cui/ui/querynosavefiledialog.ui")->Execute();
}
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index 3807782..af26126 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -1380,7 +1380,7 @@ void SbaXDataBrowserController::resetted(const css::lang::EventObject& rEvent) t
sal_Bool SbaXDataBrowserController::confirmDelete(const css::sdb::RowChangeEvent& /*aEvent*/) throw( RuntimeException, std::exception )
{
- if (ScopedVclPtrInstance<MessageDialog>::Create(getBrowserView(), ModuleRes(STR_QUERY_BRW_DELETE_ROWS), VclMessageType::Question, VCL_BUTTONS_YES_NO)->Execute() != RET_YES)
+ if (ScopedVclPtrInstance<MessageDialog>(getBrowserView(), ModuleRes(STR_QUERY_BRW_DELETE_ROWS), VclMessageType::Question, VCL_BUTTONS_YES_NO)->Execute() != RET_YES)
return false;
return true;
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index 49be4ca..7efded1 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -674,7 +674,7 @@ namespace dbaui
{
OUString sFile = ModuleRes( STR_FILE_DOES_NOT_EXIST );
sFile = sFile.replaceFirst("$file$", aTransformer.get(OFileNotation::N_SYSTEM));
- ScopedVclPtr<OSQLWarningBox>::Create( this, sFile )->Execute();
+ ScopedVclPtrInstance<OSQLWarningBox>(this, sFile)->Execute();
setURLNoPrefix(sOldPath);
SetRoadmapStateValue(false);
callModifiedHdl();
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
index ac71da2..00c5be3 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
@@ -309,7 +309,7 @@ namespace dbaui
}
else
return true;
- ScopedVclPtrInstance<MessageDialog>::Create(nullptr, MnemonicGenerator::EraseAllMnemonicChars(aErrorText))->Execute();
+ ScopedVclPtrInstance<MessageDialog>(nullptr, MnemonicGenerator::EraseAllMnemonicChars(aErrorText))->Execute();
pErrorWin->GrabFocus();
return false;
}
diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx
index c1c0e77..ee65913 100644
--- a/dbaccess/source/ui/dlg/paramdialog.cxx
+++ b/dbaccess/source/ui/dlg/paramdialog.cxx
@@ -203,7 +203,7 @@ namespace dbaui
OUString sMessage(ModuleRes(STR_COULD_NOT_CONVERT_PARAM));
sMessage = sMessage.replaceAll( "$name$", sName );
- ScopedVclPtrInstance<MessageDialog>::Create(nullptr, sMessage)->Execute();
+ ScopedVclPtrInstance<MessageDialog>(nullptr, sMessage)->Execute();
m_pParam->GrabFocus();
return true;
}
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index 086d128..8027c7a 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -940,7 +940,7 @@ bool appendToFilter(const Reference<XConnection>& _xConnection,
if(! ::dbaui::checkDataSourceAvailable(::comphelper::getString(xProp->getPropertyValue(PROPERTY_NAME)),_rxContext))
{
OUString aMessage(ModuleRes(STR_TABLEDESIGN_DATASOURCE_DELETED));
- ScopedVclPtr<OSQLWarningBox>::Create( _pParent, aMessage )->Execute();
+ ScopedVclPtrInstance<OSQLWarningBox>(_pParent, aMessage)->Execute();
bRet = false;
}
else
diff --git a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
index 5e030f2..7d520a4 100644
--- a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
+++ b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
@@ -456,7 +456,7 @@ namespace dbaui
if ( !pWin )
pWin = getView()->Window::GetParent();
- ScopedVclPtrInstance<MessageDialog>::Create(pWin, aMessage, VclMessageType::Info)->Execute();
+ ScopedVclPtrInstance<MessageDialog>(pWin, aMessage, VclMessageType::Info)->Execute();
}
const Reference< XConnection >& DBSubComponentController::getConnection() const
{
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index b7d4fac..8f8748c 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -755,7 +755,7 @@ namespace
{
// only show the messagebox the first time
if (!bCritsOnAsterikWarning)
- ScopedVclPtrInstance<MessageDialog>::Create(_pView, ModuleRes( STR_QRY_CRITERIA_ON_ASTERISK))->Execute();
+ ScopedVclPtrInstance<MessageDialog>(_pView, ModuleRes( STR_QRY_CRITERIA_ON_ASTERISK))->Execute();
bCritsOnAsterikWarning = true;
continue;
}
@@ -912,7 +912,7 @@ namespace
{
// only show the MessageBox the first time
if (!bCritsOnAsterikWarning)
- ScopedVclPtrInstance<MessageDialog>::Create(_pView, ModuleRes( STR_QRY_ORDERBY_ON_ASTERISK))->Execute();
+ ScopedVclPtrInstance<MessageDialog>(_pView, ModuleRes( STR_QRY_ORDERBY_ON_ASTERISK))->Execute();
bCritsOnAsterikWarning = true;
continue;
}
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index e9d14eb..8a823a0 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -523,7 +523,7 @@ void OSelectionBrowseBox::InitController(CellControllerRef& /*rController*/, lon
m_pVisibleCell->GetBox().EnableInput(false);
OUString aMessage(ModuleRes(STR_QRY_ORDERBY_UNRELATED));
OQueryDesignView* paDView = getDesignView();
- ScopedVclPtr<InfoBox>::Create(paDView, aMessage)->Execute();
+ ScopedVclPtrInstance<InfoBox>(paDView, aMessage)->Execute();
}
} break;
case BROW_ORDER_ROW:
@@ -613,7 +613,7 @@ bool OSelectionBrowseBox::fillColumnRef(const OUString& _sColumnName, const OUSt
{
OUString sErrorMsg(ModuleRes(RID_STR_FIELD_DOESNT_EXIST));
sErrorMsg = sErrorMsg.replaceFirst("$name$",_sColumnName);
- ScopedVclPtr<OSQLErrorBox>::Create( this, sErrorMsg )->Execute();
+ ScopedVclPtrInstance<OSQLErrorBox>(this, sErrorMsg)->Execute();
bError = true;
}
else
@@ -718,7 +718,7 @@ bool OSelectionBrowseBox::saveField(OUString& _sFieldName ,OTableFieldDescRef& _
// something different which we have to check
OUString sErrorMessage( ModuleRes( STR_QRY_COLUMN_NOT_FOUND ) );
sErrorMessage = sErrorMessage.replaceFirst("$name$",_sFieldName);
- ScopedVclPtr<OSQLErrorBox>::Create( this, sErrorMessage )->Execute();
+ ScopedVclPtrInstance<OSQLErrorBox>(this, sErrorMessage)->Execute();
return true;
}
@@ -874,7 +874,7 @@ bool OSelectionBrowseBox::saveField(OUString& _sFieldName ,OTableFieldDescRef& _
{ // the field could not be inserted
OUString sErrorMessage( ModuleRes( RID_STR_FIELD_DOESNT_EXIST ) );
sErrorMessage = sErrorMessage.replaceFirst("$name$",aSelEntry->GetField());
- ScopedVclPtr<OSQLErrorBox>::Create( this, sErrorMessage )->Execute();
+ ScopedVclPtrInstance<OSQLErrorBox>(this, sErrorMessage)->Execute();
bError = true;
}
}
@@ -1141,7 +1141,7 @@ bool OSelectionBrowseBox::SaveModified()
{
if ( !m_bDisableErrorBox )
{
- ScopedVclPtr<OSQLWarningBox>::Create( this, aErrorMsg )->Execute();
+ ScopedVclPtrInstance<OSQLWarningBox>(this, aErrorMsg)->Execute();
}
bError = true;
}
@@ -1150,7 +1150,7 @@ bool OSelectionBrowseBox::SaveModified()
{
if ( !m_bDisableErrorBox )
{
- ScopedVclPtr<OSQLWarningBox>::Create( this, aErrorMsg )->Execute();
+ ScopedVclPtrInstance<OSQLWarningBox>(this, aErrorMsg)->Execute();
}
bError = true;
}
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index 66a203b..f56bcab 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -1046,7 +1046,7 @@ void OQueryController::impl_initialize()
m_bGraphicalDesign = false;
getContainer()->initialize();
ODataView* pWindow = getView();
- ScopedVclPtr<OSQLMessageBox>::Create(pWindow,e)->Execute();
+ ScopedVclPtrInstance<OSQLMessageBox>(pWindow,e)->Execute();
}
throw;
}
@@ -1398,7 +1398,7 @@ bool OQueryController::doSaveAsDoc(bool _bSaveAs)
if ( !editingCommand() && !haveDataSource() )
{
OUString aMessage(ModuleRes(STR_DATASOURCE_DELETED));
- ScopedVclPtr<OSQLWarningBox>::Create( getView(), aMessage )->Execute();
+ ScopedVclPtrInstance<OSQLWarningBox>(getView(), aMessage)->Execute();
return false;
}
diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx
index 49dc650..8f51f9a 100644
--- a/dbaccess/source/ui/relationdesign/RelationController.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationController.cxx
@@ -160,7 +160,7 @@ void ORelationController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue
if(!::dbaui::checkDataSourceAvailable(::comphelper::getString(getDataSource()->getPropertyValue(PROPERTY_NAME)), getORB()))
{
OUString aMessage(ModuleRes(STR_DATASOURCE_DELETED));
- ScopedVclPtr<OSQLWarningBox>::Create( getView(), aMessage )->Execute();
+ ScopedVclPtrInstance<OSQLWarningBox>(getView(), aMessage)->Execute();
}
else
{
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
index c7f720f..4a691c8 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
@@ -396,7 +396,7 @@ void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const &
}
{
SolarMutexGuard guard;
- short n = ScopedVclPtrInstance<DependencyDialog>::Create( m_pDialogHelper? m_pDialogHelper->getWindow() : nullptr, deps )->Execute();
+ short n = ScopedVclPtrInstance<DependencyDialog>( m_pDialogHelper? m_pDialogHelper->getWindow() : nullptr, deps )->Execute();
// Distinguish between closing the dialog and programatically
// canceling the dialog (headless VCL):
approve = n == RET_OK
@@ -940,7 +940,7 @@ void ExtensionCmdQueue::Thread::_checkForUpdates(
short nDialogResult = RET_OK;
if ( !dataDownload.empty() )
{
- nDialogResult = ScopedVclPtrInstance<UpdateInstallDialog>::Create( m_pDialogHelper? m_pDialogHelper->getWindow() : nullptr, dataDownload, m_xContext )->Execute();
+ nDialogResult = ScopedVclPtrInstance<UpdateInstallDialog>( m_pDialogHelper? m_pDialogHelper->getWindow() : nullptr, dataDownload, m_xContext )->Execute();
pUpdateDialog->notifyMenubar( false, true ); // Check, if there are still pending updates to be notified via menu bar icon
}
else
diff --git a/editeng/source/editeng/editdbg.cxx b/editeng/source/editeng/editdbg.cxx
index ef6ab7a..2e984e7 100644
--- a/editeng/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -482,7 +482,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, bool bInfoBox )
}
fclose( fp );
if ( bInfoBox )
- ScopedVclPtr<InfoBox>::Create(nullptr, OUString( "D:\\DEBUG.LOG !" ) )->Execute();
+ ScopedVclPtrInstance<InfoBox>(nullptr, OUString( "D:\\DEBUG.LOG !" ) )->Execute();
}
#endif
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 970f6b3..37718c5 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -1031,7 +1031,7 @@ bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditView, v
bDebugPaint = !bDebugPaint;
OStringBuffer aInfo("DebugPaint: ");
aInfo.append(bDebugPaint ? "On" : "Off");
- ScopedVclPtr<InfoBox>::Create(nullptr, OStringToOUString(aInfo.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US))->Execute();
+ ScopedVclPtrInstance<InfoBox>(nullptr, OStringToOUString(aInfo.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US))->Execute();
}
bDone = false;
}
diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx
index 17e3c08..a9d2801 100644
--- a/editeng/source/misc/unolingu.cxx
+++ b/editeng/source/misc/unolingu.cxx
@@ -788,7 +788,7 @@ short SvxDicError( vcl::Window *pParent, linguistic::DictionaryError nError )
nRid = RID_SVXSTR_DIC_ERR_UNKNOWN;
SAL_WARN("editeng", "unexpected case");
}
- nRes = ScopedVclPtr<InfoBox>::Create( pParent, EE_RESSTR( nRid ) )->Execute();
+ nRes = ScopedVclPtrInstance<InfoBox>(pParent, EE_RESSTR(nRid))->Execute();
}
return nRes;
}
diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx
index def9876..a7b6c79 100644
--- a/extensions/source/abpilot/abspilot.cxx
+++ b/extensions/source/abpilot/abspilot.cxx
@@ -262,7 +262,7 @@ namespace abp
if ( aTables.empty() )
{
- if (RET_YES != ScopedVclPtrInstance<MessageDialog>::Create(this, ModuleRes(( getSettings().eType == AST_EVOLUTION_GROUPWISE ? RID_STR_QRY_NO_EVO_GW : RID_STR_QRY_NOTABLES)), VclMessageType::Question, VCL_BUTTONS_YES_NO)->Execute())
+ if (RET_YES != ScopedVclPtrInstance<MessageDialog>(this, ModuleRes(( getSettings().eType == AST_EVOLUTION_GROUPWISE ? RID_STR_QRY_NO_EVO_GW : RID_STR_QRY_NOTABLES)), VclMessageType::Question, VCL_BUTTONS_YES_NO)->Execute())
{
// cannot ask the user, or the user chose to use this data source, though there are no tables
bAllow = false;
diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx
index a9aa624..eda77ce 100644
--- a/extensions/source/propctrlr/propcontroller.cxx
+++ b/extensions/source/propctrlr/propcontroller.cxx
@@ -1397,7 +1397,7 @@ namespace pcr
}
catch(const PropertyVetoException& eVetoException)
{
- ScopedVclPtr<InfoBox>::Create(m_pView, eVetoException.Message)->Execute();
+ ScopedVclPtrInstance<InfoBox>(m_pView, eVetoException.Message)->Execute();
PropertyHandlerRef handler = impl_getHandlerForProperty_throw( rName );
Any aNormalizedValue = handler->getPropertyValue( rName );
getPropertyBox().SetPropertyValue( rName, aNormalizedValue, false );
diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx
index 25f5655..b28c11e 100644
--- a/extensions/source/update/ui/updatecheckui.cxx
+++ b/extensions/source/update/ui/updatecheckui.cxx
@@ -586,7 +586,7 @@ IMPL_LINK_NOARG_TYPED(UpdateCheckUI, ClickHdl, MenuBar::MenuBarButtonCallbackArg
mrJob->execute( aEmpty );
}
catch(const uno::Exception&) {
- ScopedVclPtrInstance<MessageDialog>::Create( nullptr, ResId( STR_NO_WEBBROWSER_FOUND, *mpSfxResMgr ))->Execute();
+ ScopedVclPtrInstance<MessageDialog>(nullptr, ResId( STR_NO_WEBBROWSER_FOUND, *mpSfxResMgr))->Execute();
}
}
diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx
index d02fad0..06b6637 100644
--- a/sc/source/ui/dbgui/consdlg.cxx
+++ b/sc/source/ui/dbgui/consdlg.cxx
@@ -34,7 +34,7 @@
#include "consdlg.hxx"
#include <vcl/msgbox.hxx>
-#define INFOBOX(id) ScopedVclPtr<InfoBox>::Create(this, ScGlobal::GetRscString(id))->Execute()
+#define INFOBOX(id) ScopedVclPtrInstance<InfoBox>(this, ScGlobal::GetRscString(id))->Execute()
class ScAreaData
{
diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx
index 76d8485..0621fad 100644
--- a/sc/source/ui/dbgui/dbnamdlg.cxx
+++ b/sc/source/ui/dbgui/dbnamdlg.cxx
@@ -37,7 +37,7 @@ class DBSaveData;
static DBSaveData* pSaveObj = nullptr;
-#define ERRORBOX(s) ScopedVclPtrInstance<MessageDialog>::Create(this, s)->Execute()
+#define ERRORBOX(s) ScopedVclPtrInstance<MessageDialog>(this, s)->Execute()
// class DBSaveData
diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index 5a2c6ba..2371377 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -680,7 +680,7 @@ IMPL_LINK_TYPED( ScFilterDlg, EndDlgHdl, Button*, pBtn, void )
if (!pExpander->get_expanded())
pExpander->set_expanded(true);
- ScopedVclPtrInstance<MessageDialog>::Create(this, ScGlobal::GetRscString(STR_INVALID_TABREF))->Execute();
+ ScopedVclPtrInstance<MessageDialog>(this, ScGlobal::GetRscString(STR_INVALID_TABREF))->Execute();
pEdCopyArea->GrabFocus();
bAreaInputOk = false;
}
diff --git a/sc/source/ui/dbgui/scendlg.cxx b/sc/source/ui/dbgui/scendlg.cxx
index 6d40b20..5cefb49 100644
--- a/sc/source/ui/dbgui/scendlg.cxx
+++ b/sc/source/ui/dbgui/scendlg.cxx
@@ -171,12 +171,12 @@ IMPL_LINK_NOARG_TYPED(ScNewScenarioDlg, OkHdl, Button*, void)
if ( !ScDocument::ValidTabName( aName ) )
{
- ScopedVclPtr<InfoBox>::Create( this, ScGlobal::GetRscString( STR_INVALIDTABNAME ) )->Execute();
+ ScopedVclPtrInstance<InfoBox>(this, ScGlobal::GetRscString(STR_INVALIDTABNAME))->Execute();
m_pEdName->GrabFocus();
}
else if ( !bIsEdit && !pDoc->ValidNewTabName( aName ) )
{
- ScopedVclPtr<InfoBox>::Create( this, ScGlobal::GetRscString( STR_NEWTABNAMENOTUNIQUE ) )->Execute();
+ ScopedVclPtrInstance<InfoBox>(this, ScGlobal::GetRscString(STR_NEWTABNAMENOTUNIQUE))->Execute();
m_pEdName->GrabFocus();
}
else
diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx
index 4cbe66f..2a3e82d 100644
--- a/sc/source/ui/dbgui/sfiltdlg.cxx
+++ b/sc/source/ui/dbgui/sfiltdlg.cxx
@@ -39,7 +39,7 @@
// DEFINE --------------------------------------------------------------------
-#define ERRORBOX(rid) ScopedVclPtrInstance<MessageDialog>::Create(this, ScGlobal::GetRscString(rid))->Execute()
+#define ERRORBOX(rid) ScopedVclPtrInstance<MessageDialog>(this, ScGlobal::GetRscString(rid))->Execute()
// class ScSpecialFilterDialog
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index 15d53ee..01bd534 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -801,7 +801,7 @@ DeactivateRC ScTabPageSortOptions::DeactivatePage( SfxItemSet* pSetP )
if ( !bPosInputOk )
{
- ScopedVclPtrInstance<MessageDialog>::Create(this, ScGlobal::GetRscString( STR_INVALID_TABREF))->Execute();
+ ScopedVclPtrInstance<MessageDialog>(this, ScGlobal::GetRscString( STR_INVALID_TABREF))->Execute();
m_pEdOutPos->GrabFocus();
m_pEdOutPos->SetSelection( Selection( 0, SELECTION_MAX ) );
theOutPos.Set(0,0,0);
diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx
index 2fad9d9..983f29d 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -990,7 +990,7 @@ void ScDBDocFunc::DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam,
if (rParam.bReplace)
if (rDoc.TestRemoveSubTotals( nTab, rParam ))
{
- bOk = ( ScopedVclPtr<MessBox>::Create( ScDocShell::GetActiveDialogParent(), WinBits(WB_YES_NO | WB_DEF_YES),
+ bOk = ( ScopedVclPtrInstance<MessBox>( ScDocShell::GetActiveDialogParent(), WinBits(WB_YES_NO | WB_DEF_YES),
// "StarCalc" "Daten loeschen?"
ScGlobal::GetRscString( STR_MSSG_DOSUBTOTALS_0 ),
ScGlobal::GetRscString( STR_MSSG_DOSUBTOTALS_1 ) )->Execute()
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index 97ab8fe..d2b1cc8 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -389,7 +389,7 @@ bool ScDocFunc::DetectiveMarkInvalid(SCTAB nTab)
aModificator.SetDocumentModified();
if ( bOverflow )
{
- ScopedVclPtr<InfoBox>::Create( nullptr,
+ ScopedVclPtrInstance<InfoBox>( nullptr,
ScGlobal::GetRscString( STR_DETINVALID_OVERFLOW ) )->Execute();
}
}
@@ -4951,7 +4951,7 @@ void ScDocFunc::CreateOneName( ScRangeName& rList,
aMessage += aName;
aMessage += aTemplate.getToken( 1, '#' );
- short nResult = ScopedVclPtr<QueryBox>::Create( ScDocShell::GetActiveDialogParent(),
+ short nResult = ScopedVclPtrInstance<QueryBox>( ScDocShell::GetActiveDialogParent(),
WinBits(WB_YES_NO_CANCEL | WB_DEF_YES),
aMessage )->Execute();
if ( nResult == RET_YES )
diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx
index 0d2c57b..59df51a 100644
--- a/sc/source/ui/miscdlgs/crnrdlg.cxx
+++ b/sc/source/ui/miscdlgs/crnrdlg.cxx
@@ -26,8 +26,8 @@
#include <vcl/msgbox.hxx>
#include <memory>
-#define ERRORBOX(s) ScopedVclPtr<MessageDialog>::Create(this, s)->Execute()
-#define QUERYBOX(m) ScopedVclPtr<QueryBox>::Create(this,WinBits(WB_YES_NO|WB_DEF_YES),m)->Execute()
+#define ERRORBOX(s) ScopedVclPtrInstance<MessageDialog>(this, s)->Execute()
+#define QUERYBOX(m) ScopedVclPtrInstance<QueryBox>(this,WinBits(WB_YES_NO|WB_DEF_YES),m)->Execute()
const sal_uLong nEntryDataCol = 0;
const sal_uLong nEntryDataRow = 1;
diff --git a/sc/source/ui/miscdlgs/filldlg.cxx b/sc/source/ui/miscdlgs/filldlg.cxx
index c2da839..e52eaf2 100644
--- a/sc/source/ui/miscdlgs/filldlg.cxx
+++ b/sc/source/ui/miscdlgs/filldlg.cxx
@@ -324,7 +324,7 @@ IMPL_LINK_NOARG_TYPED(ScFillSeriesDlg, OKHdl, Button*, void)
EndDialog( RET_OK );
else
{
- ScopedVclPtr<MessageDialog>::Create(this, aErrMsgInvalidVal)->Execute();
+ ScopedVclPtrInstance<MessageDialog>(this, aErrMsgInvalidVal)->Execute();
pEdWrong->GrabFocus();
}
}
diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx
index ff1714c..4594b3f 100644
--- a/sc/source/ui/miscdlgs/instbdlg.cxx
+++ b/sc/source/ui/miscdlgs/instbdlg.cxx
@@ -301,7 +301,7 @@ IMPL_LINK_NOARG_TYPED(ScInsertTableDlg, DoEnterHdl, Button*, void)
else
{
OUString aErrMsg ( ScGlobal::GetRscString( STR_INVALIDTABNAME ) );
- (void)ScopedVclPtrInstance<MessageDialog>::Create(this, aErrMsg)->Execute();
+ (void)ScopedVclPtrInstance<MessageDialog>(this, aErrMsg)->Execute();
}
}
diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx
index e5b1cf1..5b15550 100644
--- a/sc/source/ui/miscdlgs/optsolver.cxx
+++ b/sc/source/ui/miscdlgs/optsolver.cxx
@@ -783,7 +783,7 @@ IMPL_LINK_TYPED( ScOptSolverDlg, CursorDownHdl, ScCursorRefEdit&, rEdit, void )
void ScOptSolverDlg::ShowError( bool bCondition, formula::RefEdit* pFocus )
{
OUString aMessage = bCondition ? maConditionError : maInputError;
- ScopedVclPtrInstance<MessageDialog>::Create(this, aMessage)->Execute();
+ ScopedVclPtrInstance<MessageDialog>(this, aMessage)->Execute();
if (pFocus)
{
mpEdActive = pFocus;
diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx
index e0f4e92..19033d9 100644
--- a/sc/source/ui/miscdlgs/scuiautofmt.cxx
+++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx
@@ -261,7 +261,7 @@ IMPL_LINK_NOARG_TYPED(ScAutoFormatDlg, AddHdl, Button*, void)
if ( !bFmtInserted )
{
- sal_uInt16 nRet = ScopedVclPtr<MessageDialog>::Create(this,
+ sal_uInt16 nRet = ScopedVclPtrInstance<MessageDialog>(this,
ScGlobal::GetRscString(STR_INVALID_AFNAME),
VclMessageType::Error,
VCL_BUTTONS_OK_CANCEL
@@ -286,7 +286,7 @@ IMPL_LINK_NOARG_TYPED(ScAutoFormatDlg, RemoveHdl, Button*, void)
aMsg += aStrDelMsg.getToken( 1, '#' );
if ( RET_YES ==
- ScopedVclPtr<QueryBox>::Create( this, WinBits( WB_YES_NO | WB_DEF_YES ), aMsg )->Execute() )
+ ScopedVclPtrInstance<QueryBox>( this, WinBits( WB_YES_NO | WB_DEF_YES ), aMsg )->Execute() )
{
m_pLbFormat->RemoveEntry( nIndex );
m_pLbFormat->SelectEntryPos( nIndex-1 );
@@ -381,7 +381,7 @@ IMPL_LINK_NOARG_TYPED(ScAutoFormatDlg, RenameHdl, Button*, void)
}
if( !bFmtRenamed )
{
- bOk = RET_CANCEL == ScopedVclPtr<MessageDialog>::Create( this,
+ bOk = RET_CANCEL == ScopedVclPtrInstance<MessageDialog>( this,
ScGlobal::GetRscString(STR_INVALID_AFNAME),
VclMessageType::Error,
VCL_BUTTONS_OK_CANCEL
diff --git a/sc/source/ui/miscdlgs/solvrdlg.cxx b/sc/source/ui/miscdlgs/solvrdlg.cxx
index 29f0f7e..34c079a 100644
--- a/sc/source/ui/miscdlgs/solvrdlg.cxx
+++ b/sc/source/ui/miscdlgs/solvrdlg.cxx
@@ -35,7 +35,7 @@ namespace
{
void lclErrorDialog( vcl::Window* pParent, const OUString& aString )
{
- ScopedVclPtrInstance<MessageDialog>::Create(pParent, aString)->Execute();
+ ScopedVclPtrInstance<MessageDialog>(pParent, aString)->Execute();
}
}
diff --git a/sc/source/ui/miscdlgs/tabopdlg.cxx b/sc/source/ui/miscdlgs/tabopdlg.cxx
index 06d4634..ee45874 100644
--- a/sc/source/ui/miscdlgs/tabopdlg.cxx
+++ b/sc/source/ui/miscdlgs/tabopdlg.cxx
@@ -223,7 +223,7 @@ void ScTabOpDlg::RaiseError( ScTabOpErr eError )
break;
}
- ScopedVclPtrInstance<MessageDialog>::Create(this, *pMsg, VclMessageType::Error, VCL_BUTTONS_OK_CANCEL)->Execute();
+ ScopedVclPtrInstance<MessageDialog>(this, *pMsg, VclMessageType::Error, VCL_BUTTONS_OK_CANCEL)->Execute();
pEd->GrabFocus();
}
diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx
index 88347cb..c5976d9 100644
--- a/sc/source/ui/navipi/scenwnd.cxx
+++ b/sc/source/ui/navipi/scenwnd.cxx
@@ -189,7 +189,7 @@ void ScScenarioListBox::EditScenario()
void ScScenarioListBox::DeleteScenario()
{
if( GetSelectEntryCount() > 0 )
- if( ScopedVclPtr<QueryBox>::Create( nullptr, WinBits( WB_YES_NO | WB_DEF_YES ), ScGlobal::GetRscString( STR_QUERY_DELSCENARIO ) )->Execute() == RET_YES )
+ if( ScopedVclPtrInstance<QueryBox>( nullptr, WinBits( WB_YES_NO | WB_DEF_YES ), ScGlobal::GetRscString( STR_QUERY_DELSCENARIO ) )->Execute() == RET_YES )
ExecuteScenarioSlot( SID_DELETE_SCENARIO );
}
diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx
index a9834f4..adb13de 100644
--- a/sc/source/ui/optdlg/tpcalc.cxx
+++ b/sc/source/ui/optdlg/tpcalc.cxx
@@ -204,7 +204,7 @@ DeactivateRC ScTpCalcOptions::DeactivatePage( SfxItemSet* pSetP )
if ( nReturn == DeactivateRC::KeepPage )
{
- ScopedVclPtr<MessageDialog>::Create( this,
+ ScopedVclPtrInstance<MessageDialog>( this,
ScGlobal::GetRscString( STR_INVALID_EPS )
)->Execute();
diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx
index aca56c1..598d6f1 100644
--- a/sc/source/ui/optdlg/tpusrlst.cxx
+++ b/sc/source/ui/optdlg/tpusrlst.cxx
@@ -357,7 +357,7 @@ void ScTpUserLists::CopyListFromArea( const ScRefAddress& rStartPos,
if ( (nStartCol != nEndCol) && (nStartRow != nEndRow) )
{
- nCellDir = ScopedVclPtr<ScColOrRowDlg>::Create( this, aStrCopyList, aStrCopyFrom )->Execute();
+ nCellDir = ScopedVclPtrInstance<ScColOrRowDlg>(this, aStrCopyList, aStrCopyFrom)->Execute();
}
else if ( nStartCol != nEndCol )
nCellDir = SCRET_ROWS;
@@ -421,7 +421,7 @@ void ScTpUserLists::CopyListFromArea( const ScRefAddress& rStartPos,
if ( bValueIgnored )
{
- ScopedVclPtr<InfoBox>::Create( this, aStrCopyErr )->Execute();
+ ScopedVclPtrInstance<InfoBox>(this, aStrCopyErr)->Execute();
}
}
@@ -616,7 +616,7 @@ IMPL_LINK_TYPED( ScTpUserLists, BtnClickHdl, Button*, pBtn, void )
aMsg += mpLbLists->GetEntry( nRemovePos );
aMsg += aStrQueryRemove.getToken( 1, '#' );
- if ( RET_YES == ScopedVclPtr<QueryBox>::Create( this,
+ if ( RET_YES == ScopedVclPtrInstance<QueryBox>( this,
WinBits( WB_YES_NO | WB_DEF_YES ),
aMsg
)->Execute() )
@@ -695,7 +695,7 @@ IMPL_LINK_TYPED( ScTpUserLists, BtnClickHdl, Button*, pBtn, void )
}
else
{
- ScopedVclPtr<MessageDialog>::Create(this,
+ ScopedVclPtrInstance<MessageDialog>(this,
ScGlobal::GetRscString( STR_INVALID_TABREF )
)->Execute();
mpEdCopyFrom->GrabFocus();
diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx
index 324eeea..07c4dcc 100644
--- a/sc/source/ui/pagedlg/areasdlg.cxx
+++ b/sc/source/ui/pagedlg/areasdlg.cxx
@@ -52,7 +52,7 @@ enum {
};
#define HDL(hdl) LINK( this, ScPrintAreasDlg, hdl )
-#define ERRORBOX(nId) ScopedVclPtrInstance<MessageDialog>::Create(this, ScGlobal::GetRscString(nId))->Execute()
+#define ERRORBOX(nId) ScopedVclPtrInstance<MessageDialog>(this, ScGlobal::GetRscString(nId))->Execute()
// globale Funktionen (->am Ende der Datei):
diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx
index e8766a0..f88cb6c 100644
--- a/sc/source/ui/view/cellsh3.cxx
+++ b/sc/source/ui/view/cellsh3.cxx
@@ -430,7 +430,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
{
if ( rReq.IsAPI()
|| RET_YES ==
- ScopedVclPtr<QueryBox>::Create( pTabViewShell->GetDialogParent(), WinBits(WB_YES_NO | WB_DEF_YES),
+ ScopedVclPtrInstance<QueryBox>( pTabViewShell->GetDialogParent(), WinBits(WB_YES_NO | WB_DEF_YES),
ScGlobal::GetRscString(STR_UPDATE_SCENARIO) )->
Execute() )
{
diff --git a/sc/source/ui/view/dbfunc.cxx b/sc/source/ui/view/dbfunc.cxx
index a2bc799..ef70468 100644
--- a/sc/source/ui/view/dbfunc.cxx
+++ b/sc/source/ui/view/dbfunc.cxx
@@ -354,7 +354,7 @@ void ScDBFunc::ToggleAutoFilter()
{
if (!bHeader)
{
- if ( ScopedVclPtr<MessBox>::Create( GetViewData().GetDialogParent(), WinBits(WB_YES_NO | WB_DEF_YES),
+ if ( ScopedVclPtrInstance<MessBox>( GetViewData().GetDialogParent(), WinBits(WB_YES_NO | WB_DEF_YES),
ScGlobal::GetRscString( STR_MSSG_DOSUBTOTALS_0 ), // "StarCalc"
ScGlobal::GetRscString( STR_MSSG_MAKEAUTOFILTER_0 ) // header from first row?
)->Execute() == RET_YES )
diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx
index 576c349..c290409 100644
--- a/sc/source/ui/view/dbfunc3.cxx
+++ b/sc/source/ui/view/dbfunc3.cxx
@@ -395,7 +395,7 @@ void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, bool bRecord,
if (rParam.bReplace)
if (rDoc.TestRemoveSubTotals( nTab, rParam ))
{
- bOk = ( ScopedVclPtr<MessBox>::Create( GetViewData().GetDialogParent(), WinBits(WB_YES_NO | WB_DEF_YES),
+ bOk = ( ScopedVclPtrInstance<MessBox>( GetViewData().GetDialogParent(), WinBits(WB_YES_NO | WB_DEF_YES),
// "StarCalc" "delete data?"
ScGlobal::GetRscString( STR_MSSG_DOSUBTOTALS_0 ),
ScGlobal::GetRscString( STR_MSSG_DOSUBTOTALS_1 ) )->Execute()
diff --git a/sc/source/ui/view/spelleng.cxx b/sc/source/ui/view/spelleng.cxx
index 93767c6..f8b7f29 100644
--- a/sc/source/ui/view/spelleng.cxx
+++ b/sc/source/ui/view/spelleng.cxx
@@ -294,7 +294,7 @@ void ScSpellingEngine::ConvertAll( EditView& rEditView )
{
vcl::Window* pParent = GetDialogParent();
ScWaitCursorOff aWaitOff( pParent );
- ScopedVclPtr<InfoBox>::Create( pParent, ScGlobal::GetRscString( STR_NOLANGERR ) )->Execute();
+ ScopedVclPtrInstance<InfoBox>( pParent, ScGlobal::GetRscString( STR_NOLANGERR ) )->Execute();
}
}
@@ -322,7 +322,7 @@ void ScSpellingEngine::ShowFinishDialog()
{
vcl::Window* pParent = GetDialogParent();
ScWaitCursorOff aWaitOff( pParent );
- ScopedVclPtr<InfoBox>::Create( pParent, ScGlobal::GetRscString( STR_SPELLING_STOP_OK ) )->Execute();
+ ScopedVclPtrInstance<InfoBox>( pParent, ScGlobal::GetRscString( STR_SPELLING_STOP_OK ) )->Execute();
}
vcl::Window* ScSpellingEngine::GetDialogParent()
diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx
index fa9ee6e..63ba25e 100644
--- a/sc/source/ui/view/tabvwshf.cxx
+++ b/sc/source/ui/view/tabvwshf.cxx
@@ -425,7 +425,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
}
else
{
- nRet = ScopedVclPtr<MessageDialog>::Create(GetDialogParent(),
+ nRet = ScopedVclPtrInstance<MessageDialog>(GetDialogParent(),
aErrMsg
)->Execute();
}
@@ -595,7 +595,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
{
// no parameter given, ask for confirmation
bDoIt = ( RET_YES ==
- ScopedVclPtr<QueryBox>::Create( GetDialogParent(),
+ ScopedVclPtrInstance<QueryBox>( GetDialogParent(),
WinBits( WB_YES_NO | WB_DEF_YES ),
ScGlobal::GetRscString(STR_QUERY_DELTAB)
)->Execute() );
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index a6f3d67..649c384 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -438,7 +438,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab,
{
OUString aMessage( ScResId( SCSTR_FORMULA_AUTOCORRECTION ) );
aMessage += aCorrectedFormula;
- nResult = ScopedVclPtr<QueryBox>::Create( GetViewData().GetDialogParent(),
+ nResult = ScopedVclPtrInstance<QueryBox>( GetViewData().GetDialogParent(),
WinBits(WB_YES_NO | WB_DEF_YES),
aMessage )->Execute();
}
diff --git a/scripting/source/dlgprov/dlgevtatt.cxx b/scripting/source/dlgprov/dlgevtatt.cxx
index b0a51fe..4e94a6f 100644
--- a/scripting/source/dlgprov/dlgevtatt.cxx
+++ b/scripting/source/dlgprov/dlgevtatt.cxx
@@ -635,7 +635,7 @@ namespace dlgprov
aOUFinal += aQuoteChar;
aOUFinal += aRes.copy( nIndex + 2 );
- ScopedVclPtrInstance<MessageDialog>::Create(nullptr, aOUFinal)->Execute();
+ ScopedVclPtrInstance<MessageDialog>(nullptr, aOUFinal)->Execute();
}
}
}
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index b371fe7..b736595 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -466,7 +466,7 @@ bool SdDrawDocument::InsertBookmarkAsPage(
pBMPage->GetLwrBorder() != pRefPage->GetLwrBorder())
{
OUString aStr(SD_RESSTR(STR_SCALE_OBJECTS));
- sal_uInt16 nBut = ScopedVclPtr<QueryBox>::Create( nullptr, WB_YES_NO_CANCEL, aStr)->Execute();
+ sal_uInt16 nBut = ScopedVclPtrInstance<QueryBox>(nullptr, WB_YES_NO_CANCEL, aStr)->Execute();
bScaleObjects = nBut == RET_YES;
bContinue = nBut != RET_CANCEL;
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index 7ecdbe5..b3349c3 100644
--- a/sd/source/ui/app/sdmod1.cxx
+++ b/sd/source/ui/app/sdmod1.cxx
@@ -234,7 +234,7 @@ void SdModule::Execute(SfxRequest& rReq)
}
else
{
- ScopedVclPtrInstance<MessageDialog>::Create(nullptr, SD_RESSTR(STR_CANT_PERFORM_IN_LIVEMODE))->Execute();
+ ScopedVclPtrInstance<MessageDialog>(nullptr, SD_RESSTR(STR_CANT_PERFORM_IN_LIVEMODE))->Execute();
const SfxLinkItem* pLinkItem = rReq.GetArg<SfxLinkItem>(SID_DONELINK);
if( pLinkItem )
diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx
index f3671b5..ea6efb8 100644
--- a/sd/source/ui/dlg/custsdlg.cxx
+++ b/sd/source/ui/dlg/custsdlg.cxx
@@ -531,7 +531,7 @@ IMPL_LINK_NOARG_TYPED(SdDefineCustomShowDlg, OKHdl, Button*, void)
}
else
{
- ScopedVclPtr<WarningBox>::Create( this, WinBits( WB_OK ),
+ ScopedVclPtrInstance<WarningBox>( this, WinBits( WB_OK ),
SD_RESSTR( STR_WARN_NAME_DUPLICATE ) )->Execute();
m_pEdtName->GrabFocus();
diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx
index 9261617..8d773a9 100644
--- a/sd/source/ui/func/fudraw.cxx
+++ b/sd/source/ui/func/fudraw.cxx
@@ -340,7 +340,7 @@ bool FuDraw::KeyInput(const KeyEvent& rKEvt)
{
if (mpView->IsPresObjSelected(false, true, false, true))
{
- ScopedVclPtr<InfoBox>::Create(mpWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE) )->Execute();
+ ScopedVclPtrInstance<InfoBox>(mpWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
}
else
{
diff --git a/sd/source/ui/func/futhes.cxx b/sd/source/ui/func/futhes.cxx
index f9680f0..ddc34a8 100644
--- a/sd/source/ui/func/futhes.cxx
+++ b/sd/source/ui/func/futhes.cxx
@@ -112,7 +112,7 @@ void FuThesaurus::DoExecute( SfxRequest& )
if (eState == EE_SPELL_NOLANGUAGE)
{
- ScopedVclPtrInstance<MessageDialog>::Create(mpWindow, SD_RESSTR(STR_NOLANGUAGE))->Execute();
+ ScopedVclPtrInstance<MessageDialog>(mpWindow, SD_RESSTR(STR_NOLANGUAGE))->Execute();
}
}
}
@@ -139,7 +139,7 @@ void FuThesaurus::DoExecute( SfxRequest& )
if (eState == EE_SPELL_NOLANGUAGE)
{
- ScopedVclPtrInstance<MessageDialog>::Create(mpWindow, SD_RESSTR(STR_NOLANGUAGE))->Execute();
+ ScopedVclPtrInstance<MessageDialog>(mpWindow, SD_RESSTR(STR_NOLANGUAGE))->Execute();
}
}
}
diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx
index 4343113..df01fde 100644
--- a/sd/source/ui/view/drawview.cxx
+++ b/sd/source/ui/view/drawview.cxx
@@ -433,7 +433,7 @@ bool DrawView::SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAtt
{
if (IsPresObjSelected(false))
{
- ScopedVclPtr<InfoBox>::Create(mpDrawViewShell->GetActiveWindow(),
+ ScopedVclPtrInstance<InfoBox>(mpDrawViewShell->GetActiveWindow(),
SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
bResult = false;
}
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 829ee91..214cc73 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -604,7 +604,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
if ( mpDrawView->IsPresObjSelected() )
{
::sd::Window* pWindow = GetActiveWindow();
- ScopedVclPtr<InfoBox>::Create(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
+ ScopedVclPtrInstance<InfoBox>(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
}
else
{
@@ -649,7 +649,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
if ( mpDrawView->IsPresObjSelected() )
{
::sd::Window* pWindow = GetActiveWindow();
- ScopedVclPtr<InfoBox>::Create(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
+ ScopedVclPtrInstance<InfoBox>(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
}
else
{
@@ -677,7 +677,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
if ( mpDrawView->IsPresObjSelected(true,true,true) )
{
::sd::Window* pWindow = GetActiveWindow();
- ScopedVclPtr<InfoBox>::Create(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
+ ScopedVclPtrInstance<InfoBox>(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
}
else
{
@@ -1160,7 +1160,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
if ( mpDrawView->IsPresObjSelected(false) )
{
::sd::Window* pWindow = GetActiveWindow();
- ScopedVclPtr<InfoBox>::Create(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
+ ScopedVclPtrInstance<InfoBox>(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
}
else
{
@@ -1344,7 +1344,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
#endif
::sd::Window* pWindow = GetActiveWindow();
- ScopedVclPtr<InfoBox>::Create(pWindow, SD_RESSTR(nId))->Execute();
+ ScopedVclPtrInstance<InfoBox>(pWindow, SD_RESSTR(nId))->Execute();
}
else
{
@@ -2051,7 +2051,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
if ( mpDrawView->IsPresObjSelected( true, true, true ) )
{
::sd::Window* pWindow = GetActiveWindow();
- ScopedVclPtr<InfoBox>::Create(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
+ ScopedVclPtrInstance<InfoBox>(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
}
else
{
@@ -2170,7 +2170,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
if ( mpDrawView->IsPresObjSelected() )
{
::sd::Window* pWindow = GetActiveWindow();
- ScopedVclPtr<InfoBox>::Create(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
+ ScopedVclPtrInstance<InfoBox>(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
}
else
{
@@ -2187,7 +2187,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
if ( mpDrawView->IsPresObjSelected() )
{
::sd::Window* pWindow = GetActiveWindow();
- ScopedVclPtr<InfoBox>::Create(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
+ ScopedVclPtrInstance<InfoBox>(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
}
else
{
@@ -2207,7 +2207,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
if ( mpDrawView->IsPresObjSelected() )
{
::sd::Window* pWindow = GetActiveWindow();
- ScopedVclPtr<InfoBox>::Create(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
+ ScopedVclPtrInstance<InfoBox>(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
}
else
{
@@ -2228,7 +2228,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
if ( mpDrawView->IsPresObjSelected() )
{
::sd::Window* pWindow = GetActiveWindow();
- ScopedVclPtr<InfoBox>::Create(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
+ ScopedVclPtrInstance<InfoBox>(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
}
else
{
@@ -2249,7 +2249,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
if ( mpDrawView->IsPresObjSelected() )
{
::sd::Window* pWindow = GetActiveWindow();
- ScopedVclPtr<InfoBox>::Create(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
+ ScopedVclPtrInstance<InfoBox>(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
}
else
{
@@ -2291,7 +2291,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
if ( mpDrawView->IsPresObjSelected() )
{
::sd::Window* pWindow = GetActiveWindow();
- ScopedVclPtr<InfoBox>::Create(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
+ ScopedVclPtrInstance<InfoBox>(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
}
else
{
@@ -2383,7 +2383,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
if ( mpDrawView->IsPresObjSelected() )
{
::sd::Window* pWindow = GetActiveWindow();
- ScopedVclPtr<InfoBox>::Create(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
+ ScopedVclPtrInstance<InfoBox>(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
}
else
{
diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index fc23608..c390ffa 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -107,7 +107,7 @@ void DrawViewShell::DeleteActualLayer()
// replace placeholder
aString = aString.replaceFirst("$", rName);
- if (ScopedVclPtr<QueryBox>::Create(GetActiveWindow(), WB_YES_NO, aString)->Execute() == RET_YES)
+ if (ScopedVclPtrInstance<QueryBox>(GetActiveWindow(), WB_YES_NO, aString)->Execute() == RET_YES)
{
const SdrLayer* pLayer = rAdmin.GetLayer(rName, false);
mpDrawView->DeleteLayer( pLayer->GetName() );
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index 4bfe805..d156e48 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -327,9 +327,9 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq)
if ( mpDrawView->IsPresObjSelected() )
{
::sd::Window* pWindow = GetActiveWindow();
- ScopedVclPtr<InfoBox>::Create(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE) )->Execute();
+ ScopedVclPtrInstance<InfoBox>(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE) )->Execute();
}
- else if ( ScopedVclPtr<QueryBox>::Create(GetActiveWindow(), WB_YES_NO,
+ else if ( ScopedVclPtrInstance<QueryBox>(GetActiveWindow(), WB_YES_NO,
SD_RESSTR(STR_ASK_FOR_CONVERT_TO_BEZIER)
)->Execute() == RET_YES )
{
@@ -364,9 +364,9 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq)
if ( mpDrawView->IsPresObjSelected() )
{
::sd::Window* pWindow = GetActiveWindow();
- ScopedVclPtr<InfoBox>::Create(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE) )->Execute();
+ ScopedVclPtrInstance<InfoBox>(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE) )->Execute();
}
- else if ( ScopedVclPtr<QueryBox>::Create(GetActiveWindow(), WB_YES_NO,
+ else if ( ScopedVclPtrInstance<QueryBox>(GetActiveWindow(), WB_YES_NO,
SD_RESSTR(STR_ASK_FOR_CONVERT_TO_BEZIER)
)->Execute() == RET_YES )
{
@@ -672,7 +672,7 @@ void DrawViewShell::FuDeleteSelectedObjects()
if (mpDrawView->IsPresObjSelected(false, true, false, true))
{
::sd::Window* pWindow = GetActiveWindow();
- ScopedVclPtr<InfoBox>::Create(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE) )->Execute();
+ ScopedVclPtrInstance<InfoBox>(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE) )->Execute();
bConsumed = true;
}
@@ -782,7 +782,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
if ( mpDrawView->IsPresObjSelected(false, true, false, true) )
{
::sd::Window* pWindow = GetActiveWindow();
- ScopedVclPtr<InfoBox>::Create(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE) )->Execute();
+ ScopedVclPtrInstance<InfoBox>(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
}
else
{
@@ -804,7 +804,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
if ( mpDrawView->IsPresObjSelected(false, true, false, true) )
{
::sd::Window* pWindow = GetActiveWindow();
- ScopedVclPtr<InfoBox>::Create(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE) )->Execute();
+ ScopedVclPtrInstance<InfoBox>(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
}
else
{
diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index b76b871..d9147c7 100644
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -584,7 +584,7 @@ IMPL_LINK_NOARG_TYPED(View, DropInsertFileHdl, Idle *, void)
*/
IMPL_LINK_NOARG_TYPED(View, DropErrorHdl, Idle *, void)
{
- ScopedVclPtr<InfoBox>::Create( mpViewSh ? mpViewSh->GetActiveWindow() : nullptr, SD_RESSTR(STR_ACTION_NOTPOSSIBLE) )->Execute();
+ ScopedVclPtrInstance<InfoBox>( mpViewSh ? mpViewSh->GetActiveWindow() : nullptr, SD_RESSTR(STR_ACTION_NOTPOSSIBLE) )->Execute();
}
/**
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index a947fd2..1f2c3dd 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -1253,7 +1253,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
SvtModuleOptions aModuleOpt;
if ( !aModuleOpt.IsImpress() )
{
- ScopedVclPtrInstance<MessageDialog>::Create( nullptr, SFX2_RESSTR( STR_MODULENOTINSTALLED ))->Execute();
+ ScopedVclPtrInstance<MessageDialog>( nullptr, SFX2_RESSTR( STR_MODULENOTINSTALLED ))->Execute();
return;
}
diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx
index df5d5af..cfac8e8 100644
--- a/sfx2/source/appl/linkmgr2.cxx
+++ b/sfx2/source/appl/linkmgr2.cxx
@@ -317,7 +317,7 @@ void LinkManager::UpdateAllLinks(
if( bAskUpdate )
{
- int nRet = ScopedVclPtr<QueryBox>::Create( pParentWin, WB_YES_NO | WB_DEF_YES, SfxResId( STR_QUERY_UPDATE_LINKS ).toString() )->Execute();
+ int nRet = ScopedVclPtrInstance<QueryBox>(pParentWin, WB_YES_NO | WB_DEF_YES, SfxResId( STR_QUERY_UPDATE_LINKS ).toString())->Execute();
if( RET_YES != nRet )
{
SfxObjectShell* pShell = pLink->GetLinkManager()->GetPersist();
diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx
index 7b154c1..dcd71af 100644
--- a/sfx2/source/appl/lnkbase2.cxx
+++ b/sfx2/source/appl/lnkbase2.cxx
@@ -518,7 +518,7 @@ bool SvBaseLink::ExecuteEdit( const OUString& _rNewName )
else
return false;
- ScopedVclPtrInstance<MessageDialog>::Create(pImpl->m_pParentWin, sError)->Execute();
+ ScopedVclPtrInstance<MessageDialog>(pImpl->m_pParentWin, sError)->Execute();
}
}
else if( !pImpl->m_bIsConnect )
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index d820d49..e58ac10 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -509,7 +509,7 @@ bool SfxFilterMatcher::IsFilterInstalled_Impl( const std::shared_ptr<const SfxFi
{
#ifdef DBG_UTIL
// Start Setup
- ScopedVclPtr<InfoBox>::Create( nullptr, "Here should the Setup now be starting!" )->Execute();
+ ScopedVclPtrInstance<InfoBox>( nullptr, "Here should the Setup now be starting!" )->Execute();
#endif
// Installation must still give feedback if it worked or not,
// then the Filterflag be deleted
@@ -521,7 +521,7 @@ bool SfxFilterMatcher::IsFilterInstalled_Impl( const std::shared_ptr<const SfxFi
{
OUString aText( SfxResId(STR_FILTER_CONSULT_SERVICE).toString() );
aText = aText.replaceFirst( "$(FILTER)", pFilter->GetUIName() );
- ScopedVclPtr<InfoBox>::Create( nullptr, aText )->Execute();
+ ScopedVclPtrInstance<InfoBox>( nullptr, aText )->Execute();
return false;
}
else
diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx
index 3ad5d07..86ee344 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -621,7 +621,7 @@ bool TemplateLocalView::moveTemplates(const std::set<const ThumbnailViewItem*, s
{
OUString sMsg(SfxResId(STR_MSG_ERROR_LOCAL_MOVE).toString());
sMsg = sMsg.replaceFirst("$1",getRegionName(nTargetRegion));
- ScopedVclPtrInstance<MessageDialog>::Create(this, sMsg.replaceFirst( "$2",pViewItem->maTitle))->Execute();
+ ScopedVclPtrInstance<MessageDialog>(this, sMsg.replaceFirst( "$2",pViewItem->maTitle))->Execute();
return false; //return if any single move operation fails
}
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 7fe6aad..a2e8fc7 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1657,7 +1657,7 @@ void CustomPropertiesWindow::ValidateLine( CustomPropertyLine* pLine, bool bIsFr
if ( bIsFromTypeBox ) // LoseFocus of TypeBox
pLine->m_bTypeLostFocus = true;
vcl::Window* pParent = GetParent()->GetParent();
- if (ScopedVclPtrInstance<MessageDialog>::Create(pParent, SfxResId(STR_SFX_QUERY_WRONG_TYPE), VclMessageType::Question, VCL_BUTTONS_OK_CANCEL)->Execute() == RET_OK)
+ if (ScopedVclPtrInstance<MessageDialog>(pParent, SfxResId(STR_SFX_QUERY_WRONG_TYPE), VclMessageType::Question, VCL_BUTTONS_OK_CANCEL)->Execute() == RET_OK)
pLine->m_aTypeBox->SelectEntryPos( m_aTypeBox->GetEntryPos( reinterpret_cast<void*>(CUSTOM_TYPE_TEXT) ) );
else
pLine->m_aValueEdit->GrabFocus();
diff --git a/sfx2/source/dialog/newstyle.cxx b/sfx2/source/dialog/newstyle.cxx
index 0a01693..fc0d4f9 100644
--- a/sfx2/source/dialog/newstyle.cxx
+++ b/sfx2/source/dialog/newstyle.cxx
@@ -40,7 +40,7 @@ IMPL_LINK_NOARG_TYPED( SfxNewStyleDlg, OKHdl, ComboBox&, void )
{
if ( !pStyle->IsUserDefined() )
{
- ScopedVclPtrInstance<MessageDialog>::Create( this, SfxResId( STR_POOL_STYLE_NAME ), VclMessageType::Info )->Execute();
+ ScopedVclPtrInstance<MessageDialog>( this, SfxResId( STR_POOL_STYLE_NAME ), VclMessageType::Info )->Execute();
return;
}
diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx
index 985f1b5..e5151e4 100644
--- a/sfx2/source/dialog/securitypage.cxx
+++ b/sfx2/source/dialog/securitypage.cxx
@@ -124,7 +124,7 @@ static bool lcl_IsPasswordCorrect( const OUString &rPassword )
if (SvPasswordHelper::CompareHashPassword( aPasswordHash, rPassword ))
bRes = true; // password was correct
else
- ScopedVclPtr<InfoBox>::Create( nullptr, SFX2_RESSTR(RID_SVXSTR_INCORRECT_PASSWORD) )->Execute();
+ ScopedVclPtrInstance<InfoBox>(nullptr, SFX2_RESSTR(RID_SVXSTR_INCORRECT_PASSWORD))->Execute();
return bRes;
}
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index a58785e..2ff94f7 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -861,7 +861,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
}
case SID_CANCELCHECKOUT:
{
- if (ScopedVclPtrInstance<MessageDialog>::Create(nullptr, SfxResId(STR_QUERY_CANCELCHECKOUT), VclMessageType::Question, VCL_BUTTONS_YES_NO)->Execute() == RET_YES)
+ if (ScopedVclPtrInstance<MessageDialog>(nullptr, SfxResId(STR_QUERY_CANCELCHECKOUT), VclMessageType::Question, VCL_BUTTONS_YES_NO)->Execute() == RET_YES)
{
CancelCheckOut( );
@@ -1360,7 +1360,7 @@ void SfxObjectShell::ImplSign( bool bScriptingContent )
)
{
// Only OASIS and OOo6.x formats will be handled further
- ScopedVclPtrInstance<MessageDialog>::Create( nullptr, SfxResId( STR_INFO_WRONGDOCFORMAT ), VclMessageType::Info )->Execute();
+ ScopedVclPtrInstance<MessageDialog>( nullptr, SfxResId( STR_INFO_WRONGDOCFORMAT ), VclMessageType::Info )->Execute();
return;
}
@@ -1394,8 +1394,8 @@ void SfxObjectShell::ImplSign( bool bScriptingContent )
if ( nVersion >= SvtSaveOptions::ODFVER_012 )
{
- if ( (bHasSign && ScopedVclPtrInstance<MessageDialog>::Create(nullptr, SfxResId(STR_XMLSEC_QUERY_SAVESIGNEDBEFORESIGN), VclMessageType::Question, VCL_BUTTONS_YES_NO)->Execute() == RET_YES)
- || (!bHasSign && ScopedVclPtrInstance<MessageDialog>::Create(nullptr, SfxResId(RID_SVXSTR_XMLSEC_QUERY_SAVEBEFORESIGN), VclMessageType::Question, VCL_BUTTONS_YES_NO)->Execute() == RET_YES) )
+ if ( (bHasSign && ScopedVclPtrInstance<MessageDialog>(nullptr, SfxResId(STR_XMLSEC_QUERY_SAVESIGNEDBEFORESIGN), VclMessageType::Question, VCL_BUTTONS_YES_NO)->Execute() == RET_YES)
+ || (!bHasSign && ScopedVclPtrInstance<MessageDialog>(nullptr, SfxResId(RID_SVXSTR_XMLSEC_QUERY_SAVEBEFORESIGN), VclMessageType::Question, VCL_BUTTONS_YES_NO)->Execute() == RET_YES) )
{
sal_uInt16 nId = SID_SAVEDOC;
if ( !GetMedium() || GetMedium()->GetName().isEmpty() )
@@ -1411,7 +1411,7 @@ void SfxObjectShell::ImplSign( bool bScriptingContent )
|| SotStorage::GetVersion( GetMedium()->GetStorage() ) <= SOFFICE_FILEFORMAT_60 ) )
{
// Only OASIS format will be handled further
- ScopedVclPtrInstance<MessageDialog>::Create( nullptr, SfxResId( STR_INFO_WRONGDOCFORMAT ), VclMessageType::Info )->Execute();
+ ScopedVclPtrInstance<MessageDialog>( nullptr, SfxResId( STR_INFO_WRONGDOCFORMAT ), VclMessageType::Info )->Execute();
return;
}
}
@@ -1426,7 +1426,7 @@ void SfxObjectShell::ImplSign( bool bScriptingContent )
}
else
{
- ScopedVclPtrInstance<MessageDialog>::Create(nullptr, SfxResId(STR_XMLSEC_ODF12_EXPECTED))->Execute();
+ ScopedVclPtrInstance<MessageDialog>(nullptr, SfxResId(STR_XMLSEC_ODF12_EXPECTED))->Execute();
return;
}
diff --git a/sfx2/source/doc/saveastemplatedlg.cxx b/sfx2/source/doc/saveastemplatedlg.cxx
index 2822e99..cd384ac 100644
--- a/sfx2/source/doc/saveastemplatedlg.cxx
+++ b/sfx2/source/doc/saveastemplatedlg.cxx
@@ -95,7 +95,7 @@ IMPL_LINK_NOARG_TYPED(SfxSaveAsTemplateDialog, OkClickHdl, Button*, void)
else
{
OUString sText( SfxResId(STR_ERROR_SAVEAS).toString() );
- ScopedVclPtrInstance<MessageDialog>::Create(this, sText.replaceFirst("$1", msTemplateName))->Execute();
+ ScopedVclPtrInstance<MessageDialog>(this, sText.replaceFirst("$1", msTemplateName))->Execute();
}
}
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 840e3ef..f746147 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list