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 /jvmfwk/plugins | |
| 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 'jvmfwk/plugins')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx index 2dc5b5aa76c7..f97dbce54a38 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx @@ -49,6 +49,7 @@ #include "osl/file.hxx" #include "rtl/instance.hxx" #include "osl/getglobalmutex.hxx" +#include <o3tl/char16_t2wchar_t.hxx> #include <setjmp.h> #include <signal.h> #include <stack> @@ -485,7 +486,7 @@ static void load_msvcr(OUString const & jvm_dll, OUStringLiteral msvcr) } if (LoadLibraryW( - SAL_W(OUString(jvm_dll.copy(0, slash+1) + msvcr).getStr()))) + o3tl::toW(OUString(jvm_dll.copy(0, slash+1) + msvcr).getStr()))) return; // Then check if msvcr71.dll is in the parent folder of where @@ -497,7 +498,7 @@ static void load_msvcr(OUString const & jvm_dll, OUStringLiteral msvcr) return; LoadLibraryW( - SAL_W(OUString(jvm_dll.copy(0, slash+1) + msvcr).getStr())); + o3tl::toW(OUString(jvm_dll.copy(0, slash+1) + msvcr).getStr())); } // Check if the jvm DLL imports msvcr71.dll, and in that case try @@ -518,7 +519,7 @@ static void do_msvcr_magic(OUString const &jvm_dll) return; } - FILE *f = _wfopen(SAL_W(Module.getStr()), L"rb"); + FILE *f = _wfopen(o3tl::toW(Module.getStr()), L"rb"); if (!f) { |