diff options
| author | Yousuf Philips <philipz85@hotmail.com> | 2016-10-20 00:13:40 +0400 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2016-10-24 08:41:58 +0000 |
| commit | 967436ba7c552ea8fa30fd3b7abced231e174951 (patch) | |
| tree | a4aeeeb06fa4688842984be1c35152740dca7bc2 | |
| parent | 21e8ed8b5f032f63012a7ee84bce64fac218154f (diff) | |
tdf#103259 Add java not found error for mac
Change-Id: Ia52316b8868c8124dcb322b44e9600a33a13df28
Reviewed-on: https://gerrit.libreoffice.org/29920
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
| -rw-r--r-- | include/svtools/svtools.hrc | 1 | ||||
| -rw-r--r-- | svtools/source/java/javaerror.src | 5 | ||||
| -rw-r--r-- | svtools/source/java/javainteractionhandler.cxx | 4 |
3 files changed, 10 insertions, 0 deletions
diff --git a/include/svtools/svtools.hrc b/include/svtools/svtools.hrc index b5a38ebab204..92cc8092ab7d 100644 --- a/include/svtools/svtools.hrc +++ b/include/svtools/svtools.hrc @@ -195,6 +195,7 @@ #define STR_WARNING_INVALIDJAVASETTINGS_TITLE (STR_SVT_JAVAERROR_START+6) #define STR_ERROR_JVMCREATIONFAILED (STR_SVT_JAVAERROR_START+7) #define STR_ERROR_JVMCREATIONFAILED_MAC (STR_SVT_JAVAERROR_START+8) +#define STR_WARNING_JAVANOTFOUND_MAC (STR_SVT_JAVAERROR_START+9) #define STR_SVT_JAVAERROR_END (STR_ERROR_JVMCREATIONFAILED_MAC) // String array to match UI language names to LanguageType values and vice versa diff --git a/svtools/source/java/javaerror.src b/svtools/source/java/javaerror.src index f1d1386ccb64..60d7c720ebeb 100644 --- a/svtools/source/java/javaerror.src +++ b/svtools/source/java/javaerror.src @@ -24,6 +24,11 @@ String STR_WARNING_JAVANOTFOUND Text [ en-US ] ="%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. Please install a JRE and restart %PRODUCTNAME."; }; +String STR_WARNING_JAVANOTFOUND_MAC +{ + Text [ en-US ] ="%PRODUCTNAME requires Oracle's Java Development Kit (JDK) on Mac OS X 10.10 or greater to perform this task. Please install them and restart %PRODUCTNAME."; +}; + String STR_WARNING_INVALIDJAVASETTINGS_MAC { Text [ en-US ] ="The %PRODUCTNAME configuration has been changed. Under %PRODUCTNAME - Preferences - %PRODUCTNAME - Advanced, select the Java runtime environment you want to have used by %PRODUCTNAME."; diff --git a/svtools/source/java/javainteractionhandler.cxx b/svtools/source/java/javainteractionhandler.cxx index f947a288eac3..860f3e07971b 100644 --- a/svtools/source/java/javainteractionhandler.cxx +++ b/svtools/source/java/javainteractionhandler.cxx @@ -122,7 +122,11 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque // No suitable JRE found SolarMutexGuard aSolarGuard; m_bJavaNotFound_Handled = true; +#ifdef MACOSX + ScopedVclPtrInstance< MessageDialog > aWarningBox(nullptr, SvtResId(STR_WARNING_JAVANOTFOUND_MAC), VclMessageType::Warning); +#else ScopedVclPtrInstance< MessageDialog > aWarningBox(nullptr, SvtResId(STR_WARNING_JAVANOTFOUND), VclMessageType::Warning); +#endif aWarningBox->SetText(SvtResId(STR_WARNING_JAVANOTFOUND_TITLE)); nResult = aWarningBox->Execute(); } |