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 /sw | |
| 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 'sw')
| -rw-r--r-- | sw/source/ui/vba/vbasystem.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sw/source/ui/vba/vbasystem.cxx b/sw/source/ui/vba/vbasystem.cxx index 95eec3f1ed2e..693cd8e13679 100644 --- a/sw/source/ui/vba/vbasystem.cxx +++ b/sw/source/ui/vba/vbasystem.cxx @@ -23,6 +23,7 @@ #include <tools/config.hxx> #include <osl/file.hxx> #include <tools/urlobj.hxx> +#include <o3tl/char16_t2wchar_t.hxx> #ifdef _WIN32 #if defined _MSC_VER @@ -106,7 +107,7 @@ uno::Any PrivateProfileStringListener::getValueEvent() if( ERROR_SUCCESS == lResult ) { OUString sUValName = OStringToOUString(maKey, RTL_TEXTENCODING_DONTKNOW); - LPCWSTR lpValueName = SAL_W(sUValName.getStr()); + LPCWSTR lpValueName = o3tl::toW(sUValName.getStr()); WCHAR szBuffer[1024]; DWORD cbData = sizeof(szBuffer); lResult = RegQueryValueExW( hKey, lpValueName, nullptr, nullptr, reinterpret_cast<LPBYTE>(szBuffer), &cbData ); @@ -114,7 +115,7 @@ uno::Any PrivateProfileStringListener::getValueEvent() // https://msdn.microsoft.com/en-us/ms724911 mentions that // "the string may not have been stored with the proper terminating null characters" szBuffer[std::min(size_t(cbData / sizeof(szBuffer[0])), SAL_N_ELEMENTS(szBuffer)-1)] = 0; - sValue = SAL_U(szBuffer); + sValue = o3tl::toU(szBuffer); } } #else @@ -153,7 +154,7 @@ void PrivateProfileStringListener::setValueEvent( const css::uno::Any& value ) { DWORD cbData = sizeof(WCHAR) * (aValue.getLength() + 1); OUString sUValName = OStringToOUString(maKey, RTL_TEXTENCODING_DONTKNOW); - LPCWSTR lpValueName = SAL_W(sUValName.getStr()); + LPCWSTR lpValueName = o3tl::toW(sUValName.getStr()); lResult = RegSetValueExW( hKey, lpValueName, 0 /* Reserved */, REG_SZ, reinterpret_cast<BYTE const *>(aValue.getStr()), cbData ); RegCloseKey( hKey ); } |