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 --- dbaccess/source/ui/dlg/adodatalinks.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dbaccess') diff --git a/dbaccess/source/ui/dlg/adodatalinks.cxx b/dbaccess/source/ui/dlg/adodatalinks.cxx index 0c926f2be990..1039923a2478 100644 --- a/dbaccess/source/ui/dlg/adodatalinks.cxx +++ b/dbaccess/source/ui/dlg/adodatalinks.cxx @@ -45,7 +45,7 @@ OUString getAdoDatalink(long hWnd,OUString& oldLink) OUString dataLink; if (!oldLink.isEmpty()) { - dataLink=PromptEdit(hWnd,oldLink.getStr()); + dataLink=SAL_U(PromptEdit(hWnd,SAL_W(oldLink.getStr()))); } else dataLink=reinterpret_cast(PromptNew(hWnd)); -- cgit