ErrorBox->MessageDialog

Change-Id: I57d4e43460e40d3aff54873280eddbb18c12446b

10 files changed, 18 insertions, 20 deletions

diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index e5533b874c80..c5b6fa911a7b 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -38,6 +38,7 @@
 #include <svx/svdpagv.hxx>
 #include <svx/svdogrp.hxx>
 #include <svx/svdundo.hxx>
+#include <vcl/layout.hxx>
 #include <vcl/msgbox.hxx>
 #include <sot/formats.hxx>
 
@@ -239,7 +240,7 @@ SdDrawDocument* SdDrawDocument::OpenBookmarkDoc(SfxMedium& rMedium)
 
     if (!bOK)
     {
-        ErrorBox aErrorBox( NULL, (WinBits)WB_OK, SD_RESSTR(STR_READ_DATA_ERROR));
+        MessageDialog aErrorBox(NULL, SD_RESSTR(STR_READ_DATA_ERROR));
         aErrorBox.Execute();
 
         CloseBookmarkDoc();
diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx
index feb67f663ca4..322624a07498 100644
--- a/sd/source/filter/grf/sdgrffilter.cxx
+++ b/sd/source/filter/grf/sdgrffilter.cxx
@@ -29,7 +29,7 @@
 
 #include <unotools/localfilehelper.hxx>
 #include <tools/errinf.hxx>
-#include <vcl/msgbox.hxx>
+#include <vcl/layout.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/virdev.hxx>
 #include <sfx2/docfile.hxx>
@@ -169,7 +169,7 @@ void SdGRFFilter::HandleGraphicFilterError( sal_uInt16 nFilterError, sal_uLong n
         ErrorHandler::HandleError( ERRCODE_IO_GENERAL );
     else
     {
-        ErrorBox aErrorBox(NULL, WB_OK, SD_RESSTR(nId));
+        MessageDialog aErrorBox(NULL, SD_RESSTR(nId));
         aErrorBox.Execute();
     }
 }
diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index 3537b02a2c67..4bcd1fb0072a 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -1087,8 +1087,8 @@ IMPL_LINK_NOARG(SdPublishingDlg, FinishHdl)
 
                 if (iter != m_aDesignList.end())
                 {
-                    ErrorBox aErrorBox(this, WB_YES_NO,
-                                       SD_RESSTR(STR_PUBDLG_SAMENAME));
+                    MessageDialog aErrorBox(this, SD_RESSTR(STR_PUBDLG_SAMENAME),
+                        VCL_MESSAGE_ERROR, VCL_BUTTONS_YES_NO);
                     bRetry = aErrorBox.Execute() == RET_NO;
 
                     if(!bRetry)
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index 7ba47c463c84..cfe75ff0a3c9 100644
--- a/sd/source/ui/app/sdmod1.cxx
+++ b/sd/source/ui/app/sdmod1.cxx
@@ -234,7 +234,7 @@ void SdModule::Execute(SfxRequest& rReq)
             }
             else
             {
-                ErrorBox(NULL, WB_OK, SD_RESSTR(STR_CANT_PERFORM_IN_LIVEMODE)).Execute();
+                MessageDialog(NULL, SD_RESSTR(STR_CANT_PERFORM_IN_LIVEMODE)).Execute();
 
                 SFX_REQUEST_ARG( rReq, pLinkItem, SfxLinkItem, SID_DONELINK, false );
                 if( pLinkItem )
diff --git a/sd/source/ui/dlg/brkdlg.cxx b/sd/source/ui/dlg/brkdlg.cxx
index abd5886a6b6f..cebc2cc185b8 100644
--- a/sd/source/ui/dlg/brkdlg.cxx
+++ b/sd/source/ui/dlg/brkdlg.cxx
@@ -93,7 +93,7 @@ IMPL_LINK( BreakDlg, UpDate, void*, nInit )
     // update status bar or show a error message?
     if(nInit == (void*)1L)
     {
-        ErrorBox aErrBox( this, WB_OK, SD_RESSTR( STR_BREAK_FAIL ) );
+        MessageDialog aErrBox(this, SD_RESSTR(STR_BREAK_FAIL));
         aErrBox.Execute();
     }
     else
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 72d152fc5ddd..6836212831d0 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -20,7 +20,7 @@
 #include <sal/types.h>
 #include <sot/formats.hxx>
 #include <sot/storage.hxx>
-#include <vcl/msgbox.hxx>
+#include <vcl/layout.hxx>
 #include <svl/urihelper.hxx>
 #include <svx/svditer.hxx>
 #include <sfx2/docfile.hxx>
@@ -1009,7 +1009,7 @@ SdDrawDocument* SdPageObjsTLB::GetBookmarkDoc(SfxMedium* pMed)
 
         if ( !mpBookmarkDoc )
         {
-            ErrorBox aErrorBox( this, WB_OK, SD_RESSTR( STR_READ_DATA_ERROR ) );
+            MessageDialog aErrorBox(this, SD_RESSTR(STR_READ_DATA_ERROR));
             aErrorBox.Execute();
             mpMedium = 0; //On failure the SfxMedium is invalid
         }
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index e49ef0d23022..6a97b07210e0 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -511,7 +511,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq )
                             // unable to create PlugIn
                             OUString aStrErr( SdResId( STR_ERROR_OBJNOCREATE_PLUGIN ) );
                             aStrErr = aStrErr.replaceFirst( "%", aStrURL );
-                            ErrorBox( mpWindow, WB_3DLOOK | WB_OK, aStrErr ).Execute();
+                            MessageDialog(mpWindow, aStrErr).Execute();
                         }
                     }
                 }
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index 7514812e1442..7f81db01be69 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -306,7 +306,7 @@ void FuInsertFile::DoExecute( SfxRequest& rReq )
 
     if( !bInserted )
     {
-        ErrorBox aErrorBox( mpWindow, WB_OK, SD_RESSTR( STR_READ_DATA_ERROR ) );
+        MessageDialog aErrorBox(mpWindow, SD_RESSTR( STR_READ_DATA_ERROR));
         aErrorBox.Execute();
         delete pMedium;
     }
