ICU-23001 Fix

Author: FrankYFTang

icu4c/source/common/unicode/locid.h

@@ -1292,6 +1292,12 @@ class U_COMMON_API DataLocaleInformation : public UMemory {
 public:
     DataLocaleInformation() = default;
 
+    /**
+     * Initializes a DataLocaleInformation object from another
+     * DataLocaleInformation object.
+     *
+     * @param other The DataLocaleInformation object being copied in.
+     */
     DataLocaleInformation(const DataLocaleInformation& other);
 
     virtual ~DataLocaleInformation();

icu4c/source/i18n/measfmt.cpp

@@ -447,8 +447,8 @@ bool MeasureFormat::operator==(const Format &other) const {
     // We don't need to check locales if both objects have same cache.
     if (cache != rhs.cache) {
         UErrorCode status = U_ZERO_ERROR;
-        const char *localeId = getLocaleID(status);
-        const char *rhsLocaleId = rhs.getLocaleID(status);
+        const char *localeId = getLocaleID(ULOC_VALID_LOCALE, status);
+        const char *rhsLocaleId = rhs.getLocaleID(ULOC_VALID_LOCALE, status);
         if (U_FAILURE(status)) {
             // On failure, assume not equal
             return false;
@@ -569,7 +569,7 @@ UnicodeString &MeasureFormat::formatMeasures(
 
 UnicodeString MeasureFormat::getUnitDisplayName(const MeasureUnit& unit, UErrorCode& status) const {
     return number::impl::LongNameHandler::getUnitDisplayName(
-        getLocale(status),
+        getLocale(ULOC_VALID_LOCALE, status),
         unit,
         getUnitWidth(fWidth),
         status);
@@ -643,7 +643,7 @@ void MeasureFormat::adoptNumberFormat(
 }
 
 UBool MeasureFormat::setMeasureFormatLocale(const Locale &locale, UErrorCode &status) {
-    if (U_FAILURE(status) || locale == getLocale(status)) {
+    if (U_FAILURE(status) || locale == getLocale(ULOC_VALID_LOCALE, status)) {
         return false;
     }
     initMeasureFormat(locale, fWidth, nullptr, status);
@@ -662,14 +662,6 @@ const PluralRules &MeasureFormat::getPluralRules() const {
     return **pluralRules;
 }
 
-Locale MeasureFormat::getLocale(UErrorCode &status) const {
-    return Format::getLocale(ULOC_VALID_LOCALE, status);
-}
-
-const char *MeasureFormat::getLocaleID(UErrorCode &status) const {
-    return Format::getLocaleID(ULOC_VALID_LOCALE, status);
-}
-
 UnicodeString &MeasureFormat::formatMeasure(
         const Measure &measure,
         const NumberFormat &nf,
@@ -697,7 +689,7 @@ UnicodeString &MeasureFormat::formatMeasure(
         UnicodeString formattedNumber;
         StandardPlural::Form pluralForm = QuantityFormatter::selectPlural(
                 amtNumber, nf, **pluralRules, formattedNumber, pos, status);
-        UnicodeString pattern = number::impl::LongNameHandler::getUnitPattern(getLocale(status),
+        UnicodeString pattern = number::impl::LongNameHandler::getUnitPattern(getLocale(ULOC_VALID_LOCALE, status),
                 amtUnit, getUnitWidth(fWidth), pluralForm, status);
         // The above  handles fallback from other widths to short, and from other plural forms to OTHER
         if (U_FAILURE(status)) {

icu4c/source/i18n/tmutfmt.cpp

@@ -427,7 +427,7 @@ struct TimeUnitFormatReadSink : public ResourceSink {
                     continue;
                 }
                 LocalPointer<MessageFormat> messageFormat(new MessageFormat(
-                    pattern, timeUnitFormatObj->getLocale(errorCode), errorCode), errorCode);
+                    pattern, timeUnitFormatObj->getLocale(ULOC_VALID_LOCALE, errorCode), errorCode), errorCode);
                 if (U_FAILURE(errorCode)) {
                     return;
                 }
@@ -472,7 +472,7 @@ TimeUnitFormat::readFromCurrentLocale(UTimeUnitFormatStyle style, const char* ke
     // status is an error code used in resource lookup.
     // status does not affect "err".
     UErrorCode status = U_ZERO_ERROR;
-    LocalUResourceBundlePointer rb(ures_open(U_ICUDATA_UNIT, getLocaleID(status), &status));
+    LocalUResourceBundlePointer rb(ures_open(U_ICUDATA_UNIT, getLocaleID(ULOC_VALID_LOCALE, status), &status));
 
     LocalUResourceBundlePointer unitsRes(ures_getByKey(rb.getAlias(), key, nullptr, &status));
     ures_getByKey(unitsRes.getAlias(), "duration", unitsRes.getAlias(), &status);
@@ -524,7 +524,7 @@ TimeUnitFormat::checkConsistency(UTimeUnitFormatStyle style, const char* key, UE
             MessageFormat** formatters = static_cast<MessageFormat**>(countToPatterns->get(*pluralCount));
             if( formatters == nullptr || formatters[style] == nullptr ) {
                 // look through parents
-                const char* localeName = getLocaleID(err);
+                const char* localeName = getLocaleID(ULOC_VALID_LOCALE, err);
                 CharString pluralCountChars;
                 pluralCountChars.appendInvariantChars(*pluralCount, err);
                 searchInLocaleChain(style, key, localeName,
@@ -574,7 +574,7 @@ TimeUnitFormat::searchInLocaleChain(UTimeUnitFormatStyle style, const char* key,
         if (U_SUCCESS(status)) {
             //found
             LocalPointer<MessageFormat> messageFormat(
-                new MessageFormat(UnicodeString(true, pattern, ptLength), getLocale(err), err), err);
+                new MessageFormat(UnicodeString(true, pattern, ptLength), getLocale(ULOC_VALID_LOCALE, err), err), err);
             if (U_FAILURE(err)) {
                 return;
             }
@@ -644,7 +644,7 @@ TimeUnitFormat::searchInLocaleChain(UTimeUnitFormatStyle style, const char* key,
         }
         if (pattern != nullptr) {
             messageFormat.adoptInsteadAndCheckErrorCode(
-                     new MessageFormat(UnicodeString(true, pattern, -1), getLocale(err), err), err);
+                     new MessageFormat(UnicodeString(true, pattern, -1), getLocale(ULOC_VALID_LOCALE, err), err), err);
         }
         if (U_FAILURE(err)) {
             return;

icu4c/source/i18n/unicode/measfmt.h

@@ -342,18 +342,6 @@ class U_I18N_API MeasureFormat : public Format {
      */
     const PluralRules &getPluralRules() const;
 
-    /**
-     * ICU use only.
-     * @internal.
-     */
-    Locale getLocale(UErrorCode &status) const;
-
-    /**
-     * ICU use only.
-     * @internal.
-     */
-    const char *getLocaleID(UErrorCode &status) const;
-
 #endif /* U_HIDE_INTERNAL_API */
 
  private: