diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2014-08-15 21:46:35 +0200 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2014-08-15 23:30:28 +0200 |
| commit | 2f46431fd044f184809e298a16427d4629ff80e3 (patch) | |
| tree | fe045950a53312b3f9c2d9879cc23c4787831d62 /cui | |
| parent | dd97e4266156abe8e8e235feae75e8cd255355cc (diff) | |
ErrorBoxes from optjava to String
Change-Id: Ia3e200277a8a47b62a1ecbc21d9a83ba35c7ef7e
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/inc/cuires.hrc | 4 | ||||
| -rw-r--r-- | cui/source/options/optjava.cxx | 5 | ||||
| -rw-r--r-- | cui/source/options/optjava.src | 12 |
3 files changed, 9 insertions, 12 deletions
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc index 080e1ccaea4a..7e2d0e203bb1 100644 --- a/cui/source/inc/cuires.hrc +++ b/cui/source/inc/cuires.hrc @@ -136,8 +136,8 @@ #define RID_SVXSTR_COLOR_CONFIG_DELETE (RID_SVX_START + 855) #define RID_SVXSTR_OPT_DOUBLE_DICTS (RID_SVX_START + 320) #define RID_SVXSTR_OPT_PROXYPORTS (RID_SVX_START + 224) -#define RID_SVXERR_JRE_NOT_RECOGNIZED (RID_SVX_START + 256) -#define RID_SVXERR_JRE_FAILED_VERSION (RID_SVX_START + 257) +#define RID_SVXSTR_JRE_NOT_RECOGNIZED (RID_SVX_START + 256) +#define RID_SVXSTR_JRE_FAILED_VERSION (RID_SVX_START + 257) #define RID_SVXSTR_PATH_NAME_START (RID_SVX_START + 1003) #define RID_SVXBMP_LOCK (RID_SVX_START + 118) #define RID_SVXSTR_READONLY_CONFIG_TIP (RID_SVX_START + 1026) diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 548c8c65aae6..8f5dfc49339b 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -31,6 +31,7 @@ #include <vcl/svapp.hxx> #include <vcl/help.hxx> #include <tools/urlobj.hxx> +#include <vcl/layout.hxx> #include <vcl/msgbox.hxx> #include <vcl/waitobj.hxx> #include <unotools/pathoptions.hxx> @@ -614,12 +615,12 @@ void SvxJavaOptionsPage::AddFolder( const OUString& _rFolder ) } else if ( JFW_E_NOT_RECOGNIZED == eErr ) { - ErrorBox aErrBox( this, CUI_RES( RID_SVXERR_JRE_NOT_RECOGNIZED ) ); + MessageDialog aErrBox( this, CUI_RES( RID_SVXSTR_JRE_NOT_RECOGNIZED ) ); aErrBox.Execute(); } else if ( JFW_E_FAILED_VERSION == eErr ) { - ErrorBox aErrBox( this, CUI_RES( RID_SVXERR_JRE_FAILED_VERSION ) ); + MessageDialog aErrBox( this, CUI_RES( RID_SVXSTR_JRE_FAILED_VERSION ) ); aErrBox.Execute(); } diff --git a/cui/source/options/optjava.src b/cui/source/options/optjava.src index 58cd5825878b..c98407a5d566 100644 --- a/cui/source/options/optjava.src +++ b/cui/source/options/optjava.src @@ -20,18 +20,14 @@ #include <cuires.hrc> #include "helpid.hrc" -ErrorBox RID_SVXERR_JRE_NOT_RECOGNIZED +String RID_SVXSTR_JRE_NOT_RECOGNIZED { - BUTTONS = WB_OK ; - DEFBUTTON = WB_DEF_OK ; - Message [ en-US ] = "The folder you selected does not contain a Java runtime environment.\nPlease select a different folder." ; + Text [ en-US ] = "The folder you selected does not contain a Java runtime environment.\nPlease select a different folder." ; }; -ErrorBox RID_SVXERR_JRE_FAILED_VERSION +String RID_SVXSTR_JRE_FAILED_VERSION { - BUTTONS = WB_OK ; - DEFBUTTON = WB_DEF_OK ; - Message [ en-US ] = "The Java runtime environment you selected is not the required version.\nPlease select a different folder." ; + Text [ en-US ] = "The Java runtime environment you selected is not the required version.\nPlease select a different folder." ; }; WarningBox RID_SVX_MSGBOX_OPTIONS_RESTART |