weld native message dialogs

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 <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

6 files changed, 28 insertions, 16 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>