ICU-9586 undo r32398 as it pertains to ICU-9569 - accidentally checked in

X-SVN-Rev: 32400

diff --git a/icu4c/source/i18n/udat.cpp b/icu4c/source/i18n/udat.cpp
index 6b811cd07b051f7bde7694c6afa92377037019d4..16d52e4d77f1589d631807e61ca35d81d017e0bf 100644 (file)
--- a/icu4c/source/i18n/udat.cpp
+++ b/icu4c/source/i18n/udat.cpp
@@ -138,7 +138,7 @@ udat_open(UDateFormatStyle  timeStyle,
         return (UDateFormat*)fmt;
       } // else fall through.
     }
-    if(timeStyle != UDAT_PATTERN) {
+    if(timeStyle != UDAT_IGNORE) {
         if(locale == 0) {
             fmt = DateFormat::createDateTimeInstance((DateFormat::EStyle)dateStyle,
                 (DateFormat::EStyle)timeStyle);

diff --git a/icu4c/source/i18n/unicode/udat.h b/icu4c/source/i18n/unicode/udat.h
index 15af7da2f3b2d6a8c5f67fdd0baf9873cc68719f..c5bf9d68c20ffaf6a240f618f921a572912cd97d 100644 (file)
--- a/icu4c/source/i18n/unicode/udat.h
+++ b/icu4c/source/i18n/unicode/udat.h
@@ -167,16 +167,9 @@ typedef enum UDateFormatStyle {
     
     /** No style */
     UDAT_NONE = -1,
+    /** for internal API use only */
+    UDAT_IGNORE = -2
 
-    /**
-     * Use the pattern given in the parameter to udat_open
-     * @see udat_open
-     * @draft ICU 50
-     */
-    UDAT_PATTERN = -2,
-
-    /** @internal alias to UDAT_PATTERN */
-    UDAT_IGNORE = UDAT_PATTERN,
 } UDateFormatStyle;
 
 /* Cannot use #ifndef U_HIDE_DRAFT_API for UDateFormatContextType and UDateFormatContextValue
@@ -588,12 +581,9 @@ udat_toCalendarDateField(UDateFormatField field);
  * @param timeStyle The style used to format times; one of UDAT_FULL, UDAT_LONG,
  * UDAT_MEDIUM, UDAT_SHORT, UDAT_DEFAULT, or UDAT_NONE (relative time styles
  * are not currently supported).
- * When the pattern parameter is used, pass in UDAT_PATTERN for both timeStyle and dateStyle.
  * @param dateStyle The style used to format dates; one of UDAT_FULL, UDAT_LONG,
  * UDAT_MEDIUM, UDAT_SHORT, UDAT_DEFAULT, UDAT_FULL_RELATIVE, UDAT_LONG_RELATIVE,
- * UDAT_MEDIUM_RELATIVE, UDAT_SHORT_RELATIVE, or UDAT_NONE.
- * When the pattern parameter is used, pass in UDAT_PATTERN for both timeStyle and dateStyle.
- * As currently implemented,
+ * UDAT_MEDIUM_RELATIVE, UDAT_SHORT_RELATIVE, or UDAT_NONE. As currently implemented,
  * relative date formatting only affects a limited range of calendar days before or
  * after the current date, based on the CLDR <field type="day">/<relative> data: For
  * example, in English, "Yesterday", "Today", and "Tomorrow". Outside of this range,