Hi Flo, all, recent changes to url strings in LibO, for completeness sake - and no need for any setup here, server-side. Cheers, -- Thorsten
From da9762a0da84a061fd2adadfdb51295357d5e270 Mon Sep 17 00:00:00 2001
From: Thorsten Behrens <tbehrens@novell.com>
Date: Wed, 3 Nov 2010 11:48:47 +0100
Subject: [PATCH] Changing a few more strings to read "LibreOffice"
---
extensions/source/oooimprovecore/core.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/extensions/source/oooimprovecore/core.cxx b/extensions/source/oooimprovecore/core.cxx
index d1e2c4f..4c13d5b 100644
--- a/extensions/source/oooimprovecore/core.cxx
+++ b/extensions/source/oooimprovecore/core.cxx
@@ -131,7 +131,7 @@ namespace oooimprovecore
OUString::createFromAscii("HelpUrl"),
::comphelper::ConfigurationHelper::E_READONLY) >>= help_url;
else
- help_url = OUString::createFromAscii("http://www.openoffice.org";);
+ help_url = OUString::createFromAscii("http://www.libreoffice.org";);
{
SolarMutexGuard aGuard;
SfxAllItemSet aSet( SFX_APP()->GetPool() );
--
1.7.1
From 6f7dcc750c4d9c075190c412cea7bfaf744129ab Mon Sep 17 00:00:00 2001
From: Thorsten Behrens <tbehrens@novell.com>
Date: Wed, 3 Nov 2010 11:55:38 +0100
Subject: [PATCH] Changing a few more strings to read "LibreOffice"
---
avmedia/source/gstreamer/gstplayer.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx
index 8d2d94d..7a5defd 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -73,7 +73,7 @@ Player::Player( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
{
// Initialize GStreamer library
int argc = 1;
- char *arguments[] = { "openoffice.org" };
+ char *arguments[] = { "libreoffice.org" };
char** argv = arguments;
GError* pError = NULL;
--
1.7.1
From f398a7b5ff69169925cdee745f8c023a3ae8d90c Mon Sep 17 00:00:00 2001
From: Thorsten Behrens <tbehrens@novell.com>
Date: Wed, 3 Nov 2010 11:48:20 +0100
Subject: [PATCH] Changing a few more strings to read "LibreOffice"
---
shell/source/backends/kde4be/kde4access.cxx | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/shell/source/backends/kde4be/kde4access.cxx
b/shell/source/backends/kde4be/kde4access.cxx
index 06ae116..03ffb03 100644
--- a/shell/source/backends/kde4be/kde4access.cxx
+++ b/shell/source/backends/kde4be/kde4access.cxx
@@ -127,7 +127,7 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) {
// In such cases, the proxy address is not stored in KDE, but determined dynamically.
// The proxy address may depend on the requested address, on the time of the day, on the speed of
the wind...
// The best we can do here is to ask the current value for a given address.
- aFTPProxy = KProtocolManager::proxyForUrl( KUrl("ftp://ftp.openoffice.org";) );
+ aFTPProxy = KProtocolManager::proxyForUrl( KUrl("ftp://ftp.libreoffice.org";) );
break;
default: // No proxy is used
break;
@@ -154,7 +154,7 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) {
// In such cases, the proxy address is not stored in KDE, but determined dynamically.
// The proxy address may depend on the requested address, on the time of the day, on the speed of
the wind...
// The best we can do here is to ask the current value for a given address.
- aFTPProxy = KProtocolManager::proxyForUrl( KUrl("ftp://ftp.openoffice.org";) );
+ aFTPProxy = KProtocolManager::proxyForUrl( KUrl("ftp://ftp.libreoffice.org";) );
break;
default: // No proxy is used
break;
@@ -181,7 +181,7 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) {
// In such cases, the proxy address is not stored in KDE, but determined dynamically.
// The proxy address may depend on the requested address, on the time of the day, on the speed of
the wind...
// The best we can do here is to ask the current value for a given address.
- aHTTPProxy = KProtocolManager::proxyForUrl( KUrl("http://http.openoffice.org";) );
+ aHTTPProxy = KProtocolManager::proxyForUrl( KUrl("http://http.libreoffice.org";) );
break;
default: // No proxy is used
break;
@@ -208,7 +208,7 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) {
// In such cases, the proxy address is not stored in KDE, but determined dynamically.
// The proxy address may depend on the requested address, on the time of the day, on the speed of
the wind...
// The best we can do here is to ask the current value for a given address.
- aHTTPProxy = KProtocolManager::proxyForUrl( KUrl("http://http.openoffice.org";) );
+ aHTTPProxy = KProtocolManager::proxyForUrl( KUrl("http://http.libreoffice.org";) );
break;
default: // No proxy is used
break;
@@ -235,7 +235,7 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) {
// In such cases, the proxy address is not stored in KDE, but determined dynamically.
// The proxy address may depend on the requested address, on the time of the day, on the speed of
the wind...
// The best we can do here is to ask the current value for a given address.
- aHTTPSProxy = KProtocolManager::proxyForUrl( KUrl("https://https.openoffice.org";) );
+ aHTTPSProxy = KProtocolManager::proxyForUrl( KUrl("https://https.libreoffice.org";) );
break;
default: // No proxy is used
break;
@@ -262,7 +262,7 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) {
// In such cases, the proxy address is not stored in KDE, but determined dynamically.
// The proxy address may depend on the requested address, on the time of the day, on the speed of
the wind...
// The best we can do here is to ask the current value for a given address.
- aHTTPSProxy = KProtocolManager::proxyForUrl( KUrl("https://https.openoffice.org";) );
+ aHTTPSProxy = KProtocolManager::proxyForUrl( KUrl("https://https.libreoffice.org";) );
break;
default: // No proxy is used
break;
--
1.7.1
From d69179723a2f8f72d344b884647fd106221a1391 Mon Sep 17 00:00:00 2001
From: Thorsten Behrens <tbehrens@novell.com>
Date: Wed, 3 Nov 2010 11:47:40 +0100
Subject: [PATCH] Changing a few more strings to read "LibreOffice"
---
vcl/unx/kde/kdedata.cxx | 12 ++++++------
vcl/unx/kde4/KDEXLib.cxx | 14 +++++++-------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/vcl/unx/kde/kdedata.cxx b/vcl/unx/kde/kdedata.cxx
index 5b4b113..3630365 100644
--- a/vcl/unx/kde/kdedata.cxx
+++ b/vcl/unx/kde/kdedata.cxx
@@ -120,15 +120,15 @@ void KDEXLib::Init()
pInputMethod->SetLocale();
XrmInitialize();
- KAboutData *kAboutData = new KAboutData( "OpenOffice.org",
- I18N_NOOP( "OpenOffice.org" ),
+ KAboutData *kAboutData = new KAboutData( "LibreOffice",
+ I18N_NOOP( "LibreOffice" ),
"1.1.0",
- I18N_NOOP( "OpenOffice.org with KDE Native Widget Support." ),
+ I18N_NOOP( "LibreOffice with KDE Native Widget Support." ),
KAboutData::License_LGPL,
"(c) 2003, 2004 Novell, Inc",
- I18N_NOOP( "OpenOffice.org is an office suite.\n" ),
- "http://kde.openoffice.org/index.html";,
- "dev@kde.openoffice.org");
+ I18N_NOOP( "LibreOffice is an office suite.\n" ),
+ "http://libreoffice.org";,
+ "libreoffice@lists.freedesktop.org");
kAboutData->addAuthor( "Jan Holesovsky",
I18N_NOOP( "Original author and maintainer of the KDE NWF." ),
"kendy@artax.karlin.mff.cuni.cz",
diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx
index 75bccf0..12cb886 100644
--- a/vcl/unx/kde4/KDEXLib.cxx
+++ b/vcl/unx/kde4/KDEXLib.cxx
@@ -105,16 +105,16 @@ void KDEXLib::Init()
pInputMethod->SetLocale();
XrmInitialize();
- KAboutData *kAboutData = new KAboutData("OpenOffice.org",
+ KAboutData *kAboutData = new KAboutData("LibreOffice",
"kdelibs4",
- ki18n( "OpenOffice.org" ),
- "3.0.0",
- ki18n( "OpenOffice.org with KDE Native Widget Support." ),
+ ki18n( "LibreOffice" ),
+ "3.3.0",
+ ki18n( "LibreOffice with KDE Native Widget Support." ),
KAboutData::License_LGPL,
ki18n( "Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Novell, Inc"),
- ki18n( "OpenOffice.org is an office suite.\n" ),
- "http://kde.openoffice.org/index.html";,
- "dev@kde.openoffice.org" );
+ ki18n( "LibreOffice is an office suite.\n" ),
+ "http://libreoffice.org";,
+ "libreoffice@lists.freedesktop.org" );
kAboutData->addAuthor( ki18n( "Jan Holesovsky" ),
ki18n( "Original author and maintainer of the KDE NWF." ),
--
1.7.1
Attachment:
pgpDFkFQkupXz.pgp
Description: PGP signature