From 9ac98e6e3488e434bf4864ecfb13a121784f640b Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 4 Apr 2017 14:57:45 +0200 Subject: Finally switch MSVC to sal_Unicode = char16_t, too There is lots of (Windows-only) code that relied on sal_Unicode being the same as wchar_t, and the best change may be different in each case (and doing the changes may be somewhat error prone). So for now add SAL_U/SAL_W scaffolding functions to sal/types.h, remove their uses one by one again, and finally drop those functions again. Change-Id: I2cc791bd941d089901abb5f6fc2f05fbc49e65ea Reviewed-on: https://gerrit.libreoffice.org/36077 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- svl/source/svdde/ddestrg.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'svl/source/svdde/ddestrg.cxx') diff --git a/svl/source/svdde/ddestrg.cxx b/svl/source/svdde/ddestrg.cxx index cebc93560246..366e6ada7cf7 100644 --- a/svl/source/svdde/ddestrg.cxx +++ b/svl/source/svdde/ddestrg.cxx @@ -26,14 +26,14 @@ DdeString::DdeString( DWORD hDdeInst, const sal_Unicode* p ) : m_aString(p) { - hString = DdeCreateStringHandle( hDdeInst, p, CP_WINUNICODE ); + hString = DdeCreateStringHandle( hDdeInst, SAL_W(p), CP_WINUNICODE ); hInst = hDdeInst; } DdeString::DdeString( DWORD hDdeInst, const OUString& r) : m_aString(r) { - hString = DdeCreateStringHandle( hDdeInst, r.getStr(), CP_WINUNICODE ); + hString = DdeCreateStringHandle( hDdeInst, SAL_W(r.getStr()), CP_WINUNICODE ); hInst = hDdeInst; } -- cgit