diff options
| -rw-r--r-- | framework/source/services/backingwindow.cxx | 33 | ||||
| -rw-r--r-- | officecfg/registry/data/org/openoffice/Office/ExtensionManager.xcu | 2 |
2 files changed, 3 insertions, 32 deletions
diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx index 6d8f4992b830..73dc9ac8103d 100644 --- a/framework/source/services/backingwindow.cxx +++ b/framework/source/services/backingwindow.cxx @@ -44,6 +44,7 @@ #include "unotools/historyoptions.hxx" #include "svtools/imagemgr.hxx" #include "svtools/svtools.hrc" +#include "svtools/langhelp.hxx" #include "comphelper/processfactory.hxx" #include "comphelper/sequenceashashmap.hxx" @@ -941,37 +942,7 @@ IMPL_LINK( BackingWindow, ToolboxHdl, void*, EMPTYARG ) //throws css::container::NoSuchElementException, css::lang::WrappedTargetException Any value( xNameAccess->getByName(rtl::OUString::createFromAscii(pNode)) ); sURL = value.get<rtl::OUString> (); - - // extend the URLs with Office locale argument - INetURLObject aURLObj( sURL ); - - // read locale from configuration - ::rtl::OUString sLocale; - ::rtl::OUString sPackage = ::rtl::OUString::createFromAscii("org.openoffice.Setup"); - ::rtl::OUString sRelPath = ::rtl::OUString::createFromAscii("L10N"); - ::rtl::OUString sKey = ::rtl::OUString::createFromAscii("ooLocale"); - - try - { - ::comphelper::ConfigurationHelper::readDirectKey(comphelper::getProcessServiceFactory(), - sPackage, - sRelPath, - sKey, - ::comphelper::ConfigurationHelper::E_READONLY) >>= sLocale; - } - catch(const com::sun::star::uno::RuntimeException& exRun) - { throw exRun; } - catch(const com::sun::star::uno::Exception&) - { sLocale = ::rtl::OUString::createFromAscii("en"); } - - // Convert the URL to something that can be handled by the website - if ( sLocale.equalsAscii( "pt-BR" ) ) - sLocale = ::rtl::OUString::createFromAscii( "pt-br" ); - else - sLocale = sLocale.copy( 0, sLocale.indexOf( sal_Unicode( '-' ) ) ); - - aURLObj.insertName( sLocale ); - sURL = aURLObj.GetMainURL( INetURLObject::NO_DECODE ); + localizeWebserviceURI(sURL); Reference< com::sun::star::system::XSystemShellExecute > xSystemShellExecute( comphelper::getProcessServiceFactory()->createInstance( diff --git a/officecfg/registry/data/org/openoffice/Office/ExtensionManager.xcu b/officecfg/registry/data/org/openoffice/Office/ExtensionManager.xcu index 2019b40423fb..9ef7923735f1 100644 --- a/officecfg/registry/data/org/openoffice/Office/ExtensionManager.xcu +++ b/officecfg/registry/data/org/openoffice/Office/ExtensionManager.xcu @@ -29,7 +29,7 @@ <oor:component-data xmlns:oor="http://openoffice.org/2001/registry" oor:name="ExtensionManager" oor:package="org.openoffice.Office"> <node oor:name="ExtensionRepositories"> <prop oor:name="WebsiteLink"> - <value>http://extensions.services.openoffice.org/</value> + <value>http://extensions.documentfoundation.org/</value> </prop> </node> </oor:component-data> |