desktop/source/app/crashreport.cxx | 11 ++++++++++- instsetoo_native/util/openoffice.lst.in | 20 ++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-)
New commits: commit 0d04f835430925286d7df26db2482f31c7237264 Author: Balazs Varga <[email protected]> AuthorDate: Sun Sep 3 19:29:24 2023 +0200 Commit: Thorsten Behrens <[email protected]> CommitDate: Tue Sep 5 19:16:33 2023 +0200 Add correct STARTCENTER URLs Change-Id: Id53de5f756a6641aae28e4c5bb3435459e32105e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156495 Reviewed-by: Gabor Kelemen <[email protected]> Tested-by: Thorsten Behrens <[email protected]> diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in index e1ad2c954537..39229956a8ee 100644 --- a/instsetoo_native/util/openoffice.lst.in +++ b/instsetoo_native/util/openoffice.lst.in @@ -32,6 +32,7 @@ Globals PACKAGEMAP package_names.txt,package_names_ext.txt WINDOWSPATCHLEVEL @LIBO_VERSION_MICRO@ OOOVENDOR Allotropia Software GmbH + OOODOWNLOADNAME 1 64BITPRODUCT @WINDOWS_X64@ WINDOWSSDKVERSION @WINDOWS_SDK_VERSION@ CRASHDUMPENABLE @DEFAULT_CRASHDUMP_VALUE@ @@ -63,8 +64,14 @@ ZetaOffice ROOTMODULEGID gid_Module_Root GLOBALPATCHFILEGID gid_File_Txt_Patchfiles SPELLCHECKERFILE spellchecker_selection.txt + OOODOWNLOADNAME 1 CHANGETARGETDIR 1 PATCHCODEFILE ooo_patchcodes.txt + STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/ + STARTCENTER_INFO_URL https://www.allotropia.de/ + STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/ + DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/ + STARTCENTER_HIDE_EXTERNAL_LINKS 0 } active 1 compression 5 @@ -106,10 +113,15 @@ ZetaOfficeDev ROOTMODULEGID gid_Module_Root GLOBALPATCHFILEGID gid_File_Txt_Patchfiles SPELLCHECKERFILE spellchecker_selection.txt + OOODOWNLOADNAME 1 CHANGETARGETDIR 1 PATCHCODEFILE ooodev_patchcodes.txt CODEFILENAME codes_ooodev.txt LOCALUSERDIR $ORIGIN/.. + STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/ + STARTCENTER_INFO_URL https://www.allotropia.de/ + STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/ + DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/ } active 1 compression 5 @@ -147,6 +159,10 @@ ZetaOffice_SDK NOSHORTDIRECTORYNAMES 1 CHANGETARGETDIR 1 DONTUSESTARTMENUFOLDER 1 + STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/ + STARTCENTER_INFO_URL https://www.allotropia.de/ + STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/ + DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/ } active 1 compression 5 @@ -188,6 +204,10 @@ ZetaOfficeDev_SDK NOSHORTDIRECTORYNAMES 1 CHANGETARGETDIR 1 DONTUSESTARTMENUFOLDER 1 + STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/ + STARTCENTER_INFO_URL https://www.allotropia.de/ + STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/ + DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/ } active 1 compression 5 commit 759d5b4ac35f51edf18afb7c4d348bb3fa197b4b Author: Thorsten Behrens <[email protected]> AuthorDate: Tue Apr 21 01:13:46 2020 +0200 Commit: Thorsten Behrens <[email protected]> CommitDate: Tue Sep 5 19:16:18 2023 +0200 related tdf#127711: read crashdump URL from ini file cherry-picked from commit: 8961f4aaf38db139eb8f154d1c8bb788c992a4e7 Change-Id: I68f06aaf5b8c053d1deef2021876b1399e422dd7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156483 Reviewed-by: Gabor Kelemen <[email protected]> Tested-by: Thorsten Behrens <[email protected]> diff --git a/desktop/source/app/crashreport.cxx b/desktop/source/app/crashreport.cxx index b8754c53f706..8ff4e50bbf8a 100644 --- a/desktop/source/app/crashreport.cxx +++ b/desktop/source/app/crashreport.cxx @@ -136,9 +136,18 @@ void CrashReporter::writeCommonInfo() ucbhelper::InternetProxyDecider proxy_decider(::comphelper::getProcessComponentContext()); static const OUStringLiteral protocol = u"https"; - static const OUStringLiteral url = u"crashreport.libreoffice.org"; const sal_Int32 port = 443; + // read configuration item 'CrashDumpUrl' + OUString url; + rtl::Bootstrap::get("CrashDumpUrl", url); + if (url.isEmpty()) + { + // no url in config, bail out + mbInit = false; + return; + } + const ucbhelper::InternetProxyServer proxy_server = proxy_decider.getProxy(protocol, url, port); // save the new Keys
