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 /cppuhelper/source/bootstrap.cxx | |
| 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 'cppuhelper/source/bootstrap.cxx')
| -rw-r--r-- | cppuhelper/source/bootstrap.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cppuhelper/source/bootstrap.cxx b/cppuhelper/source/bootstrap.cxx index 923d0e925795..c16d90681ab4 100644 --- a/cppuhelper/source/bootstrap.cxx +++ b/cppuhelper/source/bootstrap.cxx @@ -31,6 +31,7 @@ #include <osl/file.hxx> #include <osl/security.hxx> #include <osl/thread.hxx> +#include <o3tl/char16_t2wchar_t.hxx> #include <cppuhelper/bootstrap.hxx> #include <cppuhelper/findsofficepath.h> @@ -94,7 +95,7 @@ Reference< XComponentContext > SAL_CALL bootstrap() } rtl::OUString p2; #if defined(_WIN32) - p2 = SAL_U(p1); + p2 = o3tl::toU(p1); free(p1); #else bool bOk = rtl_convertStringToUString( |