diff options
author | Andras Timar <atimar@suse.com> | 2012-04-03 16:22:01 +0200 |
---|---|---|
committer | Andras Timar <atimar@suse.com> | 2012-04-03 16:22:50 +0200 |
commit | 9bc097419568e61018b95148ad2a8181665051f9 (patch) | |
tree | 9e9805cb9733ed1cb2bf0b883ff0a6c44167a2d8 /svtools | |
parent | Removed the last SC_DECL_PTRARR from editdoc.hxx. (diff) | |
download | core-9bc097419568e61018b95148ad2a8181665051f9.tar.gz core-9bc097419568e61018b95148ad2a8181665051f9.zip |
fdo#44698 settings are under a different menu in Mac OS X
Diffstat (limited to 'svtools')
-rw-r--r-- | svtools/inc/svtools/sfxecode.hxx | 1 | ||||
-rw-r--r-- | svtools/inc/svtools/svtools.hrc | 2 | ||||
-rw-r--r-- | svtools/source/java/javaerror.src | 14 | ||||
-rw-r--r-- | svtools/source/java/javainteractionhandler.cxx | 8 |
4 files changed, 25 insertions, 0 deletions
diff --git a/svtools/inc/svtools/sfxecode.hxx b/svtools/inc/svtools/sfxecode.hxx index 1ac67e909b69..c00572c9ff49 100644 --- a/svtools/inc/svtools/sfxecode.hxx +++ b/svtools/inc/svtools/sfxecode.hxx @@ -84,6 +84,7 @@ #define ERRCODE_SFX_BROKENSIGNATURE (ERRCODE_WARNING_MASK | ERRCODE_AREA_SFX | ERRCODE_CLASS_NONE | 53) #define ERRCODE_SFX_SHARED_NOPASSWORDCHANGE (ERRCODE_WARNING_MASK | ERRCODE_AREA_SFX | ERRCODE_CLASS_NONE | 54) #define ERRCODE_SFX_INCOMPLETE_ENCRYPTION (ERRCODE_WARNING_MASK | ERRCODE_AREA_SFX | ERRCODE_CLASS_NONE | 55) +#define ERRCODE_SFX_DOCUMENT_MACRO_DISABLED_MAC (ERRCODE_WARNING_MASK | ERRCODE_AREA_SFX | ERRCODE_CLASS_NONE | 56) diff --git a/svtools/inc/svtools/svtools.hrc b/svtools/inc/svtools/svtools.hrc index 466b978c16bd..64c988b68000 100644 --- a/svtools/inc/svtools/svtools.hrc +++ b/svtools/inc/svtools/svtools.hrc @@ -333,6 +333,8 @@ #define WARNINGBOX_JAVANOTFOUND (RID_SVTOOLS_START+22) #define WARNINGBOX_INVALIDJAVASETTINGS (RID_SVTOOLS_START+23) #define ERRORBOX_RESTARTREQUIRED (RID_SVTOOLS_START+24) +#define WARNINGBOX_INVALIDJAVASETTINGS_MAC (RID_SVTOOLS_START+25) +#define ERRORBOX_JVMCREATIONFAILED_MAC (RID_SVTOOLS_START+26) //............................................................................. // images diff --git a/svtools/source/java/javaerror.src b/svtools/source/java/javaerror.src index f7c9763d90fc..9e12eb7ab3ef 100644 --- a/svtools/source/java/javaerror.src +++ b/svtools/source/java/javaerror.src @@ -34,6 +34,13 @@ WarningBox WARNINGBOX_JAVANOTFOUND Message[ en-US ] ="%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. Please install a JRE and restart %PRODUCTNAME."; }; +WarningBox WARNINGBOX_INVALIDJAVASETTINGS_MAC +{ + Buttons = WB_OK ; + DefButton = WB_DEF_OK ; + Message[ en-US ] ="The %PRODUCTNAME configuration has been changed. Under %PRODUCTNAME - Preferences - %PRODUCTNAME - Java, select the Java runtime environment you want to have used by %PRODUCTNAME."; +}; + WarningBox WARNINGBOX_INVALIDJAVASETTINGS { Buttons = WB_OK ; @@ -48,6 +55,13 @@ 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 +{ + 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 - Java."; +}; + ErrorBox ERRORBOX_JVMCREATIONFAILED { Buttons = WB_OK; diff --git a/svtools/source/java/javainteractionhandler.cxx b/svtools/source/java/javainteractionhandler.cxx index 61192de7568c..92308babf8a0 100644 --- a/svtools/source/java/javainteractionhandler.cxx +++ b/svtools/source/java/javainteractionhandler.cxx @@ -151,7 +151,11 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque // javavendors.xml was updated and Java has not been configured yet SolarMutexGuard aSolarGuard; m_bInvalidSettings_Handled = true; +#ifdef MACOSX + WarningBox aWarningBox( NULL, SvtResId( WARNINGBOX_INVALIDJAVASETTINGS_MAC ) ); +#else WarningBox aWarningBox( NULL, SvtResId( WARNINGBOX_INVALIDJAVASETTINGS ) ); +#endif String aTitle( SvtResId(STR_WARNING_INVALIDJAVASETTINGS)); aWarningBox.SetText( aTitle ); nResult = aWarningBox.Execute(); @@ -192,7 +196,11 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque // Java not correctly installed, or damaged SolarMutexGuard aSolarGuard; m_bVMCreationFailure_Handled = true; +#ifdef MACOSX + ErrorBox aErrorBox( NULL, SvtResId( ERRORBOX_JVMCREATIONFAILED_MAC ) ); +#else ErrorBox aErrorBox( NULL, SvtResId( ERRORBOX_JVMCREATIONFAILED ) ); +#endif String aTitle( SvtResId( STR_ERROR_JVMCREATIONFAILED ) ); aErrorBox.SetText( aTitle ); nResult = aErrorBox.Execute(); |