diff options
Diffstat (limited to 'winaccessibility/source/UAccCOM/AccTextBase.cxx')
| -rw-r--r-- | winaccessibility/source/UAccCOM/AccTextBase.cxx | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/winaccessibility/source/UAccCOM/AccTextBase.cxx b/winaccessibility/source/UAccCOM/AccTextBase.cxx index 0c7a58dbdade..651a1abe5347 100644 --- a/winaccessibility/source/UAccCOM/AccTextBase.cxx +++ b/winaccessibility/source/UAccCOM/AccTextBase.cxx @@ -183,9 +183,7 @@ STDMETHODIMP CAccTextBase::get_attributes(long offset, long * startOffset, long // #CHECK# if(*textAttributes) SysFreeString(*textAttributes); - *textAttributes = SysAllocString( - reinterpret_cast<wchar_t const *>( - strAttrs.makeStringAndClear().getStr())); + *textAttributes = SysAllocString(SAL_W(strAttrs.makeStringAndClear().getStr())); if( offset < GetXInterface()->getCharacterCount() ) { @@ -493,7 +491,7 @@ STDMETHODIMP CAccTextBase::get_text(long startOffset, long endOffset, BSTR * tex } SysFreeString(*text); - *text = SysAllocString(reinterpret_cast<wchar_t const *>(ouStr.getStr())); + *text = SysAllocString(SAL_W(ouStr.getStr())); return S_OK; LEAVE_PROTECTED_BLOCK @@ -578,7 +576,7 @@ STDMETHODIMP CAccTextBase::get_textBeforeOffset(long offset, IA2TextBoundaryType TextSegment segment = GetXInterface()->getTextBeforeIndex( offset, sal_Int16(lUnoBoundaryType)); ::rtl::OUString ouStr = segment.SegmentText; SysFreeString(*text); - *text = SysAllocString(reinterpret_cast<wchar_t const *>(ouStr.getStr())); + *text = SysAllocString(SAL_W(ouStr.getStr())); *startOffset = segment.SegmentStart; *endOffset = segment.SegmentEnd; @@ -664,7 +662,7 @@ STDMETHODIMP CAccTextBase::get_textAfterOffset(long offset, IA2TextBoundaryType TextSegment segment = GetXInterface()->getTextBehindIndex( offset, sal_Int16(lUnoBoundaryType)); ::rtl::OUString ouStr = segment.SegmentText; SysFreeString(*text); - *text = SysAllocString(reinterpret_cast<wchar_t const *>(ouStr.getStr())); + *text = SysAllocString(SAL_W(ouStr.getStr())); *startOffset = segment.SegmentStart; *endOffset = segment.SegmentEnd; @@ -751,7 +749,7 @@ STDMETHODIMP CAccTextBase::get_textAtOffset(long offset, IA2TextBoundaryType bou TextSegment segment = GetXInterface()->getTextAtIndex( offset, sal_Int16(lUnoBoundaryType)); ::rtl::OUString ouStr = segment.SegmentText; SysFreeString(*text); - *text = SysAllocString(reinterpret_cast<wchar_t const *>(ouStr.getStr())); + *text = SysAllocString(SAL_W(ouStr.getStr())); *startOffset = segment.SegmentStart; *endOffset = segment.SegmentEnd; |