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 /sc/source/ui/dbgui | |
parent | 3b6091ca42cd2d9f230e7d81648c34f3d7085107 (diff) |
ErrorBox->MessageDialog
Change-Id: I57d4e43460e40d3aff54873280eddbb18c12446b
Diffstat (limited to 'sc/source/ui/dbgui')
-rw-r--r-- | sc/source/ui/dbgui/dbnamdlg.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/dbgui/filtdlg.cxx | 5 | ||||
-rw-r--r-- | sc/source/ui/dbgui/sfiltdlg.cxx | 3 | ||||
-rw-r--r-- | sc/source/ui/dbgui/tpsort.cxx | 4 |
4 files changed, 5 insertions, 9 deletions
diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx index c70040ffd968..022283e06e78 100644 --- a/sc/source/ui/dbgui/dbnamdlg.cxx +++ b/sc/source/ui/dbgui/dbnamdlg.cxx @@ -43,7 +43,7 @@ class DBSaveData; static DBSaveData* pSaveObj = NULL; -#define ERRORBOX(s) ErrorBox(this,WinBits(WB_OK|WB_DEF_OK),s).Execute() +#define ERRORBOX(s) MessageDialog(this, s).Execute() // class DBSaveData diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx index f0860c22a9fd..c80dede2be71 100644 --- a/sc/source/ui/dbgui/filtdlg.cxx +++ b/sc/source/ui/dbgui/filtdlg.cxx @@ -36,13 +36,12 @@ #include "filter.hrc" #include "filtdlg.hxx" -#include <vcl/msgbox.hxx> +#include <vcl/layout.hxx> #include <svl/sharedstringpool.hxx> #include <limits> -#define ERRORBOX(rid) ErrorBox( this, WinBits( WB_OK|WB_DEF_OK), \ - ScGlobal::GetRscString(rid) ).Execute() +#define ERRORBOX(rid) MessageDialog(this, ScGlobal::GetRscString(rid)).Execute() #define QUERY_ENTRY_COUNT 4 #define INVALID_HEADER_POS std::numeric_limits<size_t>::max() diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx index 620b54c1658e..af6fe97c2900 100644 --- a/sc/source/ui/dbgui/sfiltdlg.cxx +++ b/sc/source/ui/dbgui/sfiltdlg.cxx @@ -38,8 +38,7 @@ // DEFINE -------------------------------------------------------------------- -#define ERRORBOX(rid) ErrorBox( this, WinBits( WB_OK|WB_DEF_OK),\ - ScGlobal::GetRscString(rid) ).Execute() +#define ERRORBOX(rid) MessageDialog(this, ScGlobal::GetRscString(rid)).Execute() // class ScSpecialFilterDialog diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index 5b805a505962..271af19386b3 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -778,9 +778,7 @@ int ScTabPageSortOptions::DeactivatePage( SfxItemSet* pSetP ) if ( !bPosInputOk ) { - ErrorBox( this, WinBits( WB_OK | WB_DEF_OK ), - ScGlobal::GetRscString( STR_INVALID_TABREF ) - ).Execute(); + MessageDialog(this, ScGlobal::GetRscString( STR_INVALID_TABREF)).Execute(); m_pEdOutPos->GrabFocus(); m_pEdOutPos->SetSelection( Selection( 0, SELECTION_MAX ) ); theOutPos.Set(0,0,0); |