[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 4 commits - cui/source instsetoo_native/util postprocess/CustomTarget_registry.mk

[Tor Lillqvist]

 cui/source/dialogs/about.cxx            |    9 +++++++++
 instsetoo_native/util/openoffice.lst.in |    8 ++++----
 postprocess/CustomTarget_registry.mk    |    2 +-
 3 files changed, 14 insertions(+), 5 deletions(-)

New commits:
commit d1a776a16faf54a5c12350fd4aae047a036b815b
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Sep 19 14:28:36 2014 +0300

    We probably don't offer localized pages on libreoffice-from-collabora.com
    
    Change-Id: I207cecc3b4ff0ac5464137161eb02d51d9e39c5e

diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 059f282..648e12f 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -113,7 +113,12 @@ IMPL_LINK( AboutDialog, HandleClick, PushButton*, pButton )
         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
commit d34d8e4d5a7708ce34d60a6e3ca316721e3ceeee
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Sep 19 14:08:24 2014 +0300

    Use LOfC-specific STARTCENTER_INFO_URL here, too
    
    Change-Id: Ia7d5c8d28fec0e229edcdb8d23e381f21a266ae7

diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index 2299f49..a541542 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -559,7 +559,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' \
 
commit 31a573d3498efbbdb75af94eb9197cb29e1526b3
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Sep 19 13:37:02 2014 +0300

    For a sandboxed OS X LOfC, use a more specific URL
    
    Change-Id: Ibe640c9557b987622a843d7e219f7fcd42f3b73a

diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 1591f4e..059f282 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -109,6 +109,10 @@ IMPL_LINK( AboutDialog, HandleClick, PushButton*, pButton )
     else if ( pDialogButton == (AboutDialogButton*)WEBSITE_BUTTON )
     {
         sURL = officecfg::Office::Common::Help::StartCenter::InfoURL::get();
+#if defined MACOSX && HAVE_FEATURE_MACOSX_SANDBOX
+        sURL += "lofc-mac-app-store/";
+#endif
+
         localizeWebserviceURI(sURL);
     }
 
commit 3a9d07e4108740303179c89db807382d3b8cb225
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Sep 19 13:36:28 2014 +0300

    Use LOfC-specific STARTCENTER_INFO_URL
    
    Change-Id: I5a16033851fd1e8441d451f14295e0c8d664d001

diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index c81eb72..ccb9034 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