diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-08-25 14:04:04 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-08-25 16:45:27 +0100 |
| commit | 7cf74a8e8e5bcd6a98ab737bd6f5655a915ce589 (patch) | |
| tree | 527a5dc397c2574c1361eda7e314842ddd353e18 /svtools/source/java | |
| parent | e932500e2342752106140c642203f97b592c7a9c (diff) | |
convert STR_QUESTION_JAVADISABLED with custom buttons to .ui
Change-Id: I6f806f27232865ab871576e18a33fae08c20ed31
Diffstat (limited to 'svtools/source/java')
| -rw-r--r-- | svtools/source/java/javaerror.src | 12 | ||||
| -rw-r--r-- | svtools/source/java/javainteractionhandler.cxx | 6 |
2 files changed, 3 insertions, 15 deletions
diff --git a/svtools/source/java/javaerror.src b/svtools/source/java/javaerror.src index 40d4194d5195..e5c17e945f2c 100644 --- a/svtools/source/java/javaerror.src +++ b/svtools/source/java/javaerror.src @@ -40,13 +40,6 @@ WarningBox WARNINGBOX_INVALIDJAVASETTINGS Message[ en-US ] ="The %PRODUCTNAME configuration has been changed. Under Tools - Options - %PRODUCTNAME - Advanced, select the Java runtime environment you want to have used by %PRODUCTNAME."; }; -QueryBox QBX_JAVADISABLED -{ - Buttons = WB_YES_NO_CANCEL ; - DefButton = WB_DEF_YES ; - 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?"; -}; - String STR_ERROR_JVMCREATIONFAILED_MAC { 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."; @@ -67,11 +60,6 @@ String STR_WARNING_INVALIDJAVASETTINGS Text[ en-US ] = "Select JRE"; }; -String STR_QUESTION_JAVADISABLED -{ - Text[ en-US ] = "Enable JRE" ; -}; - 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 beda63538dc4..36ab197f9bd7 100644 --- a/svtools/source/java/javainteractionhandler.cxx +++ b/svtools/source/java/javainteractionhandler.cxx @@ -29,8 +29,8 @@ #include <com/sun/star/java/RestartRequiredException.hpp> #include <comphelper/processfactory.hxx> #include <vcl/layout.hxx> -#include <vcl/svapp.hxx> #include <vcl/msgbox.hxx> +#include <vcl/svapp.hxx> #include <osl/mutex.hxx> #include <tools/rcid.h> #include <jvmfwk/framework.h> @@ -159,8 +159,8 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque SolarMutexGuard aSolarGuard; m_bJavaDisabled_Handled = true; // Java disabled. Give user a chance to enable Java inside Office. - QueryBox aQueryBox( NULL, SvtResId( QBX_JAVADISABLED ) ); - aQueryBox.SetText(SvtResId( STR_QUESTION_JAVADISABLED ).toString()); + MessageDialog aQueryBox(NULL, "JavaDisabledDialog", + "svt/ui/javadisableddialog.ui"); nResult = aQueryBox.Execute(); if ( nResult == RET_YES ) { |