From 6a4c464b49dbfa2801818ead1b50bc9580824d00 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 19 Feb 2018 16:33:35 +0000 Subject: weld native message dialogs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit just the straight-forward MessageDialog cases first a) remove border_width from message dialog .ui so as to take the default border width b) retain 12 as default message dialog border for vcl widget case c) remove layour_style from message dialog button boxes so as to take the default mode (a no-op for vcl widget case) d) use gtk response ids (vcl builder will converts to vcl ones) Change-Id: I7de281093a1b64f92f71ca11e7cbba42bb658154 Reviewed-on: https://gerrit.libreoffice.org/50143 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- cui/source/customize/SvxMenuConfigPage.cxx | 9 ++-- cui/source/customize/SvxToolbarConfigPage.cxx | 18 ++++---- cui/source/customize/cfg.cxx | 9 ++-- cui/source/dialogs/about.cxx | 8 ++-- cui/source/dialogs/cuifmsearch.cxx | 6 ++- cui/source/dialogs/cuigaldlg.cxx | 7 +-- cui/source/dialogs/insdlg.cxx | 17 +++++-- cui/source/dialogs/passwdomdlg.cxx | 17 ++++--- cui/source/dialogs/scriptdlg.cxx | 45 +++++++++++-------- cui/source/options/dbregister.cxx | 7 +-- cui/source/options/doclinkdialog.cxx | 18 +++++--- cui/source/options/optchart.cxx | 10 +++-- cui/source/options/optcolor.cxx | 9 ++-- cui/source/options/optdict.cxx | 17 ++++--- cui/source/options/optinet2.cxx | 10 +++-- cui/source/options/optjava.cxx | 22 ++++++--- cui/source/options/optlingu.cxx | 7 +-- cui/source/options/optopencl.cxx | 7 ++- cui/source/tabpages/tpbitmap.cxx | 35 +++++++-------- cui/source/tabpages/tpcolor.cxx | 14 ++---- cui/source/tabpages/tpgradnt.cxx | 27 +++++------ cui/source/tabpages/tphatch.cxx | 27 +++++------ cui/source/tabpages/tplnedef.cxx | 45 +++++++++---------- cui/source/tabpages/tplneend.cxx | 52 +++++++++++----------- cui/source/tabpages/tppattern.cxx | 29 +++++------- cui/uiconfig/ui/querychangelineenddialog.ui | 2 - cui/uiconfig/ui/querydeletebitmapdialog.ui | 2 - cui/uiconfig/ui/querydeletechartcolordialog.ui | 2 - cui/uiconfig/ui/querydeletecolordialog.ui | 2 - cui/uiconfig/ui/querydeletedictionarydialog.ui | 2 - cui/uiconfig/ui/querydeletegradientdialog.ui | 2 - cui/uiconfig/ui/querydeletehatchdialog.ui | 2 - cui/uiconfig/ui/querydeletelineenddialog.ui | 2 - cui/uiconfig/ui/querydeletelinestyledialog.ui | 2 - cui/uiconfig/ui/queryduplicatedialog.ui | 2 - cui/uiconfig/ui/querynoloadedfiledialog.ui | 2 - cui/uiconfig/ui/querynosavefiledialog.ui | 2 - cui/uiconfig/ui/querysavelistdialog.ui | 2 - .../ui/queryupdategalleryfilelistdialog.ui | 2 - 39 files changed, 247 insertions(+), 253 deletions(-) (limited to 'cui') diff --git a/cui/source/customize/SvxMenuConfigPage.cxx b/cui/source/customize/SvxMenuConfigPage.cxx index 61277e9ac7ae..1c2ad24094d6 100644 --- a/cui/source/customize/SvxMenuConfigPage.cxx +++ b/cui/source/customize/SvxMenuConfigPage.cxx @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include @@ -450,12 +450,13 @@ IMPL_LINK_NOARG( SvxMenuConfigPage, ResetMenuHdl, Button *, void ) { SvxConfigEntry* pMenuData = GetTopLevelSelection(); - ScopedVclPtrInstance qbox(this, - CuiResId(RID_SVXSTR_CONFIRM_RESTORE_DEFAULT_MENU), VclMessageType::Question, VclButtonsType::YesNo); + std::unique_ptr xQueryBox(Application::CreateMessageDialog(GetFrameWeld(), + VclMessageType::Question, VclButtonsType::YesNo, + CuiResId(RID_SVXSTR_CONFIRM_RESTORE_DEFAULT_MENU))); // Resetting individual top-level menus is not possible at the moment. // So we are resetting only if it is a context menu - if (!m_bIsMenuBar && qbox->Execute() == RET_YES) + if (!m_bIsMenuBar && xQueryBox->run() == RET_YES) { sal_Int32 nPos = m_pTopLevelListBox->GetSelectedEntryPos(); ContextMenuSaveInData* pSaveInData = static_cast< ContextMenuSaveInData* >(GetSaveInData()); diff --git a/cui/source/customize/SvxToolbarConfigPage.cxx b/cui/source/customize/SvxToolbarConfigPage.cxx index 478f1c44022c..49c4349c459b 100644 --- a/cui/source/customize/SvxToolbarConfigPage.cxx +++ b/cui/source/customize/SvxToolbarConfigPage.cxx @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include @@ -252,10 +252,10 @@ void SvxToolbarConfigPage::DeleteSelectedContent() if ( m_pContentsListBox->GetEntryCount() == 0 && GetTopLevelSelection()->IsDeletable() ) { - ScopedVclPtrInstance qbox(this, - CuiResId(RID_SXVSTR_CONFIRM_DELETE_TOOLBAR), VclMessageType::Question, VclButtonsType::YesNo); - - if ( qbox->Execute() == RET_YES ) + std::unique_ptr xQueryBox(Application::CreateMessageDialog(GetFrameWeld(), + VclMessageType::Question, VclButtonsType::YesNo, + CuiResId(RID_SXVSTR_CONFIRM_DELETE_TOOLBAR))); + if (xQueryBox->run() == RET_YES) { DeleteSelectedTopLevel(); } @@ -683,10 +683,10 @@ IMPL_LINK_NOARG( SvxToolbarConfigPage, ResetToolbarHdl, Button *, void ) SvxConfigEntry* pToolbar = static_cast(m_pTopLevelListBox->GetEntryData( nSelectionPos )); - ScopedVclPtrInstance qbox(this, - CuiResId(RID_SVXSTR_CONFIRM_RESTORE_DEFAULT), VclMessageType::Question, VclButtonsType::YesNo); - - if ( qbox->Execute() == RET_YES ) + std::unique_ptr xQueryBox(Application::CreateMessageDialog(GetFrameWeld(), + VclMessageType::Question, VclButtonsType::YesNo, + CuiResId(RID_SVXSTR_CONFIRM_RESTORE_DEFAULT))); + if (xQueryBox->run() == RET_YES) { ToolbarSaveInData* pSaveInData = static_cast(GetSaveInData()); diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 2711eb1d5912..94b02b86b56d 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -26,7 +26,8 @@ #include #include -#include +#include +#include #include #include #include @@ -1665,9 +1666,9 @@ SvTreeListEntry* SvxConfigPage::AddFunction( if ( pCurEntry->GetCommand() == pNewEntryData->GetCommand() ) { - ScopedVclPtrInstance(this, - CuiResId( RID_SVXSTR_MNUCFG_ALREADY_INCLUDED ), - VclMessageType::Info)->Execute(); + std::unique_ptr xBox(Application::CreateMessageDialog(GetFrameWeld(), + VclMessageType::Info, VclButtonsType::Ok, CuiResId(RID_SVXSTR_MNUCFG_ALREADY_INCLUDED))); + xBox->run(); delete pNewEntryData; return nullptr; } diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index c9ba680c8609..df8a0b131319 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -20,6 +20,7 @@ #include #include #include +#include #include #include @@ -143,9 +144,10 @@ IMPL_LINK( AboutDialog, HandleClick, Button*, pButton, void ) Any exc( ::cppu::getCaughtException() ); OUString msg( ::comphelper::anyToString( exc ) ); const SolarMutexGuard guard; - ScopedVclPtrInstance< MessageDialog > aErrorBox(nullptr, msg); - aErrorBox->SetText( GetText() ); - aErrorBox->Execute(); + std::unique_ptr xErrorBox(Application::CreateMessageDialog(pButton->GetFrameWeld(), + VclMessageType::Warning, VclButtonsType::Ok, msg)); + xErrorBox->set_title(GetText()); + xErrorBox->run(); } } diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index 8c2f03d1eada..69a867b4f036 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -18,7 +18,7 @@ */ #include -#include +#include #include #include #include @@ -728,7 +728,9 @@ IMPL_LINK(FmSearchDialog, OnSearchProgress, const FmSearchProgress*, pProgress, const char* pErrorId = (FmSearchProgress::State::Error == pProgress->aSearchState) ? RID_STR_SEARCH_GENERAL_ERROR : RID_STR_SEARCH_NORECORD; - ScopedVclPtrInstance(this, CuiResId(pErrorId))->Execute(); + std::unique_ptr xBox(Application::CreateMessageDialog(GetFrameWeld(), + VclMessageType::Warning, VclButtonsType::Ok, CuiResId(pErrorId))); + xBox->run(); SAL_FALLTHROUGH; } case FmSearchProgress::State::Canceled: diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index b194dee47f67..ef138dc257a2 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -949,7 +950,6 @@ void TPGalleryThemeProperties::FillFilterList() m_pCbbFileType->SetText( pFilterEntry->aFilterName ); } - IMPL_LINK_NOARG(TPGalleryThemeProperties, SelectFileTypeHdl, ComboBox&, void) { OUString aText( m_pCbbFileType->GetText() ); @@ -958,12 +958,13 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, SelectFileTypeHdl, ComboBox&, void) { aLastFilterName = aText; - if( ScopedVclPtrInstance( this, "QueryUpdateFileListDialog","cui/ui/queryupdategalleryfilelistdialog.ui" )->Execute() == RET_YES ) + std::unique_ptr xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/queryupdategalleryfilelistdialog.ui")); + std::unique_ptr xQuery(xBuilder->weld_message_dialog("QueryUpdateFileListDialog")); + if (xQuery->run() == RET_YES) SearchFiles(); } } - void TPGalleryThemeProperties::SearchFiles() { VclPtrInstance pProgress( this, aURL ); diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index e350506707af..9db02b3b467f 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -44,7 +44,7 @@ #include #include #include -#include +#include #include #include #include @@ -267,7 +267,10 @@ short SvInsertOleDlg::Execute() // global Resource from svtools (former so3 resource) OUString aErr(SvtResId(STR_ERROR_OBJNOCREATE_FROM_FILE)); aErr = aErr.replaceFirst( "%", aFileName ); - ScopedVclPtrInstance(this, aErr)->Execute(); + + std::unique_ptr xBox(Application::CreateMessageDialog(GetFrameWeld(), + VclMessageType::Warning, VclButtonsType::Ok, aErr)); + xBox->run(); } else { @@ -275,7 +278,10 @@ short SvInsertOleDlg::Execute() // global Resource from svtools (former so3 resource) OUString aErr(SvtResId(STR_ERROR_OBJNOCREATE)); aErr = aErr.replaceFirst( "%", aServerName ); - ScopedVclPtrInstance(this, aErr)->Execute(); + + std::unique_ptr xBox(Application::CreateMessageDialog(GetFrameWeld(), + VclMessageType::Warning, VclButtonsType::Ok, aErr)); + xBox->run(); } } } @@ -316,7 +322,10 @@ short SvInsertOleDlg::Execute() // global Resource from svtools (former so3 resource) OUString aErr(SvtResId(STR_ERROR_OBJNOCREATE_FROM_FILE)); aErr = aErr.replaceFirst( "%", aFileName ); - ScopedVclPtrInstance(this, aErr)->Execute(); + + std::unique_ptr xBox(Application::CreateMessageDialog(GetFrameWeld(), + VclMessageType::Warning, VclButtonsType::Ok, aErr)); + xBox->run(); } else { diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx index 21be42aec23d..fab6b3caa6cc 100644 --- a/cui/source/dialogs/passwdomdlg.cxx +++ b/cui/source/dialogs/passwdomdlg.cxx @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include struct PasswordToOpenModifyDialog_Impl @@ -91,16 +91,17 @@ PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl( m_pOptionsExpander->Hide(); } -IMPL_LINK_NOARG( PasswordToOpenModifyDialog_Impl, OkBtnClickHdl, Button *, void ) +IMPL_LINK(PasswordToOpenModifyDialog_Impl, OkBtnClickHdl, Button *, pButton, void) { bool bInvalidState = !m_pOpenReadonlyCB->IsChecked() && m_pPasswdToOpenED->GetText().isEmpty() && m_pPasswdToModifyED->GetText().isEmpty(); if (bInvalidState) { - ScopedVclPtrInstance aErrorBox(m_pParent, - m_bIsPasswordToModify? m_aInvalidStateForOkButton : m_aInvalidStateForOkButton_v2); - aErrorBox->Execute(); + std::unique_ptr xErrorBox(Application::CreateMessageDialog(pButton->GetFrameWeld(), + VclMessageType::Warning, VclButtonsType::Ok, + m_bIsPasswordToModify? m_aInvalidStateForOkButton : m_aInvalidStateForOkButton_v2)); + xErrorBox->run(); } else // check for mismatched passwords... { @@ -109,8 +110,10 @@ IMPL_LINK_NOARG( PasswordToOpenModifyDialog_Impl, OkBtnClickHdl, Button *, void const int nMismatch = (bToOpenMatch? 0 : 1) + (bToModifyMatch? 0 : 1); if (nMismatch > 0) { - ScopedVclPtrInstance< MessageDialog > aErrorBox(m_pParent, nMismatch == 1 ? m_aOneMismatch : m_aTwoMismatch); - aErrorBox->Execute(); + std::unique_ptr xErrorBox(Application::CreateMessageDialog(pButton->GetFrameWeld(), + VclMessageType::Warning, VclButtonsType::Ok, + nMismatch == 1 ? m_aOneMismatch : m_aTwoMismatch)); + xErrorBox->run(); Edit* pEdit = !bToOpenMatch ? m_pPasswdToOpenED.get() : m_pPasswdToModifyED.get(); Edit* pRepeatEdit = !bToOpenMatch? m_pReenterPasswdToOpenED.get() : m_pReenterPasswdToModifyED.get(); diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index 2df5cd25e516..c219b6f56ef6 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include @@ -896,9 +896,11 @@ void SvxScriptOrgDialog::createEntry( SvTreeListEntry* pEntry ) { bValid = false; OUString aError = m_createErrStr + m_createDupStr; - ScopedVclPtrInstance< MessageDialog > aErrorBox(static_cast(this), aError); - aErrorBox->SetText( m_createErrTitleStr ); - aErrorBox->Execute(); + + std::unique_ptr xErrorBox(Application::CreateMessageDialog(GetFrameWeld(), + VclMessageType::Warning, VclButtonsType::Ok, aError)); + xErrorBox->set_title(m_createErrTitleStr); + xErrorBox->run(); xNewDlg->SetObjectName( aNewName ); break; } @@ -976,9 +978,10 @@ void SvxScriptOrgDialog::createEntry( SvTreeListEntry* pEntry ) { //ISSUE L10N & message from exception? OUString aError( m_createErrStr ); - ScopedVclPtrInstance< MessageDialog > aErrorBox(static_cast(this), aError); - aErrorBox->SetText( m_createErrTitleStr ); - aErrorBox->Execute(); + std::unique_ptr xErrorBox(Application::CreateMessageDialog(GetFrameWeld(), + VclMessageType::Warning, VclButtonsType::Ok, aError)); + xErrorBox->set_title(m_createErrTitleStr); + xErrorBox->run(); } } @@ -1035,9 +1038,10 @@ void SvxScriptOrgDialog::renameEntry( SvTreeListEntry* pEntry ) { //ISSUE L10N & message from exception? OUString aError( m_renameErrStr ); - ScopedVclPtrInstance< MessageDialog > aErrorBox(static_cast(this), aError); - aErrorBox->SetText( m_renameErrTitleStr ); - aErrorBox->Execute(); + std::unique_ptr xErrorBox(Application::CreateMessageDialog(GetFrameWeld(), + VclMessageType::Warning, VclButtonsType::Ok, aError)); + xErrorBox->set_title(m_renameErrTitleStr); + xErrorBox->run(); } } void SvxScriptOrgDialog::deleteEntry( SvTreeListEntry* pEntry ) @@ -1046,9 +1050,10 @@ void SvxScriptOrgDialog::deleteEntry( SvTreeListEntry* pEntry ) Reference< browse::XBrowseNode > node = getBrowseNode( pEntry ); // ISSUE L10N string & can we centre list? OUString aQuery = m_delQueryStr + getListOfChildren( node, 0 ); - VclPtrInstance< MessageDialog > aQueryBox(static_cast(this), aQuery, VclMessageType::Question, VclButtonsType::YesNo); - aQueryBox->SetText( m_delQueryTitleStr ); - if ( aQueryBox->Execute() == RET_NO ) + std::unique_ptr xQueryBox(Application::CreateMessageDialog(GetFrameWeld(), + VclMessageType::Question, VclButtonsType::YesNo, aQuery)); + xQueryBox->set_title(m_delQueryTitleStr); + if (xQueryBox->run() == RET_NO) { return; } @@ -1079,9 +1084,10 @@ void SvxScriptOrgDialog::deleteEntry( SvTreeListEntry* pEntry ) else { //ISSUE L10N & message from exception? - ScopedVclPtrInstance< MessageDialog > aErrorBox(static_cast(this), m_delErrStr); - aErrorBox->SetText( m_delErrTitleStr ); - aErrorBox->Execute(); + std::unique_ptr xErrorBox(Application::CreateMessageDialog(GetFrameWeld(), + VclMessageType::Warning, VclButtonsType::Ok, m_delErrStr)); + xErrorBox->set_title(m_delErrTitleStr); + xErrorBox->run(); } } @@ -1428,9 +1434,10 @@ IMPL_STATIC_LINK( SvxScriptErrorDialog, ShowDialog, void*, p, void ) message = CuiResId( RID_SVXSTR_ERROR_TITLE ); } - ScopedVclPtrInstance pBox( nullptr, message, VclMessageType::Warning ); - pBox->SetText( CuiResId( RID_SVXSTR_ERROR_TITLE ) ); - pBox->Execute(); + std::unique_ptr xBox(Application::CreateMessageDialog(nullptr, + VclMessageType::Warning, VclButtonsType::Ok, message)); + xBox->set_title(CuiResId(RID_SVXSTR_ERROR_TITLE)); + xBox->run(); delete pMessage; } diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index 2ab19ca73d15..1d3cf77c746b 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include @@ -275,8 +275,9 @@ IMPL_LINK_NOARG(DbRegistrationOptionsPage, DeleteHdl, Button*, void) SvTreeListEntry* pEntry = m_pPathBox->FirstSelected(); if ( pEntry ) { - ScopedVclPtrInstance< MessageDialog > aQuery(this, CuiResId(RID_SVXSTR_QUERY_DELETE_CONFIRM), VclMessageType::Question, VclButtonsType::YesNo); - if ( aQuery->Execute() == RET_YES ) + std::unique_ptr xQuery(Application::CreateMessageDialog(GetFrameWeld(), + VclMessageType::Question, VclButtonsType::YesNo, CuiResId(RID_SVXSTR_QUERY_DELETE_CONFIRM))); + if (xQuery->run() == RET_YES) m_pPathBox->GetModel()->Remove(pEntry); } } diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx index f57cd6210ebd..abaabd906b90 100644 --- a/cui/source/options/doclinkdialog.cxx +++ b/cui/source/options/doclinkdialog.cxx @@ -23,7 +23,8 @@ #include #include #include -#include +#include +#include #include #include #include @@ -126,8 +127,9 @@ namespace svx { OUString sMsg = CuiResId(STR_LINKEDDOC_DOESNOTEXIST); sMsg = sMsg.replaceFirst("$file$", m_pURL->GetText()); - ScopedVclPtrInstance< MessageDialog > aError(this, sMsg); - aError->Execute(); + std::unique_ptr xErrorBox(Application::CreateMessageDialog(GetFrameWeld(), + VclMessageType::Warning, VclButtonsType::Ok, sMsg)); + xErrorBox->run(); return; } // if (!bFileExists) INetURLObject aURL( sURL ); @@ -135,8 +137,9 @@ namespace svx { OUString sMsg = CuiResId(STR_LINKEDDOC_NO_SYSTEM_FILE); sMsg = sMsg.replaceFirst("$file$", m_pURL->GetText()); - ScopedVclPtrInstance< MessageDialog > aError(this, sMsg); - aError->Execute(); + std::unique_ptr xErrorBox(Application::CreateMessageDialog(GetFrameWeld(), + VclMessageType::Warning, VclButtonsType::Ok, sMsg)); + xErrorBox->run(); return; } @@ -147,8 +150,9 @@ namespace svx { OUString sMsg = CuiResId(STR_NAME_CONFLICT); sMsg = sMsg.replaceFirst("$file$", sCurrentText); - ScopedVclPtrInstance< MessageDialog > aError(this, sMsg, VclMessageType::Info); - aError->Execute(); + std::unique_ptr xErrorBox(Application::CreateMessageDialog(GetFrameWeld(), + VclMessageType::Info, VclButtonsType::Ok, sMsg)); + xErrorBox->run(); m_pName->SetSelection(Selection(0,sCurrentText.getLength())); m_pName->GrabFocus(); diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx index 7cecd8e01376..0cedb6e21e9b 100644 --- a/cui/source/options/optchart.cxx +++ b/cui/source/options/optchart.cxx @@ -22,6 +22,7 @@ #include #include #include +#include #include #include @@ -286,7 +287,7 @@ IMPL_LINK_NOARG(SvxDefaultColorOptPage, AddChartColor, Button*, void) // RemoveChartColor -IMPL_LINK( SvxDefaultColorOptPage, RemoveChartColor, Button*, pButton, void ) +IMPL_LINK_NOARG( SvxDefaultColorOptPage, RemoveChartColor, Button*, void ) { sal_Int32 nIndex = m_pLbChartColors->GetSelectedEntryPos(); @@ -297,9 +298,10 @@ IMPL_LINK( SvxDefaultColorOptPage, RemoveChartColor, Button*, pButton, void ) { OSL_ENSURE(pColorConfig->GetColorList().size() > 1, "don't delete the last chart color"); - ScopedVclPtrInstance aQuery(pButton, "QueryDeleteChartColorDialog", - "cui/ui/querydeletechartcolordialog.ui"); - if (RET_YES == aQuery->Execute()) + std::unique_ptr xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/querydeletechartcolordialog.ui")); + std::unique_ptr xQuery(xBuilder->weld_message_dialog("QueryDeleteChartColorDialog")); + + if (RET_YES == xQuery->run()) { pColorConfig->GetColorList().remove( nIndex ); diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index c20b723a26be..1e8e4c5b2dc3 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include @@ -1130,9 +1131,11 @@ IMPL_LINK(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, Button*, pButton, void ) else { DBG_ASSERT(m_pColorSchemeLB->GetEntryCount() > 1, "don't delete the last scheme"); - ScopedVclPtrInstance< MessageDialog > aQuery(pButton, CuiResId(RID_SVXSTR_COLOR_CONFIG_DELETE), VclMessageType::Question, VclButtonsType::YesNo); - aQuery->SetText(CuiResId(RID_SVXSTR_COLOR_CONFIG_DELETE_TITLE)); - if(RET_YES == aQuery->Execute()) + std::unique_ptr xQuery(Application::CreateMessageDialog(pButton->GetFrameWeld(), + VclMessageType::Question, VclButtonsType::YesNo, + CuiResId(RID_SVXSTR_COLOR_CONFIG_DELETE))); + xQuery->set_title(CuiResId(RID_SVXSTR_COLOR_CONFIG_DELETE_TITLE)); + if (RET_YES == xQuery->run()) { OUString sDeleteScheme(m_pColorSchemeLB->GetSelectedEntry()); m_pColorSchemeLB->RemoveEntry(m_pColorSchemeLB->GetSelectedEntryPos()); diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index 695f358a0346..7b4e4ea5797e 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include @@ -151,7 +151,10 @@ IMPL_LINK_NOARG(SvxNewDictionaryDialog, OKHdl_Impl, Button*, void) if ( bFound ) { // duplicate names? - ScopedVclPtrInstance(this, CuiResId(RID_SVXSTR_OPT_DOUBLE_DICTS), VclMessageType::Info)->Execute(); + std::unique_ptr xInfoBox(Application::CreateMessageDialog(GetFrameWeld(), + VclMessageType::Info, VclButtonsType::Ok, + CuiResId(RID_SVXSTR_OPT_DOUBLE_DICTS))); + xInfoBox->run(); pNameEdit->GrabFocus(); return; } @@ -450,12 +453,14 @@ IMPL_LINK_NOARG(SvxEditDictionaryDialog, SelectLangHdl_Impl, ListBox&, void) if ( nLang != nOldLang ) { - ScopedVclPtrInstance< MessageDialog > aBox(this, CuiResId( RID_SVXSTR_CONFIRM_SET_LANGUAGE), VclMessageType::Question, VclButtonsType::YesNo); - OUString sTxt(aBox->get_primary_text()); + std::unique_ptr xBox(Application::CreateMessageDialog(GetFrameWeld(), + VclMessageType::Question, VclButtonsType::YesNo, + CuiResId(RID_SVXSTR_CONFIRM_SET_LANGUAGE))); + OUString sTxt(xBox->get_primary_text()); sTxt = sTxt.replaceFirst( "%1", pAllDictsLB->GetSelectedEntry() ); - aBox->set_primary_text(sTxt); + xBox->set_primary_text(sTxt); - if ( aBox->Execute() == RET_YES ) + if (xBox->run() == RET_YES) { xDic->setLocale( LanguageTag::convertToLocale( nLang ) ); bool bNegativ = xDic->getDictionaryType() == DictionaryType_NEGATIVE; diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index b1d5197e6687..1b4161575e67 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include #include @@ -138,7 +138,6 @@ void SvxNoSpaceEdit::KeyInput( const KeyEvent& rKEvent ) Edit::KeyInput(rKEvent); } - void SvxNoSpaceEdit::Modify() { Edit::Modify(); @@ -146,7 +145,12 @@ void SvxNoSpaceEdit::Modify() if ( bOnlyNumeric ) { if ( !isValidPort(GetText()) ) - ScopedVclPtrInstance(this, CuiResId( RID_SVXSTR_OPT_PROXYPORTS))->Execute(); + { + std::unique_ptr xErrorBox(Application::CreateMessageDialog(GetFrameWeld(), + VclMessageType::Warning, VclButtonsType::Ok, + CuiResId( RID_SVXSTR_OPT_PROXYPORTS))); + xErrorBox->run(); + } } } diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 26b34709384e..30d968607df6 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -538,13 +538,17 @@ void SvxJavaOptionsPage::AddFolder( const OUString& _rFolder ) } else if ( JFW_E_NOT_RECOGNIZED == eErr ) { - ScopedVclPtrInstance< MessageDialog > aErrBox( this, CuiResId( RID_SVXSTR_JRE_NOT_RECOGNIZED ) ); - aErrBox->Execute(); + std::unique_ptr xBox(Application::CreateMessageDialog(GetFrameWeld(), + VclMessageType::Warning, VclButtonsType::Ok, + CuiResId(RID_SVXSTR_JRE_NOT_RECOGNIZED))); + xBox->run(); } else if ( JFW_E_FAILED_VERSION == eErr ) { - ScopedVclPtrInstance< MessageDialog > aErrBox( this, CuiResId( RID_SVXSTR_JRE_FAILED_VERSION ) ); - aErrBox->Execute(); + std::unique_ptr xBox(Application::CreateMessageDialog(GetFrameWeld(), + VclMessageType::Warning, VclButtonsType::Ok, + CuiResId(RID_SVXSTR_JRE_FAILED_VERSION))); + xBox->run(); } if ( bStartAgain ) @@ -928,7 +932,9 @@ IMPL_LINK_NOARG(SvxJavaClassPathDlg, AddArchiveHdl_Impl, Button*, void) { OUString sMsg( CuiResId( RID_SVXSTR_MULTIFILE_DBL_ERR ) ); sMsg = sMsg.replaceFirst( "%1", sFile ); - ScopedVclPtrInstance(this, sMsg)->Execute(); + std::unique_ptr xBox(Application::CreateMessageDialog(GetFrameWeld(), + VclMessageType::Warning, VclButtonsType::Ok, sMsg)); + xBox->run(); } } EnableRemoveButton(); @@ -963,7 +969,9 @@ IMPL_LINK_NOARG(SvxJavaClassPathDlg, AddPathHdl_Impl, Button*, void) { OUString sMsg( CuiResId( RID_SVXSTR_MULTIFILE_DBL_ERR ) ); sMsg = sMsg.replaceFirst( "%1", sNewFolder ); - ScopedVclPtrInstance(this, sMsg)->Execute(); + std::unique_ptr xBox(Application::CreateMessageDialog(GetFrameWeld(), + VclMessageType::Warning, VclButtonsType::Ok, sMsg)); + xBox->run(); } } EnableRemoveButton(); diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 9400320e3d2d..c2adea57d669 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -1553,9 +1554,9 @@ IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, Button *, pBtn, void ) } else if (m_pLinguDicsDelPB == pBtn) { - ScopedVclPtrInstance aQuery(this, "QueryDeleteDictionaryDialog", - "cui/ui/querydeletedictionarydialog.ui"); - if (RET_NO == aQuery->Execute()) + std::unique_ptr xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/querydeletedictionarydialog.ui")); + std::unique_ptr xQuery(xBuilder->weld_message_dialog("QueryDeleteDictionaryDialog")); + if (RET_NO == xQuery->run()) return; SvTreeListEntry *pEntry = m_pLinguDicsCLB->GetCurEntry(); diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx index 5e94bda5a12a..e757231a0c33 100644 --- a/cui/source/options/optopencl.cxx +++ b/cui/source/options/optopencl.cxx @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -101,8 +102,10 @@ bool SvxOpenCLTabPage::FillItemSet( SfxItemSet* ) if (bModified) { - ScopedVclPtrInstance aWarnBox(this, CuiResId(RID_SVXSTR_OPTIONS_RESTART), VclMessageType::Info); - aWarnBox->Execute(); + std::unique_ptr xWarnBox(Application::CreateMessageDialog(GetFrameWeld(), + VclMessageType::Info, VclButtonsType::Ok, + CuiResId(RID_SVXSTR_OPTIONS_RESTART))); + xWarnBox->run(); batch->commit(); } diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index fa75e28873bf..37ee324e01f5 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include #include @@ -584,10 +584,9 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickRenameHdl, SvxPresetListBox*, void) } else { - ScopedVclPtrInstance aBox( GetParentDialog() - ,"DuplicateNameDialog" - ,"cui/ui/queryduplicatedialog.ui" ); - aBox->Execute(); + std::unique_ptr xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/queryduplicatedialog.ui")); + std::unique_ptr xBox(xBuilder->weld_message_dialog("DuplicateNameDialog")); + xBox->run(); } } } @@ -600,9 +599,10 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickDeleteHdl, SvxPresetListBox*, void) if( nPos != VALUESET_ITEM_NOTFOUND ) { - ScopedVclPtrInstance< MessageDialog > aQueryBox( GetParentDialog(),"AskDelBitmapDialog","cui/ui/querydeletebitmapdialog.ui" ); + std::unique_ptr xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/querydeletebitmapdialog.ui")); + std::unique_ptr xQueryBox(xBuilder->weld_message_dialog("AskDelBitmapDialog")); - if( aQueryBox->Execute() == RET_YES ) + if (xQueryBox->run() == RET_YES) { m_pBitmapList->Remove( static_cast(nPos) ); m_pBitmapLB->RemoveItem( nId ); @@ -772,7 +772,6 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl, Button*, void) if( !nError ) { OUString aDesc(CuiResId(RID_SVXSTR_DESC_EXT_BITMAP)); - ScopedVclPtr pWarnBox; // convert file URL to UI name OUString aName; @@ -798,19 +797,13 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl, Button*, void) break; } - if( !pWarnBox ) - { - pWarnBox.disposeAndReset(VclPtr::Create( GetParentDialog() - ,"DuplicateNameDialog" - ,"cui/ui/queryduplicatedialog.ui")); - } - - if( pWarnBox->Execute() != RET_OK ) + std::unique_ptr xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/queryduplicatedialog.ui")); + std::unique_ptr xBox(xBuilder->weld_message_dialog("DuplicateNameDialog")); + if (xBox->run() != RET_OK) break; } pDlg.disposeAndClear(); - pWarnBox.disposeAndClear(); if( !nError ) { @@ -827,10 +820,12 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl, Button*, void) } } else + { // graphic couldn't be loaded - ScopedVclPtrInstance( GetParentDialog() - ,"NoLoadedFileDialog" - ,"cui/ui/querynoloadedfiledialog.ui")->Execute(); + std::unique_ptr xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/querynoloadedfiledialog.ui")); + std::unique_ptr xBox(xBuilder->weld_message_dialog("NoLoadedFileDialog")); + xBox->run(); + } } } diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index fe6e5118fd23..85ffbce5373f 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -365,7 +366,6 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickAddHdl_Impl, Button*, void) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); ScopedVclPtr pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc )); - ScopedVclPtr pWarnBox; sal_uInt16 nError = 1; while (pDlg->Execute() == RET_OK) @@ -379,19 +379,13 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickAddHdl_Impl, Button*, void) break; } - if( !pWarnBox ) - { - pWarnBox.disposeAndReset(VclPtr::Create( GetParentDialog() - ,"DuplicateNameDialog" - ,"cui/ui/queryduplicatedialog.ui")); - } - - if( pWarnBox->Execute() != RET_OK ) + std::unique_ptr xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/queryduplicatedialog.ui")); + std::unique_ptr xWarnBox(xBuilder->weld_message_dialog("DuplicateNameDialog")); + if (xWarnBox->run() != RET_OK) break; } pDlg.disposeAndClear(); - pWarnBox.disposeAndClear(); if (!nError) { diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index f145f8c4f509..52cf295e245e 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -377,7 +378,6 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickAddHdl_Impl, Button*, void) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); ScopedVclPtr pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc )); - ScopedVclPtr pWarnBox; sal_uInt16 nError = 1; while (pDlg->Execute() == RET_OK) @@ -392,18 +392,12 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickAddHdl_Impl, Button*, void) break; } - if( !pWarnBox ) - { - pWarnBox.disposeAndReset(VclPtr::Create( GetParentDialog() - ,"DuplicateNameDialog" - ,"cui/ui/queryduplicatedialog.ui")); - } - - if( pWarnBox->Execute() != RET_OK ) + std::unique_ptr xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/queryduplicatedialog.ui")); + std::unique_ptr xWarnBox(xBuilder->weld_message_dialog("DuplicateNameDialog")); + if (xWarnBox->run() != RET_OK) break; } pDlg.disposeAndClear(); - pWarnBox.disposeAndClear(); if( !nError ) { @@ -475,9 +469,9 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickDeleteHdl_Impl, SvxPresetListBox*, void if( nPos != VALUESET_ITEM_NOTFOUND ) { - ScopedVclPtrInstance< MessageDialog > aQueryBox( GetParentDialog(),"AskDelGradientDialog","cui/ui/querydeletegradientdialog.ui"); - - if ( aQueryBox->Execute() == RET_YES ) + std::unique_ptr xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/querydeletegradientdialog.ui")); + std::unique_ptr xQueryBox(xBuilder->weld_message_dialog("AskDelGradientDialog")); + if (xQueryBox->run() == RET_YES) { m_pGradientList->Remove(nPos); m_pGradientLB->RemoveItem( nId ); @@ -531,10 +525,9 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickRenameHdl_Impl, SvxPresetListBox*, void } else { - ScopedVclPtrInstance aBox( GetParentDialog() - ,"DuplicateNameDialog" - ,"cui/ui/queryduplicatedialog.ui" ); - aBox->Execute(); + std::unique_ptr xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/queryduplicatedialog.ui")); + std::unique_ptr xBox(xBuilder->weld_message_dialog("DuplicateNameDialog")); + xBox->run(); } } } diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index 17faefbdd114..c34e72484f13 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -447,7 +448,6 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickAddHdl_Impl, Button*, void) assert(pFact && "Dialog creation failed!"); ScopedVclPtr pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc )); assert(pDlg && "Dialog creation failed!"); - ScopedVclPtr pWarnBox; sal_uInt16 nError = 1; while( pDlg->Execute() == RET_OK ) @@ -461,18 +461,12 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickAddHdl_Impl, Button*, void) break; } - if( !pWarnBox ) - { - pWarnBox.disposeAndReset(VclPtr::Create( GetParentDialog() - ,"DuplicateNameDialog" - ,"cui/ui/queryduplicatedialog.ui")); - } - - if( pWarnBox->Execute() != RET_OK ) + std::unique_ptr xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/queryduplicatedialog.ui")); + std::unique_ptr xWarnBox(xBuilder->weld_message_dialog("DuplicateNameDialog")); + if (xWarnBox->run() != RET_OK) break; } pDlg.disposeAndClear(); - pWarnBox.disposeAndClear(); if( !nError ) { @@ -535,9 +529,9 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickDeleteHdl_Impl, SvxPresetListBox*, void) if( nPos != VALUESET_ITEM_NOTFOUND ) { - ScopedVclPtrInstance< MessageDialog > aQueryBox( GetParentDialog(),"AskDelHatchDialog","cui/ui/querydeletehatchdialog.ui"); - - if( aQueryBox->Execute() == RET_YES ) + std::unique_ptr xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/querydeletehatchdialog.ui")); + std::unique_ptr xQueryBox(xBuilder->weld_message_dialog("AskDelHatchDialog")); + if (xQueryBox->run() == RET_YES) { m_pHatchingList->Remove(nPos); m_pHatchLB->RemoveItem( nId ); @@ -588,10 +582,9 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickRenameHdl_Impl, SvxPresetListBox*, void ) } else { - ScopedVclPtrInstance aBox( GetParentDialog() - ,"DuplicateNameDialog" - ,"cui/ui/queryduplicatedialog.ui" ); - aBox->Execute(); + std::unique_ptr xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/queryduplicatedialog.ui")); + std::unique_ptr xBox(xBuilder->weld_message_dialog("DuplicateNameDialog")); + xBox->run(); } } } diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index 5291075cc318..4c2ba2cd428e 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -590,10 +591,9 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickAddHdl_Impl, Button*, void) } else { - ScopedVclPtrInstance aBox( GetParentDialog() - ,"DuplicateNameDialog" - ,"cui/ui/queryduplicatedialog.ui" ); - aBox->Execute(); + std::unique_ptr xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/queryduplicatedialog.ui")); + std::unique_ptr xBox(xBuilder->weld_message_dialog("DuplicateNameDialog")); + xBox->run(); } } pDlg.disposeAndClear(); @@ -663,10 +663,9 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickModifyHdl_Impl, Button*, void) } else { - ScopedVclPtrInstance aBox( GetParentDialog() - ,"DuplicateNameDialog" - ,"cui/ui/queryduplicatedialog.ui" ); - aBox->Execute(); + std::unique_ptr xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/queryduplicatedialog.ui")); + std::unique_ptr xBox(xBuilder->weld_message_dialog("DuplicateNameDialog")); + xBox->run(); } } } @@ -679,11 +678,9 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickDeleteHdl_Impl, Button*, void) if ( nPos != LISTBOX_ENTRY_NOTFOUND ) { - ScopedVclPtrInstance aQueryBox( GetParentDialog() - ,"AskDelLineStyleDialog" - ,"cui/ui/querydeletelinestyledialog.ui" ); - - if ( aQueryBox->Execute() == RET_YES ) + std::unique_ptr xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/querydeletelinestyledialog.ui")); + std::unique_ptr xQueryBox(xBuilder->weld_message_dialog("AskDelLineStyleDialog")); + if (xQueryBox->run() == RET_YES) { pDashList->Remove(nPos); m_pLbLineStyles->RemoveEntry( nPos ); @@ -713,9 +710,10 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickLoadHdl_Impl, Button*, void) if ( *pnDashListState & ChangeType::MODIFIED ) { - nReturn = ScopedVclPtrInstance(GetParentDialog() - ,"AskSaveList" - ,"cui/ui/querysavelistdialog.ui")->Execute(); + std::unique_ptr xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/querysavelistdialog.ui")); + std::unique_ptr xBox(xBuilder->weld_message_dialog("AskSaveList")); + + nReturn = xBox->run(); if ( nReturn == RET_YES ) pDashList->Save(); @@ -765,10 +763,11 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickLoadHdl_Impl, Button*, void) *pnDashListState &= ~ChangeType::MODIFIED; } else - //aIStream.Close(); - ScopedVclPtrInstance(GetParentDialog() - ,"NoLoadedFileDialog" - ,"cui/ui/querynoloadedfiledialog.ui")->Execute(); + { + std::unique_ptr xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/querynoloadedfiledialog.ui")); + std::unique_ptr xBox(xBuilder->weld_message_dialog("NoLoadedFileDialog")); + xBox->run(); + } } } @@ -832,9 +831,9 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickSaveHdl_Impl, Button*, void) } else { - ScopedVclPtrInstance(GetParentDialog() - ,"NoSaveFileDialog" - ,"cui/ui/querynosavefiledialog.ui")->Execute(); + std::unique_ptr xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/querynosavefiledialog.ui")); + std::unique_ptr xBox(xBuilder->weld_message_dialog("NoSaveFileDialog")); + xBox->run(); } } } diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index e669b92135ec..621d90929028 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -200,10 +201,9 @@ void SvxLineEndDefTabPage::CheckChanges_Impl() if( aString != m_pLbLineEnds->GetSelectedEntry() ) { - ScopedVclPtrInstance aQueryBox( GetParentDialog() - ,"AskChangeLineEndDialog" - ,"cui/ui/querychangelineenddialog.ui" ); - if ( aQueryBox->Execute() == RET_YES ) + std::unique_ptr xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/querychangelineenddialog.ui")); + std::unique_ptr xQueryBox(xBuilder->weld_message_dialog("AskChangeLineEndDialog")); + if (xQueryBox->run() == RET_YES) ClickModifyHdl_Impl( nullptr ); } } @@ -321,10 +321,9 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickModifyHdl_Impl, Button*, void) // if yes, repeat and demand a new name if ( !bDifferent ) { - ScopedVclPtrInstance aWarningBox( GetParentDialog() - ,"DuplicateNameDialog" - ,"cui/ui/queryduplicatedialog.ui" ); - aWarningBox->Execute(); + std::unique_ptr xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/queryduplicatedialog.ui")); + std::unique_ptr xWarningBox(xBuilder->weld_message_dialog("DuplicateNameDialog")); + xWarningBox->run(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "Dialog creation failed!"); @@ -346,7 +345,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickModifyHdl_Impl, Button*, void) if( bDifferent ) bLoop = false; else - aWarningBox->Execute(); + xWarningBox->run(); } } @@ -466,10 +465,9 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickAddHdl_Impl, Button*, void) } else { - ScopedVclPtrInstance aBox( GetParentDialog() - ,"DuplicateNameDialog" - ,"cui/ui/queryduplicatedialog.ui" ); - aBox->Execute(); + std::unique_ptr xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/queryduplicatedialog.ui")); + std::unique_ptr xWarningBox(xBuilder->weld_message_dialog("DuplicateNameDialog")); + xWarningBox->run(); } } } @@ -492,11 +490,10 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickDeleteHdl_Impl, Button*, void) if( nPos != LISTBOX_ENTRY_NOTFOUND ) { - ScopedVclPtrInstance aQueryBox( GetParentDialog() - ,"AskDelLineEndDialog" - ,"cui/ui/querydeletelineenddialog.ui" ); + std::unique_ptr xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/querydeletelineenddialog.ui")); + std::unique_ptr xQueryBox(xBuilder->weld_message_dialog("AskDelLineEndDialog")); - if ( aQueryBox->Execute() == RET_YES ) + if (xQueryBox->run() == RET_YES) { pLineEndList->Remove(nPos); m_pLbLineEnds->RemoveEntry( nPos ); @@ -526,9 +523,10 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickLoadHdl_Impl, Button*, void) if ( *pnLineEndListState & ChangeType::MODIFIED ) { - nReturn = ScopedVclPtrInstance(GetParentDialog() - ,"AskSaveList" - ,"cui/ui/querysavelistdialog.ui")->Execute(); + std::unique_ptr xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/querysavelistdialog.ui")); + std::unique_ptr xBox(xBuilder->weld_message_dialog("AskSaveList")); + + nReturn = xBox->run(); if ( nReturn == RET_YES ) pLineEndList->Save(); @@ -580,9 +578,11 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickLoadHdl_Impl, Button*, void) *pnLineEndListState &= ~ChangeType::MODIFIED; } else - ScopedVclPtrInstance(GetParentDialog() - ,"NoLoadedFileDialog" - ,"cui/ui/querynoloadedfiledialog.ui")->Execute(); + { + std::unique_ptr xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/querynoloadedfiledialog.ui")); + std::unique_ptr xBox(xBuilder->weld_message_dialog("NoLoadedFileDialog")); + xBox->run(); + } } } @@ -647,9 +647,9 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickSaveHdl_Impl, Button*, void) } else { - ScopedVclPtrInstance(GetParentDialog() - ,"NoSaveFileDialog" - ,"cui/ui/querynosavefiledialog.ui")->Execute(); + std::unique_ptr xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/querynosavefiledialog.ui")); + std::unique_ptr xBox(xBuilder->weld_message_dialog("NoSaveFileDialog")); + xBox->run(); } } } diff --git a/cui/source/tabpages/tppattern.cxx b/cui/source/tabpages/tppattern.cxx index 8933c5fbe18c..611edb2cc557 100644 --- a/cui/source/tabpages/tppattern.cxx +++ b/cui/source/tabpages/tppattern.cxx @@ -32,6 +32,7 @@ #include #include #include +#include #include #include @@ -360,7 +361,6 @@ IMPL_LINK_NOARG(SvxPatternTabPage, ClickAddHdl_Impl, Button*, void) assert(pFact && "Dialog creation failed!"); ScopedVclPtr pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc )); assert(pDlg && "Dialog creation failed!"); - ScopedVclPtr pWarnBox; sal_uInt16 nError(1); while( pDlg->Execute() == RET_OK ) @@ -374,19 +374,13 @@ IMPL_LINK_NOARG(SvxPatternTabPage, ClickAddHdl_Impl, Button*, void) break; } - if( !pWarnBox ) - { - pWarnBox.disposeAndReset(VclPtr::Create( GetParentDialog() - ,"DuplicateNameDialog" - ,"cui/ui/queryduplicatedialog.ui")); - } - - if( pWarnBox->Execute() != RET_OK ) + std::unique_ptr xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/queryduplicatedialog.ui")); + std::unique_ptr xWarnBox(xBuilder->weld_message_dialog("DuplicateNameDialog")); + if (xWarnBox->run() != RET_OK) break; } pDlg.disposeAndClear(); - pWarnBox.disposeAndClear(); if( !nError ) { @@ -496,17 +490,14 @@ IMPL_LINK_NOARG(SvxPatternTabPage, ClickRenameHdl_Impl, SvxPresetListBox*, void) } else { - ScopedVclPtrInstance aBox( - GetParentDialog() - ,"DuplicateNameDialog" - ,"cui/ui/queryduplicatedialog.ui"); - aBox->Execute(); + std::unique_ptr xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/queryduplicatedialog.ui")); + std::unique_ptr xWarnBox(xBuilder->weld_message_dialog("DuplicateNameDialog")); + xWarnBox->run(); } } } } - IMPL_LINK_NOARG(SvxPatternTabPage, ClickDeleteHdl_Impl, SvxPresetListBox*, void) { sal_uInt16 nId = m_pPatternLB->GetSelectItemId(); @@ -514,9 +505,9 @@ IMPL_LINK_NOARG(SvxPatternTabPage, ClickDeleteHdl_Impl, SvxPresetListBox*, void) if( nPos != VALUESET_ITEM_NOTFOUND ) { - ScopedVclPtrInstance< MessageDialog > aQueryBox( GetParentDialog(),"AskDelBitmapDialog","cui/ui/querydeletebitmapdialog.ui" ); - - if( aQueryBox->Execute() == RET_YES ) + std::unique_ptr xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/querydeletebitmapdialog.ui")); + std::unique_ptr xQueryBox(xBuilder->weld_message_dialog("AskDelBitmapDialog")); + if (xQueryBox->run() == RET_YES) { m_pPatternList->Remove(nPos); m_pPatternLB->RemoveItem( nId ); diff --git a/cui/uiconfig/ui/querychangelineenddialog.ui b/cui/uiconfig/ui/querychangelineenddialog.ui index b8e5f113a203..eddcaf4711aa 100644 --- a/cui/uiconfig/ui/querychangelineenddialog.ui +++ b/cui/uiconfig/ui/querychangelineenddialog.ui @@ -4,7 +4,6 @@ False - 6 Save Arrowhead? False dialog @@ -21,7 +20,6 @@ False - end False diff --git a/cui/uiconfig/ui/querydeletebitmapdialog.ui b/cui/uiconfig/ui/querydeletebitmapdialog.ui index a737c87ee58a..8d47eb3e434f 100644 --- a/cui/uiconfig/ui/querydeletebitmapdialog.ui +++ b/cui/uiconfig/ui/querydeletebitmapdialog.ui @@ -4,7 +4,6 @@ False - 6 Delete Bitmap? False dialog @@ -20,7 +19,6 @@ False - end False diff --git a/cui/uiconfig/ui/querydeletechartcolordialog.ui b/cui/uiconfig/ui/querydeletechartcolordialog.ui index ad07c12effdb..265390241b4c 100644 --- a/cui/uiconfig/ui/querydeletechartcolordialog.ui +++ b/cui/uiconfig/ui/querydeletechartcolordialog.ui @@ -4,7 +4,6 @@ False - 6 Delete Color? False dialog @@ -21,7 +20,6 @@ False - end False diff --git a/cui/uiconfig/ui/querydeletecolordialog.ui b/cui/uiconfig/ui/querydeletecolordialog.ui index fc142aacde96..9a46b038f36f 100644 --- a/cui/uiconfig/ui/querydeletecolordialog.ui +++ b/cui/uiconfig/ui/querydeletecolordialog.ui @@ -3,7 +3,6 @@ False - 6 Delete color? False dialog @@ -19,7 +18,6 @@ False - center False diff --git a/cui/uiconfig/ui/querydeletedictionarydialog.ui b/cui/uiconfig/ui/querydeletedictionarydialog.ui index 663b917689a1..8d506808cce8 100644 --- a/cui/uiconfig/ui/querydeletedictionarydialog.ui +++ b/cui/uiconfig/ui/querydeletedictionarydialog.ui @@ -4,7 +4,6 @@ False - 6 Delete Dictionary? False dialog @@ -21,7 +20,6 @@ False - end False diff --git a/cui/uiconfig/ui/querydeletegradientdialog.ui b/cui/uiconfig/ui/querydeletegradientdialog.ui index b4353a10413f..b24920e2f2b7 100644 --- a/cui/uiconfig/ui/querydeletegradientdialog.ui +++ b/cui/uiconfig/ui/querydeletegradientdialog.ui @@ -4,7 +4,6 @@ False - 6 Delete gradient? False dialog @@ -20,7 +19,6 @@ False - end False diff --git a/cui/uiconfig/ui/querydeletehatchdialog.ui b/cui/uiconfig/ui/querydeletehatchdialog.ui index ab22d721852e..928ebc186c83 100644 --- a/cui/uiconfig/ui/querydeletehatchdialog.ui +++ b/cui/uiconfig/ui/querydeletehatchdialog.ui @@ -4,7 +4,6 @@ False - 6 Delete Hatching? False dialog @@ -20,7 +19,6 @@ False - end False diff --git a/cui/uiconfig/ui/querydeletelineenddialog.ui b/cui/uiconfig/ui/querydeletelineenddialog.ui index 30355fcd662c..1725bfefccc7 100644 --- a/cui/uiconfig/ui/querydeletelineenddialog.ui +++ b/cui/uiconfig/ui/querydeletelineenddialog.ui @@ -4,7 +4,6 @@ False - 6 Delete Arrowhead? False dialog @@ -21,7 +20,6 @@ False - end False diff --git a/cui/uiconfig/ui/querydeletelinestyledialog.ui b/cui/uiconfig/ui/querydeletelinestyledialog.ui index 86aa1fdf08da..ac76319b821e 100644 --- a/cui/uiconfig/ui/querydeletelinestyledialog.ui +++ b/cui/uiconfig/ui/querydeletelinestyledialog.ui @@ -4,7 +4,6 @@ False - 6 Delete Line Style? False dialog @@ -20,7 +19,6 @@ False - end False diff --git a/cui/uiconfig/ui/queryduplicatedialog.ui b/cui/uiconfig/ui/queryduplicatedialog.ui index 172e14baddef..aa98dbb95a61 100644 --- a/cui/uiconfig/ui/queryduplicatedialog.ui +++ b/cui/uiconfig/ui/queryduplicatedialog.ui @@ -4,7 +4,6 @@ False - 6 Duplicate Name False dialog @@ -21,7 +20,6 @@ False - end False diff --git a/cui/uiconfig/ui/querynoloadedfiledialog.ui b/cui/uiconfig/ui/querynoloadedfiledialog.ui index 397919a42717..6796c8934692 100644 --- a/cui/uiconfig/ui/querynoloadedfiledialog.ui +++ b/cui/uiconfig/ui/querynoloadedfiledialog.ui @@ -4,7 +4,6 @@ False - 6 No Loaded File False dialog @@ -20,7 +19,6 @@ False - end False diff --git a/cui/uiconfig/ui/querynosavefiledialog.ui b/cui/uiconfig/ui/querynosavefiledialog.ui index a579aba13727..7ef88a753fea 100644 --- a/cui/uiconfig/ui/querynosavefiledialog.ui +++ b/cui/uiconfig/ui/querynosavefiledialog.ui @@ -4,7 +4,6 @@ False - 6 No Saved File False dialog @@ -20,7 +19,6 @@ False - end False diff --git a/cui/uiconfig/ui/querysavelistdialog.ui b/cui/uiconfig/ui/querysavelistdialog.ui index 8ccf00b71b67..9ec49a3e8a1b 100644 --- a/cui/uiconfig/ui/querysavelistdialog.ui +++ b/cui/uiconfig/ui/querysavelistdialog.ui @@ -4,7 +4,6 @@ False - 6 Save List? False dialog @@ -21,7 +20,6 @@ False - end False diff --git a/cui/uiconfig/ui/queryupdategalleryfilelistdialog.ui b/cui/uiconfig/ui/queryupdategalleryfilelistdialog.ui index e41d5cca1724..61dd02a9b91a 100644 --- a/cui/uiconfig/ui/queryupdategalleryfilelistdialog.ui +++ b/cui/uiconfig/ui/queryupdategalleryfilelistdialog.ui @@ -4,7 +4,6 @@ False - 6 Update File List? False dialog @@ -20,7 +19,6 @@ False - end False -- cgit v1.2.3