summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/dlg
diff options
context:
space:
mode:
Diffstat (limited to 'dbaccess/source/ui/dlg')
-rw-r--r--dbaccess/source/ui/dlg/TextConnectionHelper.cxx4
-rw-r--r--dbaccess/source/ui/dlg/UserAdmin.cxx4
-rw-r--r--dbaccess/source/ui/dlg/adminpages.cxx4
-rw-r--r--dbaccess/source/ui/dlg/directsql.cxx4
-rw-r--r--dbaccess/source/ui/dlg/indexdialog.cxx6
-rw-r--r--dbaccess/source/ui/dlg/paramdialog.cxx4
6 files changed, 13 insertions, 13 deletions
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
index b399bf69c9f2..aab6965310df 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
@@ -32,7 +32,7 @@
#include "dbfindex.hxx"
#include "dbaccess_helpid.hrc"
#include "localresaccess.hxx"
-#include <vcl/msgbox.hxx>
+#include <vcl/layout.hxx>
#include <vcl/mnemonic.hxx>
#include <svl/cjkoptions.hxx>
#if HAVE_FEATURE_JAVA
@@ -304,7 +304,7 @@ namespace dbaui
}
else
return true;
- ErrorBox(NULL, WB_OK, MnemonicGenerator::EraseAllMnemonicChars( aErrorText)).Execute();
+ MessageDialog(NULL, MnemonicGenerator::EraseAllMnemonicChars(aErrorText)).Execute();
pErrorWin->GrabFocus();
return false;
}
diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx
index 15267c2e4ad1..83be777dc830 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.cxx
+++ b/dbaccess/source/ui/dlg/UserAdmin.cxx
@@ -36,8 +36,8 @@
#include <tools/debug.hxx>
#include "dbadmin.hxx"
#include "moduledbu.hxx"
-#include <vcl/msgbox.hxx>
#include <vcl/layout.hxx>
+#include <vcl/msgbox.hxx>
#include <sfx2/passwd.hxx>
using namespace ::com::sun::star::container;
@@ -93,7 +93,7 @@ IMPL_LINK_NOARG(OPasswordDialog, OKHdl_Impl)
else
{
OUString aErrorMsg( ModuleRes( STR_ERROR_PASSWORDS_NOT_IDENTICAL));
- ErrorBox aErrorBox( this, WB_OK, aErrorMsg );
+ MessageDialog aErrorBox(this, aErrorMsg);
aErrorBox.Execute();
m_pEDPassword->SetText( OUString() );
m_pEDPasswordRepeat->SetText( OUString() );
diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx
index 1b23afb0f880..8a5991e6a0b0 100644
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -36,8 +36,8 @@
#include <vcl/button.hxx>
#include <vcl/edit.hxx>
#include <vcl/field.hxx>
+#include <vcl/layout.hxx>
#include <vcl/lstbox.hxx>
-#include <vcl/msgbox.hxx>
#include <algorithm>
#include <stdlib.h>
@@ -117,7 +117,7 @@ namespace dbaui
// show an error message
OUString sError( ModuleRes( STR_COULD_NOT_LOAD_ODBC_LIB ) );
sError = sError.replaceFirst("#lib#", aEnumeration.getLibraryName());
- ErrorBox aDialog(this, WB_OK, sError);
+ MessageDialog aDialog(this, sError);
aDialog.Execute();
return false;
}
diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx
index f5cbc0f1bed9..e78dd8387beb 100644
--- a/dbaccess/source/ui/dlg/directsql.cxx
+++ b/dbaccess/source/ui/dlg/directsql.cxx
@@ -19,7 +19,7 @@
#include "directsql.hxx"
#include "dbu_dlg.hrc"
-#include <vcl/msgbox.hxx>
+#include <vcl/layout.hxx>
#include <comphelper/types.hxx>
#include <vcl/svapp.hxx>
#include <osl/mutex.hxx>
@@ -94,7 +94,7 @@ namespace dbaui
{
OUString sMessage(ModuleRes(STR_DIRECTSQL_CONNECTIONLOST));
- ErrorBox aError(this, WB_OK, sMessage);
+ MessageDialog aError(this, sMessage);
aError.Execute();
}
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx
index 8537660f153c..8c19cd8bde66 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -409,7 +409,7 @@ namespace dbaui
{
OUString sConfirm(ModuleRes(STR_CONFIRM_DROP_INDEX));
sConfirm = sConfirm.replaceFirst("$name$", m_pIndexList->GetEntryText(pSelected));
- QueryBox aConfirm(this, WB_YES_NO, sConfirm);
+ MessageDialog aConfirm(this, sConfirm, VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO);
if (RET_YES != aConfirm.Execute())
return;
}
@@ -616,7 +616,7 @@ namespace dbaui
{
OUString sError(ModuleRes(STR_INDEX_NAME_ALREADY_USED));
sError = sError.replaceFirst("$name$", sNewName);
- ErrorBox aError(this, WB_OK, sError);
+ MessageDialog aError(this, sError);
aError.Execute();
updateToolbox();
@@ -695,7 +695,7 @@ namespace dbaui
// a column is specified twice ... won't work anyway, so prevent this here and now
OUString sMessage(ModuleRes(STR_INDEXDESIGN_DOUBLE_COLUMN_NAME));
sMessage = sMessage.replaceFirst("$name$", aFieldCheck->sFieldName);
- ErrorBox aError(this, WB_OK, sMessage);
+ MessageDialog aError(this, sMessage);
aError.Execute();
m_pFields->GrabFocus();
return false;
diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx
index 6a6fa5c104a2..0d4267e5f182 100644
--- a/dbaccess/source/ui/dlg/paramdialog.cxx
+++ b/dbaccess/source/ui/dlg/paramdialog.cxx
@@ -27,7 +27,7 @@
#include <connectivity/dbtools.hxx>
#include "dbustrings.hrc"
#include <vcl/svapp.hxx>
-#include <vcl/msgbox.hxx>
+#include <vcl/layout.hxx>
#include <osl/diagnose.h>
#include <tools/diagnose_ex.h>
#include "localresaccess.hxx"
@@ -196,7 +196,7 @@ namespace dbaui
OUString sMessage(ModuleRes(STR_COULD_NOT_CONVERT_PARAM));
sMessage = sMessage.replaceAll( "$name$", sName );
- ErrorBox(NULL, WB_OK, sMessage).Execute();
+ MessageDialog(NULL, sMessage).Execute();
m_pParam->GrabFocus();
return 1L;
}