i18npool/source/indexentry/indexentrysupplier_asian.cxx | 2 +- shell/source/backends/localebe/localebackend.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
New commits: commit 4b7d3395cacbe729118b7c558413a33f38503d85 Author: Stephan Bergmann <[email protected]> Date: Tue Nov 17 22:28:10 2015 +0100 Don't assume sal_Unicode is unsigned short Change-Id: I721f53d79cd3e2c24542382d519a909a86a31111 diff --git a/i18npool/source/indexentry/indexentrysupplier_asian.cxx b/i18npool/source/indexentry/indexentrysupplier_asian.cxx index aaaee94..110c730 100644 --- a/i18npool/source/indexentry/indexentrysupplier_asian.cxx +++ b/i18npool/source/indexentry/indexentrysupplier_asian.cxx @@ -196,7 +196,7 @@ IndexEntrySupplier_asian::getPhoneticCandidate( const OUString& rIndexEntry, candidate.append( reinterpret_cast<sal_Unicode *>(&idx[2][address])); else - candidate.append(address); + candidate.append(sal_Unicode(address)); } else candidate.append(" "); } diff --git a/shell/source/backends/localebe/localebackend.cxx b/shell/source/backends/localebe/localebackend.cxx index b147b67..5a6311f 100644 --- a/shell/source/backends/localebe/localebackend.cxx +++ b/shell/source/backends/localebe/localebackend.cxx @@ -70,7 +70,7 @@ namespace /* private */ { CFIndex lstr = CFStringGetLength(s); for (CFIndex i = 0; i < lstr; i++) - buffer.append(CFStringGetCharacterAtIndex(s, i)); + buffer.append(sal_Unicode(CFStringGetCharacterAtIndex(s, i))); } template <typename T> _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
