diff options
Diffstat (limited to 'uui')
-rw-r--r-- | uui/source/masterpasscrtdlg.cxx | 9 | ||||
-rw-r--r-- | uui/source/masterpassworddlg.cxx | 8 | ||||
-rw-r--r-- | uui/source/nameclashdlg.cxx | 9 | ||||
-rw-r--r-- | uui/source/passworddlg.cxx | 14 | ||||
-rw-r--r-- | uui/source/sslwarndlg.hxx | 2 | ||||
-rw-r--r-- | uui/source/unknownauthdlg.hxx | 2 | ||||
-rw-r--r-- | uui/uiconfig/ui/sslwarndialog.ui | 4 | ||||
-rw-r--r-- | uui/uiconfig/ui/unknownauthdialog.ui | 6 |
8 files changed, 33 insertions, 21 deletions
diff --git a/uui/source/masterpasscrtdlg.cxx b/uui/source/masterpasscrtdlg.cxx index 6ceaa7315dc0..42d4a053bd95 100644 --- a/uui/source/masterpasscrtdlg.cxx +++ b/uui/source/masterpasscrtdlg.cxx @@ -19,7 +19,8 @@ #include <sal/macros.h> #include <unotools/resmgr.hxx> -#include <vcl/layout.hxx> +#include <vcl/svapp.hxx> +#include <vcl/weld.hxx> #include <strings.hrc> #include "masterpasscrtdlg.hxx" @@ -39,8 +40,10 @@ IMPL_LINK_NOARG(MasterPasswordCreateDialog, OKHdl_Impl, Button*, void) else { OUString aErrorMsg(Translate::get(STR_ERROR_PASSWORDS_NOT_IDENTICAL, rResLocale)); - ScopedVclPtrInstance< MessageDialog > aErrorBox(this, aErrorMsg); - aErrorBox->Execute(); + std::unique_ptr<weld::MessageDialog> xErrorBox(Application::CreateMessageDialog(GetFrameWeld(), + VclMessageType::Warning, VclButtonsType::Ok, + aErrorMsg)); + xErrorBox->run(); m_pEDMasterPasswordCrt->SetText( OUString() ); m_pEDMasterPasswordRepeat->SetText( OUString() ); m_pEDMasterPasswordCrt->GrabFocus(); diff --git a/uui/source/masterpassworddlg.cxx b/uui/source/masterpassworddlg.cxx index 7f860bfe81ef..f743db94f327 100644 --- a/uui/source/masterpassworddlg.cxx +++ b/uui/source/masterpassworddlg.cxx @@ -18,7 +18,8 @@ */ #include <unotools/resmgr.hxx> -#include <vcl/layout.hxx> +#include <vcl/svapp.hxx> +#include <vcl/weld.hxx> #include <strings.hrc> #include "masterpassworddlg.hxx" @@ -46,8 +47,9 @@ MasterPasswordDialog::MasterPasswordDialog if( nDialogMode == css::task::PasswordRequestMode_PASSWORD_REENTER ) { OUString aErrorMsg(Translate::get(STR_ERROR_MASTERPASSWORD_WRONG, rResLocale)); - ScopedVclPtrInstance< MessageDialog > aErrorBox(pParent, aErrorMsg); - aErrorBox->Execute(); + std::unique_ptr<weld::MessageDialog> xErrorBox(Application::CreateMessageDialog(pParent ? pParent->GetFrameWeld() : nullptr, + VclMessageType::Warning, VclButtonsType::Ok, aErrorMsg)); + xErrorBox->run(); } m_pOKBtn->SetClickHdl( LINK( this, MasterPasswordDialog, OKHdl_Impl ) ); diff --git a/uui/source/nameclashdlg.cxx b/uui/source/nameclashdlg.cxx index 8426086abbb8..9403c21af606 100644 --- a/uui/source/nameclashdlg.cxx +++ b/uui/source/nameclashdlg.cxx @@ -19,7 +19,8 @@ #include <osl/file.hxx> #include <unotools/resmgr.hxx> -#include <vcl/layout.hxx> +#include <vcl/svapp.hxx> +#include <vcl/weld.hxx> #include <strings.hrc> #include "nameclashdlg.hxx" @@ -35,8 +36,10 @@ IMPL_LINK( NameClashDialog, ButtonHdl_Impl, Button *, pBtn, void ) OUString aNewName = m_pEDNewName->GetText(); if ( ( aNewName == maNewName ) || aNewName.isEmpty() ) { - ScopedVclPtrInstance< MessageDialog > aError(nullptr, maSameName); - aError->Execute(); + std::unique_ptr<weld::MessageDialog> xErrorBox(Application::CreateMessageDialog(GetFrameWeld(), + VclMessageType::Warning, VclButtonsType::Ok, + maSameName)); + xErrorBox->run(); return; } maNewName = aNewName; diff --git a/uui/source/passworddlg.cxx b/uui/source/passworddlg.cxx index 1c1899b5657d..eec9540de9a8 100644 --- a/uui/source/passworddlg.cxx +++ b/uui/source/passworddlg.cxx @@ -22,7 +22,8 @@ #include <unotools/resmgr.hxx> #include <tools/urlobj.hxx> -#include <vcl/layout.hxx> +#include <vcl/svapp.hxx> +#include <vcl/weld.hxx> using namespace ::com::sun::star; @@ -46,8 +47,9 @@ PasswordDialog::PasswordDialog(vcl::Window* _pParent, const char* pOpenToModifyErrStrId = bOpenToModify ? STR_ERROR_PASSWORD_TO_MODIFY_WRONG : STR_ERROR_PASSWORD_TO_OPEN_WRONG; const char* pErrStrId = bIsSimplePasswordRequest ? STR_ERROR_SIMPLE_PASSWORD_WRONG : pOpenToModifyErrStrId; OUString aErrorMsg(Translate::get(pErrStrId, rResLocale)); - ScopedVclPtrInstance< MessageDialog > aErrorBox(GetParent(), aErrorMsg); - aErrorBox->Execute(); + std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(_pParent ? _pParent->GetFrameWeld() : nullptr, + VclMessageType::Warning, VclButtonsType::Ok, aErrorMsg)); + xBox->run(); } // default settings for enter password or reenter passwd... @@ -112,8 +114,10 @@ IMPL_LINK_NOARG(PasswordDialog, OKHdl_Impl, Button*, void) if (m_pEDConfirmPassword->IsVisible() && bPasswdMismatch) { - ScopedVclPtrInstance< MessageDialog > aErrorBox(this, aPasswdMismatch); - aErrorBox->Execute(); + std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(GetFrameWeld(), + VclMessageType::Warning, VclButtonsType::Ok, + aPasswdMismatch)); + xBox->run(); } else if (bValid) EndDialog( RET_OK ); diff --git a/uui/source/sslwarndlg.hxx b/uui/source/sslwarndlg.hxx index 42aa51026146..2c0a992dcc2d 100644 --- a/uui/source/sslwarndlg.hxx +++ b/uui/source/sslwarndlg.hxx @@ -21,7 +21,7 @@ #include <vcl/fixed.hxx> #include <vcl/button.hxx> -#include <vcl/layout.hxx> +#include <vcl/messagedialog.hxx> #include <com/sun/star/security/XCertificate.hpp> #include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp> #include <com/sun/star/uno/XComponentContext.hpp> diff --git a/uui/source/unknownauthdlg.hxx b/uui/source/unknownauthdlg.hxx index ad87b7579784..9c9274ef83f9 100644 --- a/uui/source/unknownauthdlg.hxx +++ b/uui/source/unknownauthdlg.hxx @@ -20,7 +20,7 @@ #define INCLUDED_UUI_SOURCE_UNKNOWNAUTHDLG_HXX #include <vcl/button.hxx> -#include <vcl/layout.hxx> +#include <vcl/messagedialog.hxx> #include <com/sun/star/security/XCertificate.hpp> #include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp> #include <com/sun/star/uno/XComponentContext.hpp> diff --git a/uui/uiconfig/ui/sslwarndialog.ui b/uui/uiconfig/ui/sslwarndialog.ui index 2a3d857816a3..9770d75e74d0 100644 --- a/uui/uiconfig/ui/sslwarndialog.ui +++ b/uui/uiconfig/ui/sslwarndialog.ui @@ -73,8 +73,8 @@ </object> </child> <action-widgets> - <action-widget response="1">ok</action-widget> - <action-widget response="0">cancel</action-widget> + <action-widget response="-5">ok</action-widget> + <action-widget response="-6">cancel</action-widget> <action-widget response="101">view</action-widget> </action-widgets> </object> diff --git a/uui/uiconfig/ui/unknownauthdialog.ui b/uui/uiconfig/ui/unknownauthdialog.ui index 9988e57b9e13..2e59c41a6859 100644 --- a/uui/uiconfig/ui/unknownauthdialog.ui +++ b/uui/uiconfig/ui/unknownauthdialog.ui @@ -131,9 +131,9 @@ </object> </child> <action-widgets> - <action-widget response="1">ok</action-widget> - <action-widget response="0">cancel</action-widget> - <action-widget response="10">help</action-widget> + <action-widget response="-5">ok</action-widget> + <action-widget response="-6">cancel</action-widget> + <action-widget response="-11">help</action-widget> </action-widgets> </object> </interface> |