path: root/helpcompiler/source
diff options
authorMike Kaganski <>2017-10-05 06:19:56 +0300
committerMike Kaganski <>2017-10-05 16:02:52 +0200
commit1944e3ddc0b2247de3138d2a441cd6999e21fd9a (patch)
treeb59f213e245e151ee792ca424fd06b5a11c88857 /helpcompiler/source
parent81d404803f477eb71b74eb9c7a67bba6b1af95d1 (diff)
Rename and move SAL_U/W to o3tl::toU/W
Previosly (since commit 9ac98e6e3488e434bf4864ecfb13a121784f640b) it was expected to gradually remove SAL_U/W usage in Windows code by replacing with reinterpret_cast or changing to some bettertypes. But as it's useful to make use of fact that LibreOffice and Windows use compatible representation of strings, this commit puts these functions to a better-suited o3tl, and recommends that the functions be consistently used throughout Windows-specific code to reflect the compatibility and keep the casts safe. Change-Id: I2f7c65606d0e2d0c01a00f08812bb4ab7659c5f6 Reviewed-on: Tested-by: Jenkins <> Reviewed-by: Mike Kaganski <>
Diffstat (limited to 'helpcompiler/source')
1 files changed, 2 insertions, 1 deletions
diff --git a/helpcompiler/source/HelpLinker.cxx b/helpcompiler/source/HelpLinker.cxx
index 07303afe9e6a..9589da095405 100644
--- a/helpcompiler/source/HelpLinker.cxx
+++ b/helpcompiler/source/HelpLinker.cxx
@@ -34,6 +34,7 @@
#include <sal/types.h>
#include <osl/time.h>
#include <rtl/bootstrap.hxx>
+#include <o3tl/char16_t2wchar_t.hxx>
#include <expat.h>
#include <memory>
@@ -42,7 +43,7 @@ namespace {
FILE* fopen_impl(const fs::path& rPath, const char* szMode)
#ifdef _WIN32 //We need _wfopen to support long file paths on Windows XP
- return _wfopen(rPath.native_file_string_w().c_str(), SAL_W(OUString::createFromAscii(szMode).getStr()));
+ return _wfopen(rPath.native_file_string_w().c_str(), o3tl::toW(OUString::createFromAscii(szMode).getStr()));
return fopen(rPath.native_file_string().c_str(), szMode);