Switch all urls from TDF to LibreOffice

Additionally, fixes fdo#30667 with new about dialog text, and a
link to http://libreoffice.org/credits.html

5 files changed, 37 insertions, 37 deletions

diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 0aa9562ddebc..ce1ac92a900b 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -23,8 +23,8 @@ Globals
 			USE_FILEVERSION 1
 			LIBRARYVERSION 9.3.0
             POOLPRODUCT 1
-            REGISTRATION_HOST https://registration.documentfoundation.org/RegistrationWeb
-			REGISTRATIONURL http://survey.documentfoundation.org/user/index.php
+            REGISTRATION_HOST https://registration.libreoffice.org/RegistrationWeb
+			REGISTRATIONURL http://survey.libreoffice.org/user/index.php
 			PROGRESSBARCOLOR 126,170,23
 			PROGRESSSIZE 320,7
 			PROGRESSPOSITION 185,206
@@ -64,8 +64,8 @@ LibreOffice
 			ABOUTBOXPRODUCTVERSION 3.3.0
 			BASEPRODUCTVERSION 3.3
             PCPFILENAME openoffice.pcp
-			UPDATEURL http://update.documentfoundation.org/ProductUpdateService/check.Update
-            ODFNOTIFYURL http://odfnotify.documentfoundation.org/OOo3.0/notification.jsp?version=ODF
+			UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update
+            ODFNOTIFYURL http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF
 			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst
 			REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
 			ADDSYSTEMINTEGRATION 1
@@ -94,13 +94,13 @@ LibreOffice
 			DOWNLOADBITMAP	ooobitmap.bmp
 			DOWNLOADSETUPICO	ooosetup.ico
 			RELATIVE_PATHES_IN_DDF 1
-            STARTCENTER_ADDFEATURE_URL http://extensions.documentfoundation.org/
-            STARTCENTER_INFO_URL http://www.documentfoundation.org/
-            STARTCENTER_TEMPLREP_URL http://templates.documentfoundation.org/
+            STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
+            STARTCENTER_INFO_URL http://www.libreoffice.org/
+            STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
             STARTCENTER_LAYOUT_STYLE 0
             REGISTRATION_PRODUCT LibreOffice
             REGISTRATION_CID 926117
-            DICT_REPO_URL http://extensions.documentfoundation.org/dictionaries/
+            DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
 		}
 		active			1
 		compression		5
@@ -128,8 +128,8 @@ LibreOffice_wJRE
 			USERDIRPRODUCTVERSION 3
 			ABOUTBOXPRODUCTVERSION 3.3.0
 			BASEPRODUCTVERSION 3.3
-			UPDATEURL http://update.documentfoundation.org/ProductUpdateService/check.Update
-            ODFNOTIFYURL http://odfnotify.documentfoundation.org/OOo3.0/notification.jsp?version=ODF
+			UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update
+            ODFNOTIFYURL http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF
 			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
 			REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
 			ADDSYSTEMINTEGRATION 1
@@ -160,13 +160,13 @@ LibreOffice_wJRE
 			DOWNLOADBITMAP	ooobitmap.bmp
 			DOWNLOADSETUPICO	ooosetup.ico
 			RELATIVE_PATHES_IN_DDF 1
-            STARTCENTER_ADDFEATURE_URL http://extensions.documentfoundation.org/
-            STARTCENTER_INFO_URL http://www.documentfoundation.org/
-            STARTCENTER_TEMPLREP_URL http://templates.documentfoundation.org/
+            STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
+            STARTCENTER_INFO_URL http://www.libreoffice.org/
+            STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
             STARTCENTER_LAYOUT_STYLE 0
             REGISTRATION_PRODUCT LibreOffice
             REGISTRATION_CID 926117
-            DICT_REPO_URL http://extensions.documentfoundation.org/dictionaries/
+            DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
 		}
 		active			1
 		compression		5
@@ -201,8 +201,8 @@ LibreOffice_Dev
 			SOLSUREPACKAGEPREFIX lodev
 			REGISTRYLAYERNAME LayerDev
 			SERVICETAG_URN urn:uuid:1680b00d-e45c-11de-82d6-080020a9ed93
-			UPDATEURL http://update.documentfoundation.org/ProductUpdateService/check.Update
-            ODFNOTIFYURL http://odfnotify.documentfoundation.org/OOo3.0/notification.jsp?version=ODF
+			UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update
+            ODFNOTIFYURL http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF
 			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
 			EVAL
 			FILEFORMATNAME OpenOffice.org
@@ -232,13 +232,13 @@ LibreOffice_Dev
 			DOWNLOADSETUPICO	ooosetup.ico
 			LOCALUSERDIR $ORIGIN/..
 			RELATIVE_PATHES_IN_DDF 1
-            STARTCENTER_ADDFEATURE_URL http://extensions.documentfoundation.org/
-            STARTCENTER_INFO_URL http://www.documentfoundation.org/
-            STARTCENTER_TEMPLREP_URL http://templates.documentfoundation.org/
+            STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
+            STARTCENTER_INFO_URL http://www.libreoffice.org/
+            STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
             STARTCENTER_LAYOUT_STYLE 0
             REGISTRATION_PRODUCT LibreOffice
             REGISTRATION_CID 926117
-            DICT_REPO_URL http://extensions.documentfoundation.org/dictionaries/
+            DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
 		}
 		active			1
 		compression		5
