ICU-57131.0.1.tar.gz

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

diff --git a/icuSources/i18n/uni2name.cpp b/icuSources/i18n/uni2name.cpp
index 648e466c3e2b025b69e36eb7ff6e17dbd08dd55a..4a1defd0582bc746b0dddbc615210aa2643673c5 100644 (file)
--- a/icuSources/i18n/uni2name.cpp
+++ b/icuSources/i18n/uni2name.cpp
@@ -1,6 +1,6 @@
 /*
 **********************************************************************
 /*
 **********************************************************************

-*   Copyright (C) 2001-2004, International Business Machines
+*   Copyright (C) 2001-2011, International Business Machines

 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 *   Date        Name        Description
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 *   Date        Name        Description


@@ -14,6 +14,7 @@
 
 #include "unicode/unifilt.h"
 #include "unicode/uchar.h"
 
 #include "unicode/unifilt.h"
 #include "unicode/uchar.h"

+#include "unicode/utf16.h"

 #include "uni2name.h"
 #include "cstring.h"
 #include "cmemory.h"
 #include "uni2name.h"
 #include "cstring.h"
 #include "cmemory.h"


@@ -48,11 +49,11 @@ UnicodeNameTransliterator::UnicodeNameTransliterator(const UnicodeNameTransliter
 /**
  * Assignment operator.
  */
 /**
  * Assignment operator.
  */

-UnicodeNameTransliterator& UnicodeNameTransliterator::operator=(
+/*UnicodeNameTransliterator& UnicodeNameTransliterator::operator=(

                              const UnicodeNameTransliterator& o) {
     Transliterator::operator=(o);
     return *this;
                              const UnicodeNameTransliterator& o) {
     Transliterator::operator=(o);
     return *this;

-}
+}*/

 
 /**
  * Transliterator API.
 
 /**
  * Transliterator API.


@@ -94,11 +95,11 @@ void UnicodeNameTransliterator::handleTransliterate(Replaceable& text, UTransPos
 
     while (cursor < limit) {
         UChar32 c = text.char32At(cursor);
 
     while (cursor < limit) {
         UChar32 c = text.char32At(cursor);

-        int32_t clen = UTF_CHAR_LENGTH(c);
+        int32_t clen = U16_LENGTH(c);

         status = U_ZERO_ERROR;
         if ((len = u_charName(c, U_EXTENDED_CHAR_NAME, buf, maxLen, &status)) >0 && !U_FAILURE(status)) {
             str.truncate(OPEN_DELIM_LEN);
         status = U_ZERO_ERROR;
         if ((len = u_charName(c, U_EXTENDED_CHAR_NAME, buf, maxLen, &status)) >0 && !U_FAILURE(status)) {
             str.truncate(OPEN_DELIM_LEN);

-            str.append(UnicodeString(buf, len, "")).append(CLOSE_DELIM);
+            str.append(UnicodeString(buf, len, US_INV)).append(CLOSE_DELIM);

             text.handleReplaceBetween(cursor, cursor+clen, str);
             len += OPEN_DELIM_LEN + 1; // adjust for delimiters
             cursor += len; // advance cursor and adjust for new text
             text.handleReplaceBetween(cursor, cursor+clen, str);
             len += OPEN_DELIM_LEN + 1; // adjust for delimiters
             cursor += len; // advance cursor and adjust for new text