4 files changed, 9 insertions, 13 deletions
diff --git a/uui/source/masterpasscrtdlg.cxx b/uui/source/masterpasscrtdlg.cxx
index f954c74bc8df..1ec8c852db62 100644
--- a/uui/source/masterpasscrtdlg.cxx
+++ b/uui/source/masterpasscrtdlg.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <sal/macros.h>
-#include <vcl/msgbox.hxx>
+#include <vcl/layout.hxx>
 
 #include "ids.hrc"
 #include "masterpasscrtdlg.hxx"
@@ -33,8 +33,6 @@ IMPL_LINK_NOARG(MasterPasswordCreateDialog, EditHdl_Impl)
     return 0;
 }
 
-
-
 IMPL_LINK_NOARG(MasterPasswordCreateDialog, OKHdl_Impl)
 {
     // compare both passwords and show message box if there are not equal!!
@@ -43,7 +41,7 @@ IMPL_LINK_NOARG(MasterPasswordCreateDialog, OKHdl_Impl)
     else
     {
         OUString aErrorMsg( ResId( STR_ERROR_PASSWORDS_NOT_IDENTICAL, *pResourceMgr ));
-        ErrorBox aErrorBox( this, WB_OK, aErrorMsg );
+        MessageDialog aErrorBox(this, aErrorMsg);
         aErrorBox.Execute();
         m_pEDMasterPasswordCrt->SetText( OUString() );
         m_pEDMasterPasswordRepeat->SetText( OUString() );
@@ -52,8 +50,6 @@ IMPL_LINK_NOARG(MasterPasswordCreateDialog, OKHdl_Impl)
     return 1;
 }
 
-
-
 MasterPasswordCreateDialog::MasterPasswordCreateDialog(Window* pParent, ResMgr* pResMgr)
     : ModalDialog(pParent, "SetMasterPasswordDialog", "uui/ui/setmasterpassworddlg.ui")
     , pResourceMgr(pResMgr)
diff --git a/uui/source/masterpassworddlg.cxx b/uui/source/masterpassworddlg.cxx
index 0b2a6afd9176..ed297a860e69 100644
--- a/uui/source/masterpassworddlg.cxx
+++ b/uui/source/masterpassworddlg.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <vcl/msgbox.hxx>
+#include <vcl/layout.hxx>
 
 #include "ids.hrc"
 #include "masterpassworddlg.hxx"
@@ -49,7 +49,7 @@ MasterPasswordDialog::MasterPasswordDialog
     if( nDialogMode == ::com::sun::star::task::PasswordRequestMode_PASSWORD_REENTER )
     {
         OUString aErrorMsg( ResId( STR_ERROR_MASTERPASSWORD_WRONG, *pResourceMgr ));
-        ErrorBox aErrorBox( pParent, WB_OK, aErrorMsg );
+        MessageDialog aErrorBox(pParent, aErrorMsg);
         aErrorBox.Execute();
     }
 
diff --git a/uui/source/nameclashdlg.cxx b/uui/source/nameclashdlg.cxx
index 201c6ab89ce0..65244d7f5dd6 100644
--- a/uui/source/nameclashdlg.cxx
+++ b/uui/source/nameclashdlg.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <vcl/msgbox.hxx>
+#include <vcl/layout.hxx>
 #include <osl/file.hxx>
 
 #include "ids.hrc"
@@ -35,7 +35,7 @@ IMPL_LINK( NameClashDialog, ButtonHdl_Impl, PushButton *, pBtn )
         OUString aNewName = maEDNewName.GetText();
         if ( ( aNewName == maNewName ) || aNewName.isEmpty() )
         {
-            ErrorBox aError( NULL, WB_OK, maSameName );
+            MessageDialog aError(NULL, maSameName);
             aError.Execute();
             return 1;
         }
diff --git a/uui/source/passworddlg.cxx b/uui/source/passworddlg.cxx
index 19c08e022ce7..3d4326eb10ff 100644
--- a/uui/source/passworddlg.cxx
+++ b/uui/source/passworddlg.cxx
@@ -20,7 +20,7 @@
 #include "passworddlg.hxx"
 #include "ids.hrc"
 
-#include <vcl/msgbox.hxx>
+#include <vcl/layout.hxx>
 
 using namespace ::com::sun::star;
 
@@ -44,7 +44,7 @@ PasswordDialog::PasswordDialog(Window* _pParent,
         const sal_uInt16 nOpenToModifyErrStrId = bOpenToModify ? STR_ERROR_PASSWORD_TO_MODIFY_WRONG : STR_ERROR_PASSWORD_TO_OPEN_WRONG;
         const sal_uInt16 nErrStrId = bIsSimplePasswordRequest ? STR_ERROR_SIMPLE_PASSWORD_WRONG : nOpenToModifyErrStrId;
         OUString aErrorMsg(ResId(nErrStrId, *pResourceMgr).toString());
-        ErrorBox aErrorBox( GetParent(), WB_OK, aErrorMsg );
+        MessageDialog aErrorBox(GetParent(), aErrorMsg);
         aErrorBox.Execute();
     }
 
@@ -91,7 +91,7 @@ IMPL_LINK_NOARG(PasswordDialog, OKHdl_Impl)
 
     if (m_pEDConfirmPassword->IsVisible() && bPasswdMismatch)
     {
-        ErrorBox aErrorBox( this, WB_OK, aPasswdMismatch );
+        MessageDialog aErrorBox(this, aPasswdMismatch);
         aErrorBox.Execute();
     }
     else if (bValid)