From e7100526958afb791e5e94f2f5aa4d28b50fc30d Mon Sep 17 00:00:00 2001
From: Andy Heninger <andy.heninger@gmail.com>
Date: Wed, 26 Apr 2006 01:07:31 +0000
Subject: [PATCH] ICU-5170 More RBBI with UText cleanup

X-SVN-Rev: 19594
---
 icu4c/source/common/ubrk.cpp | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/icu4c/source/common/ubrk.cpp b/icu4c/source/common/ubrk.cpp
index 6abf5396626..8f0e46c91a4 100644
--- a/icu4c/source/common/ubrk.cpp
+++ b/icu4c/source/common/ubrk.cpp
@@ -70,18 +70,12 @@ ubrk_open(UBreakIteratorType type,
     return 0;
   }
 
-  if (text != NULL) {
-      UCharCharacterIterator *iter = 0;
-      iter = new UCharCharacterIterator(text, textLength);
-      if(iter == 0) {
-          *status = U_MEMORY_ALLOCATION_ERROR;
-          delete result;
-          return 0;
-      }
-      result->adoptText(iter);
-  }
 
-  return (UBreakIterator*)result;
+  UBreakIterator *uBI = (UBreakIterator *)result;
+  if (text != NULL) {
+      ubrk_setText(uBI, text, textLength, status);
+  }
+  return uBI;
 }
 
 
@@ -111,17 +105,11 @@ ubrk_openRules(  const UChar        *rules,
         return 0;
     }
 
+    UBreakIterator *uBI = (UBreakIterator *)result;
     if (text != NULL) {
-        UCharCharacterIterator *iter = 0;
-        iter = new UCharCharacterIterator(text, textLength);
-        if(iter == 0) {
-            *status = U_MEMORY_ALLOCATION_ERROR;
-            delete result;
-            return 0;
-        }
-        result->adoptText(iter);
+        ubrk_setText(uBI, text, textLength, status);
     }
-    return (UBreakIterator *)result;
+    return uBI;
 }