diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2014-08-15 21:42:52 +0200 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2014-08-15 23:30:27 +0200 |
| commit | dd97e4266156abe8e8e235feae75e8cd255355cc (patch) | |
| tree | c3b4f875e3dbf8bd5b519cdec11f024f11df6931 /cui | |
| parent | b64d7c9ecc6511a66fc34d8b031c4f89edfded48 (diff) | |
ErrorBoxes from fmsearch to String
Change-Id: I0c2d12a79e8af2125c3aad7f0a6cb873ce3b4d2c
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/dialogs/cuifmsearch.cxx | 8 | ||||
| -rw-r--r-- | cui/source/dialogs/fmsearch.hrc | 4 | ||||
| -rw-r--r-- | cui/source/dialogs/fmsearch.src | 10 |
3 files changed, 10 insertions, 12 deletions
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index b91be846614b..184e9db26eb4 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -18,7 +18,7 @@ */ #include <tools/debug.hxx> -#include <vcl/msgbox.hxx> +#include <vcl/layout.hxx> #include <vcl/svapp.hxx> #include <tools/shl.hxx> #include <dialmgr.hxx> @@ -719,9 +719,9 @@ IMPL_LINK(FmSearchDialog, OnSearchProgress, FmSearchProgress*, pProgress) case FmSearchProgress::STATE_NOTHINGFOUND: { sal_uInt16 nErrorId = (FmSearchProgress::STATE_ERROR == pProgress->aSearchState) - ? RID_SVXERR_SEARCH_GENERAL_ERROR - : RID_SVXERR_SEARCH_NORECORD; - ErrorBox(this, CUI_RES(nErrorId)).Execute(); + ? RID_STR_SEARCH_GENERAL_ERROR + : RID_STR_SEARCH_NORECORD; + MessageDialog(this, CUI_RES(nErrorId)).Execute(); } // NO break ! case FmSearchProgress::STATE_CANCELED: diff --git a/cui/source/dialogs/fmsearch.hrc b/cui/source/dialogs/fmsearch.hrc index c42775fdc622..f17cd76b04d4 100644 --- a/cui/source/dialogs/fmsearch.hrc +++ b/cui/source/dialogs/fmsearch.hrc @@ -27,8 +27,8 @@ #define RID_STR_SEARCH_WHOLE (RID_FORMS_START + 88) #define RID_STR_FROM_TOP (RID_FORMS_START + 74) #define RID_STR_FROM_BOTTOM (RID_FORMS_START + 75) -#define RID_SVXERR_SEARCH_NORECORD (RID_FORMS_START + 8) -#define RID_SVXERR_SEARCH_GENERAL_ERROR (RID_FORMS_START + 9) +#define RID_STR_SEARCH_NORECORD (RID_FORMS_START + 8) +#define RID_STR_SEARCH_GENERAL_ERROR (RID_FORMS_START + 9) #define RID_STR_OVERFLOW_FORWARD (RID_FORMS_START + 34) #define RID_STR_OVERFLOW_BACKWARD (RID_FORMS_START + 35) #define RID_STR_SEARCH_COUNTING (RID_FORMS_START + 76) diff --git a/cui/source/dialogs/fmsearch.src b/cui/source/dialogs/fmsearch.src index 48111ecb9b22..0a8cf0024a58 100644 --- a/cui/source/dialogs/fmsearch.src +++ b/cui/source/dialogs/fmsearch.src @@ -49,16 +49,14 @@ String RID_STR_FROM_BOTTOM Text [ en-US ] = "From bottom"; }; -ErrorBox RID_SVXERR_SEARCH_NORECORD +String RID_STR_SEARCH_NORECORD { - Buttons = WB_OK; - Message [ en-US ] = "No records corresponding to your data found."; + Text [ en-US ] = "No records corresponding to your data found."; }; -ErrorBox RID_SVXERR_SEARCH_GENERAL_ERROR +String RID_STR_SEARCH_GENERAL_ERROR { - Buttons = WB_OK; - Message [ en-US ] = "An unknown error occurred. The search could not be finished."; + Text [ en-US ] = "An unknown error occurred. The search could not be finished."; }; String RID_STR_OVERFLOW_FORWARD |