3 files changed, 7 insertions, 15 deletions
diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx
index 97745739198d..9099258194a0 100644
--- a/vcl/source/app/dbggui.cxx
+++ b/vcl/source/app/dbggui.cxx
@@ -40,7 +40,7 @@
 #include "vcl/fixed.hxx"
 #include "vcl/group.hxx"
 #include "vcl/field.hxx"
-#include "vcl/msgbox.hxx"
+#include "vcl/layout.hxx"
 #include "vcl/settings.hxx"
 #include "vcl/wrkwin.hxx"
 #include "vcl/threadex.hxx"
@@ -819,7 +819,7 @@ void DbgGUIStart()
     }
     else
     {
-        ErrorBox( 0, WB_OK, OUString("TOOLS Library has no Debug-Routines") ).Execute();
+        MessageDialog(0, OUString("TOOLS Library has no Debug-Routines")).Execute();
     }
 }
 
diff --git a/vcl/source/app/stdtext.cxx b/vcl/source/app/stdtext.cxx
index edd115d0befa..2327639aa6fe 100644
--- a/vcl/source/app/stdtext.cxx
+++ b/vcl/source/app/stdtext.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 <vcl/stdtext.hxx>
 
 #include <svids.hrc>
@@ -39,16 +39,8 @@ void ShowServiceNotAvailableError(Window* pParent,
 {
     OUString aText  = GetStandardText(STANDARD_TEXT_SERVICE_NOT_AVAILABLE).
         replaceAll("%s", rServiceName);
-    if (bError)
-    {
-        ErrorBox aBox( pParent, WB_OK | WB_DEF_OK, aText );
-        aBox.Execute();
-    }
-    else
-    {
-        WarningBox aBox( pParent, WB_OK | WB_DEF_OK, aText );
-        aBox.Execute();
-    }
+    MessageDialog aBox(pParent, aText, bError ? VCL_MESSAGE_ERROR : VCL_MESSAGE_WARNING);
+    aBox.Execute();
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index 6ff25c5b726a..6054d6968f18 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -34,7 +34,7 @@
 #include "vcl/svapp.hxx"
 #include "vcl/settings.hxx"
 #include "vcl/wrkwin.hxx"
-#include "vcl/msgbox.hxx"
+#include "vcl/layout.hxx"
 #include "vcl/button.hxx"
 #include "vcl/dockwin.hxx"
 #include "salinst.hxx"
@@ -155,7 +155,7 @@ ResMgr* ImplGetResMgr()
                 "Missing vcl resource. This indicates that files vital to localization are missing. "
                 "You might have a corrupt installation.";
             fprintf( stderr, "%s\n", pMsg );
-            ErrorBox aBox( NULL, WB_OK | WB_DEF_OK, OUString( pMsg, strlen( pMsg ), RTL_TEXTENCODING_ASCII_US ) );
+            MessageDialog aBox(NULL, OUString(pMsg, strlen(pMsg), RTL_TEXTENCODING_ASCII_US));
             aBox.Execute();
         }
     }