diff options
| author | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2023-12-08 08:30:18 +0100 |
|---|---|---|
| committer | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2023-12-08 09:49:41 +0100 |
| commit | 13595f6220095d120e13ccb6fbfac1de4c803fe7 (patch) | |
| tree | 37f0863365bdd78a5451f85e29b1fbbf74214d28 /desktop | |
| parent | c0e438eaceb47932e61b9223e048e4eda3ed7636 (diff) | |
Fix --enable-online-update-mar on Windows
The code had apparently rotten a bit,
* a wchar_t vs. char16_t confusion in desktop/source/app/updater.cxx
* code broken by 926e4e469d0285ee72f8da80f00370b4b3120417 "Rename online updater
functions and strcmp relpath" in
onlineupdate/source/update/updater/updater.cxx
* -DUNICODE missing in some places (so that plain Windows functions resolve to
the ...W variant), which had been set centrally in the past IIRC
* silencing some warnings like "C4267: 'initializing': conversion from 'size_t'
to 'int', possible loss of data" (where silencing is the right thing to do for
effectively extern code); no sure why those apparently didn't hit in the past,
maybe it is all warnings that compilers only started to emit in recent years,
or only for recent -std:c++... modes
* silencing some "Conversion from string literal loses const qualifier" errors
with -Zc:strictStrings-; these hit at least with recent VS 2022 Preview and
--with-latest-c++, where -Zc:strictStrings is apparently now on by default
Change-Id: I7fe46f5aa2b42fc9c03f24f7f0236512b4d3b936
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160451
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/updater.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/desktop/source/app/updater.cxx b/desktop/source/app/updater.cxx index 0cd95da8d4e7..bdd232be8560 100644 --- a/desktop/source/app/updater.cxx +++ b/desktop/source/app/updater.cxx @@ -28,6 +28,7 @@ #include <rtl/ustring.hxx> #include <unotools/tempfile.hxx> #include <unotools/configmgr.hxx> +#include <o3tl/char16_t2wchar_t.hxx> #include <osl/file.hxx> #include <rtl/process.h> #include <sal/log.hxx> @@ -316,7 +317,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", pArgs[i]); + SAL_WARN("desktop.updater", OUString(o3tl::toU(pArgs[i]))); } bSuccess = false; } |