diff options
| author | Bryan Gazali <byg4299@gmail.com> | 2020-10-03 01:46:48 -0400 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2020-10-28 19:08:05 +0100 |
| commit | 2048a5afc9b1c6340cea594c4ead75914b358e74 (patch) | |
| tree | d6252cf796e009faba76da39de8e1c906eca6342 /svtools/source/java | |
| parent | 9350b162c3432ca3f160ce6b86cc50a00eb7de0a (diff) | |
tdf#125379 updated javainteractionhandler.cxx to add a link for the JRE missing warning
Change-Id: Iac940b24a9fbe914af46fe928b758ad962d3d3e0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103881
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'svtools/source/java')
| -rw-r--r-- | svtools/source/java/javainteractionhandler.cxx | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/svtools/source/java/javainteractionhandler.cxx b/svtools/source/java/javainteractionhandler.cxx index e484eb56a0ac..ce360463b6dc 100644 --- a/svtools/source/java/javainteractionhandler.cxx +++ b/svtools/source/java/javainteractionhandler.cxx @@ -34,6 +34,8 @@ #include <svtools/restartdialog.hxx> #include <svtools/svtresid.hxx> #include <svtools/javainteractionhandler.hxx> +#include <unotools/configmgr.hxx> +#include <officecfg/Office/Common.hxx> using namespace com::sun::star::uno; using namespace com::sun::star::task; @@ -126,23 +128,25 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque if( !g_JavaEvents.bNotFoundHandled ) { // No suitable JRE found + OUString sPrimTex; + OUString urlLink(officecfg::Office::Common::Menus::InstallJavaURL::get() + // https://hub.libreoffice.org/InstallJava/ + "?LOlocale=" + utl::ConfigManager::getUILocale()); g_JavaEvents.bNotFoundHandled = true; -#if defined( MACOSX ) - std::unique_ptr<weld::MessageDialog> xWarningBox(Application::CreateMessageDialog(nullptr, - VclMessageType::Warning, VclButtonsType::Ok, SvtResId(STR_WARNING_JAVANOTFOUND_MAC))); -#elif defined( _WIN32 ) - std::unique_ptr<weld::MessageDialog> xWarningBox(Application::CreateMessageDialog(nullptr, - VclMessageType::Warning, VclButtonsType::Ok, SvtResId(STR_WARNING_JAVANOTFOUND_WIN))); - OUString sPrimTex = xWarningBox->get_primary_text(); -#if defined( _WIN64 ) - xWarningBox->set_primary_text(sPrimTex.replaceAll( "%BITNESS", "64" )); +#if defined(MACOSX) + sPrimTex = SvtResId(STR_WARNING_JAVANOTFOUND_MAC); +#elif defined(_WIN32) + sPrimTex = SvtResId(STR_WARNING_JAVANOTFOUND_WIN); +#if defined(_WIN64) + sPrimTex = sPrimTex.replaceAll("%BITNESS", "64"); #else - xWarningBox->set_primary_text(sPrimTex.replaceAll( "%BITNESS", "32" )); + sPrimTex = sPrimTex.replaceAll("%BITNESS", "32"); #endif #else - std::unique_ptr<weld::MessageDialog> xWarningBox(Application::CreateMessageDialog(nullptr, - VclMessageType::Warning, VclButtonsType::Ok, SvtResId(STR_WARNING_JAVANOTFOUND))); + sPrimTex = SvtResId(STR_WARNING_JAVANOTFOUND); #endif + sPrimTex = sPrimTex.replaceAll("%FAQLINK", urlLink); + std::unique_ptr<weld::MessageDialog> xWarningBox(Application::CreateMessageDialog( + nullptr, VclMessageType::Warning, VclButtonsType::Ok, sPrimTex)); xWarningBox->set_title(SvtResId(STR_WARNING_JAVANOTFOUND_TITLE)); nResult = xWarningBox->run(); } |