diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-08-18 08:50:54 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-08-18 10:57:21 +0100 |
| commit | a107bdfdfc1baf73f14055262d64bf616fc0a889 (patch) | |
| tree | 2e4cbadd538f5e8d495fb8953a5a7939c8ab2bb5 /svx | |
| parent | 3b6091ca42cd2d9f230e7d81648c34f3d7085107 (diff) | |
ErrorBox->MessageDialog
Change-Id: I57d4e43460e40d3aff54873280eddbb18c12446b
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/dialog/passwd.cxx | 7 | ||||
| -rw-r--r-- | svx/source/form/fmshimp.cxx | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/svx/source/dialog/passwd.cxx b/svx/source/dialog/passwd.cxx index 5d186ba0a5be..9933dc03ba6d 100644 --- a/svx/source/dialog/passwd.cxx +++ b/svx/source/dialog/passwd.cxx @@ -18,8 +18,7 @@ */ #include <comphelper/string.hxx> -#include <tools/shl.hxx> -#include <vcl/msgbox.hxx> +#include <vcl/layout.hxx> #include "svx/passwd.hxx" #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> @@ -34,7 +33,7 @@ IMPL_LINK_NOARG(SvxPasswordDialog, ButtonHdl) if ( m_pNewPasswdED->GetText() != m_pRepeatPasswdED->GetText() ) { - ErrorBox( this, WB_OK, aRepeatPasswdErrStr ).Execute(); + MessageDialog(this, aRepeatPasswdErrStr).Execute(); m_pNewPasswdED->SetText( aEmpty ); m_pRepeatPasswdED->SetText( aEmpty ); m_pNewPasswdED->GrabFocus(); @@ -43,7 +42,7 @@ IMPL_LINK_NOARG(SvxPasswordDialog, ButtonHdl) if ( bOK && aCheckPasswordHdl.IsSet() && !aCheckPasswordHdl.Call( this ) ) { - ErrorBox( this, WB_OK, aOldPasswdErrStr ).Execute(); + MessageDialog(this, aOldPasswdErrStr).Execute(); m_pOldPasswdED->SetText( aEmpty ); m_pOldPasswdED->GrabFocus(); bOK = false; diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index dab6033698ae..3c1798aa1c4d 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -92,8 +92,7 @@ #include <sfx2/viewsh.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <tools/diagnose_ex.h> -#include <tools/shl.hxx> -#include <vcl/msgbox.hxx> +#include <vcl/layout.hxx> #include <vcl/waitobj.hxx> #include <vcl/settings.hxx> @@ -1512,7 +1511,7 @@ void FmXFormShell::ExecuteSearch() if (m_aSearchForms.empty() ) { // es gibt keine Controls, die alle Bedingungen fuer eine Suche erfuellen - ErrorBox(NULL, WB_OK, SVX_RESSTR(RID_STR_NODATACONTROLS)).Execute(); + MessageDialog(NULL, SVX_RESSTR(RID_STR_NODATACONTROLS)).Execute(); return; } @@ -3188,7 +3187,7 @@ void FmXFormShell::CreateExternalView() if (!bHaveUsableControls) { - ErrorBox(NULL, WB_OK, SVX_RESSTR(RID_STR_NOCONTROLS_FOR_EXTERNALDISPLAY)).Execute(); + MessageDialog(NULL, SVX_RESSTR(RID_STR_NOCONTROLS_FOR_EXTERNALDISPLAY)).Execute(); return; } } |