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 --- fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx | 2 +- fpicker/source/win32/filepicker/helppopupwindow.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'fpicker') diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx index 994326d4c14d..9e4fda73ddf7 100644 --- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx +++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx @@ -62,7 +62,7 @@ bool createFolderItem(OUString const & url, ComPtr & folder) { return false; } HRESULT res = SHCreateItemFromParsingName( - path.getStr(), nullptr, IID_PPV_ARGS(&folder)); + SAL_W(path.getStr()), nullptr, IID_PPV_ARGS(&folder)); return SUCCEEDED(res); } diff --git a/fpicker/source/win32/filepicker/helppopupwindow.cxx b/fpicker/source/win32/filepicker/helppopupwindow.cxx index 78395ed745bb..068a7f8ed39e 100644 --- a/fpicker/source/win32/filepicker/helppopupwindow.cxx +++ b/fpicker/source/win32/filepicker/helppopupwindow.cxx @@ -335,7 +335,7 @@ void SAL_CALL CHelpPopupWindow::onPaint( HWND hWnd, HDC hdc ) DrawTextW( hdc, - m_HelpText.getStr( ), + SAL_W(m_HelpText.getStr( )), m_HelpText.getLength( ), &rect, nFormat ); -- cgit