| commit | bce717bcc3b647fa43e403c459500ed5ed79def4 | [log] |
|---|---|---|
| author | Stephan Bergmann <stephan.bergmann@allotropia.de> | Fri Dec 08 16:32:56 2023 +0100 |
| committer | Stephan Bergmann <stephan.bergmann@allotropia.de> | Mon Dec 11 14:18:16 2023 +0100 |
| tree | 852d53e48e1772f7efe1d50e27a82ac8fddac7e9 | |
| parent | 8d3092eaea3fba2b96318d09722ca15b75a5b467 [diff] |
Fix Linux --enable-online-update-mar build ...after 13595f6220095d120e13ccb6fbfac1de4c803fe7 "Fix --enable-online-update-mar on Windows" Change-Id: I8e13a3f4234f3b5fb64d606eb3c2c16611dacd33 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160491 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de> (cherry picked from commit 2e92f184f025e99d51542722f0398c33a3d146f1) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160475
diff --git a/desktop/source/app/updater.cxx b/desktop/source/app/updater.cxx index bdd232b..5596028 100644 --- a/desktop/source/app/updater.cxx +++ b/desktop/source/app/updater.cxx
@@ -141,9 +141,11 @@ void CopyUpdaterToTempDir(const OUString& rInstallDirURL, const OUString& rTempD #ifdef UNX typedef char CharT; #define tstrncpy std::strncpy char const * toStream(char const * s) { return s; } #elif defined(_WIN32) typedef wchar_t CharT; #define tstrncpy std::wcsncpy OUString toStream(wchar_t const * s) { return OUString(o3tl::toU(s)); } #else #error "Need an implementation" #endif @@ -317,7 +319,7 @@ bool update() SAL_WARN("desktop.updater", "Updater executable path: " << aUpdaterPath); for (size_t i = 0; i < 8 + rtl_getAppCommandArgCount(); ++i) { SAL_WARN("desktop.updater", OUString(o3tl::toU(pArgs[i]))); SAL_WARN("desktop.updater", toStream(pArgs[i])); } bSuccess = false; }