From b5687cb66498c45152b0f3e813e028c0cff01f2d Mon Sep 17 00:00:00 2001 From: Lukasz Pik Date: Tue, 19 Jun 2018 11:15:42 +0200 Subject: [PATCH] Fix errors caused by ICU 59 Change-Id: I11677d969e331f4e8bd6b593397456d2a96affb5 Signed-off-by: Lukasz Pik Signed-off-by: Hyunjee Kim --- packaging/capi-base-utils.spec | 2 +- src/utils_i18n_measure_format.cpp | 6 +++--- src/utils_i18n_plural_format.cpp | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packaging/capi-base-utils.spec b/packaging/capi-base-utils.spec index e427e89..6db4c12 100755 --- a/packaging/capi-base-utils.spec +++ b/packaging/capi-base-utils.spec @@ -1,6 +1,6 @@ Name: capi-base-utils Summary: Base Utils -Version: 3.0.3 +Version: 3.0.4 Release: 1 Group: Base License: Apache-2.0 and ICU diff --git a/src/utils_i18n_measure_format.cpp b/src/utils_i18n_measure_format.cpp index 317ae15..70cd9cb 100644 --- a/src/utils_i18n_measure_format.cpp +++ b/src/utils_i18n_measure_format.cpp @@ -173,7 +173,7 @@ int i18n_measure_format_format_buff(const i18n_measure_format_h measure_format, UnicodeString unicode_append_to; if (append_to_size > 0) { retv_if(append_to == NULL, I18N_ERROR_INVALID_PARAMETER); - unicode_append_to.append(append_to, 0, -1); + unicode_append_to = UnicodeString(append_to); } UnicodeString &result = @@ -213,7 +213,7 @@ int i18n_measure_format_format_measures(const i18n_measure_format_h measure_form UnicodeString unicode_append_to; if (append_to_size > 0) { retv_if(append_to == NULL, I18N_ERROR_INVALID_PARAMETER); - unicode_append_to.append(append_to, 0, -1); + unicode_append_to = UnicodeString(append_to); } std::vector measure_clones; @@ -259,7 +259,7 @@ int i18n_measure_format_format_measure_per_unit(const i18n_measure_format_h meas UnicodeString unicode_append_to; if (append_to_size > 0) { retv_if(append_to == NULL, I18N_ERROR_INVALID_PARAMETER); - unicode_append_to.append(append_to, 0, -1); + unicode_append_to = UnicodeString(append_to); } UnicodeString &result = diff --git a/src/utils_i18n_plural_format.cpp b/src/utils_i18n_plural_format.cpp index 2b40015..c109a2d 100644 --- a/src/utils_i18n_plural_format.cpp +++ b/src/utils_i18n_plural_format.cpp @@ -179,7 +179,7 @@ int i18n_plural_format_format_int32(i18n_plural_format_h plural_format, UnicodeString unicode_append_to; if (append_to_size > 0) { retv_if(append_to == NULL, I18N_ERROR_INVALID_PARAMETER); - unicode_append_to.append(append_to, 0, -1); + unicode_append_to = UnicodeString(append_to); } UnicodeString result = ((PluralFormat *)plural_format)->format(number, @@ -213,7 +213,7 @@ int i18n_plural_format_format_double(i18n_plural_format_h plural_format, UnicodeString unicode_append_to; if (append_to_size > 0) { retv_if(append_to == NULL, I18N_ERROR_INVALID_PARAMETER); - unicode_append_to.append(append_to, 0, -1); + unicode_append_to = UnicodeString(append_to); } UnicodeString result = ((PluralFormat *)plural_format)->format(number, @@ -248,7 +248,7 @@ int i18n_plural_format_format_formattable(i18n_plural_format_h plural_format, UnicodeString unicode_append_to; if (append_to_size > 0) { retv_if(append_to == NULL, I18N_ERROR_INVALID_PARAMETER); - unicode_append_to.append(append_to, 0, -1); + unicode_append_to = UnicodeString(append_to); } UnicodeString result = ((PluralFormat *)plural_format)->format(*((Formattable *)formattable), @@ -291,7 +291,7 @@ int i18n_plural_format_to_pattern(i18n_plural_format_h plural_format, UnicodeString unicode_append_to; if (append_to_size > 0) { retv_if(append_to == NULL, I18N_ERROR_INVALID_PARAMETER); - unicode_append_to.append(append_to, 0, -1); + unicode_append_to = UnicodeString(append_to); } UnicodeString result = ((PluralFormat *)plural_format)->toPattern(unicode_append_to); -- 2.7.4