diff options
| -rw-r--r-- | include/svtools/svtools.hrc | 8 | ||||
| -rw-r--r-- | svtools/source/java/javaerror.src | 14 | ||||
| -rw-r--r-- | svtools/source/java/javainteractionhandler.cxx | 7 |
3 files changed, 13 insertions, 16 deletions
diff --git a/include/svtools/svtools.hrc b/include/svtools/svtools.hrc index 5705c6b713c7..2887e54688c2 100644 --- a/include/svtools/svtools.hrc +++ b/include/svtools/svtools.hrc @@ -198,10 +198,12 @@ //String - Ids for Java errors, messages #define STR_SVT_JAVAERROR_START (STR_SVT_INDEXENTRY_END + 1) #define STR_QUESTION_JAVADISABLED (STR_SVT_JAVAERROR_START+0) -#define STR_ERROR_JVMCREATIONFAILED (STR_SVT_JAVAERROR_START+1) +#define STR_ERROR_JVMCREATIONFAILED_TITLE (STR_SVT_JAVAERROR_START+1) #define STR_WARNING_JAVANOTFOUND (STR_SVT_JAVAERROR_START+2) #define STR_WARNING_INVALIDJAVASETTINGS (STR_SVT_JAVAERROR_START+3) -#define STR_SVT_JAVAERROR_END (STR_WARNING_INVALIDJAVASETTINGS) +#define STR_ERROR_JVMCREATIONFAILED (STR_SVT_JAVAERROR_START+4) +#define STR_ERROR_JVMCREATIONFAILED_MAC (STR_SVT_JAVAERROR_START+5) +#define STR_SVT_JAVAERROR_END (STR_ERROR_JVMCREATIONFAILED_MAC) // String array to match UI language names to LanguageType values and vice versa #define STR_ARR_SVT_LANGUAGE_TABLE_START (STR_SVT_JAVAERROR_END + 1) @@ -262,12 +264,10 @@ // Java message boxes #define QBX_JAVADISABLED (RID_SVTOOLS_START+20) -#define ERRORBOX_JVMCREATIONFAILED (RID_SVTOOLS_START+21) #define WARNINGBOX_JAVANOTFOUND (RID_SVTOOLS_START+22) #define WARNINGBOX_INVALIDJAVASETTINGS (RID_SVTOOLS_START+23) // RID_SVTOOLS_START + 24 unused #define WARNINGBOX_INVALIDJAVASETTINGS_MAC (RID_SVTOOLS_START+25) -#define ERRORBOX_JVMCREATIONFAILED_MAC (RID_SVTOOLS_START+26) // images #define RID_IMG_TREENODE_COLLAPSED (RID_SVTOOLS_START + 0) diff --git a/svtools/source/java/javaerror.src b/svtools/source/java/javaerror.src index c8c0fc197929..40d4194d5195 100644 --- a/svtools/source/java/javaerror.src +++ b/svtools/source/java/javaerror.src @@ -47,18 +47,14 @@ QueryBox QBX_JAVADISABLED Message[ en-US ] = "%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. However, use of a JRE has been disabled. Do you want to enable the use of a JRE now?"; }; -ErrorBox ERRORBOX_JVMCREATIONFAILED_MAC +String STR_ERROR_JVMCREATIONFAILED_MAC { - Buttons = WB_OK; - DefButton = WB_DEF_OK ; - Message[ en-US ] = "%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. The selected JRE is defective. Please select another version or install a new JRE and select it under %PRODUCTNAME - Preferences - %PRODUCTNAME - Advanced."; + Text[ en-US ] = "%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. The selected JRE is defective. Please select another version or install a new JRE and select it under %PRODUCTNAME - Preferences - %PRODUCTNAME - Advanced."; }; -ErrorBox ERRORBOX_JVMCREATIONFAILED +String STR_ERROR_JVMCREATIONFAILED { - Buttons = WB_OK; - DefButton = WB_DEF_OK ; - Message[ en-US ] = "%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. The selected JRE is defective. Please select another version or install a new JRE and select it under Tools - Options - %PRODUCTNAME - Advanced."; + Text[ en-US ] = "%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. The selected JRE is defective. Please select another version or install a new JRE and select it under Tools - Options - %PRODUCTNAME - Advanced."; }; String STR_WARNING_JAVANOTFOUND @@ -76,7 +72,7 @@ String STR_QUESTION_JAVADISABLED Text[ en-US ] = "Enable JRE" ; }; -String STR_ERROR_JVMCREATIONFAILED +String STR_ERROR_JVMCREATIONFAILED_TITLE { Text[ en-US ] = "JRE is Defective" ; }; diff --git a/svtools/source/java/javainteractionhandler.cxx b/svtools/source/java/javainteractionhandler.cxx index 6d2e5494e914..beda63538dc4 100644 --- a/svtools/source/java/javainteractionhandler.cxx +++ b/svtools/source/java/javainteractionhandler.cxx @@ -28,6 +28,7 @@ #include <com/sun/star/java/JavaVMCreationFailureException.hpp> #include <com/sun/star/java/RestartRequiredException.hpp> #include <comphelper/processfactory.hxx> +#include <vcl/layout.hxx> #include <vcl/svapp.hxx> #include <vcl/msgbox.hxx> #include <osl/mutex.hxx> @@ -182,11 +183,11 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque SolarMutexGuard aSolarGuard; m_bVMCreationFailure_Handled = true; #ifdef MACOSX - ErrorBox aErrorBox( NULL, SvtResId( ERRORBOX_JVMCREATIONFAILED_MAC ) ); + MessageDialog aErrorBox(NULL, SvtResId(STR_ERROR_JVMCREATIONFAILED_MAC)); #else - ErrorBox aErrorBox( NULL, SvtResId( ERRORBOX_JVMCREATIONFAILED ) ); + MessageDialog aErrorBox(NULL, SvtResId(STR_ERROR_JVMCREATIONFAILED)); #endif - aErrorBox.SetText(SvtResId( STR_ERROR_JVMCREATIONFAILED ).toString()); + aErrorBox.SetText(SvtResId(STR_ERROR_JVMCREATIONFAILED_TITLE)); nResult = aErrorBox.Execute(); } else |