@@ -276,13 +276,13 @@ URE
             DONTUSESTARTMENUFOLDER 1
             SERVICESPROJEKT 1
             RELATIVE_PATHES_IN_DDF 1
-            STARTCENTER_ADDFEATURE_URL http://extensions.documentfoundation.org/
-            STARTCENTER_INFO_URL http://www.documentfoundation.org/
-            STARTCENTER_TEMPLREP_URL http://templates.documentfoundation.org/
+            STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
+            STARTCENTER_INFO_URL http://www.libreoffice.org/
+            STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
             STARTCENTER_LAYOUT_STYLE 0
             ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,version.lst
 			PACKAGEMAP package_names_ext.txt
-            DICT_REPO_URL http://extensions.documentfoundation.org/dictionaries/
+            DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
         }
         active 1
         compression 5
@@ -323,11 +323,11 @@ LibreOffice_SDK
             DOWNLOADSETUPICO ooosetup.ico
             DONTUSESTARTMENUFOLDER 1
             RELATIVE_PATHES_IN_DDF 1
-            STARTCENTER_ADDFEATURE_URL http://extensions.documentfoundation.org/
-            STARTCENTER_INFO_URL http://www.documentfoundation.org/
-            STARTCENTER_TEMPLREP_URL http://templates.documentfoundation.org/
+            STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
+            STARTCENTER_INFO_URL http://www.libreoffice.org/
+            STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
             STARTCENTER_LAYOUT_STYLE 0
-            DICT_REPO_URL http://extensions.documentfoundation.org/dictionaries/
+            DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
         }
         active 1
         compression 5
@@ -375,11 +375,11 @@ LibreOffice_Dev_SDK
             DOWNLOADSETUPICO ooosetup.ico
             DONTUSESTARTMENUFOLDER 1
             RELATIVE_PATHES_IN_DDF 1
-            STARTCENTER_ADDFEATURE_URL http://extensions.documentfoundation.org/
-            STARTCENTER_INFO_URL http://www.documentfoundation.org/
-            STARTCENTER_TEMPLREP_URL http://templates.documentfoundation.org/
+            STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
+            STARTCENTER_INFO_URL http://www.libreoffice.org/
+            STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
             STARTCENTER_LAYOUT_STYLE 0
-            DICT_REPO_URL http://extensions.documentfoundation.org/dictionaries/
+            DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
         }
         active 1
         compression 5
diff --git a/instsetoo_native/util/update.xml b/instsetoo_native/util/update.xml
index 8b8a4dc7cd37..832de6bffcb0 100644
--- a/instsetoo_native/util/update.xml
+++ b/instsetoo_native/util/update.xml
@@ -6,5 +6,5 @@
   <inst:buildid></inst:buildid>
   <inst:os></inst:os>
   <inst:arch></inst:arch>
-  <inst:update type="text/html" src="http://update.services.openoffice.org/ooo/snapshot.html" />
+  <inst:update type="text/html" src="http://update.libreoffice.org/ooo/snapshot.html" />
 </inst:description>
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index c5b07c4ba2db..5734a4bac00f 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -1230,7 +1230,7 @@ ProfileItem gid_Brand_Profileitem_Version_Extensionupdateurl
     Section = "Version";
     Order = 18;
     Key = "ExtensionUpdateURL";
-    Value = "http://updateexte.services.openoffice.org/ExtensionUpdateService/check.Update";
+    Value = "http://updateexte.libreoffice.org/ExtensionUpdateService/check.Update";
 End
 
 ProfileItem gid_Brand_Profileitem_Fundamental_Brand_Base_Dir
diff --git a/scp2/source/ooo/ooo_brand.scp b/scp2/source/ooo/ooo_brand.scp
index 47df5f2ad084..b3ac38781cbb 100644
--- a/scp2/source/ooo/ooo_brand.scp
+++ b/scp2/source/ooo/ooo_brand.scp
@@ -46,7 +46,7 @@ ProfileItem gid_Brand_Profileitem_Bootstrap_Errorreport_Server
     Order = 8;
     Key = "ErrorReportServer";
   #if defined(BUILD_SPECIAL)
-    Value = "report.services.openoffice.org";
+    Value = "report.libreoffice.org";
   #else
     Value = "";
   #endif
diff --git a/scp2/source/ooo/registryitem_ooo.scp b/scp2/source/ooo/registryitem_ooo.scp
index 787244a98f71..6aa7c4eb8c03 100644
--- a/scp2/source/ooo/registryitem_ooo.scp
+++ b/scp2/source/ooo/registryitem_ooo.scp
@@ -206,7 +206,7 @@ RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Sta
     ModuleID = gid_Module_Root;
     Subkey = "Software\Microsoft\Windows\CurrentVersion\Uninstall\%PRODUCTNAME %PRODUCTVERSION";
     Name = "HelpLink";
-    Value = "http://www.documentfoundation.org";
+    Value = "http://www.libreoffice.org";
 End
 
 RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Staroffice_Modifypath
@@ -238,7 +238,7 @@ RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Sta
     ModuleID = gid_Module_Root;
     Subkey = "Software\Microsoft\Windows\CurrentVersion\Uninstall\%PRODUCTNAME %PRODUCTVERSION";
     Name = "URLInfoAbout";
-    Value = "http://www.documentfoundation.org/";
+    Value = "http://www.libreoffice.org/";
 End
 
 RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Staroffice_Urlupdateinfo