diff options
| author | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2023-12-08 16:32:56 +0100 |
|---|---|---|
| committer | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2023-12-09 08:32:10 +0100 |
| commit | 7ed0ba0555de892b348b14d4c5900ebcfb4ddd67 (patch) | |
| tree | f6b96432c90aab058783c65b3934db89963e3038 /desktop/source | |
| parent | cad62803ba39c560a3e5bc3a51300cc1136b5afd (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>
Diffstat (limited to 'desktop/source')
| -rw-r--r-- | desktop/source/app/updater.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/desktop/source/app/updater.cxx b/desktop/source/app/updater.cxx index bdd232be8560..5596028b0f79 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; } |