summaryrefslogtreecommitdiff
path: root/winaccessibility/source/UAccCOM/AccActionBase.cxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-04-04 14:57:45 +0200
committerStephan Bergmann <sbergman@redhat.com>2017-04-04 16:12:11 +0000
commit9ac98e6e3488e434bf4864ecfb13a121784f640b (patch)
treeb3c9cbf52126fee5864be12e9109f7413e7a0878 /winaccessibility/source/UAccCOM/AccActionBase.cxx
parent6f995da5a652d993ab253b3363188cd18e289728 (diff)
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 <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'winaccessibility/source/UAccCOM/AccActionBase.cxx')
-rw-r--r--winaccessibility/source/UAccCOM/AccActionBase.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/winaccessibility/source/UAccCOM/AccActionBase.cxx b/winaccessibility/source/UAccCOM/AccActionBase.cxx
index 485dc6b5da84..5610ba4f3627 100644
--- a/winaccessibility/source/UAccCOM/AccActionBase.cxx
+++ b/winaccessibility/source/UAccCOM/AccActionBase.cxx
@@ -117,7 +117,7 @@ STDMETHODIMP CAccActionBase::get_description(long actionIndex,BSTR __RPC_FAR *de
// #CHECK#
SAFE_SYSFREESTRING(*description);
- *description = SysAllocString(ouStr.getStr());
+ *description = SysAllocString(SAL_W(ouStr.getStr()));
return S_OK;
@@ -235,7 +235,7 @@ void CAccActionBase::GetkeyBindingStrByXkeyBinding( const Sequence< KeyStroke >
KeyStroke stroke = keySet[iIndex];
OLECHAR wString[64] = {NULL};
wcscat(wString, OLESTR("\n"));
- wcscat(wString, &stroke.KeyChar);
+ wcscat(wString, SAL_W(&stroke.KeyChar));
wcscat( pString, wString);
}