diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2017-10-05 06:19:56 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2017-10-05 16:02:52 +0200 |
| commit | 1944e3ddc0b2247de3138d2a441cd6999e21fd9a (patch) | |
| tree | b59f213e245e151ee792ca424fd06b5a11c88857 /helpcompiler | |
| parent | 81d404803f477eb71b74eb9c7a67bba6b1af95d1 (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: https://gerrit.libreoffice.org/43150
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'helpcompiler')
| -rw-r--r-- | helpcompiler/inc/HelpCompiler.hxx | 3 | ||||
| -rw-r--r-- | helpcompiler/source/HelpLinker.cxx | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/helpcompiler/inc/HelpCompiler.hxx b/helpcompiler/inc/HelpCompiler.hxx index 8d8a920da696..f9827eb2bbbe 100644 --- a/helpcompiler/inc/HelpCompiler.hxx +++ b/helpcompiler/inc/HelpCompiler.hxx @@ -42,6 +42,7 @@ #include <osl/thread.h> #include <osl/process.h> #include <osl/file.hxx> +#include <o3tl/char16_t2wchar_t.hxx> #include <BasCodeTagger.hxx> #include <helpcompiler/compilehelp.hxx> @@ -92,7 +93,7 @@ namespace fs { OUString ustrSystemPath; osl::File::getSystemPathFromFileURL(data, ustrSystemPath); - return std::wstring(SAL_W(ustrSystemPath.getStr())); + return std::wstring(o3tl::toW(ustrSystemPath.getStr())); } #endif std::string toUTF8() const 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())); #else return fopen(rPath.native_file_string().c_str(), szMode); #endif |