ICU-59117.0.1.tar.gz

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

diff --git a/icuSources/i18n/currfmt.cpp b/icuSources/i18n/currfmt.cpp
index 42471c01856a76a06ff2a076c7dd326d196af189..06bdad042aad0e1589f8d25494b4afd759e7737c 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, International Business Machines
+* Copyright (c) 2004-2014 International Business Machines
 * Corporation and others.  All Rights Reserved.
 **********************************************************************
 * Author: Alan Liu
@@ -14,16 +16,19 @@
 
 #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(NULL)
+{
     fmt = NumberFormat::createCurrencyInstance(locale, ec);
 }
 
 CurrencyFormat::CurrencyFormat(const CurrencyFormat& other) :
-    MeasureFormat(other), fmt(NULL) {
+    MeasureFormat(other), fmt(NULL)
+{
     fmt = (NumberFormat*) other.fmt->clone();
 }
 
@@ -31,17 +36,6 @@ CurrencyFormat::~CurrencyFormat() {
     delete fmt;
 }
 
-UBool CurrencyFormat::operator==(const Format& other) const {
-    if (this == &other) {
-        return TRUE;
-    }
-    if (other.getDynamicClassID() != CurrencyFormat::getStaticClassID()) {
-        return FALSE;
-    }
-    const CurrencyFormat* c = (const CurrencyFormat*) &other;
-    return *fmt == *c->fmt;
-}
-
 Format* CurrencyFormat::clone() const {
     return new CurrencyFormat(*this);
 }
@@ -49,26 +43,19 @@ Format* CurrencyFormat::clone() const {
 UnicodeString& CurrencyFormat::format(const Formattable& obj,
                                       UnicodeString& appendTo,
                                       FieldPosition& pos,
-                                      UErrorCode& ec) const {
+                                      UErrorCode& ec) const
+{
     return fmt->format(obj, appendTo, pos, ec);
 }
 
-UnicodeString& CurrencyFormat::format(const Formattable& obj,
-                                      UnicodeString& appendTo,
-                                      UErrorCode& ec) const {
-    return MeasureFormat::format(obj, appendTo, ec);
-}
-
-void CurrencyFormat::parseObject(const UnicodeString& source,
-                                 Formattable& result,
-                                 ParsePosition& pos) const {
-    fmt->parseCurrency(source, result, pos);
-}
-
 void CurrencyFormat::parseObject(const UnicodeString& source,
                                  Formattable& result,
-                                 UErrorCode& ec) const {
-    MeasureFormat::parseObject(source, result, ec);
+                                 ParsePosition& pos) const
+{
+    CurrencyAmount* currAmt = fmt->parseCurrency(source, pos);
+    if (currAmt != NULL) {
+        result.adoptObject(currAmt);
+    }
 }
 
 UOBJECT_DEFINE_RTTI_IMPLEMENTATION(CurrencyFormat)