diff options
| author | Venetia Furtado <venetiarosita@gmail.com> | 2023-08-10 15:08:50 -0600 |
|---|---|---|
| committer | Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org> | 2023-11-03 11:49:42 +0100 |
| commit | 4af07053517ba3526d4050ffc29993a65b54352b (patch) | |
| tree | ff7f8075904b55dfffc66830ef9ad8242778b35b /sfx2 | |
| parent | f813d7138dea193b31988cc3097ed560b4f2ce98 (diff) | |
tdf#140314:Use hub.libreoffice.org URL with params in Extensions
Change-Id: Iccf76581de8dc44fe80aa818e9fb81c2cdf0967b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155571
Tested-by: Jenkins
Tested-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>
Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/dialog/backingwindow.cxx | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index 553577a846df..846fa2ffb70e 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -28,6 +28,7 @@ #include <unotools/historyoptions.hxx> #include <unotools/moduleoptions.hxx> +#include <unotools/configmgr.hxx> #include <svtools/openfiledroptargetlistener.hxx> #include <svtools/colorcfg.hxx> #include <svtools/langhelp.hxx> @@ -39,6 +40,7 @@ #include <sfx2/app.hxx> #include <officecfg/Office/Common.hxx> +#include <i18nlangtag/languagetag.hxx> #include <comphelper/diagnose_ex.hxx> #include <com/sun/star/configuration/theDefaultProvider.hpp> @@ -519,15 +521,10 @@ void BackingWindow::setOwningFrame( const css::uno::Reference< css::frame::XFram xFramesSupplier->setActiveFrame(mxFrame); } -IMPL_LINK(BackingWindow, ExtLinkClickHdl, weld::Button&, rButton, void) +IMPL_LINK(BackingWindow, ExtLinkClickHdl, weld::Button&, rButton,void) { - OUString aNode; - - if (&rButton == mxExtensionsButton.get()) - aNode = "AddFeatureURL"; - - if (aNode.isEmpty()) - return; + if (&rButton != mxExtensionsButton.get()) + return; try { @@ -540,11 +537,9 @@ IMPL_LINK(BackingWindow, ExtLinkClickHdl, weld::Button&, rButton, void) Reference<container::XNameAccess> xNameAccess(xConfig->createInstanceWithArguments(SERVICENAME_CFGREADACCESS, args), UNO_QUERY); if (xNameAccess.is()) { - OUString sURL; - Any value(xNameAccess->getByName(aNode)); - - sURL = value.get<OUString>(); - localizeWebserviceURI(sURL); + OUString sURL(officecfg::Office::Common::Menus::ExtensionsURL::get() + + "?LOvers=" + utl::ConfigManager::getProductVersion() + + "&LOlocale=" + LanguageTag(utl::ConfigManager::getUILocale()).getBcp47() ); Reference<css::system::XSystemShellExecute> const xSystemShellExecute( |