ICU 56 update step 1

source/i18n/unicode/dcfmtsym.h

 /*
 ********************************************************************************
-*   Copyright (C) 1997-2014, International Business Machines
+*   Copyright (C) 1997-2015, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 ********************************************************************************
 *
 * File DCFMTSYM.H
 *
 * Modification History:
 *
 *   Date        Name        Description
 *   02/19/97    aliu        Converted from java.
 *   03/18/97    clhuang     Updated per C++ implementation.
@@ skipping 143 matching lines @@
         kSevenDigitSymbol,
         /** Eight
          * @stable ICU 4.6
          */
         kEightDigitSymbol,
         /** Nine
          * @stable ICU 4.6
          */
         kNineDigitSymbol,
         /** Multiplication sign.
-         * @draft ICU 54
+         * @stable ICU 54
          */
         kExponentMultiplicationSymbol,
         /** count symbol constants */
-        kFormatSymbolCount
+        kFormatSymbolCount = kNineDigitSymbol + 2
     };
 
     /**
      * Create a DecimalFormatSymbols object for the given locale.
      *
      * @param locale    The locale to get symbols for.
      * @param status    Input/output parameter, set to success or
      *                  failure code upon return.
      * @stable ICU 2.0
      */
@@ skipping 165 matching lines @@
     void initialize(const Locale& locale, UErrorCode& success, UBool useLastResortData = FALSE);
 
     /**
      * Initialize the symbols with default values.
      */
     void initialize();
 
     void setCurrencyForSymbols();
 
 public:
+
+#ifndef U_HIDE_INTERNAL_API
+    /** 
+     * @internal For ICU use only 
+     */ 
+    inline UBool isCustomCurrencySymbol() const { 
+        return fIsCustomCurrencySymbol; 
+    } 
+
+    /**
+     * @internal For ICU use only
+     */
+    inline UBool isCustomIntlCurrencySymbol() const {
+        return fIsCustomIntlCurrencySymbol;
+    }
+#endif  /* U_HIDE_INTERNAL_API */
+
     /**
      * _Internal_ function - more efficient version of getSymbol,
      * returning a const reference to one of the symbol strings.
      * The returned reference becomes invalid when the symbol is changed
      * or when the DecimalFormatSymbols are destroyed.
      * ### TODO markus 2002oct11: Consider proposing getConstSymbol() to be really public.
      * Note: moved #ifndef U_HIDE_INTERNAL_API after this, since this is needed for inline in DecimalFormat
      *
      * @param symbol Constant to indicate a number format symbol.
      * @return the format symbol by the param 'symbol'
@@ skipping 34 matching lines @@
     UnicodeString fNoSymbol;
 
     Locale locale;
 
     char actualLocale[ULOC_FULLNAME_CAPACITY];
     char validLocale[ULOC_FULLNAME_CAPACITY];
     const UChar* currPattern;
 
     UnicodeString currencySpcBeforeSym[UNUM_CURRENCY_SPACING_COUNT];
     UnicodeString currencySpcAfterSym[UNUM_CURRENCY_SPACING_COUNT];
+    UBool fIsCustomCurrencySymbol; 
+    UBool fIsCustomIntlCurrencySymbol;
 };
 
 // -------------------------------------
 
 inline UnicodeString
 DecimalFormatSymbols::getSymbol(ENumberFormatSymbol symbol) const {
     const UnicodeString *strPtr;
     if(symbol < kFormatSymbolCount) {
         strPtr = &fSymbols[symbol];
     } else {
@@ skipping 15 matching lines @@
     return *strPtr;
 }
 
 //#endif  /* U_HIDE_INTERNAL_API */
 
 
 // -------------------------------------
 
 inline void
 DecimalFormatSymbols::setSymbol(ENumberFormatSymbol symbol, const UnicodeString &value, const UBool propogateDigits = TRUE) {
+    if (symbol == kCurrencySymbol) { 
+        fIsCustomCurrencySymbol = TRUE; 
+    } 
+    else if (symbol == kIntlCurrencySymbol) { 
+        fIsCustomIntlCurrencySymbol = TRUE; 
+    } 
     if(symbol<kFormatSymbolCount) {
         fSymbols[symbol]=value;
     }
 
     // If the zero digit is being set to a known zero digit according to Unicode,
     // then we automatically set the corresponding 1-9 digits
     if ( propogateDigits && symbol == kZeroDigitSymbol && value.countChar32() == 1 ) {
         UChar32 sym = value.char32At(0);
         if ( u_charDigitValue(sym) == 0 ) {
             for ( int8_t i = 1 ; i<= 9 ; i++ ) {
@@ skipping 17 matching lines @@
     return currPattern;
 }
 #endif /* U_HIDE_INTERNAL_API */
 
 U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
 #endif // _DCFMTSYM
 //eof