diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-08-15 08:49:57 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-08-15 09:09:36 +0100 |
| commit | e159d0bb53ea265e3813b06bf7a050f73b3ce616 (patch) | |
| tree | e1a1bf8b140e919292fc07bec5db2b1738e04b39 /svtools/source/java | |
| parent | 9bf3ef7cd875d11cc5ca57372716597c51d52a23 (diff) | |
ErrorBox resources -> MessageDialog + strings
Change-Id: I0e4e8e0393a5a86dc3125f6dccc9e4e7b47973a9
Diffstat (limited to 'svtools/source/java')
| -rw-r--r-- | svtools/source/java/javaerror.src | 14 | ||||
| -rw-r--r-- | svtools/source/java/javainteractionhandler.cxx | 7 |
2 files changed, 9 insertions, 12 deletions
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 |