[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - 2 commits - configure.ac instsetoo_native/inc_ooohelppack instsetoo_native/util sfx2/source

[Thorsten Behrens (via logerrit)]

Rebased ref, commits from common ancestor:
commit 5f0a5e522e7a6a6106d66641cdee00d0db769208
Author:     Thorsten Behrens <thorsten.behr...@allotropia.de>
AuthorDate: Fri Aug 19 10:50:46 2022 +0200
Commit:     Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Fri Aug 19 11:16:42 2022 +0200

    Bump version to 6.1.7.36
    
    Change-Id: I17d2ecf5015a1f8aaf035f8a3e003f52b2ccbe50

diff --git a/configure.ac b/configure.ac
index 3654054067c9..7acafadac987 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([CIB Office],[6.1.7.35],[],[],[https://www.cib.de/ciboffice/])
+AC_INIT([CIB Office],[6.1.7.36],[],[],[https://www.cib.de/ciboffice/])
 
 AC_PREREQ([2.59])
 
commit 2e290b1068ccd85b9751cfa4f38089d7686aea88
Author:     Thorsten Behrens <thorsten.behr...@allotropia.de>
AuthorDate: Fri Aug 19 10:49:53 2022 +0200
Commit:     Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Fri Aug 19 11:16:12 2022 +0200

    [CIBO] Update product URLs
    
    Change-Id: Ibae24aa103d96c451e6f5ae9b632d1f1d63fb1b4

diff --git a/configure.ac b/configure.ac
index 5dd920612bc6..3654054067c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([CIB Office],[6.1.7.35],[],[],[https://libreoffice.cib.eu/])
+AC_INIT([CIB Office],[6.1.7.35],[],[],[https://www.cib.de/ciboffice/])
 
 AC_PREREQ([2.59])
 
diff --git 
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt 
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
index 1e78c7476822..dab2e830f194 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
@@ -8,9 +8,9 @@ ApplicationUsers        AllUsers
 ALLUSERS       1
 ARPCOMMENTS    ARPCOMMENTSTEMPLATE
 ARPCONTACT     CIB software GmbH
-ARPHELPLINK    https://libreoffice.cib.eu
-ARPURLINFOABOUT        https://libreoffice.cib.eu
-ARPURLUPDATEINFO       https://libreoffice.cib.eu
+ARPHELPLINK    https://www.cib.de/ciboffice
+ARPURLINFOABOUT        https://www.cib.de/ciboffice
+ARPURLUPDATEINFO       https://www.cib.de/ciboffice
 DefaultUIFont  Tahoma8
 DialogCaption  Windows Installer
 DiskPrompt     [1]
diff --git a/instsetoo_native/util/openoffice.lst.in 
b/instsetoo_native/util/openoffice.lst.in
index 45b64218e455..2becd6ce9b99 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -71,7 +71,7 @@ CIBOffice
             CHANGETARGETDIR 1
             PATCHCODEFILE ooo_patchcodes.txt
             STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
-            STARTCENTER_INFO_URL https://libreoffice.cib.eu
+            STARTCENTER_INFO_URL https://www.cib.de/ciboffice
             STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
             DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
             STARTCENTER_HIDE_EXTERNAL_LINKS 0
@@ -124,7 +124,7 @@ CIBOfficeDev
             CODEFILENAME codes_ooodev.txt
             LOCALUSERDIR $ORIGIN/..
             STARTCENTER_ADDFEATURE_URL https://extensions.libreoffice.org/
-            STARTCENTER_INFO_URL https://libreoffice.cib.eu
+            STARTCENTER_INFO_URL https://www.cib.de/ciboffice
             STARTCENTER_TEMPLREP_URL https://templates.libreoffice.org/
             DICT_REPO_URL https://extensions.libreoffice.org/dictionaries/
         }
@@ -165,7 +165,7 @@ CIBOffice_SDK
             CHANGETARGETDIR 1
             DONTUSESTARTMENUFOLDER 1
             STARTCENTER_ADDFEATURE_URL https://extensions.libreoffice.org/
-            STARTCENTER_INFO_URL https://libreoffice.cib.eu
+            STARTCENTER_INFO_URL https://www.cib.de/ciboffice
             STARTCENTER_TEMPLREP_URL https://templates.libreoffice.org/
             DICT_REPO_URL https://extensions.libreoffice.org/dictionaries/
         }
@@ -210,7 +210,7 @@ CIBOfficeDev_SDK
             CHANGETARGETDIR 1
             DONTUSESTARTMENUFOLDER 1
             STARTCENTER_ADDFEATURE_URL https://extensions.libreoffice.org/
-            STARTCENTER_INFO_URL https://libreoffice.cib.eu
+            STARTCENTER_INFO_URL https://www.cib.de/ciboffice
             STARTCENTER_TEMPLREP_URL https://templates.libreoffice.org/
             DICT_REPO_URL https://extensions.libreoffice.org/dictionaries/
         }
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index f0524f2dd803..66026e064921 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -532,10 +532,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
 
         case SID_SEND_FEEDBACK:
         {
-            OUString lang = 
Application::GetSettings().GetUILanguageTag().getLanguage();
-            OUString sURL("https://libreoffice.cib.de/support_%1.html";);
-            sURL = sURL.replaceFirst("%1", lang);
-            sfx2::openUriExternally(sURL, false);
+            sfx2::openUriExternally("https://www.cib.de/ciboffice";, false);
             break;
         }