ErrorBox->MessageDialog

Change-Id: I57d4e43460e40d3aff54873280eddbb18c12446b

6 files changed, 14 insertions, 13 deletions

diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx
index dc4a3b83eea4..ec6c4fda964d 100644
--- a/sc/source/ui/miscdlgs/crnrdlg.cxx
+++ b/sc/source/ui/miscdlgs/crnrdlg.cxx
@@ -26,7 +26,7 @@
 #include <vcl/msgbox.hxx>
 #include <boost/scoped_array.hpp>
 
-#define ERRORBOX(s) ErrorBox(this,WinBits(WB_OK|WB_DEF_OK),s).Execute()
+#define ERRORBOX(s) MessageDialog(this, s).Execute()
 #define QUERYBOX(m) QueryBox(this,WinBits(WB_YES_NO|WB_DEF_YES),m).Execute()
 
 const sal_uLong nEntryDataCol = 0;
diff --git a/sc/source/ui/miscdlgs/filldlg.cxx b/sc/source/ui/miscdlgs/filldlg.cxx
index 3b057dab871f..deb798d1738f 100644
--- a/sc/source/ui/miscdlgs/filldlg.cxx
+++ b/sc/source/ui/miscdlgs/filldlg.cxx
@@ -20,7 +20,7 @@
 #undef SC_DLLIMPLEMENTATION
 
 #include <svl/zforlist.hxx>
-#include <vcl/msgbox.hxx>
+#include <vcl/layout.hxx>
 #include <limits.h>
 
 #include "scresid.hxx"
@@ -299,8 +299,7 @@ IMPL_LINK_NOARG(ScFillSeriesDlg, OKHdl)
         EndDialog( RET_OK );
     else
     {
-        ErrorBox( this,
-                  WinBits( WB_OK | WB_DEF_OK ),
+        MessageDialog(this,
                   aErrMsgInvalidVal
                 ).Execute();
         pEdWrong->GrabFocus();
diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx
index f48035515bf6..ffe119b0603c 100644
--- a/sc/source/ui/miscdlgs/instbdlg.cxx
+++ b/sc/source/ui/miscdlgs/instbdlg.cxx
@@ -293,7 +293,7 @@ IMPL_LINK_NOARG(ScInsertTableDlg, DoEnterHdl)
     else
     {
         OUString aErrMsg ( ScGlobal::GetRscString( STR_INVALIDTABNAME ) );
-        (void)ErrorBox( this,WinBits( WB_OK | WB_DEF_OK ),aErrMsg).Execute();
+        (void)MessageDialog(this, aErrMsg).Execute();
     }
     return 0;
 }
diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx
index db7d9f103f08..72cf968d96cf 100644
--- a/sc/source/ui/miscdlgs/optsolver.cxx
+++ b/sc/source/ui/miscdlgs/optsolver.cxx
@@ -721,7 +721,7 @@ IMPL_LINK( ScOptSolverDlg, CursorDownHdl, ScCursorRefEdit*, pEdit )
 void ScOptSolverDlg::ShowError( bool bCondition, formula::RefEdit* pFocus )
 {
     OUString aMessage = bCondition ? maConditionError : maInputError;
-    ErrorBox( this, WinBits( WB_OK | WB_DEF_OK ), aMessage ).Execute();
+    MessageDialog(this, aMessage).Execute();
     if (pFocus)
     {
         mpEdActive = pFocus;
diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx
index 381ce874b72c..cfb075418e83 100644
--- a/sc/source/ui/miscdlgs/scuiautofmt.cxx
+++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx
@@ -245,9 +245,10 @@ IMPL_LINK_NOARG(ScAutoFormatDlg, AddHdl)
 
                 if ( !bFmtInserted )
                 {
-                    sal_uInt16 nRet = ErrorBox( this,
-                                            WinBits( WB_OK_CANCEL | WB_DEF_OK),
-                                            ScGlobal::GetRscString(STR_INVALID_AFNAME)
+                    sal_uInt16 nRet = MessageDialog(this,
+                                            ScGlobal::GetRscString(STR_INVALID_AFNAME),
+                                            VCL_MESSAGE_ERROR,
+                                            VCL_BUTTONS_OK_CANCEL
                                           ).Execute();
 
                     bOk = ( nRet == RET_CANCEL );
@@ -369,9 +370,10 @@ IMPL_LINK_NOARG(ScAutoFormatDlg, RenameHdl)
             }
             if( !bFmtRenamed )
             {
-                bOk = RET_CANCEL == ErrorBox( this,
-                                    WinBits( WB_OK_CANCEL | WB_DEF_OK),
-                                    ScGlobal::GetRscString(STR_INVALID_AFNAME)
+                bOk = RET_CANCEL == MessageDialog( this,
+                                    ScGlobal::GetRscString(STR_INVALID_AFNAME),
+                                    VCL_MESSAGE_ERROR,
+                                    VCL_BUTTONS_OK_CANCEL
                                     ).Execute();
             }
         }
diff --git a/sc/source/ui/miscdlgs/solvrdlg.cxx b/sc/source/ui/miscdlgs/solvrdlg.cxx
index 0e93c2f9337c..bd3fa622b7d0 100644
--- a/sc/source/ui/miscdlgs/solvrdlg.cxx
+++ b/sc/source/ui/miscdlgs/solvrdlg.cxx
@@ -35,7 +35,7 @@ namespace
 {
     void lclErrorDialog( Window* pParent, const OUString& aString )
     {
-        ErrorBox( pParent, WinBits( WB_OK | WB_DEF_OK), aString ).Execute();
+        MessageDialog(pParent, aString).Execute();
     }
 }