@@ -456,8 +456,7 @@ void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium)
 
         if (nErr || pOutliner->GetEditEngine().GetText().isEmpty())
         {
-            ErrorBox aErrorBox( mpWindow, (WinBits)WB_OK,
-                      SD_RESSTR(STR_READ_DATA_ERROR));
+            MessageDialog aErrorBox(mpWindow, SD_RESSTR(STR_READ_DATA_ERROR));
             aErrorBox.Execute();
         }
         else
@@ -601,8 +600,7 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium)
 
     if (nErr || pOutliner->GetEditEngine().GetText().isEmpty())
     {
-        ErrorBox aErrorBox( mpWindow, (WinBits)WB_OK,
-                  SD_RESSTR(STR_READ_DATA_ERROR));
+        MessageDialog aErrorBox(mpWindow, SD_RESSTR(STR_READ_DATA_ERROR));
         aErrorBox.Execute();
     }
     else
diff --git a/sd/source/ui/func/futhes.cxx b/sd/source/ui/func/futhes.cxx
index 01b0ae93bfd7..a6c1fb9d6d75 100644
--- a/sd/source/ui/func/futhes.cxx
+++ b/sd/source/ui/func/futhes.cxx
@@ -20,7 +20,7 @@
 #include "futhes.hxx"
 
 #include <editeng/outliner.hxx>
-#include <vcl/msgbox.hxx>
+#include <vcl/layout.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdotext.hxx>
 #include <editeng/eeitem.hxx>
@@ -113,7 +113,7 @@ void FuThesaurus::DoExecute( SfxRequest& )
 
             if (eState == EE_SPELL_NOLANGUAGE)
             {
-                ErrorBox(mpWindow, WB_OK, SD_RESSTR(STR_NOLANGUAGE)).Execute();
+                MessageDialog(mpWindow, SD_RESSTR(STR_NOLANGUAGE)).Execute();
             }
         }
     }
@@ -140,7 +140,7 @@ void FuThesaurus::DoExecute( SfxRequest& )
 
         if (eState == EE_SPELL_NOLANGUAGE)
         {
-            ErrorBox(mpWindow, WB_OK, SD_RESSTR(STR_NOLANGUAGE)).Execute();
+            MessageDialog(mpWindow, SD_RESSTR(STR_NOLANGUAGE)).Execute();
         }
     }
 }
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index bcbef49ff39b..ea831ac39185 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -1158,8 +1158,7 @@ void Outliner::PrepareSpellCheck (void)
     {
         mbError = true;
         mbEndOfSearch = true;
-        ErrorBox aErrorBox (NULL,
-            WB_OK,
+        MessageDialog aErrorBox (NULL,
             SD_RESSTR(STR_NOLANGUAGE));
         ShowModalMessageBox (aErrorBox);
     }