[ooo-build-commit] .: framework/source officecfg/registry

[Thorsten Behrens]

 framework/source/services/backingwindow.cxx                        |   35 ----------
 officecfg/registry/data/org/openoffice/Office/ExtensionManager.xcu |    2 
 2 files changed, 4 insertions(+), 33 deletions(-)

New commits:
commit 8bb78a0f38b4f8823ff772da372613db04582b29
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Thu Oct 7 12:29:30 2010 +0200

    Webservice URLs now point to documentfoundation
    
    Changed places referencing OOo webservices to refer to
    *.documentfoundation.org instead. Also, append coutry string to URL.

diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx
index c524428..e0844f1 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"
@@ -940,38 +941,8 @@ IMPL_LINK( BackingWindow, ToolboxHdl, void*, EMPTYARG )
                     rtl::OUString sURL;
                     //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 );
+                    sURL = value.get<rtl::OUString> ();                    
+                    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 7759f49..bc55109 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>