ICU-64243.0.1.tar.gz

[apple/icu.git] / icuSources / i18n / currfmt.cpp

diff --git a/icuSources/i18n/currfmt.cpp b/icuSources/i18n/currfmt.cpp
index 133497154b574bdf2d7ef91f4f5f451725ff88c5..8f20f783d25031daeed43f11f02325574bc309d1 100644 (file)
--- a/icuSources/i18n/currfmt.cpp
+++ b/icuSources/i18n/currfmt.cpp
@@ -1,6 +1,8 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
 /*
 **********************************************************************
-* Copyright (c) 2004-2010, International Business Machines
+* Copyright (c) 2004-2014 International Business Machines
 * Corporation and others.  All Rights Reserved.
 **********************************************************************
 * Author: Alan Liu
@@ -8,42 +10,27 @@
 * Since: ICU 3.0
 **********************************************************************
 */
-#include <typeinfo>  // for 'typeid' to work
-
 #include "unicode/utypes.h"
 
 #if !UCONFIG_NO_FORMATTING
 
 #include "currfmt.h"
 #include "unicode/numfmt.h"
+#include "unicode/curramt.h"
 
 U_NAMESPACE_BEGIN
 
 CurrencyFormat::CurrencyFormat(const Locale& locale, UErrorCode& ec) :
-    fmt(NULL)
+    MeasureFormat(locale, UMEASFMT_WIDTH_WIDE, ec)
 {
-    fmt = NumberFormat::createCurrencyInstance(locale, ec);
 }
 
 CurrencyFormat::CurrencyFormat(const CurrencyFormat& other) :
-    MeasureFormat(other), fmt(NULL)
+    MeasureFormat(other)
 {
-    fmt = (NumberFormat*) other.fmt->clone();
 }
 
 CurrencyFormat::~CurrencyFormat() {
-    delete fmt;
-}
-
-UBool CurrencyFormat::operator==(const Format& other) const {
-    if (this == &other) {
-        return TRUE;
-    }
-    if (typeid(*this) != typeid(other)) {
-        return FALSE;
-    }
-    const CurrencyFormat* c = (const CurrencyFormat*) &other;
-    return *fmt == *c->fmt;
 }
 
 Format* CurrencyFormat::clone() const {
@@ -55,14 +42,17 @@ UnicodeString& CurrencyFormat::format(const Formattable& obj,
                                       FieldPosition& pos,
                                       UErrorCode& ec) const
 {
-    return fmt->format(obj, appendTo, pos, ec);
+    return getCurrencyFormatInternal().format(obj, appendTo, pos, ec);
 }
 
 void CurrencyFormat::parseObject(const UnicodeString& source,
                                  Formattable& result,
                                  ParsePosition& pos) const
 {
-    fmt->parseCurrency(source, result, pos);
+    CurrencyAmount* currAmt = getCurrencyFormatInternal().parseCurrency(source, pos);
+    if (currAmt != NULL) {
+        result.adoptObject(currAmt);
+    }
 }
 
 UOBJECT_DEFINE_RTTI_IMPLEMENTATION(CurrencyFormat)