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 /idlc | |
| 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 'idlc')
| -rw-r--r-- | idlc/source/options.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/idlc/source/options.cxx b/idlc/source/options.cxx index 1ae892471ac3..58908c9f38ad 100644 --- a/idlc/source/options.cxx +++ b/idlc/source/options.cxx @@ -24,8 +24,9 @@ #include <rtl/string.hxx> #include <rtl/strbuf.hxx> -#include "rtl/ustring.hxx" -#include "osl/file.hxx" +#include <rtl/ustring.hxx> +#include <osl/file.hxx> +#include <o3tl/char16_t2wchar_t.hxx> #ifdef _WIN32 # if !defined WIN32_LEAN_AND_MEAN @@ -192,7 +193,7 @@ OString convertIncPathtoShortWindowsPath(const OString& incPath) { std::vector<sal_Unicode> vec(path.getLength() + 1); //GetShortPathNameW only works if the file can be found! const DWORD len = GetShortPathNameW( - SAL_W(path.getStr()), SAL_W(&vec[0]), path.getLength() + 1); + o3tl::toW(path.getStr()), o3tl::toW(&vec[0]), path.getLength() + 1); if (len > 0) { |