| Index: source/i18n/dcfmtsym.cpp
|
| diff --git a/source/i18n/dcfmtsym.cpp b/source/i18n/dcfmtsym.cpp
|
| index 68d8238b2328aa0d5d3e2243c3f06bb2fa5677be..35d2f0d75628b50446259cd0b7fd32f754e679e7 100644
|
| --- a/source/i18n/dcfmtsym.cpp
|
| +++ b/source/i18n/dcfmtsym.cpp
|
| @@ -1,6 +1,6 @@
|
| /*
|
| *******************************************************************************
|
| -* Copyright (C) 1997-2014, International Business Machines Corporation and
|
| +* Copyright (C) 1997-2015, International Business Machines Corporation and
|
| * others. All Rights Reserved.
|
| *******************************************************************************
|
| *
|
| @@ -126,6 +126,8 @@ DecimalFormatSymbols::operator=(const DecimalFormatSymbols& rhs)
|
| locale = rhs.locale;
|
| uprv_strcpy(validLocale, rhs.validLocale);
|
| uprv_strcpy(actualLocale, rhs.actualLocale);
|
| + fIsCustomCurrencySymbol = rhs.fIsCustomCurrencySymbol;
|
| + fIsCustomIntlCurrencySymbol = rhs.fIsCustomIntlCurrencySymbol;
|
| }
|
| return *this;
|
| }
|
| @@ -138,6 +140,12 @@ DecimalFormatSymbols::operator==(const DecimalFormatSymbols& that) const
|
| if (this == &that) {
|
| return TRUE;
|
| }
|
| + if (fIsCustomCurrencySymbol != that.fIsCustomCurrencySymbol) {
|
| + return FALSE;
|
| + }
|
| + if (fIsCustomIntlCurrencySymbol != that.fIsCustomIntlCurrencySymbol) {
|
| + return FALSE;
|
| + }
|
| for(int32_t i = 0; i < (int32_t)kFormatSymbolCount; ++i) {
|
| if(fSymbols[(ENumberFormatSymbol)i] != that.fSymbols[(ENumberFormatSymbol)i]) {
|
| return FALSE;
|
| @@ -422,6 +430,9 @@ DecimalFormatSymbols::initialize() {
|
| fSymbols[kSignificantDigitSymbol] = (UChar)0x0040; // '@' significant digit
|
| fSymbols[kMonetaryGroupingSeparatorSymbol].remove(); //
|
| fSymbols[kExponentMultiplicationSymbol] = (UChar)0xd7; // 'x' multiplication symbol for exponents
|
| + fIsCustomCurrencySymbol = FALSE;
|
| + fIsCustomIntlCurrencySymbol = FALSE;
|
| +
|
| }
|
|
|
| Locale
|
|
|