cui/source/dialogs/about.cxx | 9 +++++++++
instsetoo_native/util/openoffice.lst.in | 8 ++++----
postprocess/CustomTarget_registry.mk | 2 +-
scp2/source/ooo/registryitem_ooo.scp | 8 ++++----
4 files changed, 18 insertions(+), 9 deletions(-)
New commits:
commit 8e30ebd205220c4561b8b0d098c06dbda1f69796
Author: Tor Lillqvist <t...@collabora.com>
Date: Fri Sep 19 13:36:28 2014 +0300
Collabora specific URLs
Conflicts:
scp2/source/ooo/registryitem_ooo.scp
Change-Id: I5a16033851fd1e8441d451f14295e0c8d664d001
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 2c39df8..e102e82 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -110,7 +110,16 @@ IMPL_LINK( AboutDialog, HandleClick, PushButton*, pButton )
else if ( aDialogButton == WEBSITE_BUTTON )
{
sURL = officecfg::Office::Common::Help::StartCenter::InfoURL::get();
+#if defined MACOSX && HAVE_FEATURE_MACOSX_SANDBOX
+ sURL += "lofc-mac-app-store/";
+#endif
+
+#if 0 // In this branch the URL is on
+ // libreoffice-from-collabora.com, which does not offer
+ // localized pages, or automatic redirection to an English
+ // page if a localized one does not exist. I think.
localizeWebserviceURI(sURL);
+#endif
}
// If the URL is empty, don't do anything
diff --git a/instsetoo_native/util/openoffice.lst.in
b/instsetoo_native/util/openoffice.lst.in
index 1214dd0..9117dca 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -67,7 +67,7 @@ LibreOffice
CHANGETARGETDIR 1
PATCHCODEFILE ooo_patchcodes.txt
STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
- STARTCENTER_INFO_URL http://www.libreoffice.org/
+ STARTCENTER_INFO_URL http://libreoffice-from-collabora.com/
STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
STARTCENTER_HIDE_EXTERNAL_LINKS 0
@@ -120,7 +120,7 @@ LibreOffice_Dev
CODEFILENAME codes_ooodev.txt
LOCALUSERDIR $ORIGIN/..
STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
- STARTCENTER_INFO_URL http://www.libreoffice.org/
+ STARTCENTER_INFO_URL http://libreoffice-from-collabora.com/
STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
STARTCENTER_HIDE_EXTERNAL_LINKS 0
@@ -162,7 +162,7 @@ LibreOffice_SDK
CHANGETARGETDIR 1
DONTUSESTARTMENUFOLDER 1
STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
- STARTCENTER_INFO_URL http://www.libreoffice.org/
+ STARTCENTER_INFO_URL http://libreoffice-from-collabora.com/
STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
STARTCENTER_HIDE_EXTERNAL_LINKS 0
@@ -208,7 +208,7 @@ LibreOffice_Dev_SDK
CHANGETARGETDIR 1
DONTUSESTARTMENUFOLDER 1
STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
- STARTCENTER_INFO_URL http://www.libreoffice.org/
+ STARTCENTER_INFO_URL http://libreoffice-from-collabora.com/
STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
STARTCENTER_HIDE_EXTERNAL_LINKS 0
diff --git a/postprocess/CustomTarget_registry.mk
b/postprocess/CustomTarget_registry.mk
index e8d90da..ee73e86 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -562,7 +562,7 @@ postprocess_main_SED := \
-e 's,$${PRODUCTVERSION},$(PRODUCTVERSION),g' \
-e
's,$${PRODUCTEXTENSION},.$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)$(LIBO_VERSION_SUFFIX),g'
\
-e
's,$${STARTCENTER_ADDFEATURE_URL},http://extensions.libreoffice.org/,g' \
- -e 's,$${STARTCENTER_INFO_URL},http://www.libreoffice.org/,g' \
+ -e
's,$${STARTCENTER_INFO_URL},http://libreoffice-from-collabora.com/,g' \
-e 's,$${STARTCENTER_HIDE_EXTERNAL_LINKS},0,g' \
-e 's,$${STARTCENTER_TEMPLREP_URL},http://templates.libreoffice.org/,g'
\
diff --git a/scp2/source/ooo/registryitem_ooo.scp
b/scp2/source/ooo/registryitem_ooo.scp
index 0640400..a18cfa4 100644
--- a/scp2/source/ooo/registryitem_ooo.scp
+++ b/scp2/source/ooo/registryitem_ooo.scp
@@ -197,7 +197,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.libreoffice.org";;
+ Value = "http://libreoffice-from-collabora.com";;
End
RegistryItem
gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Staroffice_Modifypath
@@ -213,7 +213,7 @@ RegistryItem
gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Sta
ModuleID = gid_Module_Root;
Subkey = "Software\Microsoft\Windows\CurrentVersion\Uninstall\%PRODUCTNAME
%PRODUCTVERSION";
Name = "Publisher";
- Value = "The Document Foundation for the LibreOffice Community";
+ Value = "Collabora Productivity Ltd.";
End
RegistryItem
gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Staroffice_Uninstallstring
@@ -229,7 +229,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.libreoffice.org/";;
+ Value = "http://libreoffice-from-collabora.com";;
End
RegistryItem
gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Staroffice_Urlupdateinfo
@@ -237,7 +237,7 @@ RegistryItem
gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Sta
ModuleID = gid_Module_Root;
Subkey = "Software\Microsoft\Windows\CurrentVersion\Uninstall\%PRODUCTNAME
%PRODUCTVERSION";
Name = "URLUpdateInfo";
- Value = "http://download.libreoffice.org";;
+ Value = "http://libreoffice-from-collabora.com";;
End
RegistryItem gid_Regitem_Software_Openoffice_Productname_Productversion_Path
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
