ICU-64243.0.1.tar.gz

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

diff --git a/icuSources/i18n/choicfmt.cpp b/icuSources/i18n/choicfmt.cpp
index 79a722bdfee66984d414e4e7a44c2d09c35ef950..42e1fa281037afa49b79b9d628661cd98fb8fd5d 100644 (file)
--- a/icuSources/i18n/choicfmt.cpp
+++ b/icuSources/i18n/choicfmt.cpp
@@ -1,6 +1,8 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html

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

-* Copyright (C) 1997-2012, International Business Machines Corporation and    *
+* Copyright (C) 1997-2013, International Business Machines Corporation and    *

 * others. All Rights Reserved.                                                *
 *******************************************************************************
 *
 * others. All Rights Reserved.                                                *
 *******************************************************************************
 *


@@ -490,18 +492,6 @@ ChoiceFormat::format(const Formattable* objs,
     return appendTo;
 }
 
     return appendTo;
 }
 

-// -------------------------------------
-// Formats an array of objects. Checks if the data type of the objects
-// to get the right value for formatting.  
-
-UnicodeString&
-ChoiceFormat::format(const Formattable& obj, 
-                     UnicodeString& appendTo, 
-                     FieldPosition& pos,
-                     UErrorCode& status) const
-{
-    return NumberFormat::format(obj, appendTo, pos, status);
-}

 // -------------------------------------
 
 void
 // -------------------------------------
 
 void


@@ -571,17 +561,6 @@ ChoiceFormat::matchStringUntilLimitPart(
     }
 }
 
     }
 }
 

-// -------------------------------------
-// Parses the text and return the Formattable object.  
-
-void
-ChoiceFormat::parse(const UnicodeString& text, 
-                    Formattable& result,
-                    UErrorCode& status) const
-{
-    NumberFormat::parse(text, result, status);
-}
-

 // -------------------------------------
 
 Format*
 // -------------------------------------
 
 Format*