ICU-59180.0.1.tar.gz

[apple/icu.git] / icuSources / i18n / unicode / dcfmtsym.h

diff --git a/icuSources/i18n/unicode/dcfmtsym.h b/icuSources/i18n/unicode/dcfmtsym.h
index 46ef22241b31c58789465ee941b44036f51bcd9a..83815a4a93644d5c25d2bf71d032fc976133ba38 100644 (file)
--- a/icuSources/i18n/unicode/dcfmtsym.h
+++ b/icuSources/i18n/unicode/dcfmtsym.h
@@ -1,6 +1,8 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html

 /*
 ********************************************************************************
 /*
 ********************************************************************************

-*   Copyright (C) 1997-2015, International Business Machines
+*   Copyright (C) 1997-2016, International Business Machines

 *   Corporation and others.  All Rights Reserved.
 ********************************************************************************
 *
 *   Corporation and others.  All Rights Reserved.
 ********************************************************************************
 *


@@ -33,6 +35,7 @@
 #include "unicode/uobject.h"
 #include "unicode/locid.h"
 #include "unicode/unum.h"
 #include "unicode/uobject.h"
 #include "unicode/locid.h"
 #include "unicode/unum.h"

+#include "unicode/unistr.h"

 
 /**
  * \file
 
 /**
  * \file


@@ -40,6 +43,7 @@
  */
 
 
  */
 
 

+#if U_SHOW_CPLUSPLUS_API

 U_NAMESPACE_BEGIN
 
 /**
 U_NAMESPACE_BEGIN
 
 /**


@@ -163,12 +167,10 @@ public:
          * @stable ICU 4.6
          */
         kNineDigitSymbol,
          * @stable ICU 4.6
          */
         kNineDigitSymbol,

-#ifndef U_HIDE_DRAFT_API

         /** Multiplication sign.
         /** Multiplication sign.

-         * @draft ICU 54
+         * @stable ICU 54

          */
         kExponentMultiplicationSymbol,
          */
         kExponentMultiplicationSymbol,

-#endif  /* U_HIDE_DRAFT_API */

         /** count symbol constants */
         kFormatSymbolCount = kNineDigitSymbol + 2
     };
         /** count symbol constants */
         kFormatSymbolCount = kNineDigitSymbol + 2
     };


@@ -356,6 +358,23 @@ private:
     void setCurrencyForSymbols();
 
 public:
     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.
     /**
      * _Internal_ function - more efficient version of getSymbol,
      * returning a const reference to one of the symbol strings.


@@ -375,7 +394,7 @@ public:
      * Returns that pattern stored in currecy info. Internal API for use by NumberFormat API.
      * @internal
      */
      * Returns that pattern stored in currecy info. Internal API for use by NumberFormat API.
      * @internal
      */

-    inline const UChar* getCurrencyPattern(void) const;
+    inline const char16_t* getCurrencyPattern(void) const;

 #endif  /* U_HIDE_INTERNAL_API */
 
 private:
 #endif  /* U_HIDE_INTERNAL_API */
 
 private:


@@ -406,10 +425,12 @@ private:
 
     char actualLocale[ULOC_FULLNAME_CAPACITY];
     char validLocale[ULOC_FULLNAME_CAPACITY];
 
     char actualLocale[ULOC_FULLNAME_CAPACITY];
     char validLocale[ULOC_FULLNAME_CAPACITY];

-    const UChar* currPattern;
+    const char16_t* currPattern;

 
     UnicodeString currencySpcBeforeSym[UNUM_CURRENCY_SPACING_COUNT];
     UnicodeString currencySpcAfterSym[UNUM_CURRENCY_SPACING_COUNT];
 
     UnicodeString currencySpcBeforeSym[UNUM_CURRENCY_SPACING_COUNT];
     UnicodeString currencySpcAfterSym[UNUM_CURRENCY_SPACING_COUNT];

+    UBool fIsCustomCurrencySymbol;
+    UBool fIsCustomIntlCurrencySymbol;

 };
 
 // -------------------------------------
 };
 
 // -------------------------------------


@@ -425,8 +446,7 @@ DecimalFormatSymbols::getSymbol(ENumberFormatSymbol symbol) const {
     return *strPtr;
 }
 
     return *strPtr;
 }
 

-//#ifndef U_HIDE_INTERNAL_API
-// See comments above for this function. Not hidden.
+// See comments above for this function. Not hidden with #ifndef U_HIDE_INTERNAL_API

 inline const UnicodeString &
 DecimalFormatSymbols::getConstSymbol(ENumberFormatSymbol symbol) const {
     const UnicodeString *strPtr;
 inline const UnicodeString &
 DecimalFormatSymbols::getConstSymbol(ENumberFormatSymbol symbol) const {
     const UnicodeString *strPtr;


@@ -438,13 +458,16 @@ DecimalFormatSymbols::getConstSymbol(ENumberFormatSymbol symbol) const {
     return *strPtr;
 }
 
     return *strPtr;
 }
 

-//#endif  /* U_HIDE_INTERNAL_API */
-
-

 // -------------------------------------
 
 inline void
 DecimalFormatSymbols::setSymbol(ENumberFormatSymbol symbol, const UnicodeString &value, const UBool propogateDigits = TRUE) {
 // -------------------------------------
 
 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(symbol<kFormatSymbolCount) {
         fSymbols[symbol]=value;
     }


@@ -470,13 +493,14 @@ DecimalFormatSymbols::getLocale() const {
 }
 
 #ifndef U_HIDE_INTERNAL_API
 }
 
 #ifndef U_HIDE_INTERNAL_API

-inline const UChar*
+inline const char16_t*

 DecimalFormatSymbols::getCurrencyPattern() const {
     return currPattern;
 }
 #endif /* U_HIDE_INTERNAL_API */
 
 U_NAMESPACE_END
 DecimalFormatSymbols::getCurrencyPattern() const {
     return currPattern;
 }
 #endif /* U_HIDE_INTERNAL_API */
 
 U_NAMESPACE_END

+#endif // U_SHOW_CPLUSPLUS_API

 
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
 
 #endif /* #if !UCONFIG_NO_FORMATTING */