From: MyoungJune Park Date: Thu, 22 Jun 2017 05:54:34 +0000 (+0000) Subject: Merge "[Base-utils][Measure Format][ACR-986] Missing functions added" into tizen X-Git-Tag: submit/tizen/20170622.061147~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=afc2516ba472b762b1b07bdcbc940062c9458956;p=platform%2Fcore%2Fapi%2Fbase-utils.git Merge "[Base-utils][Measure Format][ACR-986] Missing functions added" into tizen --- afc2516ba472b762b1b07bdcbc940062c9458956 diff --cc src/utils_i18n_measure_format.cpp index b92dc2f,c5244f7..f8c71d4 --- a/src/utils_i18n_measure_format.cpp +++ b/src/utils_i18n_measure_format.cpp @@@ -18,23 -18,24 +18,25 @@@ #include #include + #include #include #include +#include - int i18n_measure_format_create(const char *language, const char *country, i18n_umeasure_format_width_e width, i18n_measure_format_h *measure_format) + int i18n_measure_format_create(const char *language, + const char *country, + i18n_umeasure_format_width_e width, + i18n_measure_format_h *measure_format) { - retv_if(measure_format == NULL, I18N_ERROR_INVALID_PARAMETER); - retv_if(width < I18N_UMEASFMT_WIDTH_WIDE, I18N_ERROR_INVALID_PARAMETER); - retv_if(width > I18N_UMEASFMT_WIDTH_COUNT, I18N_ERROR_INVALID_PARAMETER); - UErrorCode status = U_ZERO_ERROR; - Locale locale(language, country, 0, 0); - UMeasureFormatWidth icu_width = (UMeasureFormatWidth) width; + retv_if(measure_format == NULL, I18N_ERROR_INVALID_PARAMETER); + UErrorCode status = U_ZERO_ERROR; + Locale locale(language, country, 0, 0); + UMeasureFormatWidth icu_width = (UMeasureFormatWidth) width; - *measure_format = new MeasureFormat(locale, icu_width, status); - retv_if(*measure_format == NULL, I18N_ERROR_OUT_OF_MEMORY); + *measure_format = new MeasureFormat(locale, icu_width, status); + retv_if(*measure_format == NULL, I18N_ERROR_OUT_OF_MEMORY); - return _i18n_error_mapping(status); + return _i18n_error_mapping(status); } int i18n_measure_format_destroy(i18n_measure_format_h measure_format)