From 8c78422db2c9f2f890bcf70c7819510e84f48f73 Mon Sep 17 00:00:00 2001 From: Markus Scherer Date: Tue, 12 Mar 2002 01:32:42 +0000 Subject: [PATCH] ICU-1561 replace all UTextOffset with int32_t X-SVN-Rev: 7942 --- icu4c/source/common/brkiter.cpp | 2 +- icu4c/source/common/chariter.cpp | 4 +- icu4c/source/common/convert.cpp | 2 +- icu4c/source/common/normlzr.cpp | 10 +- icu4c/source/common/putil.c | 4 +- icu4c/source/common/schriter.cpp | 8 +- icu4c/source/common/ubidi.c | 24 +- icu4c/source/common/ubidiimp.h | 12 +- icu4c/source/common/ubidiln.c | 74 +-- icu4c/source/common/ubidiwrt.c | 18 +- icu4c/source/common/ubrk.cpp | 18 +- icu4c/source/common/uchriter.cpp | 22 +- icu4c/source/common/ucnv.c | 2 +- icu4c/source/common/umemstrm.c | 8 +- icu4c/source/common/umemstrm.h | 8 +- icu4c/source/common/unames.c | 8 +- icu4c/source/common/unicode/bidi.h | 80 +-- icu4c/source/common/unicode/brkiter.h | 44 +- icu4c/source/common/unicode/chariter.h | 44 +- icu4c/source/common/unicode/normlzr.h | 14 +- icu4c/source/common/unicode/putil.h | 4 +- icu4c/source/common/unicode/rep.h | 20 +- icu4c/source/common/unicode/schriter.h | 8 +- icu4c/source/common/unicode/ubidi.h | 64 +-- icu4c/source/common/unicode/ubrk.h | 44 +- icu4c/source/common/unicode/uchar.h | 6 +- icu4c/source/common/unicode/uchriter.h | 16 +- icu4c/source/common/unicode/unicode.h | 12 +- icu4c/source/common/unicode/unistr.h | 626 +++++++++++----------- icu4c/source/common/unicode/utf.h | 5 +- icu4c/source/common/unicode/utf16.h | 8 +- icu4c/source/common/unicode/utf8.h | 32 +- icu4c/source/common/unistr.cpp | 106 ++-- icu4c/source/common/utf_impl.c | 22 +- icu4c/source/i18n/coleitr.cpp | 4 +- icu4c/source/i18n/decimfmt.cpp | 18 +- icu4c/source/i18n/msgfmt.cpp | 2 +- icu4c/source/i18n/nfrs.cpp | 6 +- icu4c/source/i18n/rbbi_bld.cpp | 24 +- icu4c/source/i18n/rbbi_bld.h | 6 +- icu4c/source/i18n/rbnf.cpp | 10 +- icu4c/source/i18n/search.cpp | 26 +- icu4c/source/i18n/smpdtfmt.cpp | 4 +- icu4c/source/i18n/stsearch.cpp | 8 +- icu4c/source/i18n/ucoleitr.cpp | 4 +- icu4c/source/i18n/uni2name.cpp | 2 +- icu4c/source/i18n/unicode/coleitr.h | 4 +- icu4c/source/i18n/unicode/dcfmtsym.h | 16 +- icu4c/source/i18n/unicode/parseerr.h | 2 +- icu4c/source/i18n/unicode/parsepos.h | 22 +- icu4c/source/i18n/unicode/search.h | 24 +- icu4c/source/i18n/unicode/smpdtfmt.h | 2 +- icu4c/source/i18n/unicode/stsearch.h | 8 +- icu4c/source/i18n/unicode/ucoleitr.h | 4 +- icu4c/source/i18n/unicode/usearch.h | 22 +- icu4c/source/i18n/usearch.cpp | 282 +++++----- icu4c/source/i18n/usrchimp.h | 2 +- icu4c/source/i18n/utrans.cpp | 24 +- icu4c/source/layout/unicode/loengine.h | 20 +- icu4c/source/samples/layout/paragraph.cpp | 4 +- icu4c/source/samples/scsu/compsamp.cpp | 2 +- icu4c/source/samples/ucnv/convsamp.cpp | 2 +- icu4c/source/samples/ustring/ustring.cpp | 2 +- icu4c/source/test/cintltst/capitst.c | 2 +- icu4c/source/test/cintltst/cbiapts.c | 2 +- icu4c/source/test/cintltst/cbiditst.c | 20 +- icu4c/source/test/cintltst/cbiditst.h | 4 +- icu4c/source/test/cintltst/cdtdptst.c | 4 +- icu4c/source/test/cintltst/cregrtst.c | 14 +- icu4c/source/test/cintltst/cregrtst.h | 2 +- icu4c/source/test/cintltst/cucdtst.c | 10 +- icu4c/source/test/cintltst/usrchdat.c | 2 +- icu4c/source/test/cintltst/usrchtst.c | 8 +- icu4c/source/test/cintltst/utf8tst.c | 6 +- icu4c/source/test/intltest/apicoll.cpp | 2 +- icu4c/source/test/intltest/citrtest.cpp | 10 +- icu4c/source/test/intltest/dtfmttst.cpp | 2 +- icu4c/source/test/intltest/ittxtbd.cpp | 20 +- icu4c/source/test/intltest/numfmtst.cpp | 2 +- icu4c/source/test/intltest/numrgts.cpp | 4 +- icu4c/source/test/intltest/pptest.cpp | 4 +- icu4c/source/test/intltest/reptest.cpp | 10 +- icu4c/source/test/intltest/srchtest.cpp | 24 +- icu4c/source/test/intltest/tfsmalls.cpp | 8 +- icu4c/source/test/intltest/ucdtest.cpp | 2 +- icu4c/source/test/intltest/usettest.cpp | 2 +- icu4c/source/test/intltest/ustrtest.cpp | 16 +- icu4c/source/tools/dumpce/dumpce.cpp | 2 +- icu4c/source/tools/toolutil/unewdata.c | 8 +- icu4c/source/tools/toolutil/unewdata.h | 8 +- 90 files changed, 1068 insertions(+), 1065 deletions(-) diff --git a/icu4c/source/common/brkiter.cpp b/icu4c/source/common/brkiter.cpp index dbc43d1b809..30d45e6b106 100644 --- a/icu4c/source/common/brkiter.cpp +++ b/icu4c/source/common/brkiter.cpp @@ -34,7 +34,7 @@ U_NAMESPACE_BEGIN -const UTextOffset BreakIterator::DONE = (int32_t)-1; +const int32_t BreakIterator::DONE = (int32_t)-1; // ------------------------------------- diff --git a/icu4c/source/common/chariter.cpp b/icu4c/source/common/chariter.cpp index 85408e4e4ff..23711eb8953 100644 --- a/icu4c/source/common/chariter.cpp +++ b/icu4c/source/common/chariter.cpp @@ -16,7 +16,7 @@ CharacterIterator::CharacterIterator(int32_t length) } } -CharacterIterator::CharacterIterator(int32_t length, UTextOffset position) +CharacterIterator::CharacterIterator(int32_t length, int32_t position) : textLength(length), pos(position), begin(0), end(length) { if(textLength < 0) { textLength = end = 0; @@ -28,7 +28,7 @@ CharacterIterator::CharacterIterator(int32_t length, UTextOffset position) } } -CharacterIterator::CharacterIterator(int32_t length, UTextOffset textBegin, UTextOffset textEnd, UTextOffset position) +CharacterIterator::CharacterIterator(int32_t length, int32_t textBegin, int32_t textEnd, int32_t position) : textLength(length), pos(position), begin(textBegin), end(textEnd) { if(textLength < 0) { textLength = 0; diff --git a/icu4c/source/common/convert.cpp b/icu4c/source/common/convert.cpp index d8b0c21a7b5..5cae7d15876 100644 --- a/icu4c/source/common/convert.cpp +++ b/icu4c/source/common/convert.cpp @@ -231,7 +231,7 @@ UnicodeConverter::toUnicodeString(UnicodeString& target, &err); /*appends what we got thus far to the UnicodeString*/ - target.replace((UTextOffset)target.length(), + target.replace((int32_t)target.length(), myTargetUCharsAlias - myTargetUChars, myTargetUChars, myTargetUCharsAlias - myTargetUChars); diff --git a/icu4c/source/common/normlzr.cpp b/icu4c/source/common/normlzr.cpp index f167dbdcfc4..4b695f8798e 100644 --- a/icu4c/source/common/normlzr.cpp +++ b/icu4c/source/common/normlzr.cpp @@ -311,7 +311,7 @@ void Normalizer::reset() { } void -Normalizer::setIndexOnly(UTextOffset index) { +Normalizer::setIndexOnly(int32_t index) { currentIndex=nextIndex=text->move(text, index, UITER_START); // validates index clearBuffer(); } @@ -335,7 +335,7 @@ Normalizer::setIndexOnly(UTextOffset index) { * @throws IllegalArgumentException if the given index is less than * {@link #getBeginIndex} or greater than {@link #getEndIndex}. */ -UChar32 Normalizer::setIndex(UTextOffset index) { +UChar32 Normalizer::setIndex(int32_t index) { setIndexOnly(index); return current(); } @@ -374,7 +374,7 @@ UChar32 Normalizer::last() { * setIndex and {@link #getIndex}. * */ -UTextOffset Normalizer::getIndex() const { +int32_t Normalizer::getIndex() const { if(bufferPosCharacterIterator or the start (i.e. 0) of the String * over which this Normalizer is iterating */ -UTextOffset Normalizer::startIndex() const { +int32_t Normalizer::startIndex() const { return text->move(text, 0, UITER_START); } @@ -396,7 +396,7 @@ UTextOffset Normalizer::startIndex() const { * of the CharacterIterator or the length of the String * over which this Normalizer is iterating */ -UTextOffset Normalizer::endIndex() const { +int32_t Normalizer::endIndex() const { return text->move(text, 0, UITER_LIMIT); } diff --git a/icu4c/source/common/putil.c b/icu4c/source/common/putil.c index 625058322aa..cad75c185ea 100644 --- a/icu4c/source/common/putil.c +++ b/icu4c/source/common/putil.c @@ -1601,7 +1601,7 @@ static const uint8_t ebcdicFromAscii[256]={ #endif U_CAPI void U_EXPORT2 -u_charsToUChars(const char *cs, UChar *us, UTextOffset length) { +u_charsToUChars(const char *cs, UChar *us, int32_t length) { while(length>0) { #if U_CHARSET_FAMILY==U_ASCII_FAMILY *us++=(UChar)(uint8_t)(*cs++); @@ -1615,7 +1615,7 @@ u_charsToUChars(const char *cs, UChar *us, UTextOffset length) { } U_CAPI void U_EXPORT2 -u_UCharsToChars(const UChar *us, char *cs, UTextOffset length) { +u_UCharsToChars(const UChar *us, char *cs, int32_t length) { while(length>0) { #if U_CHARSET_FAMILY==U_ASCII_FAMILY *cs++=(char)(*us++); diff --git a/icu4c/source/common/schriter.cpp b/icu4c/source/common/schriter.cpp index b486e8b7ab2..2711651cac7 100644 --- a/icu4c/source/common/schriter.cpp +++ b/icu4c/source/common/schriter.cpp @@ -36,7 +36,7 @@ StringCharacterIterator::StringCharacterIterator(const UnicodeString& textStr) } StringCharacterIterator::StringCharacterIterator(const UnicodeString& textStr, - UTextOffset textPos) + int32_t textPos) : UCharCharacterIterator(textStr.fArray, textStr.length(), textPos), text(textStr) { @@ -45,9 +45,9 @@ StringCharacterIterator::StringCharacterIterator(const UnicodeString& textStr, } StringCharacterIterator::StringCharacterIterator(const UnicodeString& textStr, - UTextOffset textBegin, - UTextOffset textEnd, - UTextOffset textPos) + int32_t textBegin, + int32_t textEnd, + int32_t textPos) : UCharCharacterIterator(textStr.fArray, textStr.length(), textBegin, textEnd, textPos), text(textStr) { diff --git a/icu4c/source/common/ubidi.c b/icu4c/source/common/ubidi.c index 04a08abe2dc..63ee4fee240 100644 --- a/icu4c/source/common/ubidi.c +++ b/icu4c/source/common/ubidi.c @@ -123,7 +123,7 @@ directionFromFlags(Flags flags); static void resolveImplicitLevels(UBiDi *pBiDi, - UTextOffset start, UTextOffset limit, + int32_t start, int32_t limit, DirProp sor, DirProp eor); static void @@ -148,7 +148,7 @@ ubidi_open(void) } U_CAPI UBiDi * U_EXPORT2 -ubidi_openSized(UTextOffset maxLength, UTextOffset maxRunCount, UErrorCode *pErrorCode) { +ubidi_openSized(int32_t maxLength, int32_t maxRunCount, UErrorCode *pErrorCode) { UBiDi *pBiDi; /* check the argument values */ @@ -213,7 +213,7 @@ ubidi_openSized(UTextOffset maxLength, UTextOffset maxRunCount, UErrorCode *pErr * is this the best way to do this?? */ U_CFUNC UBool -ubidi_getMemory(void **pMemory, UTextOffset *pSize, UBool mayAllocate, UTextOffset sizeNeeded) { +ubidi_getMemory(void **pMemory, int32_t *pSize, UBool mayAllocate, int32_t sizeNeeded) { /* check for existing memory */ if(*pMemory==NULL) { /* we need to allocate memory */ @@ -284,7 +284,7 @@ ubidi_isInverse(UBiDi *pBiDi) { /* ubidi_setPara ------------------------------------------------------------ */ U_CAPI void U_EXPORT2 -ubidi_setPara(UBiDi *pBiDi, const UChar *text, UTextOffset length, +ubidi_setPara(UBiDi *pBiDi, const UChar *text, int32_t length, UBiDiLevel paraLevel, UBiDiLevel *embeddingLevels, UErrorCode *pErrorCode) { UBiDiDirection direction; @@ -409,7 +409,7 @@ ubidi_setPara(UBiDi *pBiDi, const UChar *text, UTextOffset length, } else { /* sor, eor: start and end types of same-level-run */ UBiDiLevel *levels=pBiDi->levels; - UTextOffset start, limit=0; + int32_t start, limit=0; UBiDiLevel level, nextLevel; DirProp sor, eor; @@ -485,7 +485,7 @@ static void getDirProps(UBiDi *pBiDi, const UChar *text) { DirProp *dirProps=pBiDi->dirPropsMemory; /* pBiDi->dirProps is const */ - UTextOffset i=0, i0, i1, length=pBiDi->length; + int32_t i=0, i0, i1, length=pBiDi->length; Flags flags=0; /* collect all directionalities in the text */ UChar32 uchar; DirProp dirProp; @@ -602,7 +602,7 @@ resolveExplicitLevels(UBiDi *pBiDi) { const DirProp *dirProps=pBiDi->dirProps; UBiDiLevel *levels=pBiDi->levels; - UTextOffset i=0, length=pBiDi->length; + int32_t i=0, length=pBiDi->length; Flags flags=pBiDi->flags; /* collect all directionalities in the text */ DirProp dirProp; UBiDiLevel level=pBiDi->paraLevel; @@ -759,7 +759,7 @@ checkExplicitLevels(UBiDi *pBiDi, UErrorCode *pErrorCode) { const DirProp *dirProps=pBiDi->dirProps; UBiDiLevel *levels=pBiDi->levels; - UTextOffset i, length=pBiDi->length; + int32_t i, length=pBiDi->length; Flags flags=0; /* collect all directionalities in the text */ UBiDiLevel level, paraLevel=pBiDi->paraLevel; @@ -835,12 +835,12 @@ directionFromFlags(Flags flags) { static void resolveImplicitLevels(UBiDi *pBiDi, - UTextOffset start, UTextOffset limit, + int32_t start, int32_t limit, DirProp sor, DirProp eor) { const DirProp *dirProps=pBiDi->dirProps; UBiDiLevel *levels=pBiDi->levels; - UTextOffset i, next, neutralStart=-1; + int32_t i, next, neutralStart=-1; DirProp prevDirProp, dirProp, nextDirProp, lastStrong, beforeNeutral=L; UBiDiLevel numberLevel; uint8_t historyOfEN; @@ -1183,7 +1183,7 @@ static void adjustWSLevels(UBiDi *pBiDi) { const DirProp *dirProps=pBiDi->dirProps; UBiDiLevel *levels=pBiDi->levels; - UTextOffset i; + int32_t i; if(pBiDi->flags&MASK_WS) { UBiDiLevel paraLevel=pBiDi->paraLevel; @@ -1231,7 +1231,7 @@ ubidi_getText(const UBiDi *pBiDi) { } } -U_CAPI UTextOffset U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ubidi_getLength(const UBiDi *pBiDi) { if(pBiDi!=NULL) { return pBiDi->length; diff --git a/icu4c/source/common/ubidiimp.h b/icu4c/source/common/ubidiimp.h index 30fd3c84730..310e2a72ce0 100644 --- a/icu4c/source/common/ubidiimp.h +++ b/icu4c/source/common/ubidiimp.h @@ -106,7 +106,7 @@ enum { /* Run structure for reordering --------------------------------------------- */ typedef struct Run { - UTextOffset logicalStart, /* first character of the run; b31 indicates even/odd level */ + int32_t logicalStart, /* first character of the run; b31 indicates even/odd level */ visualLimit; /* last visual position of the run +1 */ } Run; @@ -132,10 +132,10 @@ struct UBiDi { const UChar *text; /* length of the current text */ - UTextOffset length; + int32_t length; /* memory sizes in bytes */ - UTextOffset dirPropsSize, levelsSize, runsSize; + int32_t dirPropsSize, levelsSize, runsSize; /* allocated memory */ DirProp *dirPropsMemory; @@ -163,10 +163,10 @@ struct UBiDi { /* characters after trailingWSStart are WS and are */ /* implicitly at the paraLevel (rule (L1)) - levels may not reflect that */ - UTextOffset trailingWSStart; + int32_t trailingWSStart; /* fields for line reordering */ - UTextOffset runCount; /* ==-1: runs not set up yet */ + int32_t runCount; /* ==-1: runs not set up yet */ Run *runs; /* for non-mixed text, we only need a tiny array of runs (no malloc()) */ @@ -175,7 +175,7 @@ struct UBiDi { /* helper function to (re)allocate memory if allowed */ U_CFUNC UBool -ubidi_getMemory(void **pMemory, UTextOffset *pSize, UBool mayAllocate, UTextOffset sizeNeeded); +ubidi_getMemory(void **pMemory, int32_t *pSize, UBool mayAllocate, int32_t sizeNeeded); /* helper macros for each allocated array in UBiDi */ #define getDirPropsMemory(pBiDi, length) \ diff --git a/icu4c/source/common/ubidiln.c b/icu4c/source/common/ubidiln.c index 31ec21757f2..6680cc60248 100644 --- a/icu4c/source/common/ubidiln.c +++ b/icu4c/source/common/ubidiln.c @@ -88,18 +88,18 @@ static void reorderLine(UBiDi *pBiDi, UBiDiLevel minLevel, UBiDiLevel maxLevel); static UBool -prepareReorder(const UBiDiLevel *levels, UTextOffset length, - UTextOffset *indexMap, +prepareReorder(const UBiDiLevel *levels, int32_t length, + int32_t *indexMap, UBiDiLevel *pMinLevel, UBiDiLevel *pMaxLevel); /* ubidi_setLine ------------------------------------------------------------ */ U_CAPI void U_EXPORT2 ubidi_setLine(const UBiDi *pParaBiDi, - UTextOffset start, UTextOffset limit, + int32_t start, int32_t limit, UBiDi *pLineBiDi, UErrorCode *pErrorCode) { - UTextOffset length; + int32_t length; /* check the argument values */ if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { @@ -143,7 +143,7 @@ ubidi_setLine(const UBiDi *pParaBiDi, } } else { const UBiDiLevel *levels=pLineBiDi->levels; - UTextOffset i, trailingWSStart; + int32_t i, trailingWSStart; UBiDiLevel level; setTrailingWSStart(pLineBiDi); @@ -209,7 +209,7 @@ ubidi_setLine(const UBiDi *pParaBiDi, } U_CAPI UBiDiLevel U_EXPORT2 -ubidi_getLevelAt(const UBiDi *pBiDi, UTextOffset charIndex) { +ubidi_getLevelAt(const UBiDi *pBiDi, int32_t charIndex) { /* return paraLevel if in the trailing WS run, otherwise the real level */ if(pBiDi==NULL || charIndex<0 || pBiDi->length<=charIndex) { return 0; @@ -222,7 +222,7 @@ ubidi_getLevelAt(const UBiDi *pBiDi, UTextOffset charIndex) { U_CAPI const UBiDiLevel * U_EXPORT2 ubidi_getLevels(UBiDi *pBiDi, UErrorCode *pErrorCode) { - UTextOffset start, length; + int32_t start, length; if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { return NULL; @@ -263,9 +263,9 @@ ubidi_getLevels(UBiDi *pBiDi, UErrorCode *pErrorCode) { } U_CAPI void U_EXPORT2 -ubidi_getLogicalRun(const UBiDi *pBiDi, UTextOffset logicalStart, - UTextOffset *pLogicalLimit, UBiDiLevel *pLevel) { - UTextOffset length; +ubidi_getLogicalRun(const UBiDi *pBiDi, int32_t logicalStart, + int32_t *pLogicalLimit, UBiDiLevel *pLevel) { + int32_t length; if(pBiDi==NULL || logicalStart<0 || (length=pBiDi->length)<=logicalStart) { return; @@ -312,7 +312,7 @@ setTrailingWSStart(UBiDi *pBiDi) { const DirProp *dirProps=pBiDi->dirProps; UBiDiLevel *levels=pBiDi->levels; - UTextOffset start=pBiDi->length; + int32_t start=pBiDi->length; UBiDiLevel paraLevel=pBiDi->paraLevel; /* go backwards across all WS, BN, explicit codes */ @@ -330,7 +330,7 @@ setTrailingWSStart(UBiDi *pBiDi) { /* runs API functions ------------------------------------------------------- */ -U_CAPI UTextOffset U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ubidi_countRuns(UBiDi *pBiDi, UErrorCode *pErrorCode) { if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { return -1; @@ -343,15 +343,15 @@ ubidi_countRuns(UBiDi *pBiDi, UErrorCode *pErrorCode) { } U_CAPI UBiDiDirection U_EXPORT2 -ubidi_getVisualRun(UBiDi *pBiDi, UTextOffset runIndex, - UTextOffset *pLogicalStart, UTextOffset *pLength) { +ubidi_getVisualRun(UBiDi *pBiDi, int32_t runIndex, + int32_t *pLogicalStart, int32_t *pLength) { if( pBiDi==NULL || runIndex<0 || (pBiDi->runCount==-1 && !ubidi_getRuns(pBiDi)) || runIndex>=pBiDi->runCount ) { return UBIDI_LTR; } else { - UTextOffset start=pBiDi->runs[runIndex].logicalStart; + int32_t start=pBiDi->runs[runIndex].logicalStart; if(pLogicalStart!=NULL) { *pLogicalStart=GET_INDEX(start); } @@ -383,7 +383,7 @@ ubidi_getRuns(UBiDi *pBiDi) { getSingleRun(pBiDi, pBiDi->paraLevel); } else /* UBIDI_MIXED, length>0 */ { /* mixed directionality */ - UTextOffset length=pBiDi->length, limit; + int32_t length=pBiDi->length, limit; /* * If there are WS characters at the end of the line @@ -402,7 +402,7 @@ ubidi_getRuns(UBiDi *pBiDi) { getSingleRun(pBiDi, pBiDi->paraLevel); } else { UBiDiLevel *levels=pBiDi->levels; - UTextOffset i, runCount; + int32_t i, runCount; UBiDiLevel level=UBIDI_DEFAULT_LTR; /* initialize with no valid level */ /* count the runs, there is at least one non-WS run, and limit>0 */ @@ -425,7 +425,7 @@ ubidi_getRuns(UBiDi *pBiDi) { } else /* runCount>1 || limitvisual mapping ------------------------------- */ -U_CAPI UTextOffset U_EXPORT2 -ubidi_getVisualIndex(UBiDi *pBiDi, UTextOffset logicalIndex, UErrorCode *pErrorCode) { +U_CAPI int32_t U_EXPORT2 +ubidi_getVisualIndex(UBiDi *pBiDi, int32_t logicalIndex, UErrorCode *pErrorCode) { if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { return 0; } else if(pBiDi==NULL) { @@ -827,7 +827,7 @@ ubidi_getVisualIndex(UBiDi *pBiDi, UTextOffset logicalIndex, UErrorCode *pErrorC return 0; } else { Run *runs=pBiDi->runs; - UTextOffset i, visualStart=0, offset, length; + int32_t i, visualStart=0, offset, length; /* linear search for the run, search on the visual runs */ for(i=0;; ++i) { @@ -849,8 +849,8 @@ ubidi_getVisualIndex(UBiDi *pBiDi, UTextOffset logicalIndex, UErrorCode *pErrorC } } -U_CAPI UTextOffset U_EXPORT2 -ubidi_getLogicalIndex(UBiDi *pBiDi, UTextOffset visualIndex, UErrorCode *pErrorCode) { +U_CAPI int32_t U_EXPORT2 +ubidi_getLogicalIndex(UBiDi *pBiDi, int32_t visualIndex, UErrorCode *pErrorCode) { if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { return 0; } else if(pBiDi==NULL) { @@ -872,14 +872,14 @@ ubidi_getLogicalIndex(UBiDi *pBiDi, UTextOffset visualIndex, UErrorCode *pErrorC return 0; } else { Run *runs=pBiDi->runs; - UTextOffset i, runCount=pBiDi->runCount, start; + int32_t i, runCount=pBiDi->runCount, start; if(runCount<=10) { /* linear search for the run */ for(i=0; visualIndex>=runs[i].visualLimit; ++i) {} } else { /* binary search for the run */ - UTextOffset begin=0, limit=runCount; + int32_t begin=0, limit=runCount; /* the middle if() will guaranteed find the run, we don't need a loop limit */ for(;;) { @@ -912,7 +912,7 @@ ubidi_getLogicalIndex(UBiDi *pBiDi, UTextOffset visualIndex, UErrorCode *pErrorC } U_CAPI void U_EXPORT2 -ubidi_getLogicalMap(UBiDi *pBiDi, UTextOffset *indexMap, UErrorCode *pErrorCode) { +ubidi_getLogicalMap(UBiDi *pBiDi, int32_t *indexMap, UErrorCode *pErrorCode) { UBiDiLevel *levels; /* ubidi_getLevels() checks all of its and our arguments */ @@ -926,7 +926,7 @@ ubidi_getLogicalMap(UBiDi *pBiDi, UTextOffset *indexMap, UErrorCode *pErrorCode) } U_CAPI void U_EXPORT2 -ubidi_getVisualMap(UBiDi *pBiDi, UTextOffset *indexMap, UErrorCode *pErrorCode) { +ubidi_getVisualMap(UBiDi *pBiDi, int32_t *indexMap, UErrorCode *pErrorCode) { /* ubidi_countRuns() checks all of its and our arguments */ if(ubidi_countRuns(pBiDi, pErrorCode)<=0) { /* no op */ @@ -935,7 +935,7 @@ ubidi_getVisualMap(UBiDi *pBiDi, UTextOffset *indexMap, UErrorCode *pErrorCode) } else { /* fill a visual-to-logical index map using the runs[] */ Run *runs=pBiDi->runs, *runsLimit=runs+pBiDi->runCount; - UTextOffset logicalStart, visualStart, visualLimit; + int32_t logicalStart, visualStart, visualLimit; visualStart=0; for(; runs0) { diff --git a/icu4c/source/common/ubidiwrt.c b/icu4c/source/common/ubidiwrt.c index 80e0a98316c..8c89c0cc6cc 100644 --- a/icu4c/source/common/ubidiwrt.c +++ b/icu4c/source/common/ubidiwrt.c @@ -69,7 +69,7 @@ enum { * It looks strange to do mirroring in LTR output, but it is only because * we are writing RTL output in reverse. */ -static UTextOffset +static int32_t doWriteForward(const UChar *src, int32_t srcLength, UChar *dest, int32_t destSize, uint16_t options, @@ -90,7 +90,7 @@ doWriteForward(const UChar *src, int32_t srcLength, } case UBIDI_DO_MIRRORING: { /* do mirroring */ - UTextOffset i=0, j=0; + int32_t i=0, j=0; UChar32 c; if(destSizecurrent(); } -U_CAPI UTextOffset U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ubrk_next(UBreakIterator *bi) { return ((BreakIterator*)bi)->next(); } -U_CAPI UTextOffset U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ubrk_previous(UBreakIterator *bi) { return ((BreakIterator*)bi)->previous(); } -U_CAPI UTextOffset U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ubrk_first(UBreakIterator *bi) { return ((BreakIterator*)bi)->first(); } -U_CAPI UTextOffset U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ubrk_last(UBreakIterator *bi) { return ((BreakIterator*)bi)->last(); } -U_CAPI UTextOffset U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ubrk_preceding(UBreakIterator *bi, - UTextOffset offset) + int32_t offset) { return ((BreakIterator*)bi)->preceding(offset); } -U_CAPI UTextOffset U_EXPORT2 +U_CAPI int32_t U_EXPORT2 ubrk_following(UBreakIterator *bi, - UTextOffset offset) + int32_t offset) { return ((BreakIterator*)bi)->following(offset); diff --git a/icu4c/source/common/uchriter.cpp b/icu4c/source/common/uchriter.cpp index d4f6c75170f..2573baa9902 100644 --- a/icu4c/source/common/uchriter.cpp +++ b/icu4c/source/common/uchriter.cpp @@ -29,7 +29,7 @@ UCharCharacterIterator::UCharCharacterIterator(const UChar* textPtr, UCharCharacterIterator::UCharCharacterIterator(const UChar* textPtr, int32_t length, - UTextOffset position) + int32_t position) : CharacterIterator(textPtr != 0 ? (length>=0 ? length : u_strlen(textPtr)) : 0, position), text(textPtr) { @@ -37,9 +37,9 @@ UCharCharacterIterator::UCharCharacterIterator(const UChar* textPtr, UCharCharacterIterator::UCharCharacterIterator(const UChar* textPtr, int32_t length, - UTextOffset textBegin, - UTextOffset textEnd, - UTextOffset position) + int32_t textBegin, + int32_t textEnd, + int32_t position) : CharacterIterator(textPtr != 0 ? (length>=0 ? length : u_strlen(textPtr)) : 0, textBegin, textEnd, position), text(textPtr) { @@ -121,7 +121,7 @@ UCharCharacterIterator::last() { } UChar -UCharCharacterIterator::setIndex(UTextOffset position) { +UCharCharacterIterator::setIndex(int32_t position) { if(position < begin) { pos = begin; } else if(position > end) { @@ -188,7 +188,7 @@ UChar32 UCharCharacterIterator::first32() { pos = begin; if(pos < end) { - UTextOffset i = pos; + int32_t i = pos; UChar32 c; UTF_NEXT_CHAR(text, i, end, c); return c; @@ -222,7 +222,7 @@ UCharCharacterIterator::last32() { } UChar32 -UCharCharacterIterator::setIndex32(UTextOffset position) { +UCharCharacterIterator::setIndex32(int32_t position) { if(position < begin) { position = begin; } else if(position > end) { @@ -230,7 +230,7 @@ UCharCharacterIterator::setIndex32(UTextOffset position) { } if(position < end) { UTF_SET_CHAR_START(text, begin, position); - UTextOffset i = this->pos = position; + int32_t i = this->pos = position; UChar32 c; UTF_NEXT_CHAR(text, i, end, c); return c; @@ -256,7 +256,7 @@ UCharCharacterIterator::next32() { if (pos < end) { UTF_FWD_1(text, pos, end); if(pos < end) { - UTextOffset i = pos; + int32_t i = pos; UChar32 c; UTF_NEXT_CHAR(text, i, end, c); return c; @@ -289,7 +289,7 @@ UCharCharacterIterator::previous32() { } } -UTextOffset +int32_t UCharCharacterIterator::move(int32_t delta, CharacterIterator::EOrigin origin) { switch(origin) { case kStart: @@ -314,7 +314,7 @@ UCharCharacterIterator::move(int32_t delta, CharacterIterator::EOrigin origin) { return pos; } -UTextOffset +int32_t UCharCharacterIterator::move32(int32_t delta, CharacterIterator::EOrigin origin) { // this implementation relies on the "safe" version of the UTF macros // (or the trustworthiness of the caller) diff --git a/icu4c/source/common/ucnv.c b/icu4c/source/common/ucnv.c index 461011f8626..f13c951b942 100644 --- a/icu4c/source/common/ucnv.c +++ b/icu4c/source/common/ucnv.c @@ -914,7 +914,7 @@ ucnv_getNextUChar(UConverter * converter, */ if (converter->UCharErrorBufferLength > 0) { - UTextOffset i = 0; + int32_t i = 0; UChar32 myUChar; UTF_NEXT_CHAR(converter->UCharErrorBuffer, i, sizeof(converter->UCharErrorBuffer), myUChar); /*In this memmove we update the internal buffer by diff --git a/icu4c/source/common/umemstrm.c b/icu4c/source/common/umemstrm.c index 90c927a2609..b975038e8a3 100644 --- a/icu4c/source/common/umemstrm.c +++ b/icu4c/source/common/umemstrm.c @@ -194,7 +194,7 @@ uprv_mstrm_write32(UMemoryStream *MS, uint32_t wyde) { } U_CAPI void U_EXPORT2 -uprv_mstrm_writeBlock(UMemoryStream *MS, const void *s, UTextOffset length) { +uprv_mstrm_writeBlock(UMemoryStream *MS, const void *s, int32_t length) { if(MS!=NULL) { if(length>0) { uprv_mstrm_write(MS, s, length); @@ -203,7 +203,7 @@ uprv_mstrm_writeBlock(UMemoryStream *MS, const void *s, UTextOffset length) { } U_CAPI void U_EXPORT2 -uprv_mstrm_writePadding(UMemoryStream *MS, UTextOffset length) { +uprv_mstrm_writePadding(UMemoryStream *MS, int32_t length) { static const uint8_t padding[16]={ 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, @@ -222,7 +222,7 @@ uprv_mstrm_writePadding(UMemoryStream *MS, UTextOffset length) { } U_CAPI void U_EXPORT2 -uprv_mstrm_writeString(UMemoryStream *MS, const char *s, UTextOffset length) { +uprv_mstrm_writeString(UMemoryStream *MS, const char *s, int32_t length) { if(MS!=NULL) { if(length==-1) { length=uprv_strlen(s); @@ -234,7 +234,7 @@ uprv_mstrm_writeString(UMemoryStream *MS, const char *s, UTextOffset length) { } U_CAPI void U_EXPORT2 -uprv_mstrm_writeUString(UMemoryStream *MS, const UChar *s, UTextOffset length) { +uprv_mstrm_writeUString(UMemoryStream *MS, const UChar *s, int32_t length) { if(MS!=NULL) { if(length==-1) { length=u_strlen(s); diff --git a/icu4c/source/common/umemstrm.h b/icu4c/source/common/umemstrm.h index eba591f7db7..de58170b5c0 100644 --- a/icu4c/source/common/umemstrm.h +++ b/icu4c/source/common/umemstrm.h @@ -57,10 +57,10 @@ U_CAPI int32_t U_EXPORT2 uprv_mstrm_jump(UMemoryStream *MS, const uint8_t *where U_CAPI void U_EXPORT2 uprv_mstrm_write8(UMemoryStream *MS, uint8_t byte); U_CAPI void U_EXPORT2 uprv_mstrm_write16(UMemoryStream *MS, uint16_t word); U_CAPI void U_EXPORT2 uprv_mstrm_write32(UMemoryStream *MS, uint32_t wyde); -U_CAPI void U_EXPORT2 uprv_mstrm_writeBlock(UMemoryStream *MS, const void *s, UTextOffset length); -U_CAPI void U_EXPORT2 uprv_mstrm_writePadding(UMemoryStream *MS, UTextOffset length); -U_CAPI void U_EXPORT2 uprv_mstrm_writeString(UMemoryStream *MS, const char *s, UTextOffset length); -U_CAPI void U_EXPORT2 uprv_mstrm_writeUString(UMemoryStream *MS, const UChar *s, UTextOffset length); +U_CAPI void U_EXPORT2 uprv_mstrm_writeBlock(UMemoryStream *MS, const void *s, int32_t length); +U_CAPI void U_EXPORT2 uprv_mstrm_writePadding(UMemoryStream *MS, int32_t length); +U_CAPI void U_EXPORT2 uprv_mstrm_writeString(UMemoryStream *MS, const char *s, int32_t length); +U_CAPI void U_EXPORT2 uprv_mstrm_writeUString(UMemoryStream *MS, const UChar *s, int32_t length); #endif /* _FILESTRM*/ diff --git a/icu4c/source/common/unames.c b/icu4c/source/common/unames.c index 35549c3a2ed..37623be9ce9 100644 --- a/icu4c/source/common/unames.c +++ b/icu4c/source/common/unames.c @@ -139,7 +139,7 @@ findAlgName(AlgorithmicRange *range, UCharNameChoice nameChoice, const char *oth static UBool findNameDummy(void *context, UChar32 code, UCharNameChoice nameChoice, - const char *name, UTextOffset length); + const char *name, int32_t length); static uint16_t getExtName(uint32_t code, char *buffer, uint16_t bufferLength); @@ -161,9 +161,9 @@ getCharCatName(UChar32 cp); /* public API --------------------------------------------------------------- */ -U_CAPI UTextOffset U_EXPORT2 +U_CAPI int32_t U_EXPORT2 u_charName(UChar32 code, UCharNameChoice nameChoice, - char *buffer, UTextOffset bufferLength, + char *buffer, int32_t bufferLength, UErrorCode *pErrorCode) { AlgorithmicRange *algRange; uint32_t *p; @@ -1364,7 +1364,7 @@ findAlgName(AlgorithmicRange *range, UCharNameChoice nameChoice, const char *oth static UBool findNameDummy(void *context, UChar32 code, UCharNameChoice nameChoice, - const char *name, UTextOffset length) { + const char *name, int32_t length) { return FALSE; } diff --git a/icu4c/source/common/unicode/bidi.h b/icu4c/source/common/unicode/bidi.h index 098a221146c..dcfeeb783fd 100644 --- a/icu4c/source/common/unicode/bidi.h +++ b/icu4c/source/common/unicode/bidi.h @@ -55,7 +55,7 @@ public: /** @memo Preallocating constructor, calls ubidi_openSized(). * @deprecated */ - BiDi(UTextOffset maxLength, UTextOffset maxRunCount, UErrorCode &rErrorCode); + BiDi(int32_t maxLength, int32_t maxRunCount, UErrorCode &rErrorCode); /** @memo Destructor, calls ubidi_close(). * @deprecated @@ -89,7 +89,7 @@ public: * @deprecated */ BiDi & - setPara(const UChar *text, UTextOffset length, + setPara(const UChar *text, int32_t length, UBiDiLevel paraLevel, UBiDiLevel *embeddingLevels, UErrorCode &rErrorCode); @@ -99,7 +99,7 @@ public: */ BiDi & setLine(const BiDi &rParaBiDi, - UTextOffset start, UTextOffset limit, + int32_t start, int32_t limit, UErrorCode &rErrorCode); /** @memo Get the directionality of the text. @@ -117,7 +117,7 @@ public: /** @memo Get the length of the text. * @deprecated */ - UTextOffset + int32_t getLength() const; /** @memo Get the paragraph level of the text. @@ -130,7 +130,7 @@ public: * @deprecated */ UBiDiLevel - getLevelAt(UTextOffset charIndex) const; + getLevelAt(int32_t charIndex) const; /** @memo Get an array of levels for each character. * @deprecated @@ -142,13 +142,13 @@ public: * @deprecated */ void - getLogicalRun(UTextOffset logicalStart, - UTextOffset &rLogicalLimit, UBiDiLevel &rLevel) const; + getLogicalRun(int32_t logicalStart, + int32_t &rLogicalLimit, UBiDiLevel &rLevel) const; /** @memo Get the number of runs. * @deprecated */ - UTextOffset + int32_t countRuns(UErrorCode &rErrorCode); /** @@ -157,19 +157,19 @@ public: * @deprecated */ UBiDiDirection - getVisualRun(UTextOffset runIndex, UTextOffset &rLogicalStart, UTextOffset &rLength); + getVisualRun(int32_t runIndex, int32_t &rLogicalStart, int32_t &rLength); /** @memo Get the visual position from a logical text position. * @deprecated */ - UTextOffset - getVisualIndex(UTextOffset logicalIndex, UErrorCode &rErrorCode); + int32_t + getVisualIndex(int32_t logicalIndex, UErrorCode &rErrorCode); /** @memo Get the logical text position from a visual position. * @deprecated */ - UTextOffset - getLogicalIndex(UTextOffset visualIndex, UErrorCode &rErrorCode); + int32_t + getLogicalIndex(int32_t visualIndex, UErrorCode &rErrorCode); /** * @memo Get a logical-to-visual index map (array) for the characters in the UBiDi @@ -177,7 +177,7 @@ public: * @deprecated */ void - getLogicalMap(UTextOffset *indexMap, UErrorCode &rErrorCode); + getLogicalMap(int32_t *indexMap, UErrorCode &rErrorCode); /** * @memo Get a visual-to-logical index map (array) for the characters in the UBiDi @@ -185,25 +185,25 @@ public: * @deprecated */ void - getVisualMap(UTextOffset *indexMap, UErrorCode &rErrorCode); + getVisualMap(int32_t *indexMap, UErrorCode &rErrorCode); /** @memo Same as ubidi_reorderLogical(). * @deprecated */ static void - reorderLogical(const UBiDiLevel *levels, UTextOffset length, UTextOffset *indexMap); + reorderLogical(const UBiDiLevel *levels, int32_t length, int32_t *indexMap); /** @memo Same as ubidi_reorderVisual(). * @deprecated */ static void - reorderVisual(const UBiDiLevel *levels, UTextOffset length, UTextOffset *indexMap); + reorderVisual(const UBiDiLevel *levels, int32_t length, int32_t *indexMap); /** @memo Same as ubidi_invertMap(). * @deprecated */ static void - invertMap(const UTextOffset *srcMap, UTextOffset *destMap, UTextOffset length); + invertMap(const int32_t *srcMap, int32_t *destMap, int32_t length); /** * Use the BiDi object containing the reordering @@ -214,7 +214,7 @@ public: * @see ubidi_writeReordered * @deprecated */ - UTextOffset + int32_t writeReordered(UChar *dest, int32_t destSize, uint16_t options, UErrorCode &rErrorCode); @@ -225,7 +225,7 @@ public: * @see ubidi_writeReverse * @deprecated */ - static UTextOffset + static int32_t writeReverse(const UChar *src, int32_t srcLength, UChar *dest, int32_t destSize, uint16_t options, @@ -252,7 +252,7 @@ inline BiDi::BiDi(UErrorCode &rErrorCode) { } } -inline BiDi::BiDi(UTextOffset maxLength, UTextOffset maxRunCount, UErrorCode &rErrorCode) { +inline BiDi::BiDi(int32_t maxLength, int32_t maxRunCount, UErrorCode &rErrorCode) { pBiDi=ubidi_openSized(maxLength, maxRunCount, &rErrorCode); } @@ -272,7 +272,7 @@ BiDi::isInverse() { } inline BiDi & -BiDi::setPara(const UChar *text, UTextOffset length, +BiDi::setPara(const UChar *text, int32_t length, UBiDiLevel paraLevel, UBiDiLevel *embeddingLevels, UErrorCode &rErrorCode) { ubidi_setPara(pBiDi, text, length, paraLevel, embeddingLevels, &rErrorCode); @@ -282,7 +282,7 @@ BiDi::setPara(const UChar *text, UTextOffset length, inline BiDi & BiDi::setLine(const BiDi &rParaBiDi, - UTextOffset start, UTextOffset limit, + int32_t start, int32_t limit, UErrorCode &rErrorCode) { ubidi_setLine(rParaBiDi.pBiDi, start, limit, pBiDi, &rErrorCode); return *this; @@ -298,7 +298,7 @@ BiDi::getText() const { return ubidi_getText(pBiDi); } -inline UTextOffset +inline int32_t BiDi::getLength() const { return ubidi_getLength(pBiDi); } @@ -309,7 +309,7 @@ BiDi::getParaLevel() const { } inline UBiDiLevel -BiDi::getLevelAt(UTextOffset charIndex) const { +BiDi::getLevelAt(int32_t charIndex) const { return ubidi_getLevelAt(pBiDi, charIndex); } @@ -319,64 +319,64 @@ BiDi::getLevels(UErrorCode &rErrorCode) { } inline void -BiDi::getLogicalRun(UTextOffset logicalStart, - UTextOffset &rLogicalLimit, UBiDiLevel &rLevel) const { +BiDi::getLogicalRun(int32_t logicalStart, + int32_t &rLogicalLimit, UBiDiLevel &rLevel) const { ubidi_getLogicalRun(pBiDi, logicalStart, &rLogicalLimit, &rLevel); } -inline UTextOffset +inline int32_t BiDi::countRuns(UErrorCode &rErrorCode) { return ubidi_countRuns(pBiDi, &rErrorCode); } inline UBiDiDirection -BiDi::getVisualRun(UTextOffset runIndex, UTextOffset &rLogicalStart, UTextOffset &rLength) { +BiDi::getVisualRun(int32_t runIndex, int32_t &rLogicalStart, int32_t &rLength) { return ubidi_getVisualRun(pBiDi, runIndex, &rLogicalStart, &rLength); } -inline UTextOffset -BiDi::getVisualIndex(UTextOffset logicalIndex, UErrorCode &rErrorCode) { +inline int32_t +BiDi::getVisualIndex(int32_t logicalIndex, UErrorCode &rErrorCode) { return ubidi_getVisualIndex(pBiDi, logicalIndex, &rErrorCode); } -inline UTextOffset -BiDi::getLogicalIndex(UTextOffset visualIndex, UErrorCode &rErrorCode) { +inline int32_t +BiDi::getLogicalIndex(int32_t visualIndex, UErrorCode &rErrorCode) { return ubidi_getLogicalIndex(pBiDi, visualIndex, &rErrorCode); } inline void -BiDi::getLogicalMap(UTextOffset *indexMap, UErrorCode &rErrorCode) { +BiDi::getLogicalMap(int32_t *indexMap, UErrorCode &rErrorCode) { ubidi_getLogicalMap(pBiDi, indexMap, &rErrorCode); } inline void -BiDi::getVisualMap(UTextOffset *indexMap, UErrorCode &rErrorCode) { +BiDi::getVisualMap(int32_t *indexMap, UErrorCode &rErrorCode) { ubidi_getVisualMap(pBiDi, indexMap, &rErrorCode); } inline void -BiDi::reorderLogical(const UBiDiLevel *levels, UTextOffset length, UTextOffset *indexMap) { +BiDi::reorderLogical(const UBiDiLevel *levels, int32_t length, int32_t *indexMap) { ubidi_reorderLogical(levels, length, indexMap); } inline void -BiDi::reorderVisual(const UBiDiLevel *levels, UTextOffset length, UTextOffset *indexMap) { +BiDi::reorderVisual(const UBiDiLevel *levels, int32_t length, int32_t *indexMap) { ubidi_reorderVisual(levels, length, indexMap); } inline void -BiDi::invertMap(const UTextOffset *srcMap, UTextOffset *destMap, UTextOffset length) { +BiDi::invertMap(const int32_t *srcMap, int32_t *destMap, int32_t length) { ubidi_invertMap(srcMap, destMap, length); } -inline UTextOffset +inline int32_t BiDi::writeReordered(UChar *dest, int32_t destSize, uint16_t options, UErrorCode &rErrorCode) { return ubidi_writeReordered(pBiDi, dest, destSize, options, &rErrorCode); } -inline UTextOffset +inline int32_t BiDi::writeReverse(const UChar *src, int32_t srcLength, UChar *dest, int32_t destSize, uint16_t options, diff --git a/icu4c/source/common/unicode/brkiter.h b/icu4c/source/common/unicode/brkiter.h index a1907348faf..5f0beb9957f 100644 --- a/icu4c/source/common/unicode/brkiter.h +++ b/icu4c/source/common/unicode/brkiter.h @@ -64,7 +64,7 @@ U_NAMESPACE_BEGIN * Helper function to output text * 
  * \code 
- *    void printTextRange( BreakIterator& iterator, UTextOffset start, UTextOffset end )
+ *    void printTextRange( BreakIterator& iterator, int32_t start, int32_t end )
  *    {
  *        UnicodeString textBuffer, temp;
  *        CharacterIterator *strIter = iterator.createText();
@@ -81,8 +81,8 @@ U_NAMESPACE_BEGIN
  * \code
  *    void printEachForward( BreakIterator& boundary)
  *    {
- *       UTextOffset start = boundary.first();
- *       for (UTextOffset end = boundary.next();
+ *       int32_t start = boundary.first();
+ *       for (int32_t end = boundary.next();
  *         end != BreakIterator::DONE;
  *         start = end, end = boundary.next())
  *         {
@@ -96,8 +96,8 @@ U_NAMESPACE_BEGIN
  * \code
  *    void printEachBackward( BreakIterator& boundary)
  *    {
- *       UTextOffset end = boundary.last();
- *       for (UTextOffset start = boundary.previous();
+ *       int32_t end = boundary.last();
+ *       for (int32_t start = boundary.previous();
  *         start != BreakIterator::DONE;
  *         end = start, start = boundary.previous())
  *         {
@@ -111,8 +111,8 @@ U_NAMESPACE_BEGIN
  * \code
  *    void printFirst(BreakIterator& boundary)
  *    {
- *        UTextOffset start = boundary.first();
- *        UTextOffset end = boundary.next();
+ *        int32_t start = boundary.first();
+ *        int32_t end = boundary.next();
  *        printTextRange( boundary, start, end );
  *    }
  * \endcode
@@ -122,8 +122,8 @@ U_NAMESPACE_BEGIN
  *  \code
  *    void printLast(BreakIterator& boundary)
  *    {
- *        UTextOffset end = boundary.last();
- *        UTextOffset start = boundary.previous();
+ *        int32_t end = boundary.last();
+ *        int32_t start = boundary.previous();
  *        printTextRange( boundary, start, end );
  *    }
  * \endcode
@@ -131,10 +131,10 @@ U_NAMESPACE_BEGIN
  * Print the element at a specified position
  * 
  * \code
- *    void printAt(BreakIterator &boundary, UTextOffset pos )
+ *    void printAt(BreakIterator &boundary, int32_t pos )
  *    {
- *        UTextOffset end = boundary.following(pos);
- *        UTextOffset start = boundary.previous();
+ *        int32_t end = boundary.following(pos);
+ *        int32_t start = boundary.previous();
  *        printTextRange( boundary, start, end );
  *    }
  * \endcode
@@ -256,19 +256,19 @@ public:
      * boundaries have been returned.
      * @stable
      */
-    static const UTextOffset DONE;
+    static const int32_t DONE;
 
     /**
      * Return the index of the first character in the text being scanned.
      * @stable
      */
-    virtual UTextOffset first(void) = 0;
+    virtual int32_t first(void) = 0;
 
     /**
      * Return the index immediately BEYOND the last character in the text being scanned.
      * @stable
      */
-    virtual UTextOffset last(void) = 0;
+    virtual int32_t last(void) = 0;
 
     /**
      * Return the boundary preceding the current boundary.
@@ -276,7 +276,7 @@ public:
      * boundaries have been returned.
      * @stable
      */
-    virtual UTextOffset previous(void) = 0;
+    virtual int32_t previous(void) = 0;
 
     /**
      * Return the boundary following the current boundary.
@@ -284,7 +284,7 @@ public:
      * boundaries have been returned.
      * @stable
      */
-    virtual UTextOffset next(void) = 0;
+    virtual int32_t next(void) = 0;
 
     /**
      * Return character index of the text boundary that was most recently
@@ -292,7 +292,7 @@ public:
      * @return The boundary most recently returned.
      * @stable
      */
-    virtual UTextOffset current(void) const = 0;
+    virtual int32_t current(void) const = 0;
 
     /**
      * Return the first boundary following the specified offset.
@@ -302,7 +302,7 @@ public:
      * @return The first boundary after the specified offset.
      * @stable
      */
-    virtual UTextOffset following(UTextOffset offset) = 0;
+    virtual int32_t following(int32_t offset) = 0;
 
     /**
      * Return the first boundary preceding the specified offset.
@@ -312,7 +312,7 @@ public:
      * @return The first boundary before the specified offset.
      * @stable
      */
-    virtual UTextOffset preceding(UTextOffset offset) = 0;
+    virtual int32_t preceding(int32_t offset) = 0;
  
     /**
      * Return true if the specfied position is a boundary position.
@@ -320,7 +320,7 @@ public:
      * @return True if "offset" is a boundary position.
      * @stable
      */
-    virtual UBool isBoundary(UTextOffset offset) = 0;
+    virtual UBool isBoundary(int32_t offset) = 0;
 
     /**
      * Return the nth boundary from the current boundary
@@ -331,7 +331,7 @@ public:
      * DONE if there are fewer than |n| boundaries in the specfied direction.
      * @stable
      */
-    virtual UTextOffset next(int32_t n) = 0;
+    virtual int32_t next(int32_t n) = 0;
 
     /**
      * Create BreakIterator for word-breaks using the given locale.
diff --git a/icu4c/source/common/unicode/chariter.h b/icu4c/source/common/unicode/chariter.h
index 62d2c256113..5e44479340f 100644
--- a/icu4c/source/common/unicode/chariter.h
+++ b/icu4c/source/common/unicode/chariter.h
@@ -287,17 +287,17 @@ protected:
  * Calls to notBoundary() in this example represents some additional stopping criteria.
  * 
  * \code
- * void traverseOut(CharacterIterator& iter, UTextOffset pos)
+ * void traverseOut(CharacterIterator& iter, int32_t pos)
  * {
  *      UChar c;
  *      for (c = iter.setIndex(pos);
  *      c != CharacterIterator.DONE && (Unicode::isLetter(c) || Unicode::isDigit(c));
  *          c = iter.next()) {}
- *      UTextOffset end = iter.getIndex();
+ *      int32_t end = iter.getIndex();
  *      for (c = iter.setIndex(pos);
  *          c != CharacterIterator.DONE && (Unicode::isLetter(c) || Unicode::isDigit(c));
  *          c = iter.previous()) {}
- *      UTextOffset start = iter.getIndex() + 1;
+ *      int32_t start = iter.getIndex() + 1;
  *  
  *      cout << "start: " << start << " end: " << end << endl;
  *      for (c = iter.setIndex(start); iter.getIndex() < end; c = iter.next() ) {
@@ -387,7 +387,7 @@ public:
    * @return the start position of the iteration range
    * @stable
    */
-  inline UTextOffset    setToStart();
+  inline int32_t    setToStart();
 
   /**
    * Sets the iterator to refer to the last code unit in its
@@ -412,7 +412,7 @@ public:
    * @return the end position of the iteration range
    * @stable
    */
-  inline UTextOffset    setToEnd();
+  inline int32_t    setToEnd();
 
   /**
    * Sets the iterator to refer to the "position"-th code unit
@@ -420,7 +420,7 @@ public:
    * returns that code unit.  
    * @stable
    */
-  virtual UChar         setIndex(UTextOffset position) = 0;
+  virtual UChar         setIndex(int32_t position) = 0;
 
   /**
    * Sets the iterator to refer to the beginning of the code point
@@ -431,7 +431,7 @@ public:
    * (its first code unit).
    * @stable
    */
-  virtual UChar32       setIndex32(UTextOffset position) = 0;
+  virtual UChar32       setIndex32(int32_t position) = 0;
 
   /**
    * Returns the code unit the iterator currently refers to.  
@@ -497,7 +497,7 @@ public:
    * necessarily 0.  
    * @stable
    */
-  inline UTextOffset       startIndex(void) const;
+  inline int32_t       startIndex(void) const;
         
   /**
    * Returns the numeric index in the underlying text-storage
@@ -505,7 +505,7 @@ public:
    * returned by last().  
    * @stable
    */
-  inline UTextOffset       endIndex(void) const;
+  inline int32_t       endIndex(void) const;
         
   /**
    * Returns the numeric index in the underlying text-storage
@@ -513,7 +513,7 @@ public:
    * (i.e., the character returned by current()).  
    * @stable
    */
-  inline UTextOffset       getIndex(void) const;
+  inline int32_t       getIndex(void) const;
 
   /**
    * Returns the length of the entire text in the underlying
@@ -530,7 +530,7 @@ public:
    * @return the new position
    * @stable
    */
-  virtual UTextOffset      move(int32_t delta, EOrigin origin) = 0;
+  virtual int32_t      move(int32_t delta, EOrigin origin) = 0;
 
   /**
    * Moves the current position relative to the start or end of the
@@ -540,7 +540,7 @@ public:
    * @return the new position
    * @stable
    */
-  virtual UTextOffset      move32(int32_t delta, EOrigin origin) = 0;
+  virtual int32_t      move32(int32_t delta, EOrigin origin) = 0;
 
   /**
    * Copies the text under iteration into the UnicodeString
@@ -553,16 +553,16 @@ public:
 protected:
   CharacterIterator() {}
   CharacterIterator(int32_t length);
-  CharacterIterator(int32_t length, UTextOffset position);
-  CharacterIterator(int32_t length, UTextOffset textBegin, UTextOffset textEnd, UTextOffset position);
+  CharacterIterator(int32_t length, int32_t position);
+  CharacterIterator(int32_t length, int32_t textBegin, int32_t textEnd, int32_t position);
   CharacterIterator(const CharacterIterator &that);
 
   CharacterIterator &operator=(const CharacterIterator &that);
 
   int32_t      textLength; // need this for correct getText() and hashCode()
-  UTextOffset  pos;
-  UTextOffset  begin;
-  UTextOffset  end;
+  int32_t  pos;
+  int32_t  begin;
+  int32_t  end;
 };
 
 inline UBool
@@ -570,27 +570,27 @@ ForwardCharacterIterator::operator!=(const ForwardCharacterIterator& that) const
   return !operator==(that);
 }
 
-inline UTextOffset
+inline int32_t
 CharacterIterator::setToStart() {
   return move(0, kStart);
 }
 
-inline UTextOffset
+inline int32_t
 CharacterIterator::setToEnd() {
   return move(0, kEnd);
 }
 
-inline UTextOffset
+inline int32_t
 CharacterIterator::startIndex(void) const {
   return begin;
 }
 
-inline UTextOffset
+inline int32_t
 CharacterIterator::endIndex(void) const {
   return end;
 }
 
-inline UTextOffset
+inline int32_t
 CharacterIterator::getIndex(void) const {
   return pos;
 }
diff --git a/icu4c/source/common/unicode/normlzr.h b/icu4c/source/common/unicode/normlzr.h
index 52611023f38..71bb082647b 100644
--- a/icu4c/source/common/unicode/normlzr.h
+++ b/icu4c/source/common/unicode/normlzr.h
@@ -345,7 +345,7 @@ public:
    * @return      the normalized character from the text at index
    * @deprecated To be removed after 2002-aug-31. Use setIndexOnly().
    */
-  UChar32              setIndex(UTextOffset index);
+  UChar32              setIndex(int32_t index);
 
   /**
    * Set the iteration position in the input text that is being normalized,
@@ -356,7 +356,7 @@ public:
    * @param index the desired index in the input text.
    * @draft ICU 2.0
    */
-  void                 setIndexOnly(UTextOffset index);
+  void                 setIndexOnly(int32_t index);
 
   /**
    * Reset the index to the beginning of the text.
@@ -379,7 +379,7 @@ public:
    * @return the current index in the input text
    * @stable
    */
-  UTextOffset            getIndex(void) const;
+  int32_t            getIndex(void) const;
 
   /**
    * Retrieve the index of the start of the input text. This is the begin index
@@ -389,7 +389,7 @@ public:
    * @return the smallest index in the input text where the Normalizer operates
    * @stable
    */
-  UTextOffset            startIndex(void) const;
+  int32_t            startIndex(void) const;
 
   /**
    * Retrieve the index of the end of the input text. This is the end index
@@ -401,7 +401,7 @@ public:
    * @return the first index in the input text where the Normalizer does not operate
    * @stable
    */
-  UTextOffset            endIndex(void) const;
+  int32_t            endIndex(void) const;
 
   /**
    * Returns TRUE when both iterators refer to the same character in the same
@@ -912,11 +912,11 @@ private:
 
   // The normalization buffer is the result of normalization
   // of the source in [currentIndex..nextIndex[ .
-  UTextOffset         currentIndex, nextIndex;
+  int32_t         currentIndex, nextIndex;
 
   // A buffer for holding intermediate results
   UnicodeString       buffer;
-  UTextOffset         bufferPos;
+  int32_t         bufferPos;
 };
 
 //-------------------------------------------------------------------------
diff --git a/icu4c/source/common/unicode/putil.h b/icu4c/source/common/unicode/putil.h
index 6f961515c53..486e82878f4 100644
--- a/icu4c/source/common/unicode/putil.h
+++ b/icu4c/source/common/unicode/putil.h
@@ -256,7 +256,7 @@ U_CAPI double       U_EXPORT2 uprv_nextDouble(double d, UBool positive);
  * @stable
  */
 U_CAPI void U_EXPORT2
-u_charsToUChars(const char *cs, UChar *us, UTextOffset length);
+u_charsToUChars(const char *cs, UChar *us, int32_t length);
 
 /**
  * Convert UChar characters to char characters.
@@ -276,7 +276,7 @@ u_charsToUChars(const char *cs, UChar *us, UTextOffset length);
  * @stable
  */
 U_CAPI void U_EXPORT2
-u_UCharsToChars(const UChar *us, char *cs, UTextOffset length);
+u_UCharsToChars(const UChar *us, char *cs, int32_t length);
 
 /* Define U_UPPER_ORDINAL */
 #if U_CHARSET_FAMILY==U_ASCII_FAMILY
diff --git a/icu4c/source/common/unicode/rep.h b/icu4c/source/common/unicode/rep.h
index 68c5cfa1c30..8bdfeacedad 100644
--- a/icu4c/source/common/unicode/rep.h
+++ b/icu4c/source/common/unicode/rep.h
@@ -77,7 +77,7 @@ public:
      * @return code unit of text at given offset
      * @draft ICU 1.8
      */
-    inline UChar charAt(UTextOffset offset) const;
+    inline UChar charAt(int32_t offset) const;
 
     /**
      * Return the Unicode code point that contains the code unit
@@ -88,7 +88,7 @@ public:
      * @return code point of text at given offset
      * @draft ICU 1.8
      */
-    inline UChar32 char32At(UTextOffset offset) const;
+    inline UChar32 char32At(int32_t offset) const;
 
     /**
      * Copy the characters in the range [start, limit) 
@@ -100,8 +100,8 @@ public:
      * @return A reference to target
      * @draft ICU 2.1
      */
-    virtual void extractBetween(UTextOffset start,
-                                UTextOffset limit,
+    virtual void extractBetween(int32_t start,
+                                int32_t limit,
                                 UnicodeString& target) const = 0;
 
     /**
@@ -124,8 +124,8 @@ public:
      * to limit - 1 
      * @stable
      */
-    virtual void handleReplaceBetween(UTextOffset start,
-                                      UTextOffset limit,
+    virtual void handleReplaceBetween(int32_t start,
+                                      int32_t limit,
                                       const UnicodeString& text) = 0;
     // Note: All other methods in this class take the names of
     // existing UnicodeString methods.  This method is the exception.
@@ -175,12 +175,12 @@ protected:
     /**
      * Virtual version of charAt().
      */
-    virtual UChar getCharAt(UTextOffset offset) const = 0;
+    virtual UChar getCharAt(int32_t offset) const = 0;
 
     /**
      * Virtual version of char32At().
      */
-    virtual UChar32 getChar32At(UTextOffset offset) const = 0;
+    virtual UChar32 getChar32At(int32_t offset) const = 0;
 };
 
 inline Replaceable::Replaceable() {}
@@ -193,12 +193,12 @@ Replaceable::length() const {
 }
 
 inline UChar
-Replaceable::charAt(UTextOffset offset) const {
+Replaceable::charAt(int32_t offset) const {
     return getCharAt(offset);
 }
 
 inline UChar32
-Replaceable::char32At(UTextOffset offset) const {
+Replaceable::char32At(int32_t offset) const {
     return getChar32At(offset);
 }
 
diff --git a/icu4c/source/common/unicode/schriter.h b/icu4c/source/common/unicode/schriter.h
index cfa7968eb35..6d49bd72a50 100644
--- a/icu4c/source/common/unicode/schriter.h
+++ b/icu4c/source/common/unicode/schriter.h
@@ -53,7 +53,7 @@ public:
    * @stable
    */
   StringCharacterIterator(const UnicodeString&    textStr,
-              UTextOffset              textPos);
+              int32_t              textPos);
 
   /**
    * Create an iterator over the UnicodeString referred to by "textStr".
@@ -68,9 +68,9 @@ public:
    * @stable
    */
   StringCharacterIterator(const UnicodeString&    textStr,
-              UTextOffset              textBegin,
-              UTextOffset              textEnd,
-              UTextOffset              textPos);
+              int32_t              textBegin,
+              int32_t              textEnd,
+              int32_t              textPos);
 
   /**
    * Copy constructor.  The new iterator iterates over the same range
diff --git a/icu4c/source/common/unicode/ubidi.h b/icu4c/source/common/unicode/ubidi.h
index 9eaa45721ad..c1fcae1e033 100644
--- a/icu4c/source/common/unicode/ubidi.h
+++ b/icu4c/source/common/unicode/ubidi.h
@@ -96,15 +96,15 @@
  *     styleSuper=8, styleSub=16
  *} Style;
  *
- *typedef struct { UTextOffset limit; Style style; } StyleRun;
+ *typedef struct { int32_t limit; Style style; } StyleRun;
  *
- *int getTextWidth(const UChar *text, UTextOffset start, UTextOffset limit,
+ *int getTextWidth(const UChar *text, int32_t start, int32_t limit,
  *                  const StyleRun *styleRuns, int styleRunCount);
  *
  * // set *pLimit and *pStyleRunLimit for a line
  * // from text[start] and from styleRuns[styleRunStart]
  * // using ubidi_getLogicalRun(para, ...)
- *void getLineBreak(const UChar *text, UTextOffset start, UTextOffset *pLimit,
+ *void getLineBreak(const UChar *text, int32_t start, int32_t *pLimit,
  *                  UBiDi *para,
  *                  const StyleRun *styleRuns, int styleRunStart, int *pStyleRunLimit,
  *                  int *pLineWidth);
@@ -116,7 +116,7 @@
  *
  * // render a run of text and advance to the right by the run width
  * // the text[start..limit-1] is always in logical order
- *void renderRun(const UChar *text, UTextOffset start, UTextOffset limit,
+ *void renderRun(const UChar *text, int32_t start, int32_t limit,
  *               UBiDiDirection textDirection, Style style);
  *
  * // We could compute a cross-product
@@ -130,7 +130,7 @@
  * // render a directional run with
  * // (possibly) multiple style runs intersecting with it
  *void renderDirectionalRun(const UChar *text,
- *                           UTextOffset start, UTextOffset limit,
+ *                           int32_t start, int32_t limit,
  *                           UBiDiDirection direction,
  *                           const StyleRun *styleRuns, int styleRunCount) {
  *     int i;
@@ -171,7 +171,7 @@
  *
  * // the line object represents text[start..limit-1]
  * void renderLine(UBiDi *line, const UChar *text,
- *                 UTextOffset start, UTextOffset limit,
+ *                 int32_t start, int32_t limit,
  *                 const StyleRun *styleRuns, int styleRunCount) {
  *     UBiDiDirection direction=ubidi_getDirection(line);
  *     if(direction!=UBIDI_MIXED) {
@@ -184,7 +184,7 @@
  *         }
  *     } else {
  *         // mixed-directional
- *         UTextOffset count, i, length;
+ *         int32_t count, i, length;
  *         UBiDiLevel level;
  *
  *         count=ubidi_countRuns(para, pErrorCode);
@@ -198,7 +198,7 @@
  *                     renderRun(text, start, start+length, direction, style);
  *                }
  *             } else {
- *                 UTextOffset j;
+ *                 int32_t j;
  *
  *                 // iterate over both directional and style runs
  *                 for(i=0; iubidi_close() must be called to free the memory
@@ -591,7 +591,7 @@ ubidi_isInverse(UBiDi *pBiDi);
  * @stable
  */
 U_CAPI void U_EXPORT2
-ubidi_setPara(UBiDi *pBiDi, const UChar *text, UTextOffset length,
+ubidi_setPara(UBiDi *pBiDi, const UChar *text, int32_t length,
               UBiDiLevel paraLevel, UBiDiLevel *embeddingLevels,
               UErrorCode *pErrorCode);
 
@@ -640,7 +640,7 @@ ubidi_setPara(UBiDi *pBiDi, const UChar *text, UTextOffset length,
  */
 U_CAPI void U_EXPORT2
 ubidi_setLine(const UBiDi *pParaBiDi,
-              UTextOffset start, UTextOffset limit,
+              int32_t start, int32_t limit,
               UBiDi *pLineBiDi,
               UErrorCode *pErrorCode);
 
@@ -681,7 +681,7 @@ ubidi_getText(const UBiDi *pBiDi);
  * @return The length of the text that the UBiDi object was created for.
  * @stable
  */
-U_CAPI UTextOffset U_EXPORT2
+U_CAPI int32_t U_EXPORT2
 ubidi_getLength(const UBiDi *pBiDi);
 
 /**
@@ -710,7 +710,7 @@ ubidi_getParaLevel(const UBiDi *pBiDi);
  * @stable
  */
 U_CAPI UBiDiLevel U_EXPORT2
-ubidi_getLevelAt(const UBiDi *pBiDi, UTextOffset charIndex);
+ubidi_getLevelAt(const UBiDi *pBiDi, int32_t charIndex);
 
 /**
  * Get an array of levels for each character.

@@ -755,8 +755,8 @@ ubidi_getLevels(UBiDi *pBiDi, UErrorCode *pErrorCode);
  * @stable
  */
 U_CAPI void U_EXPORT2
-ubidi_getLogicalRun(const UBiDi *pBiDi, UTextOffset logicalStart,
-                    UTextOffset *pLogicalLimit, UBiDiLevel *pLevel);
+ubidi_getLogicalRun(const UBiDi *pBiDi, int32_t logicalStart,
+                    int32_t *pLogicalLimit, UBiDiLevel *pLevel);
 
 /**
  * Get the number of runs.
@@ -774,7 +774,7 @@ ubidi_getLogicalRun(const UBiDi *pBiDi, UTextOffset logicalStart,
  * @return The number of runs.
  * @stable
  */
-U_CAPI UTextOffset U_EXPORT2
+U_CAPI int32_t U_EXPORT2
 ubidi_countRuns(UBiDi *pBiDi, UErrorCode *pErrorCode);
 
 /**
@@ -806,7 +806,7 @@ ubidi_countRuns(UBiDi *pBiDi, UErrorCode *pErrorCode);
  * Example:
  * 
  * \code
- * UTextOffset i, count=ubidi_countRuns(pBiDi),
+ * int32_t i, count=ubidi_countRuns(pBiDi),
  *         logicalStart, visualIndex=0, length;
  * for(i=0; i
  * \code
- *    void printTextRange(UChar* str, UTextOffset start, UTextOffset end ) {
+ *    void printTextRange(UChar* str, int32_t start, int32_t end ) {
  *         UChar* result;
  *         UChar* temp;
  *         const char* res;
@@ -71,8 +71,8 @@
  * 
  * \code
  *    void printEachForward( UBreakIterator* boundary, UChar* str) {
- *       UTextOffset end;
- *       UTextOffset start = ubrk_first(boundary);
+ *       int32_t end;
+ *       int32_t start = ubrk_first(boundary);
  *       for (end = ubrk_next(boundary)); end != UBRK_DONE; start = end, end = ubrk_next(boundary)) {
  *             printTextRange(str, start, end );
  *         }
@@ -83,8 +83,8 @@
  * 
  * \code
  *    void printEachBackward( UBreakIterator* boundary, UChar* str) {
- *       UTextOffset start;
- *       UTextOffset end = ubrk_last(boundary);
+ *       int32_t start;
+ *       int32_t end = ubrk_last(boundary);
  *       for (start = ubrk_previous(boundary); start != UBRK_DONE;  end = start, start =ubrk_previous(boundary)) {
  *             printTextRange( str, start, end );
  *         }
@@ -95,8 +95,8 @@
  * 
  * \code
  *    void printFirst(UBreakIterator* boundary, UChar* str) {
- *        UTextOffset end;
- *        UTextOffset start = ubrk_first(boundary);
+ *        int32_t end;
+ *        int32_t start = ubrk_first(boundary);
  *        end = ubrk_next(boundary);
  *        printTextRange( str, start, end );
  *    }
@@ -106,8 +106,8 @@
  * 
  * \code
  *    void printLast(UBreakIterator* boundary, UChar* str) {
- *        UTextOffset start;
- *        UTextOffset end = ubrk_last(boundary);
+ *        int32_t start;
+ *        int32_t end = ubrk_last(boundary);
  *        start = ubrk_previous(boundary);
  *        printTextRange(str, start, end );
  *    }
@@ -116,9 +116,9 @@
  * Print the element at a specified position
  * 
  * \code
- *    void printAt(UBreakIterator* boundary, UTextOffset pos , UChar* str) {
- *        UTextOffset start;
- *        UTextOffset end = ubrk_following(boundary, pos);
+ *    void printAt(UBreakIterator* boundary, int32_t pos , UChar* str) {
+ *        int32_t start;
+ *        int32_t end = ubrk_following(boundary, pos);
  *        start = ubrk_previous(boundary);
  *        printTextRange(str, start, end );
  *    }
@@ -191,7 +191,7 @@ typedef enum UBreakIteratorType UBreakIteratorType;
 /** Value indicating all text boundaries have been returned.
  *
  */
-#define UBRK_DONE ((UTextOffset) -1)
+#define UBRK_DONE ((int32_t) -1)
 
 /**
  * Open a new UBreakIterator for locating text boundaries for a specified locale.
@@ -287,7 +287,7 @@ ubrk_setText(UBreakIterator* bi,
  * \Ref{ubrk_first}, or \Ref{ubrk_last}.
  * @stable
  */
-U_CAPI UTextOffset U_EXPORT2 
+U_CAPI int32_t U_EXPORT2 
 ubrk_current(const UBreakIterator *bi);
 
 /**
@@ -299,7 +299,7 @@ ubrk_current(const UBreakIterator *bi);
  * @see ubrk_previous
  * @stable
  */
-U_CAPI UTextOffset U_EXPORT2 
+U_CAPI int32_t U_EXPORT2 
 ubrk_next(UBreakIterator *bi);
 
 /**
@@ -311,7 +311,7 @@ ubrk_next(UBreakIterator *bi);
  * @see ubrk_next
  * @stable
  */
-U_CAPI UTextOffset U_EXPORT2 
+U_CAPI int32_t U_EXPORT2 
 ubrk_previous(UBreakIterator *bi);
 
 /**
@@ -322,7 +322,7 @@ ubrk_previous(UBreakIterator *bi);
  * @see ubrk_last
  * @stable
  */
-U_CAPI UTextOffset U_EXPORT2 
+U_CAPI int32_t U_EXPORT2 
 ubrk_first(UBreakIterator *bi);
 
 /**
@@ -335,7 +335,7 @@ ubrk_first(UBreakIterator *bi);
  * @see ubrk_first
  * @stable
  */
-U_CAPI UTextOffset U_EXPORT2 
+U_CAPI int32_t U_EXPORT2 
 ubrk_last(UBreakIterator *bi);
 
 /**
@@ -347,9 +347,9 @@ ubrk_last(UBreakIterator *bi);
  * @see ubrk_following
  * @stable
  */
-U_CAPI UTextOffset U_EXPORT2 
+U_CAPI int32_t U_EXPORT2 
 ubrk_preceding(UBreakIterator *bi,
-           UTextOffset offset);
+           int32_t offset);
 
 /**
  * Determine the text boundary following the specified offset.
@@ -360,9 +360,9 @@ ubrk_preceding(UBreakIterator *bi,
  * @see ubrk_preceding
  * @stable
  */
-U_CAPI UTextOffset U_EXPORT2 
+U_CAPI int32_t U_EXPORT2 
 ubrk_following(UBreakIterator *bi,
-           UTextOffset offset);
+           int32_t offset);
 
 /**
 * Get a locale for which text breaking information is available.
diff --git a/icu4c/source/common/unicode/uchar.h b/icu4c/source/common/unicode/uchar.h
index 52f198eb4b9..91b70beeeaf 100644
--- a/icu4c/source/common/unicode/uchar.h
+++ b/icu4c/source/common/unicode/uchar.h
@@ -1336,9 +1336,9 @@ ublock_getCode(UChar32    ch);
  * @see u_enumCharNames
  * @stable
  */
-U_CAPI UTextOffset U_EXPORT2
+U_CAPI int32_t U_EXPORT2
 u_charName(UChar32 code, UCharNameChoice nameChoice,
-           char *buffer, UTextOffset bufferLength,
+           char *buffer, int32_t bufferLength,
            UErrorCode *pErrorCode);
 
 /**
@@ -1385,7 +1385,7 @@ typedef UBool UEnumCharNamesFn(void *context,
                                UChar32 code,
                                UCharNameChoice nameChoice,
                                const char *name,
-                               UTextOffset length);
+                               int32_t length);
 
 /**
  * Enumerate all assigned Unicode characters between the start and limit
diff --git a/icu4c/source/common/unicode/uchriter.h b/icu4c/source/common/unicode/uchriter.h
index 7d6b920e52d..3a003c49833 100644
--- a/icu4c/source/common/unicode/uchriter.h
+++ b/icu4c/source/common/unicode/uchriter.h
@@ -47,7 +47,7 @@ public:
    * @stable
    */
   UCharCharacterIterator(const UChar* textPtr, int32_t length,
-                         UTextOffset position);
+                         int32_t position);
 
   /**
    * Create an iterator over the UChar array referred to by "textPtr".
@@ -61,9 +61,9 @@ public:
    * @stable
    */
   UCharCharacterIterator(const UChar* textPtr, int32_t length,
-                         UTextOffset textBegin,
-                         UTextOffset textEnd,
-                         UTextOffset position);
+                         int32_t textBegin,
+                         int32_t textEnd,
+                         int32_t position);
 
   /**
    * Copy constructor.  The new iterator iterates over the same range
@@ -167,7 +167,7 @@ public:
    * returns that code unit.  
    * @stable
    */
-  virtual UChar         setIndex(UTextOffset position);
+  virtual UChar         setIndex(int32_t position);
 
   /**
    * Sets the iterator to refer to the beginning of the code point
@@ -178,7 +178,7 @@ public:
    * (its first code unit).
    * @stable
    */
-  virtual UChar32       setIndex32(UTextOffset position);
+  virtual UChar32       setIndex32(int32_t position);
 
   /**
    * Returns the code unit the iterator currently refers to.  
@@ -271,7 +271,7 @@ public:
    * @return the new position
    * @stable
    */
-  virtual UTextOffset      move(int32_t delta, EOrigin origin);
+  virtual int32_t      move(int32_t delta, EOrigin origin);
 
   /**
    * Moves the current position relative to the start or end of the
@@ -281,7 +281,7 @@ public:
    * @return the new position
    * @stable
    */
-  virtual UTextOffset      move32(int32_t delta, EOrigin origin);
+  virtual int32_t      move32(int32_t delta, EOrigin origin);
 
   /**
    * Sets the iterator to iterate over a new range of text
diff --git a/icu4c/source/common/unicode/unicode.h b/icu4c/source/common/unicode/unicode.h
index 6a3308fa988..938908501d4 100644
--- a/icu4c/source/common/unicode/unicode.h
+++ b/icu4c/source/common/unicode/unicode.h
@@ -979,7 +979,7 @@ public:
      * Example:
      * 
      *     char buffer[100];
-     *     UTextOffset length=Unicode::getCharName(
+     *     int32_t length=Unicode::getCharName(
      *             0x284, buffer, sizeof(buffer));
      *     
      *     // use invariant-character conversion to Unicode
@@ -988,9 +988,9 @@ public:
      *
      * @deprecated See the Unicode class description.
      */
-    static inline UTextOffset
+    static inline int32_t
     getCharName(uint32_t code,
-                char *buffer, UTextOffset bufferLength,
+                char *buffer, int32_t bufferLength,
                 UCharNameChoice nameChoice=U_UNICODE_CHAR_NAME);
 
     /**
@@ -1311,12 +1311,12 @@ Unicode::getCellWidth(UChar32 ch) {
     return u_charCellWidth(ch);
 }
 
-inline UTextOffset
+inline int32_t
 Unicode::getCharName(uint32_t code,
-                     char *buffer, UTextOffset bufferLength,
+                     char *buffer, int32_t bufferLength,
                      UCharNameChoice nameChoice) {
     UErrorCode errorCode=U_ZERO_ERROR;
-    UTextOffset length=u_charName(code, nameChoice, buffer, bufferLength, &errorCode);
+    int32_t length=u_charName(code, nameChoice, buffer, bufferLength, &errorCode);
     return U_SUCCESS(errorCode) ? length : 0;
 }
 
diff --git a/icu4c/source/common/unicode/unistr.h b/icu4c/source/common/unicode/unistr.h
index dacb3d417d0..d88573f5eb7 100644
--- a/icu4c/source/common/unicode/unistr.h
+++ b/icu4c/source/common/unicode/unistr.h
@@ -235,7 +235,7 @@ public:
    * in this.
    * @stable
    */
-  inline int8_t compare(UTextOffset start,
+  inline int8_t compare(int32_t start,
          int32_t length,
          const UnicodeString& srcText) const;
 
@@ -256,10 +256,10 @@ public:
    * in this.
    * @stable
    */
-   inline int8_t compare(UTextOffset start,
+   inline int8_t compare(int32_t start,
          int32_t length,
          const UnicodeString& srcText,
-         UTextOffset srcStart,
+         int32_t srcStart,
          int32_t srcLength) const;
 
   /**
@@ -291,7 +291,7 @@ public:
    * in this.
    * @stable
    */
-  inline int8_t compare(UTextOffset start,
+  inline int8_t compare(int32_t start,
          int32_t length,
          const UChar *srcChars) const;
 
@@ -312,10 +312,10 @@ public:
    * in this.
    * @stable
    */
-  inline int8_t compare(UTextOffset start,
+  inline int8_t compare(int32_t start,
          int32_t length,
          const UChar *srcChars,
-         UTextOffset srcStart,
+         int32_t srcStart,
          int32_t srcLength) const;
 
   /**
@@ -335,11 +335,11 @@ public:
    * in this.
    * @stable
    */
-  inline int8_t compareBetween(UTextOffset start,
-            UTextOffset limit,
+  inline int8_t compareBetween(int32_t start,
+            int32_t limit,
             const UnicodeString& srcText,
-            UTextOffset srcStart,
-            UTextOffset srcLimit) const;
+            int32_t srcStart,
+            int32_t srcLimit) const;
 
   /**
    * Compare two Unicode strings in code point order.
@@ -379,7 +379,7 @@ public:
    * in code point order
    * @draft ICU 1.8
    */
-  inline int8_t compareCodePointOrder(UTextOffset start,
+  inline int8_t compareCodePointOrder(int32_t start,
                                       int32_t length,
                                       const UnicodeString& srcText) const;
 
@@ -404,10 +404,10 @@ public:
    * in code point order
    * @draft ICU 1.8
    */
-   inline int8_t compareCodePointOrder(UTextOffset start,
+   inline int8_t compareCodePointOrder(int32_t start,
                                        int32_t length,
                                        const UnicodeString& srcText,
-                                       UTextOffset srcStart,
+                                       int32_t srcStart,
                                        int32_t srcLength) const;
 
   /**
@@ -450,7 +450,7 @@ public:
    * in code point order
    * @draft ICU 1.8
    */
-  inline int8_t compareCodePointOrder(UTextOffset start,
+  inline int8_t compareCodePointOrder(int32_t start,
                                       int32_t length,
                                       const UChar *srcChars) const;
 
@@ -475,10 +475,10 @@ public:
    * in code point order
    * @draft ICU 1.8
    */
-  inline int8_t compareCodePointOrder(UTextOffset start,
+  inline int8_t compareCodePointOrder(int32_t start,
                                       int32_t length,
                                       const UChar *srcChars,
-                                      UTextOffset srcStart,
+                                      int32_t srcStart,
                                       int32_t srcLength) const;
 
   /**
@@ -502,11 +502,11 @@ public:
    * in code point order
    * @draft ICU 1.8
    */
-  inline int8_t compareCodePointOrderBetween(UTextOffset start,
-                                             UTextOffset limit,
+  inline int8_t compareCodePointOrderBetween(int32_t start,
+                                             int32_t limit,
                                              const UnicodeString& srcText,
-                                             UTextOffset srcStart,
-                                             UTextOffset srcLimit) const;
+                                             int32_t srcStart,
+                                             int32_t srcLimit) const;
 
   /**
    * Compare two strings case-insensitively using full case folding.
@@ -530,7 +530,7 @@ public:
    * @return A negative, zero, or positive integer indicating the comparison result.
    * @draft ICU 1.8
    */
-  inline int8_t caseCompare(UTextOffset start,
+  inline int8_t caseCompare(int32_t start,
          int32_t length,
          const UnicodeString& srcText,
          uint32_t options) const;
@@ -548,10 +548,10 @@ public:
    * @return A negative, zero, or positive integer indicating the comparison result.
    * @draft ICU 1.8
    */
-  inline int8_t caseCompare(UTextOffset start,
+  inline int8_t caseCompare(int32_t start,
          int32_t length,
          const UnicodeString& srcText,
-         UTextOffset srcStart,
+         int32_t srcStart,
          int32_t srcLength,
          uint32_t options) const;
 
@@ -580,7 +580,7 @@ public:
    * @return A negative, zero, or positive integer indicating the comparison result.
    * @draft ICU 1.8
    */
-  inline int8_t caseCompare(UTextOffset start,
+  inline int8_t caseCompare(int32_t start,
          int32_t length,
          const UChar *srcChars,
          uint32_t options) const;
@@ -598,10 +598,10 @@ public:
    * @return A negative, zero, or positive integer indicating the comparison result.
    * @draft ICU 1.8
    */
-  inline int8_t caseCompare(UTextOffset start,
+  inline int8_t caseCompare(int32_t start,
          int32_t length,
          const UChar *srcChars,
-         UTextOffset srcStart,
+         int32_t srcStart,
          int32_t srcLength,
          uint32_t options) const;
 
@@ -618,11 +618,11 @@ public:
    * @return A negative, zero, or positive integer indicating the comparison result.
    * @draft ICU 1.8
    */
-  inline int8_t caseCompareBetween(UTextOffset start,
-            UTextOffset limit,
+  inline int8_t caseCompareBetween(int32_t start,
+            int32_t limit,
             const UnicodeString& srcText,
-            UTextOffset srcStart,
-            UTextOffset srcLimit,
+            int32_t srcStart,
+            int32_t srcLimit,
             uint32_t options) const;
 
   /**
@@ -645,7 +645,7 @@ public:
    * @stable
    */
   inline UBool startsWith(const UnicodeString& srcText,
-            UTextOffset srcStart,
+            int32_t srcStart,
             int32_t srcLength) const;
 
   /**
@@ -669,7 +669,7 @@ public:
    * @stable
    */
   inline UBool startsWith(const UChar *srcChars,
-            UTextOffset srcStart,
+            int32_t srcStart,
             int32_t srcLength) const;
 
   /**
@@ -692,7 +692,7 @@ public:
    * @stable
    */
   inline UBool endsWith(const UnicodeString& srcText,
-          UTextOffset srcStart,
+          int32_t srcStart,
           int32_t srcLength) const;
 
   /**
@@ -717,7 +717,7 @@ public:
    * @stable
    */
   inline UBool endsWith(const UChar *srcChars,
-          UTextOffset srcStart,
+          int32_t srcStart,
           int32_t srcLength) const;
 
 
@@ -731,7 +731,7 @@ public:
    * or -1 if not found.
    * @stable
    */
-  inline UTextOffset indexOf(const UnicodeString& text) const;
+  inline int32_t indexOf(const UnicodeString& text) const;
 
   /**
    * Locate in this the first occurrence of the characters in text
@@ -742,8 +742,8 @@ public:
    * or -1 if not found.
    * @stable
    */
-  inline UTextOffset indexOf(const UnicodeString& text,
-              UTextOffset start) const;
+  inline int32_t indexOf(const UnicodeString& text,
+              int32_t start) const;
 
   /**
    * Locate in this the first occurrence in the range
@@ -756,8 +756,8 @@ public:
    * or -1 if not found.
    * @stable
    */
-  inline UTextOffset indexOf(const UnicodeString& text,
-              UTextOffset start,
+  inline int32_t indexOf(const UnicodeString& text,
+              int32_t start,
               int32_t length) const;
 
   /**
@@ -776,10 +776,10 @@ public:
    * or -1 if not found.
    * @stable
    */
-  inline UTextOffset indexOf(const UnicodeString& srcText,
-              UTextOffset srcStart,
+  inline int32_t indexOf(const UnicodeString& srcText,
+              int32_t srcStart,
               int32_t srcLength,
-              UTextOffset start,
+              int32_t start,
               int32_t length) const;
 
   /**
@@ -793,9 +793,9 @@ public:
    * or -1 if not found.
    * @stable
    */
-  inline UTextOffset indexOf(const UChar *srcChars,
+  inline int32_t indexOf(const UChar *srcChars,
               int32_t srcLength,
-              UTextOffset start) const;
+              int32_t start) const;
 
   /**
    * Locate in this the first occurrence in the range
@@ -809,9 +809,9 @@ public:
    * or -1 if not found.
    * @stable
    */
-  inline UTextOffset indexOf(const UChar *srcChars,
+  inline int32_t indexOf(const UChar *srcChars,
               int32_t srcLength,
-              UTextOffset start,
+              int32_t start,
               int32_t length) const;
  
   /**
@@ -830,10 +830,10 @@ public:
    * or -1 if not found.
    * @stable
    */
-  UTextOffset indexOf(const UChar *srcChars,
-              UTextOffset srcStart,
+  int32_t indexOf(const UChar *srcChars,
+              int32_t srcStart,
               int32_t srcLength,
-              UTextOffset start,
+              int32_t start,
               int32_t length) const;
 
   /**
@@ -843,7 +843,7 @@ public:
    * @return The offset into this of c, or -1 if not found.
    * @stable
    */
-  inline UTextOffset indexOf(UChar c) const;
+  inline int32_t indexOf(UChar c) const;
 
   /**
    * Locate in this the first occurrence of the code point c, 
@@ -866,7 +866,7 @@ public:
    * @return The offset into this of c, or -1 if not found.
    * @stable
    */
-  inline UTextOffset indexOf(UChar32 c) const;
+  inline int32_t indexOf(UChar32 c) const;
 
   /**
    * Locate in this the first occurrence of the code unit c
@@ -876,8 +876,8 @@ public:
    * @return The offset into this of c, or -1 if not found.
    * @stable
    */
-  inline UTextOffset indexOf(UChar c,
-              UTextOffset start) const;
+  inline int32_t indexOf(UChar c,
+              int32_t start) const;
 
   /**
    * Locate in this the first occurrence of the code point c
@@ -901,8 +901,8 @@ public:
    * @return The offset into this of c, or -1 if not found.
    * @stable
    */
-  inline UTextOffset indexOf(UChar32 c,
-              UTextOffset start) const;
+  inline int32_t indexOf(UChar32 c,
+              int32_t start) const;
 
   /**
    * Locate in this the first occurrence of the code unit c 
@@ -914,8 +914,8 @@ public:
    * @return The offset into this of c, or -1 if not found.
    * @stable
    */
-  inline UTextOffset indexOf(UChar c,
-              UTextOffset start,
+  inline int32_t indexOf(UChar c,
+              int32_t start,
               int32_t length) const;
 
   /**
@@ -942,8 +942,8 @@ public:
    * @return The offset into this of c, or -1 if not found.
    * @stable
    */
-  inline UTextOffset indexOf(UChar32 c,
-              UTextOffset start,
+  inline int32_t indexOf(UChar32 c,
+              int32_t start,
               int32_t length) const;
 
   /**
@@ -954,7 +954,7 @@ public:
    * or -1 if not found.
    * @stable
    */
-  inline UTextOffset lastIndexOf(const UnicodeString& text) const;
+  inline int32_t lastIndexOf(const UnicodeString& text) const;
 
   /**
    * Locate in this the last occurrence of the characters in text
@@ -965,8 +965,8 @@ public:
    * or -1 if not found.
    * @stable
    */
-  inline UTextOffset lastIndexOf(const UnicodeString& text,
-              UTextOffset start) const;
+  inline int32_t lastIndexOf(const UnicodeString& text,
+              int32_t start) const;
 
   /**
    * Locate in this the last occurrence in the range 
@@ -979,8 +979,8 @@ public:
    * or -1 if not found.
    * @stable
    */
-  inline UTextOffset lastIndexOf(const UnicodeString& text,
-              UTextOffset start,
+  inline int32_t lastIndexOf(const UnicodeString& text,
+              int32_t start,
               int32_t length) const;
 
   /**
@@ -999,10 +999,10 @@ public:
    * or -1 if not found.
    * @stable
    */
-  inline UTextOffset lastIndexOf(const UnicodeString& srcText,
-              UTextOffset srcStart,
+  inline int32_t lastIndexOf(const UnicodeString& srcText,
+              int32_t srcStart,
               int32_t srcLength,
-              UTextOffset start,
+              int32_t start,
               int32_t length) const;
 
   /**
@@ -1015,9 +1015,9 @@ public:
    * or -1 if not found.
    * @stable
    */
-  inline UTextOffset lastIndexOf(const UChar *srcChars,
+  inline int32_t lastIndexOf(const UChar *srcChars,
               int32_t srcLength,
-              UTextOffset start) const;
+              int32_t start) const;
 
   /**
    * Locate in this the last occurrence in the range 
@@ -1031,9 +1031,9 @@ public:
    * or -1 if not found.
    * @stable
    */
-  inline UTextOffset lastIndexOf(const UChar *srcChars,
+  inline int32_t lastIndexOf(const UChar *srcChars,
               int32_t srcLength,
-              UTextOffset start,
+              int32_t start,
               int32_t length) const;
  
   /**
@@ -1052,10 +1052,10 @@ public:
    * or -1 if not found.
    * @stable
    */
-  UTextOffset lastIndexOf(const UChar *srcChars,
-              UTextOffset srcStart,
+  int32_t lastIndexOf(const UChar *srcChars,
+              int32_t srcStart,
               int32_t srcLength,
-              UTextOffset start,
+              int32_t start,
               int32_t length) const;
 
   /**
@@ -1065,7 +1065,7 @@ public:
    * @return The offset into this of c, or -1 if not found.
    * @stable
    */
-  inline UTextOffset lastIndexOf(UChar c) const;
+  inline int32_t lastIndexOf(UChar c) const;
 
   /**
    * Locate in this the last occurrence of the code point c, 
@@ -1088,7 +1088,7 @@ public:
    * @return The offset into this of c, or -1 if not found.
    * @stable
    */
-  inline UTextOffset lastIndexOf(UChar32 c) const;
+  inline int32_t lastIndexOf(UChar32 c) const;
 
   /**
    * Locate in this the last occurrence of the code unit c
@@ -1098,8 +1098,8 @@ public:
    * @return The offset into this of c, or -1 if not found.
    * @stable
    */
-  inline UTextOffset lastIndexOf(UChar c,
-              UTextOffset start) const;
+  inline int32_t lastIndexOf(UChar c,
+              int32_t start) const;
 
   /**
    * Locate in this the last occurrence of the code point c
@@ -1123,8 +1123,8 @@ public:
    * @return The offset into this of c, or -1 if not found.
    * @stable
    */
-  inline UTextOffset lastIndexOf(UChar32 c,
-              UTextOffset start) const;
+  inline int32_t lastIndexOf(UChar32 c,
+              int32_t start) const;
 
   /**
    * Locate in this the last occurrence of the code unit c 
@@ -1136,8 +1136,8 @@ public:
    * @return The offset into this of c, or -1 if not found.
    * @stable
    */
-  inline UTextOffset lastIndexOf(UChar c,
-              UTextOffset start,
+  inline int32_t lastIndexOf(UChar c,
+              int32_t start,
               int32_t length) const;
 
   /**
@@ -1164,8 +1164,8 @@ public:
    * @return The offset into this of c, or -1 if not found.
    * @stable
    */
-  inline UTextOffset lastIndexOf(UChar32 c,
-              UTextOffset start,
+  inline int32_t lastIndexOf(UChar32 c,
+              int32_t start,
               int32_t length) const;
 
 
@@ -1177,7 +1177,7 @@ public:
    * @returns the code unit at offset offset
    * @stable
    */
-  inline UChar charAt(UTextOffset offset) const;
+  inline UChar charAt(int32_t offset) const;
 
   /**
    * Return the code unit at offset offset.
@@ -1185,7 +1185,7 @@ public:
    * @returns the code unit at offset offset
    * @stable
    */
-  inline UChar operator [] (UTextOffset offset) const;
+  inline UChar operator [] (int32_t offset) const;
 
   /**
    * Return the code point that contains the code unit
@@ -1196,7 +1196,7 @@ public:
    * @returns the code point of text at offset
    * @stable
    */
-  inline UChar32 char32At(UTextOffset offset) const;
+  inline UChar32 char32At(int32_t offset) const;
 
   /**
    * Adjust a random-access offset so that
@@ -1212,7 +1212,7 @@ public:
    * @return offset of the first code unit of the same code point
    * @draft ICU 2.0
    */
-  inline UTextOffset getChar32Start(UTextOffset offset) const;
+  inline int32_t getChar32Start(int32_t offset) const;
 
   /**
    * Same as getChar32Start().
@@ -1234,7 +1234,7 @@ public:
    * @return offset of the first code unit of the same code point
    * @deprecated To be removed after 2002-sep-30. Use getChar32Start().
    */
-  inline UTextOffset getCharStart(UTextOffset offset) const;
+  inline int32_t getCharStart(int32_t offset) const;
 
   /**
    * Adjust a random-access offset so that
@@ -1251,7 +1251,7 @@ public:
    * @return offset of the first code unit after the same code point
    * @draft ICU 2.0
    */
-  inline UTextOffset getChar32Limit(UTextOffset offset) const;
+  inline int32_t getChar32Limit(int32_t offset) const;
 
   /**
    * Same as getChar32Limit().
@@ -1274,7 +1274,7 @@ public:
    * @return offset of the first code unit after the same code point
    * @deprecated To be removed after 2002-sep-30. Use getChar32Limit().
    */
-  inline UTextOffset getCharLimit(UTextOffset offset) const;
+  inline int32_t getCharLimit(int32_t offset) const;
 
   /**
    * Move the code unit index along the string by delta code points.
@@ -1297,7 +1297,7 @@ public:
    * UnicodeString s=UNICODE_STRING("a\\U00010000b\\U0010ffff\\u2029", 31).unescape();
    *
    * // initial index: position of U+10000
-   * UTextOffset index=1;
+   * int32_t index=1;
    *
    * // the following examples will all result in index==4, position of U+10ffff
    *
@@ -1317,7 +1317,7 @@ public:
    * @return the resulting code unit index
    * @draft ICU 2.0
    */
-  UTextOffset moveIndex32(UTextOffset index, int32_t delta) const;
+  int32_t moveIndex32(int32_t index, int32_t delta) const;
 
   /* Substring extraction */
 
@@ -1336,10 +1336,10 @@ public:
    * will be extracted
    * @stable
    */
-  inline void extract(UTextOffset start, 
+  inline void extract(int32_t start, 
            int32_t length, 
            UChar *dst, 
-           UTextOffset dstStart = 0) const;
+           int32_t dstStart = 0) const;
 
   /**
    * Copy the contents of the string into dest.
@@ -1376,7 +1376,7 @@ public:
    * @return A reference to target
    * @stable
    */
-  inline void extract(UTextOffset start,
+  inline void extract(int32_t start,
            int32_t length,
            UnicodeString& target) const;
 
@@ -1391,10 +1391,10 @@ public:
    * will be extracted
    * @stable
    */
-  inline void extractBetween(UTextOffset start, 
-              UTextOffset limit, 
+  inline void extractBetween(int32_t start, 
+              int32_t limit, 
               UChar *dst, 
-              UTextOffset dstStart = 0) const;
+              int32_t dstStart = 0) const;
 
   /**
    * Copy the characters in the range [start, limit) 
@@ -1405,8 +1405,8 @@ public:
    * @return A reference to target
    * @stable
    */
-  virtual void extractBetween(UTextOffset start,
-              UTextOffset limit,
+  virtual void extractBetween(int32_t start,
+              int32_t limit,
               UnicodeString& target) const;
 
   /**
@@ -1429,7 +1429,7 @@ public:
    * @return the output string length, not including the terminating NUL
    * @stable
    */
-  inline int32_t extract(UTextOffset start,
+  inline int32_t extract(int32_t start,
                  int32_t startLength,
                  char *target,
                  const char *codepage = 0) const;
@@ -1458,7 +1458,7 @@ public:
    * @return the output string length, not including the terminating NUL
    * @stable
    */
-  int32_t extract(UTextOffset start,
+  int32_t extract(int32_t start,
            int32_t startLength,
            char *target,
            uint32_t targetLength,
@@ -1508,7 +1508,7 @@ public:
    * @draft ICU 2.0
    */
   int32_t
-  countChar32(UTextOffset start=0, int32_t length=0x7fffffff) const;
+  countChar32(int32_t start=0, int32_t length=0x7fffffff) const;
 
   /**
    * Determine if this string is empty.
@@ -1604,7 +1604,7 @@ public:
    * @stable
    */
   inline UnicodeString& setTo(const UnicodeString& srcText, 
-               UTextOffset srcStart, 
+               int32_t srcStart, 
                int32_t srcLength);
 
   /**
@@ -1723,7 +1723,7 @@ public:
    * @return A reference to this
    * @stable
    */
-  UnicodeString& setCharAt(UTextOffset offset, 
+  UnicodeString& setCharAt(int32_t offset, 
                UChar ch);
 
 
@@ -1772,7 +1772,7 @@ public:
    * @stable
    */
   inline UnicodeString& append(const UnicodeString& srcText, 
-            UTextOffset srcStart, 
+            int32_t srcStart, 
             int32_t srcLength);
 
   /**
@@ -1798,7 +1798,7 @@ public:
    * @stable
    */
   inline UnicodeString& append(const UChar *srcChars, 
-            UTextOffset srcStart, 
+            int32_t srcStart, 
             int32_t srcLength);
 
   /**
@@ -1844,9 +1844,9 @@ public:
    * @return a reference to this
    * @stable
    */
-  inline UnicodeString& insert(UTextOffset start, 
+  inline UnicodeString& insert(int32_t start, 
             const UnicodeString& srcText, 
-            UTextOffset srcStart, 
+            int32_t srcStart, 
             int32_t srcLength);
 
   /**
@@ -1857,7 +1857,7 @@ public:
    * @return a reference to this
    * @stable
    */
-  inline UnicodeString& insert(UTextOffset start, 
+  inline UnicodeString& insert(int32_t start, 
             const UnicodeString& srcText);
 
   /**
@@ -1873,9 +1873,9 @@ public:
    * @return a reference to this
    * @stable
    */
-  inline UnicodeString& insert(UTextOffset start, 
+  inline UnicodeString& insert(int32_t start, 
             const UChar *srcChars, 
-            UTextOffset srcStart, 
+            int32_t srcStart, 
             int32_t srcLength);
 
   /**
@@ -1887,7 +1887,7 @@ public:
    * @return a reference to this
    * @stable
    */
-  inline UnicodeString& insert(UTextOffset start, 
+  inline UnicodeString& insert(int32_t start, 
             const UChar *srcChars,
             int32_t srcLength);
 
@@ -1899,7 +1899,7 @@ public:
    * @return a reference to this
    * @stable
    */
-  inline UnicodeString& insert(UTextOffset start, 
+  inline UnicodeString& insert(int32_t start, 
             UChar srcChar);
 
   /**
@@ -1910,7 +1910,7 @@ public:
    * @return a reference to this
    * @stable
    */
-  inline UnicodeString& insert(UTextOffset start, 
+  inline UnicodeString& insert(int32_t start, 
             UChar32 srcChar);
 
 
@@ -1933,10 +1933,10 @@ public:
    * @return a reference to this
    * @stable
    */
-  UnicodeString& replace(UTextOffset start, 
+  UnicodeString& replace(int32_t start, 
              int32_t length, 
              const UnicodeString& srcText, 
-             UTextOffset srcStart, 
+             int32_t srcStart, 
              int32_t srcLength);
 
   /**
@@ -1951,7 +1951,7 @@ public:
    * @return a reference to this
    * @stable
    */
-  UnicodeString& replace(UTextOffset start, 
+  UnicodeString& replace(int32_t start, 
              int32_t length, 
              const UnicodeString& srcText);
 
@@ -1972,10 +1972,10 @@ public:
    * @return a reference to this
    * @stable
    */
-  UnicodeString& replace(UTextOffset start, 
+  UnicodeString& replace(int32_t start, 
              int32_t length, 
              const UChar *srcChars, 
-             UTextOffset srcStart, 
+             int32_t srcStart, 
              int32_t srcLength);
 
   /**
@@ -1990,7 +1990,7 @@ public:
    * @return a reference to this
    * @stable
    */
-  inline UnicodeString& replace(UTextOffset start, 
+  inline UnicodeString& replace(int32_t start, 
              int32_t length, 
              const UChar *srcChars,
              int32_t srcLength);
@@ -2006,7 +2006,7 @@ public:
    * @return a reference to this
    * @stable
    */
-  inline UnicodeString& replace(UTextOffset start, 
+  inline UnicodeString& replace(int32_t start, 
              int32_t length, 
              UChar srcChar);
 
@@ -2021,7 +2021,7 @@ public:
    * @return a reference to this
    * @stable
    */
-  inline UnicodeString& replace(UTextOffset start, 
+  inline UnicodeString& replace(int32_t start, 
              int32_t length, 
              UChar32 srcChar);
 
@@ -2034,8 +2034,8 @@ public:
    * @return a reference to this
    * @stable
    */
-  inline UnicodeString& replaceBetween(UTextOffset start, 
-                UTextOffset limit, 
+  inline UnicodeString& replaceBetween(int32_t start, 
+                int32_t limit, 
                 const UnicodeString& srcText);
 
   /**
@@ -2052,11 +2052,11 @@ public:
    * @return a reference to this
    * @stable
    */
-  inline UnicodeString& replaceBetween(UTextOffset start, 
-                UTextOffset limit, 
+  inline UnicodeString& replaceBetween(int32_t start, 
+                int32_t limit, 
                 const UnicodeString& srcText, 
-                UTextOffset srcStart, 
-                UTextOffset srcLimit);
+                int32_t srcStart, 
+                int32_t srcLimit);
 
   /**
    * Replace a substring of this object with the given text.
@@ -2068,8 +2068,8 @@ public:
    * to limit - 1
    * @stable
    */
-  virtual void handleReplaceBetween(UTextOffset start,
-                                    UTextOffset limit,
+  virtual void handleReplaceBetween(int32_t start,
+                                    int32_t limit,
                                     const UnicodeString& text);
 
   /**
@@ -2113,7 +2113,7 @@ public:
    * @return a reference to this
    * @stable
    */
-  inline UnicodeString& findAndReplace(UTextOffset start,
+  inline UnicodeString& findAndReplace(int32_t start,
                 int32_t length,
                 const UnicodeString& oldText,
                 const UnicodeString& newText);
@@ -2135,13 +2135,13 @@ public:
    * @return a reference to this
    * @stable
    */
-  UnicodeString& findAndReplace(UTextOffset start,
+  UnicodeString& findAndReplace(int32_t start,
                 int32_t length,
                 const UnicodeString& oldText,
-                UTextOffset oldStart,
+                int32_t oldStart,
                 int32_t oldLength,
                 const UnicodeString& newText,
-                UTextOffset newStart,
+                int32_t newStart,
                 int32_t newLength);
 
 
@@ -2162,7 +2162,7 @@ public:
    * @return a reference to this
    * @stable
    */
-  inline UnicodeString& remove(UTextOffset start, 
+  inline UnicodeString& remove(int32_t start, 
                                int32_t length = (int32_t)INT32_MAX);
 
   /**
@@ -2173,8 +2173,8 @@ public:
    * @return a reference to this
    * @stable
    */
-  inline UnicodeString& removeBetween(UTextOffset start,
-                                      UTextOffset limit = (int32_t)INT32_MAX);
+  inline UnicodeString& removeBetween(int32_t start,
+                                      int32_t limit = (int32_t)INT32_MAX);
 
 
   /* Length operations */
@@ -2240,7 +2240,7 @@ public:
    * @return a reference to this
    * @stable
    */
-  inline UnicodeString& reverse(UTextOffset start,
+  inline UnicodeString& reverse(int32_t start,
              int32_t length);
 
   /**
@@ -2633,7 +2633,7 @@ public:
    * @return the number of display cells occupied by the specified substring.
    * @stable
    */
-  int32_t numDisplayCells(UTextOffset start = 0,
+  int32_t numDisplayCells(int32_t start = 0,
               int32_t length = INT32_MAX,
               UBool asian = TRUE) const;
 
@@ -2644,7 +2644,7 @@ public:
    * @return A modifiable UCharReference to that code unit.
    * @stable
    */
-  UCharReference operator[] (UTextOffset pos);
+  UCharReference operator[] (int32_t pos);
 
   /**
    * Unescape a string of characters and return a string containing
@@ -2716,100 +2716,100 @@ protected:
    * The change in Replaceable to use virtual getCharAt() allows
    * UnicodeString::charAt() to be inline again (see jitterbug 709).
    */
-  virtual UChar getCharAt(UTextOffset offset) const;
+  virtual UChar getCharAt(int32_t offset) const;
 
   /**
    * The change in Replaceable to use virtual getChar32At() allows
    * UnicodeString::char32At() to be inline again (see jitterbug 709).
    */
-  virtual UChar32 getChar32At(UTextOffset offset) const;
+  virtual UChar32 getChar32At(int32_t offset) const;
 
 private:
 
   inline int8_t
-  doCompare(UTextOffset start,
+  doCompare(int32_t start,
            int32_t length,
            const UnicodeString& srcText,
-           UTextOffset srcStart,
+           int32_t srcStart,
            int32_t srcLength) const;
 
-  int8_t doCompare(UTextOffset start,
+  int8_t doCompare(int32_t start,
            int32_t length,
            const UChar *srcChars,
-           UTextOffset srcStart,
+           int32_t srcStart,
            int32_t srcLength) const;
 
   inline int8_t
-  doCompareCodePointOrder(UTextOffset start,
+  doCompareCodePointOrder(int32_t start,
                           int32_t length,
                           const UnicodeString& srcText,
-                          UTextOffset srcStart,
+                          int32_t srcStart,
                           int32_t srcLength) const;
 
-  int8_t doCompareCodePointOrder(UTextOffset start,
+  int8_t doCompareCodePointOrder(int32_t start,
                                  int32_t length,
                                  const UChar *srcChars,
-                                 UTextOffset srcStart,
+                                 int32_t srcStart,
                                  int32_t srcLength) const;
 
   inline int8_t
-  doCaseCompare(UTextOffset start,
+  doCaseCompare(int32_t start,
                 int32_t length,
                 const UnicodeString &srcText,
-                UTextOffset srcStart,
+                int32_t srcStart,
                 int32_t srcLength,
                 uint32_t options) const;
 
   int8_t
-  doCaseCompare(UTextOffset start,
+  doCaseCompare(int32_t start,
                 int32_t length,
                 const UChar *srcChars,
-                UTextOffset srcStart,
+                int32_t srcStart,
                 int32_t srcLength,
                 uint32_t options) const;
 
-  UTextOffset doIndexOf(UChar c,
-            UTextOffset start,
+  int32_t doIndexOf(UChar c,
+            int32_t start,
             int32_t length) const;
 
   // only for c>=0xd800
-  UTextOffset doIndexOf(UChar32 c,
-                        UTextOffset start,
+  int32_t doIndexOf(UChar32 c,
+                        int32_t start,
                         int32_t length) const;
 
-  UTextOffset doLastIndexOf(UChar c,
-                UTextOffset start,
+  int32_t doLastIndexOf(UChar c,
+                int32_t start,
                 int32_t length) const;
 
   // only for c>=0xd800
-  UTextOffset doLastIndexOf(UChar32 c,
-                            UTextOffset start,
+  int32_t doLastIndexOf(UChar32 c,
+                            int32_t start,
                             int32_t length) const;
 
-  void doExtract(UTextOffset start, 
+  void doExtract(int32_t start, 
          int32_t length, 
          UChar *dst, 
-         UTextOffset dstStart) const;
+         int32_t dstStart) const;
 
-  inline void doExtract(UTextOffset start,
+  inline void doExtract(int32_t start,
          int32_t length,
          UnicodeString& target) const;
 
-  inline UChar doCharAt(UTextOffset offset)  const;
+  inline UChar doCharAt(int32_t offset)  const;
 
-  UnicodeString& doReplace(UTextOffset start, 
+  UnicodeString& doReplace(int32_t start, 
                int32_t length, 
                const UnicodeString& srcText, 
-               UTextOffset srcStart, 
+               int32_t srcStart, 
                int32_t srcLength);
 
-  UnicodeString& doReplace(UTextOffset start, 
+  UnicodeString& doReplace(int32_t start, 
                int32_t length, 
                const UChar *srcChars, 
-               UTextOffset srcStart, 
+               int32_t srcStart, 
                int32_t srcLength);
 
-  UnicodeString& doReverse(UTextOffset start,
+  UnicodeString& doReverse(int32_t start,
                int32_t length);
 
   // calculate hash code
@@ -2829,11 +2829,11 @@ private:
   void releaseArray(void);
 
   // Pin start and limit to acceptable values.
-  inline void pinIndices(UTextOffset& start,
+  inline void pinIndices(int32_t& start,
                          int32_t& length) const;
 
   /* Internal extract() using UConverter. */
-  int32_t doExtract(UTextOffset start, int32_t length,
+  int32_t doExtract(int32_t start, int32_t length,
                     char *dest, int32_t destCapacity,
                     UConverter *cnv,
                     UErrorCode &errorCode) const;
@@ -3010,7 +3010,7 @@ UnicodeString::compare(const UnicodeString& text) const
 { return doCompare(0, fLength, text, 0, text.fLength); }
 
 inline int8_t 
-UnicodeString::compare(UTextOffset start,
+UnicodeString::compare(int32_t start,
                int32_t length,
                const UnicodeString& srcText) const
 { return doCompare(start, length, srcText, 0, srcText.fLength); }
@@ -3021,41 +3021,41 @@ UnicodeString::compare(const UChar *srcChars,
 { return doCompare(0, fLength, srcChars, 0, srcLength); }
 
 inline int8_t 
-UnicodeString::compare(UTextOffset start,
+UnicodeString::compare(int32_t start,
                int32_t length,
                const UnicodeString& srcText,
-               UTextOffset srcStart,
+               int32_t srcStart,
                int32_t srcLength) const
 { return doCompare(start, length, srcText, srcStart, srcLength); }
 
 inline int8_t
-UnicodeString::compare(UTextOffset start,
+UnicodeString::compare(int32_t start,
                int32_t length,
                const UChar *srcChars) const
 { return doCompare(start, length, srcChars, 0, length); }
 
 inline int8_t 
-UnicodeString::compare(UTextOffset start,
+UnicodeString::compare(int32_t start,
                int32_t length,
                const UChar *srcChars,
-               UTextOffset srcStart,
+               int32_t srcStart,
                int32_t srcLength) const
 { return doCompare(start, length, srcChars, srcStart, srcLength); }
 
 inline int8_t
-UnicodeString::compareBetween(UTextOffset start,
-                  UTextOffset limit,
+UnicodeString::compareBetween(int32_t start,
+                  int32_t limit,
                   const UnicodeString& srcText,
-                  UTextOffset srcStart,
-                  UTextOffset srcLimit) const
+                  int32_t srcStart,
+                  int32_t srcLimit) const
 { return doCompare(start, limit - start, 
            srcText, srcStart, srcLimit - srcStart); }
 
 inline int8_t
-UnicodeString::doCompare(UTextOffset start,
+UnicodeString::doCompare(int32_t start,
               int32_t length,
               const UnicodeString& srcText,
-              UTextOffset srcStart,
+              int32_t srcStart,
               int32_t srcLength) const
 {
   const UChar *srcChars;
@@ -3073,7 +3073,7 @@ UnicodeString::compareCodePointOrder(const UnicodeString& text) const
 { return doCompareCodePointOrder(0, fLength, text, 0, text.fLength); }
 
 inline int8_t 
-UnicodeString::compareCodePointOrder(UTextOffset start,
+UnicodeString::compareCodePointOrder(int32_t start,
                                      int32_t length,
                                      const UnicodeString& srcText) const
 { return doCompareCodePointOrder(start, length, srcText, 0, srcText.fLength); }
@@ -3084,41 +3084,41 @@ UnicodeString::compareCodePointOrder(const UChar *srcChars,
 { return doCompareCodePointOrder(0, fLength, srcChars, 0, srcLength); }
 
 inline int8_t 
-UnicodeString::compareCodePointOrder(UTextOffset start,
+UnicodeString::compareCodePointOrder(int32_t start,
                                      int32_t length,
                                      const UnicodeString& srcText,
-                                     UTextOffset srcStart,
+                                     int32_t srcStart,
                                      int32_t srcLength) const
 { return doCompareCodePointOrder(start, length, srcText, srcStart, srcLength); }
 
 inline int8_t
-UnicodeString::compareCodePointOrder(UTextOffset start,
+UnicodeString::compareCodePointOrder(int32_t start,
                                      int32_t length,
                                      const UChar *srcChars) const
 { return doCompareCodePointOrder(start, length, srcChars, 0, length); }
 
 inline int8_t 
-UnicodeString::compareCodePointOrder(UTextOffset start,
+UnicodeString::compareCodePointOrder(int32_t start,
                                      int32_t length,
                                      const UChar *srcChars,
-                                     UTextOffset srcStart,
+                                     int32_t srcStart,
                                      int32_t srcLength) const
 { return doCompareCodePointOrder(start, length, srcChars, srcStart, srcLength); }
 
 inline int8_t
-UnicodeString::compareCodePointOrderBetween(UTextOffset start,
-                                            UTextOffset limit,
+UnicodeString::compareCodePointOrderBetween(int32_t start,
+                                            int32_t limit,
                                             const UnicodeString& srcText,
-                                            UTextOffset srcStart,
-                                            UTextOffset srcLimit) const
+                                            int32_t srcStart,
+                                            int32_t srcLimit) const
 { return doCompareCodePointOrder(start, limit - start, 
            srcText, srcStart, srcLimit - srcStart); }
 
 inline int8_t
-UnicodeString::doCompareCodePointOrder(UTextOffset start,
+UnicodeString::doCompareCodePointOrder(int32_t start,
                                        int32_t length,
                                        const UnicodeString& srcText,
-                                       UTextOffset srcStart,
+                                       int32_t srcStart,
                                        int32_t srcLength) const
 {
   const UChar *srcChars;
@@ -3137,7 +3137,7 @@ UnicodeString::caseCompare(const UnicodeString &text, uint32_t options) const {
 }
 
 inline int8_t 
-UnicodeString::caseCompare(UTextOffset start,
+UnicodeString::caseCompare(int32_t start,
                            int32_t length,
                            const UnicodeString &srcText,
                            uint32_t options) const {
@@ -3152,17 +3152,17 @@ UnicodeString::caseCompare(const UChar *srcChars,
 }
 
 inline int8_t 
-UnicodeString::caseCompare(UTextOffset start,
+UnicodeString::caseCompare(int32_t start,
                            int32_t length,
                            const UnicodeString &srcText,
-                           UTextOffset srcStart,
+                           int32_t srcStart,
                            int32_t srcLength,
                            uint32_t options) const {
   return doCaseCompare(start, length, srcText, srcStart, srcLength, options);
 }
 
 inline int8_t
-UnicodeString::caseCompare(UTextOffset start,
+UnicodeString::caseCompare(int32_t start,
                            int32_t length,
                            const UChar *srcChars,
                            uint32_t options) const {
@@ -3170,30 +3170,30 @@ UnicodeString::caseCompare(UTextOffset start,
 }
 
 inline int8_t 
-UnicodeString::caseCompare(UTextOffset start,
+UnicodeString::caseCompare(int32_t start,
                            int32_t length,
                            const UChar *srcChars,
-                           UTextOffset srcStart,
+                           int32_t srcStart,
                            int32_t srcLength,
                            uint32_t options) const {
   return doCaseCompare(start, length, srcChars, srcStart, srcLength, options);
 }
 
 inline int8_t
-UnicodeString::caseCompareBetween(UTextOffset start,
-                                  UTextOffset limit,
+UnicodeString::caseCompareBetween(int32_t start,
+                                  int32_t limit,
                                   const UnicodeString &srcText,
-                                  UTextOffset srcStart,
-                                  UTextOffset srcLimit,
+                                  int32_t srcStart,
+                                  int32_t srcLimit,
                                   uint32_t options) const {
   return doCaseCompare(start, limit - start, srcText, srcStart, srcLimit - srcStart, options);
 }
 
 inline int8_t
-UnicodeString::doCaseCompare(UTextOffset start,
+UnicodeString::doCaseCompare(int32_t start,
                              int32_t length,
                              const UnicodeString &srcText,
-                             UTextOffset srcStart,
+                             int32_t srcStart,
                              int32_t srcLength,
                              uint32_t options) const
 {
@@ -3207,26 +3207,26 @@ UnicodeString::doCaseCompare(UTextOffset start,
   return doCaseCompare(start, length, srcChars, srcStart, srcLength, options);
 }
 
-inline UTextOffset 
+inline int32_t 
 UnicodeString::indexOf(const UnicodeString& text) const
 { return indexOf(text, 0, text.fLength, 0, fLength); }
 
-inline UTextOffset 
+inline int32_t 
 UnicodeString::indexOf(const UnicodeString& text,
-               UTextOffset start) const
+               int32_t start) const
 { return indexOf(text, 0, text.fLength, start, fLength - start); }
 
-inline UTextOffset 
+inline int32_t 
 UnicodeString::indexOf(const UnicodeString& text,
-               UTextOffset start,
+               int32_t start,
                int32_t length) const
 { return indexOf(text, 0, text.fLength, start, length); }
 
-inline UTextOffset 
+inline int32_t 
 UnicodeString::indexOf(const UnicodeString& srcText,
-               UTextOffset srcStart,
+               int32_t srcStart,
                int32_t srcLength,
-               UTextOffset start,
+               int32_t start,
                int32_t length) const
 {
   if(!srcText.isBogus()) {
@@ -3238,48 +3238,48 @@ UnicodeString::indexOf(const UnicodeString& srcText,
   return -1;
 }
 
-inline UTextOffset 
+inline int32_t 
 UnicodeString::indexOf(const UChar *srcChars,
                int32_t srcLength,
-               UTextOffset start) const
+               int32_t start) const
 { return indexOf(srcChars, 0, srcLength, start, fLength - start); }
 
-inline UTextOffset 
+inline int32_t 
 UnicodeString::indexOf(const UChar *srcChars,
                int32_t srcLength,
-               UTextOffset start,
+               int32_t start,
                int32_t length) const
 { return indexOf(srcChars, 0, srcLength, start, length); }
 
-inline UTextOffset 
+inline int32_t 
 UnicodeString::indexOf(UChar c) const
 { return doIndexOf(c, 0, fLength); }
 
-inline UTextOffset 
+inline int32_t 
 UnicodeString::indexOf(UChar32 c) const {
   return indexOf(c, 0, fLength);
 }
 
-inline UTextOffset 
+inline int32_t 
 UnicodeString::indexOf(UChar c,
-               UTextOffset start) const
+               int32_t start) const
 { return doIndexOf(c, start, fLength - start); }
 
-inline UTextOffset 
+inline int32_t 
 UnicodeString::indexOf(UChar32 c,
-               UTextOffset start) const {
+               int32_t start) const {
   return indexOf(c, start, fLength - start);
 }
 
-inline UTextOffset 
+inline int32_t 
 UnicodeString::indexOf(UChar c,
-               UTextOffset start,
+               int32_t start,
                int32_t length) const
 { return doIndexOf(c, start, length); }
 
-inline UTextOffset 
+inline int32_t 
 UnicodeString::indexOf(UChar32 c,
-               UTextOffset start,
+               int32_t start,
                int32_t length) const {
   if((uint32_t)c<0xd800) {
     return doIndexOf((UChar)c, start, length);
@@ -3288,26 +3288,26 @@ UnicodeString::indexOf(UChar32 c,
   }
 }
 
-inline UTextOffset 
+inline int32_t 
 UnicodeString::lastIndexOf(const UnicodeString& text) const
 { return lastIndexOf(text, 0, text.fLength, 0, fLength); }
 
-inline UTextOffset 
+inline int32_t 
 UnicodeString::lastIndexOf(const UnicodeString& text,
-               UTextOffset start) const
+               int32_t start) const
 { return lastIndexOf(text, 0, text.fLength, start, fLength - start); }
 
-inline UTextOffset 
+inline int32_t 
 UnicodeString::lastIndexOf(const UnicodeString& text,
-               UTextOffset start,
+               int32_t start,
                int32_t length) const
 { return lastIndexOf(text, 0, text.fLength, start, length); }
 
-inline UTextOffset 
+inline int32_t 
 UnicodeString::lastIndexOf(const UnicodeString& srcText,
-               UTextOffset srcStart,
+               int32_t srcStart,
                int32_t srcLength,
-               UTextOffset start,
+               int32_t start,
                int32_t length) const
 {
   if(!srcText.isBogus()) {
@@ -3319,48 +3319,48 @@ UnicodeString::lastIndexOf(const UnicodeString& srcText,
   return -1;
 }
 
-inline UTextOffset 
+inline int32_t 
 UnicodeString::lastIndexOf(const UChar *srcChars,
                int32_t srcLength,
-               UTextOffset start) const
+               int32_t start) const
 { return lastIndexOf(srcChars, 0, srcLength, start, fLength - start); }
 
-inline UTextOffset 
+inline int32_t 
 UnicodeString::lastIndexOf(const UChar *srcChars,
                int32_t srcLength,
-               UTextOffset start,
+               int32_t start,
                int32_t length) const
 { return lastIndexOf(srcChars, 0, srcLength, start, length); }
 
-inline UTextOffset 
+inline int32_t 
 UnicodeString::lastIndexOf(UChar c) const
 { return doLastIndexOf(c, 0, fLength); }
 
-inline UTextOffset 
+inline int32_t 
 UnicodeString::lastIndexOf(UChar32 c) const {
   return lastIndexOf(c, 0, fLength);
 }
 
-inline UTextOffset 
+inline int32_t 
 UnicodeString::lastIndexOf(UChar c,
-               UTextOffset start) const
+               int32_t start) const
 { return doLastIndexOf(c, start, fLength - start); }
 
-inline UTextOffset 
+inline int32_t 
 UnicodeString::lastIndexOf(UChar32 c,
-               UTextOffset start) const {
+               int32_t start) const {
   return lastIndexOf(c, start, fLength - start);
 }
 
-inline UTextOffset 
+inline int32_t 
 UnicodeString::lastIndexOf(UChar c,
-               UTextOffset start,
+               int32_t start,
                int32_t length) const
 { return doLastIndexOf(c, start, length); }
 
-inline UTextOffset 
+inline int32_t 
 UnicodeString::lastIndexOf(UChar32 c,
-               UTextOffset start,
+               int32_t start,
                int32_t length) const {
   if((uint32_t)c<0xd800) {
     return doLastIndexOf((UChar)c, start, length);
@@ -3375,7 +3375,7 @@ UnicodeString::startsWith(const UnicodeString& text) const
 
 inline UBool 
 UnicodeString::startsWith(const UnicodeString& srcText,
-              UTextOffset srcStart,
+              int32_t srcStart,
               int32_t srcLength) const
 { return doCompare(0, srcLength, srcText, srcStart, srcLength) == 0; }
 
@@ -3386,7 +3386,7 @@ UnicodeString::startsWith(const UChar *srcChars,
 
 inline UBool 
 UnicodeString::startsWith(const UChar *srcChars,
-              UTextOffset srcStart,
+              int32_t srcStart,
               int32_t srcLength) const
 { return doCompare(0, srcLength, srcChars, srcStart, srcLength) == 0;}
 
@@ -3397,7 +3397,7 @@ UnicodeString::endsWith(const UnicodeString& text) const
 
 inline UBool 
 UnicodeString::endsWith(const UnicodeString& srcText,
-            UTextOffset srcStart,
+            int32_t srcStart,
             int32_t srcLength) const
 { return doCompare(fLength - srcLength, srcLength, 
            srcText, srcStart, srcLength) == 0; }
@@ -3410,7 +3410,7 @@ UnicodeString::endsWith(const UChar *srcChars,
 
 inline UBool 
 UnicodeString::endsWith(const UChar *srcChars,
-            UTextOffset srcStart,
+            int32_t srcStart,
             int32_t srcLength) const
 { return doCompare(fLength - srcLength, srcLength, 
            srcChars, srcStart, srcLength) == 0;}
@@ -3418,42 +3418,42 @@ UnicodeString::endsWith(const UChar *srcChars,
 // replace
 //========================================
 inline UnicodeString& 
-UnicodeString::replace(UTextOffset start, 
+UnicodeString::replace(int32_t start, 
                int32_t length, 
                const UnicodeString& srcText) 
 { return doReplace(start, length, srcText, 0, srcText.fLength); }
 
 inline UnicodeString& 
-UnicodeString::replace(UTextOffset start, 
+UnicodeString::replace(int32_t start, 
                int32_t length, 
                const UnicodeString& srcText, 
-               UTextOffset srcStart, 
+               int32_t srcStart, 
                int32_t srcLength)
 { return doReplace(start, length, srcText, srcStart, srcLength); }
 
 inline UnicodeString& 
-UnicodeString::replace(UTextOffset start, 
+UnicodeString::replace(int32_t start, 
                int32_t length, 
                const UChar *srcChars,
                int32_t srcLength)
 { return doReplace(start, length, srcChars, 0, srcLength); }
 
 inline UnicodeString& 
-UnicodeString::replace(UTextOffset start, 
+UnicodeString::replace(int32_t start, 
                int32_t length, 
                const UChar *srcChars, 
-               UTextOffset srcStart, 
+               int32_t srcStart, 
                int32_t srcLength)
 { return doReplace(start, length, srcChars, srcStart, srcLength); }
 
 inline UnicodeString& 
-UnicodeString::replace(UTextOffset start, 
+UnicodeString::replace(int32_t start, 
                int32_t length, 
                UChar srcChar)
 { return doReplace(start, length, &srcChar, 0, 1); }
 
 inline UnicodeString&
-UnicodeString::replace(UTextOffset start, 
+UnicodeString::replace(int32_t start, 
                int32_t length, 
                UChar32 srcChar) {
   UChar buffer[UTF_MAX_CHAR_LENGTH];
@@ -3463,17 +3463,17 @@ UnicodeString::replace(UTextOffset start,
 }
 
 inline UnicodeString& 
-UnicodeString::replaceBetween(UTextOffset start, 
-                  UTextOffset limit, 
+UnicodeString::replaceBetween(int32_t start, 
+                  int32_t limit, 
                   const UnicodeString& srcText)
 { return doReplace(start, limit - start, srcText, 0, srcText.fLength); }
 
 inline UnicodeString&
-UnicodeString::replaceBetween(UTextOffset start, 
-                  UTextOffset limit, 
+UnicodeString::replaceBetween(int32_t start, 
+                  int32_t limit, 
                   const UnicodeString& srcText, 
-                  UTextOffset srcStart, 
-                  UTextOffset srcLimit)
+                  int32_t srcStart, 
+                  int32_t srcLimit)
 { return doReplace(start, limit - start, srcText, srcStart, srcLimit - srcStart); }
 
 inline UnicodeString& 
@@ -3483,7 +3483,7 @@ UnicodeString::findAndReplace(const UnicodeString& oldText,
             newText, 0, newText.fLength); }
 
 inline UnicodeString& 
-UnicodeString::findAndReplace(UTextOffset start,
+UnicodeString::findAndReplace(int32_t start,
                   int32_t length,
                   const UnicodeString& oldText,
                   const UnicodeString& newText)
@@ -3494,26 +3494,26 @@ UnicodeString::findAndReplace(UTextOffset start,
 // extract
 // ============================
 inline void
-UnicodeString::doExtract(UTextOffset start,
+UnicodeString::doExtract(int32_t start,
              int32_t length,
              UnicodeString& target) const
 { target.replace(0, target.fLength, *this, start, length); }
 
 inline void  
-UnicodeString::extract(UTextOffset start, 
+UnicodeString::extract(int32_t start, 
                int32_t length, 
                UChar *target, 
-               UTextOffset targetStart) const
+               int32_t targetStart) const
 { doExtract(start, length, target, targetStart); }
 
 inline void 
-UnicodeString::extract(UTextOffset start,
+UnicodeString::extract(int32_t start,
                int32_t length,
                UnicodeString& target) const
 { doExtract(start, length, target); }
 
 inline int32_t
-UnicodeString::extract(UTextOffset start,
+UnicodeString::extract(int32_t start,
                int32_t length,
                char *dst,
                const char *codepage) const
@@ -3524,14 +3524,14 @@ UnicodeString::extract(UTextOffset start,
 }
 
 inline void  
-UnicodeString::extractBetween(UTextOffset start, 
-                  UTextOffset limit, 
+UnicodeString::extractBetween(int32_t start, 
+                  int32_t limit, 
                   UChar *dst, 
-                  UTextOffset dstStart) const
+                  int32_t dstStart) const
 { doExtract(start, limit - start, dst, dstStart); }
 
 inline UChar
-UnicodeString::doCharAt(UTextOffset offset) const
+UnicodeString::doCharAt(int32_t offset) const
 {
   if((uint32_t)offset < (uint32_t)fLength) {
     return fArray[offset];
@@ -3541,15 +3541,15 @@ UnicodeString::doCharAt(UTextOffset offset) const
 }
 
 inline UChar
-UnicodeString::charAt(UTextOffset offset) const
+UnicodeString::charAt(int32_t offset) const
 { return doCharAt(offset); }
 
 inline UChar
-UnicodeString::operator[] (UTextOffset offset) const
+UnicodeString::operator[] (int32_t offset) const
 { return doCharAt(offset); }
 
 inline UChar32
-UnicodeString::char32At(UTextOffset offset) const
+UnicodeString::char32At(int32_t offset) const
 {
   if((uint32_t)offset < (uint32_t)fLength) {
     UChar32 c;
@@ -3560,8 +3560,8 @@ UnicodeString::char32At(UTextOffset offset) const
   }
 }
 
-inline UTextOffset
-UnicodeString::getChar32Start(UTextOffset offset) const {
+inline int32_t
+UnicodeString::getChar32Start(int32_t offset) const {
   if((uint32_t)offset < (uint32_t)fLength) {
     UTF_SET_CHAR_START(fArray, 0, offset);
     return offset;
@@ -3570,8 +3570,8 @@ UnicodeString::getChar32Start(UTextOffset offset) const {
   }
 }
 
-inline UTextOffset
-UnicodeString::getChar32Limit(UTextOffset offset) const {
+inline int32_t
+UnicodeString::getChar32Limit(int32_t offset) const {
   if((uint32_t)offset < (uint32_t)fLength) {
     UTF_SET_CHAR_LIMIT(fArray, 0, offset, fLength);
     return offset;
@@ -3580,13 +3580,13 @@ UnicodeString::getChar32Limit(UTextOffset offset) const {
   }
 }
 
-inline UTextOffset
-UnicodeString::getCharStart(UTextOffset offset) const {
+inline int32_t
+UnicodeString::getCharStart(int32_t offset) const {
   return getChar32Start(offset);
 }
 
-inline UTextOffset
-UnicodeString::getCharLimit(UTextOffset offset) const {
+inline int32_t
+UnicodeString::getCharLimit(int32_t offset) const {
   return getChar32Limit(offset);
 }
 
@@ -3633,7 +3633,7 @@ UnicodeString::operator= (UChar32 ch)
 
 inline UnicodeString& 
 UnicodeString::setTo(const UnicodeString& srcText, 
-             UTextOffset srcStart, 
+             int32_t srcStart, 
              int32_t srcLength)
 { return doReplace(0, fLength, srcText, srcStart, srcLength); }
 
@@ -3672,7 +3672,7 @@ UnicodeString::operator+= (const UnicodeString& srcText)
 
 inline UnicodeString& 
 UnicodeString::append(const UnicodeString& srcText, 
-              UTextOffset srcStart, 
+              int32_t srcStart, 
               int32_t srcLength)
 { return doReplace(fLength, 0, srcText, srcStart, srcLength); }
 
@@ -3682,7 +3682,7 @@ UnicodeString::append(const UnicodeString& srcText)
 
 inline UnicodeString& 
 UnicodeString::append(const UChar *srcChars, 
-              UTextOffset srcStart, 
+              int32_t srcStart, 
               int32_t srcLength)
 { return doReplace(fLength, 0, srcChars, srcStart, srcLength); }
 
@@ -3704,43 +3704,43 @@ UnicodeString::append(UChar32 srcChar) {
 }
 
 inline UnicodeString& 
-UnicodeString::insert(UTextOffset start, 
+UnicodeString::insert(int32_t start, 
               const UnicodeString& srcText, 
-              UTextOffset srcStart, 
+              int32_t srcStart, 
               int32_t srcLength)
 { return doReplace(start, 0, srcText, srcStart, srcLength); }
 
 inline UnicodeString& 
-UnicodeString::insert(UTextOffset start, 
+UnicodeString::insert(int32_t start, 
               const UnicodeString& srcText)
 { return doReplace(start, 0, srcText, 0, srcText.fLength); }
 
 inline UnicodeString& 
-UnicodeString::insert(UTextOffset start, 
+UnicodeString::insert(int32_t start, 
               const UChar *srcChars, 
-              UTextOffset srcStart, 
+              int32_t srcStart, 
               int32_t srcLength)
 { return doReplace(start, 0, srcChars, srcStart, srcLength); }
 
 inline UnicodeString& 
-UnicodeString::insert(UTextOffset start, 
+UnicodeString::insert(int32_t start, 
               const UChar *srcChars,
               int32_t srcLength)
 { return doReplace(start, 0, srcChars, 0, srcLength); }
 
 inline UnicodeString& 
-UnicodeString::insert(UTextOffset start, 
+UnicodeString::insert(int32_t start, 
               UChar srcChar)
 { return doReplace(start, 0, &srcChar, 0, 1); }
 
 inline UnicodeString& 
-UnicodeString::insert(UTextOffset start, 
+UnicodeString::insert(int32_t start, 
               UChar32 srcChar)
 { return replace(start, 0, srcChar); }
 
 
 inline UnicodeString& 
-UnicodeString::remove(UTextOffset start, 
+UnicodeString::remove(int32_t start, 
              int32_t length)
 { return doReplace(start, length, NULL, 0, 0); }
 
@@ -3749,8 +3749,8 @@ UnicodeString::remove()
 { return doReplace(0, fLength, 0, 0, 0); }
 
 inline UnicodeString& 
-UnicodeString::removeBetween(UTextOffset start,
-                UTextOffset limit)
+UnicodeString::removeBetween(int32_t start,
+                int32_t limit)
 { return doReplace(start, limit - start, NULL, 0, 0); }
 
 inline UBool 
@@ -3769,7 +3769,7 @@ UnicodeString::reverse()
 { return doReverse(0, fLength); }
 
 inline UnicodeString& 
-UnicodeString::reverse(UTextOffset start,
+UnicodeString::reverse(int32_t start,
                int32_t length)
 { return doReverse(start, length); }
 
@@ -3787,7 +3787,7 @@ UnicodeString::isBogus() const
 //========================================
 
 inline void
-UnicodeString::pinIndices(UTextOffset& start,
+UnicodeString::pinIndices(int32_t& start,
                           int32_t& length) const
 {
   // pin indices
@@ -3830,7 +3830,7 @@ class U_COMMON_API UCharReference
 public:
   UCharReference();
   inline UCharReference(UnicodeString *string,
-         UTextOffset pos);
+         int32_t pos);
   inline UCharReference(const UCharReference& that);
   ~UCharReference();
 
@@ -3841,7 +3841,7 @@ public:
 
 private:
   UnicodeString *fString;
-  UTextOffset fPos;
+  int32_t fPos;
 };
 
 
@@ -3850,7 +3850,7 @@ private:
 //========================================
 inline
 UCharReference::UCharReference(UnicodeString *string, 
-                   UTextOffset pos)
+                   int32_t pos)
   : fString(string), fPos(pos)
 {}
 
diff --git a/icu4c/source/common/unicode/utf.h b/icu4c/source/common/unicode/utf.h
index faae9116c70..6f89c64e681 100644
--- a/icu4c/source/common/unicode/utf.h
+++ b/icu4c/source/common/unicode/utf.h
@@ -159,7 +159,10 @@
 
 /**
  * Unicode string and array offset and index type.
- * ICU always counts Unicode code units (UChars) for string offsets, indexes, and lengths, not Unicode code points.
+ * ICU always counts Unicode code units (UChars) for
+ * string offsets, indexes, and lengths, not Unicode code points.
+ *
+ * @deprecated Use int32_t directly. UTextOffset to be removed after 2003-mar.
  */
 typedef int32_t UTextOffset;
 
diff --git a/icu4c/source/common/unicode/utf16.h b/icu4c/source/common/unicode/utf16.h
index d73c16090fa..657d267f140 100644
--- a/icu4c/source/common/unicode/utf16.h
+++ b/icu4c/source/common/unicode/utf16.h
@@ -165,7 +165,7 @@
 }
 
 #define UTF16_FWD_N_UNSAFE(s, i, n) { \
-    UTextOffset __N=(n); \
+    int32_t __N=(n); \
     while(__N>0) { \
         UTF16_FWD_1_UNSAFE(s, i); \
         --__N; \
@@ -229,7 +229,7 @@
 }
 
 #define UTF16_FWD_N_SAFE(s, i, length, n) { \
-    UTextOffset __N=(n); \
+    int32_t __N=(n); \
     while(__N>0 && (i)<(length)) { \
         UTF16_FWD_1_SAFE(s, i, length); \
         --__N; \
@@ -272,7 +272,7 @@
 }
 
 #define UTF16_BACK_N_UNSAFE(s, i, n) { \
-    UTextOffset __N=(n); \
+    int32_t __N=(n); \
     while(__N>0) { \
         UTF16_BACK_1_UNSAFE(s, i); \
         --__N; \
@@ -321,7 +321,7 @@
 }
 
 #define UTF16_BACK_N_SAFE(s, start, i, n) { \
-    UTextOffset __N=(n); \
+    int32_t __N=(n); \
     while(__N>0 && (i)>(start)) { \
         UTF16_BACK_1_SAFE(s, start, i); \
         --__N; \
diff --git a/icu4c/source/common/unicode/utf8.h b/icu4c/source/common/unicode/utf8.h
index 7ca64b4dbd6..7a8b22db1f0 100644
--- a/icu4c/source/common/unicode/utf8.h
+++ b/icu4c/source/common/unicode/utf8.h
@@ -58,16 +58,16 @@ utf8_countTrailBytes[256];
 #define UTF8_MASK_LEAD_BYTE(leadByte, countTrailBytes) ((leadByte)&=(1<<(6-(countTrailBytes)))-1)
 
 U_CAPI UChar32 U_EXPORT2
-utf8_nextCharSafeBody(const uint8_t *s, UTextOffset *pi, UTextOffset length, UChar32 c, UBool strict);
+utf8_nextCharSafeBody(const uint8_t *s, int32_t *pi, int32_t length, UChar32 c, UBool strict);
 
-U_CAPI UTextOffset U_EXPORT2
-utf8_appendCharSafeBody(uint8_t *s, UTextOffset i, UTextOffset length, UChar32 c);
+U_CAPI int32_t U_EXPORT2
+utf8_appendCharSafeBody(uint8_t *s, int32_t i, int32_t length, UChar32 c);
 
 U_CAPI UChar32 U_EXPORT2
-utf8_prevCharSafeBody(const uint8_t *s, UTextOffset start, UTextOffset *pi, UChar32 c, UBool strict);
+utf8_prevCharSafeBody(const uint8_t *s, int32_t start, int32_t *pi, UChar32 c, UBool strict);
 
-U_CAPI UTextOffset U_EXPORT2
-utf8_back1SafeBody(const uint8_t *s, UTextOffset start, UTextOffset i);
+U_CAPI int32_t U_EXPORT2
+utf8_back1SafeBody(const uint8_t *s, int32_t start, int32_t i);
 
 /*
  * For the semantics of all of these macros, see utf16.h.
@@ -124,13 +124,13 @@ utf8_back1SafeBody(const uint8_t *s, UTextOffset start, UTextOffset i);
 #define UTF8_ARRAY_SIZE(size) ((5*(size))/2)
 
 #define UTF8_GET_CHAR_UNSAFE(s, i, c) { \
-    UTextOffset __I=(UTextOffset)(i); \
+    int32_t __I=(int32_t)(i); \
     UTF8_SET_CHAR_START_UNSAFE(s, __I); \
     UTF8_NEXT_CHAR_UNSAFE(s, __I, c); \
 }
 
 #define UTF8_GET_CHAR_SAFE(s, start, i, length, c, strict) { \
-    UTextOffset __I=(UTextOffset)(i); \
+    int32_t __I=(int32_t)(i); \
     UTF8_SET_CHAR_START_SAFE(s, start, __I); \
     UTF8_NEXT_CHAR_SAFE(s, __I, length, c, strict); \
 }
@@ -190,7 +190,7 @@ utf8_back1SafeBody(const uint8_t *s, UTextOffset start, UTextOffset i);
 }
 
 #define UTF8_FWD_N_UNSAFE(s, i, n) { \
-    UTextOffset __N=(n); \
+    int32_t __N=(n); \
     while(__N>0) { \
         UTF8_FWD_1_UNSAFE(s, i); \
         --__N; \
@@ -205,7 +205,7 @@ utf8_back1SafeBody(const uint8_t *s, UTextOffset start, UTextOffset i);
     (c)=(s)[(i)++]; \
     if((c)>=0x80) { \
         if(UTF8_IS_LEAD(c)) { \
-            (c)=utf8_nextCharSafeBody(s, &(i), (UTextOffset)(length), c, strict); \
+            (c)=utf8_nextCharSafeBody(s, &(i), (int32_t)(length), c, strict); \
         } else { \
             (c)=UTF8_ERROR_VALUE_1; \
         } \
@@ -216,7 +216,7 @@ utf8_back1SafeBody(const uint8_t *s, UTextOffset start, UTextOffset i);
     if((uint32_t)(c)<=0x7f) { \
         (s)[(i)++]=(uint8_t)(c); \
     } else { \
-        (i)=utf8_appendCharSafeBody(s, (UTextOffset)(i), (UTextOffset)(length), c); \
+        (i)=utf8_appendCharSafeBody(s, (int32_t)(i), (int32_t)(length), c); \
     } \
 }
 
@@ -235,7 +235,7 @@ utf8_back1SafeBody(const uint8_t *s, UTextOffset start, UTextOffset i);
 }
 
 #define UTF8_FWD_N_SAFE(s, i, length, n) { \
-    UTextOffset __N=(n); \
+    int32_t __N=(n); \
     while(__N>0 && (i)<(length)) { \
         UTF8_FWD_1_SAFE(s, i, length); \
         --__N; \
@@ -244,7 +244,7 @@ utf8_back1SafeBody(const uint8_t *s, UTextOffset start, UTextOffset i);
 
 #define UTF8_SET_CHAR_START_SAFE(s, start, i) { \
     if(UTF8_IS_TRAIL((s)[(i)])) { \
-        (i)=utf8_back1SafeBody(s, start, (UTextOffset)(i)); \
+        (i)=utf8_back1SafeBody(s, start, (int32_t)(i)); \
     } \
 }
 
@@ -277,7 +277,7 @@ utf8_back1SafeBody(const uint8_t *s, UTextOffset start, UTextOffset i);
 }
 
 #define UTF8_BACK_N_UNSAFE(s, i, n) { \
-    UTextOffset __N=(n); \
+    int32_t __N=(n); \
     while(__N>0) { \
         UTF8_BACK_1_UNSAFE(s, i); \
         --__N; \
@@ -302,12 +302,12 @@ utf8_back1SafeBody(const uint8_t *s, UTextOffset start, UTextOffset i);
 
 #define UTF8_BACK_1_SAFE(s, start, i) { \
     if(UTF8_IS_TRAIL((s)[--(i)])) { \
-        (i)=utf8_back1SafeBody(s, start, (UTextOffset)(i)); \
+        (i)=utf8_back1SafeBody(s, start, (int32_t)(i)); \
     } \
 }
 
 #define UTF8_BACK_N_SAFE(s, start, i, n) { \
-    UTextOffset __N=(n); \
+    int32_t __N=(n); \
     while(__N>0 && (i)>(start)) { \
         UTF8_BACK_1_SAFE(s, start, i); \
         --__N; \
diff --git a/icu4c/source/common/unistr.cpp b/icu4c/source/common/unistr.cpp
index 41e291155dc..60c708f2708 100644
--- a/icu4c/source/common/unistr.cpp
+++ b/icu4c/source/common/unistr.cpp
@@ -194,7 +194,7 @@ UnicodeString::UnicodeString(UChar32 ch)
     fArray(fStackBuffer),
     fFlags(kShortString)
 {
-  UTextOffset i = 0;
+  int32_t i = 0;
   UTF_APPEND_CHAR(fStackBuffer, i, US_STACKBUF_SIZE, ch);
   fLength = i;
 }
@@ -438,7 +438,7 @@ UnicodeString::operator= (const UnicodeString& src)
 // Miscellaneous operations
 //========================================
 int32_t
-UnicodeString::numDisplayCells( UTextOffset start,
+UnicodeString::numDisplayCells( int32_t start,
                 int32_t length,
                 UBool asian) const
 {
@@ -447,7 +447,7 @@ UnicodeString::numDisplayCells( UTextOffset start,
 
   UChar32 c;
   int32_t result = 0;
-  UTextOffset limit = start + length;
+  int32_t limit = start + length;
 
   while(start < limit) {
     UTF_NEXT_CHAR(fArray, start, limit, c);
@@ -473,7 +473,7 @@ UnicodeString::numDisplayCells( UTextOffset start,
 }
 
 UCharReference
-UnicodeString::operator[] (UTextOffset pos)
+UnicodeString::operator[] (int32_t pos)
 {
   return UCharReference(this, pos);
 }
@@ -510,10 +510,10 @@ UChar32 UnicodeString::unescapeAt(int32_t &offset) const {
 // Read-only implementation
 //========================================
 int8_t
-UnicodeString::doCompare( UTextOffset start,
+UnicodeString::doCompare( int32_t start,
               int32_t length,
               const UChar *srcChars,
-              UTextOffset srcStart,
+              int32_t srcStart,
               int32_t srcLength) const
 {
   // compare illegal string values
@@ -536,7 +536,7 @@ UnicodeString::doCompare( UTextOffset start,
   chars += start;
   srcChars += srcStart;
 
-  UTextOffset minLength;
+  int32_t minLength;
   int8_t lengthResult;
 
   // get the srcLength if necessary
@@ -590,10 +590,10 @@ UnicodeString::doCompare( UTextOffset start,
 
 /* String compare in code point order - doCompare() compares in code unit order. */
 int8_t
-UnicodeString::doCompareCodePointOrder(UTextOffset start,
+UnicodeString::doCompareCodePointOrder(int32_t start,
                                        int32_t length,
                                        const UChar *srcChars,
-                                       UTextOffset srcStart,
+                                       int32_t srcStart,
                                        int32_t srcLength) const
 {
   // compare illegal string values
@@ -616,7 +616,7 @@ UnicodeString::doCompareCodePointOrder(UTextOffset start,
   chars += start;
   srcChars += srcStart;
 
-  UTextOffset minLength;
+  int32_t minLength;
   int8_t lengthResult;
 
   // get the srcLength if necessary
@@ -648,10 +648,10 @@ UnicodeString::doCompareCodePointOrder(UTextOffset start,
 }
 
 int8_t
-UnicodeString::doCaseCompare(UTextOffset start,
+UnicodeString::doCaseCompare(int32_t start,
                              int32_t length,
                              const UChar *srcChars,
-                             UTextOffset srcStart,
+                             int32_t srcStart,
                              int32_t srcLength,
                              uint32_t options) const
 {
@@ -697,24 +697,24 @@ UnicodeString::getLength() const {
 }
 
 UChar
-UnicodeString::getCharAt(UTextOffset offset) const {
+UnicodeString::getCharAt(int32_t offset) const {
   return charAt(offset);
 }
 
 UChar32
-UnicodeString::getChar32At(UTextOffset offset) const {
+UnicodeString::getChar32At(int32_t offset) const {
   return char32At(offset);
 }
 
 int32_t
-UnicodeString::countChar32(UTextOffset start, int32_t length) const {
+UnicodeString::countChar32(int32_t start, int32_t length) const {
   pinIndices(start, length);
   // if(isBogus()) then fArray==0 and start==0 - u_countChar32() checks for NULL
   return u_countChar32(fArray+start, length);
 }
 
-UTextOffset
-UnicodeString::moveIndex32(UTextOffset index, int32_t delta) const {
+int32_t
+UnicodeString::moveIndex32(int32_t index, int32_t delta) const {
   // pin index
   if(index<0) {
     index=0;
@@ -732,10 +732,10 @@ UnicodeString::moveIndex32(UTextOffset index, int32_t delta) const {
 }
 
 void
-UnicodeString::doExtract(UTextOffset start,
+UnicodeString::doExtract(int32_t start,
              int32_t length,
              UChar *dst,
-             UTextOffset dstStart) const
+             int32_t dstStart) const
 {
   // pin indices to legal values
   pinIndices(start, length);
@@ -763,11 +763,11 @@ UnicodeString::extract(UChar *dest, int32_t destCapacity,
   return fLength;
 }
 
-UTextOffset 
+int32_t 
 UnicodeString::indexOf(const UChar *srcChars,
-               UTextOffset srcStart,
+               int32_t srcStart,
                int32_t srcLength,
-               UTextOffset start,
+               int32_t start,
                int32_t length) const
 {
   if(isBogus() || srcChars == 0 || srcStart < 0 || srcLength == 0) {
@@ -797,7 +797,7 @@ UnicodeString::indexOf(const UChar *srcChars,
   }
 
   const UChar *array = getArrayStart();
-  UTextOffset limit = start + length;
+  int32_t limit = start + length;
 
   // search for the first char, then compare the rest of the string
   // increment srcStart here for that, matching the --srcLength above
@@ -812,9 +812,9 @@ UnicodeString::indexOf(const UChar *srcChars,
   return -1;
 }
 
-UTextOffset
+int32_t
 UnicodeString::doIndexOf(UChar c,
-             UTextOffset start,
+             int32_t start,
              int32_t length) const
 {
   // pin indices
@@ -836,9 +836,9 @@ UnicodeString::doIndexOf(UChar c,
   return -1;
 }
 
-UTextOffset
+int32_t
 UnicodeString::doIndexOf(UChar32 c,
-                         UTextOffset start,
+                         int32_t start,
                          int32_t length) const {
   // pin indices
   pinIndices(start, length);
@@ -879,11 +879,11 @@ UnicodeString::doIndexOf(UChar32 c,
   }
 }
 
-UTextOffset 
+int32_t 
 UnicodeString::lastIndexOf(const UChar *srcChars,
-               UTextOffset srcStart,
+               int32_t srcStart,
                int32_t srcLength,
-               UTextOffset start,
+               int32_t start,
                int32_t length) const
 {
   if(isBogus() || srcChars == 0 || srcStart < 0 || srcLength == 0) {
@@ -913,7 +913,7 @@ UnicodeString::lastIndexOf(const UChar *srcChars,
   }
 
   const UChar *array = getArrayStart();
-  UTextOffset pos;
+  int32_t pos;
 
   // search for the first char, then compare the rest of the string
   // increment srcStart here for that, matching the --srcLength above
@@ -929,9 +929,9 @@ UnicodeString::lastIndexOf(const UChar *srcChars,
   return -1;
 }
 
-UTextOffset
+int32_t
 UnicodeString::doLastIndexOf(UChar c,
-                 UTextOffset start,
+                 int32_t start,
                  int32_t length) const
 {
   if(isBogus()) {
@@ -956,9 +956,9 @@ UnicodeString::doLastIndexOf(UChar c,
   return -1;
 }
 
-UTextOffset
+int32_t
 UnicodeString::doLastIndexOf(UChar32 c,
-                             UTextOffset start,
+                             int32_t start,
                              int32_t length) const {
   // pin indices
   pinIndices(start, length);
@@ -999,13 +999,13 @@ UnicodeString::doLastIndexOf(UChar32 c,
 }
 
 UnicodeString& 
-UnicodeString::findAndReplace(UTextOffset start,
+UnicodeString::findAndReplace(int32_t start,
                   int32_t length,
                   const UnicodeString& oldText,
-                  UTextOffset oldStart,
+                  int32_t oldStart,
                   int32_t oldLength,
                   const UnicodeString& newText,
-                  UTextOffset newStart,
+                  int32_t newStart,
                   int32_t newLength)
 {
   if(isBogus() || oldText.isBogus() || newText.isBogus()) {
@@ -1021,7 +1021,7 @@ UnicodeString::findAndReplace(UTextOffset start,
   }
 
   while(length > 0 && length >= oldLength) {
-    UTextOffset pos = indexOf(oldText, oldStart, oldLength, start, length);
+    int32_t pos = indexOf(oldText, oldStart, oldLength, start, length);
     if(pos < 0) {
       // no more oldText's here: done
       break;
@@ -1108,7 +1108,7 @@ UnicodeString::setTo(UChar *buffer,
 }
 
 UnicodeString&
-UnicodeString::setCharAt(UTextOffset offset,
+UnicodeString::setCharAt(int32_t offset,
              UChar c)
 {
   if(cloneArrayIfNeeded() && fLength > 0) {
@@ -1262,10 +1262,10 @@ UnicodeString::caseMap(BreakIterator *titleIter,
 }
 
 UnicodeString&
-UnicodeString::doReplace( UTextOffset start,
+UnicodeString::doReplace( int32_t start,
               int32_t length,
               const UnicodeString& src,
-              UTextOffset srcStart,
+              int32_t srcStart,
               int32_t srcLength)
 {
   if(!src.isBogus()) {
@@ -1282,10 +1282,10 @@ UnicodeString::doReplace( UTextOffset start,
 }
 
 UnicodeString&
-UnicodeString::doReplace(UTextOffset start,
+UnicodeString::doReplace(int32_t start,
              int32_t length,
              const UChar *srcChars,
-             UTextOffset srcStart,
+             int32_t srcStart,
              int32_t srcLength)
 {
   // if we're bogus, set us to empty first
@@ -1354,8 +1354,8 @@ UnicodeString::doReplace(UTextOffset start,
  * Replaceable API
  */
 void
-UnicodeString::handleReplaceBetween(UTextOffset start,
-                                    UTextOffset limit,
+UnicodeString::handleReplaceBetween(int32_t start,
+                                    int32_t limit,
                                     const UnicodeString& text) {
     replaceBetween(start, limit, text);
 }
@@ -1372,7 +1372,7 @@ UnicodeString::copy(int32_t start, int32_t limit, int32_t dest) {
 }
 
 UnicodeString&
-UnicodeString::doReverse(UTextOffset start,
+UnicodeString::doReverse(int32_t start,
              int32_t length)
 {
   if(fLength <= 1 || !cloneArrayIfNeeded()) {
@@ -1457,7 +1457,7 @@ UnicodeString::trim()
   }
 
   UChar32 c;
-  UTextOffset i = fLength, length;
+  int32_t i = fLength, length;
 
   // first cut off trailing white space
   for(;;) {
@@ -1475,7 +1475,7 @@ UnicodeString::trim()
   }
 
   // find leading white space
-  UTextOffset start;
+  int32_t start;
   i = 0;
   for(;;) {
     start = i;
@@ -1515,7 +1515,7 @@ UnicodeString::doHashCode() const
 // Codeset conversion
 //========================================
 int32_t
-UnicodeString::extract(UTextOffset start,
+UnicodeString::extract(int32_t start,
                        int32_t length,
                        char *target,
                        uint32_t dstSize,
@@ -1616,13 +1616,13 @@ UnicodeString::extract(char *dest, int32_t destCapacity,
 }
 
 void 
-UnicodeString::extractBetween(UTextOffset start,
-                  UTextOffset limit,
+UnicodeString::extractBetween(int32_t start,
+                  int32_t limit,
                   UnicodeString& target) const
 { doExtract(start, limit - start, target); }
 
 int32_t
-UnicodeString::doExtract(UTextOffset start, int32_t length,
+UnicodeString::doExtract(int32_t start, int32_t length,
                          char *dest, int32_t destCapacity,
                          UConverter *cnv,
                          UErrorCode &errorCode) const {
diff --git a/icu4c/source/common/utf_impl.c b/icu4c/source/common/utf_impl.c
index cf5a8b9528e..c01544af6bb 100644
--- a/icu4c/source/common/utf_impl.c
+++ b/icu4c/source/common/utf_impl.c
@@ -83,8 +83,8 @@ utf8_errorValue[6]={
 };
 
 U_CAPI UChar32 U_EXPORT2
-utf8_nextCharSafeBody(const uint8_t *s, UTextOffset *pi, UTextOffset length, UChar32 c, UBool strict) {
-    UTextOffset i=*pi;
+utf8_nextCharSafeBody(const uint8_t *s, int32_t *pi, int32_t length, UChar32 c, UBool strict) {
+    int32_t i=*pi;
     uint8_t count=UTF8_COUNT_TRAIL_BYTES(c);
     if((i)+count<=(length)) {
         uint8_t trail, illegal=0;
@@ -147,7 +147,7 @@ utf8_nextCharSafeBody(const uint8_t *s, UTextOffset *pi, UTextOffset length, UCh
         }
     } else /* too few bytes left */ {
         /* error handling */
-        UTextOffset i0=i;
+        int32_t i0=i;
         /* don't just set (i)=(length) in case there is an illegal sequence */
         while((i)<(length) && UTF8_IS_TRAIL(s[i])) {
             ++(i);
@@ -158,8 +158,8 @@ utf8_nextCharSafeBody(const uint8_t *s, UTextOffset *pi, UTextOffset length, UCh
     return c;
 }
 
-U_CAPI UTextOffset U_EXPORT2
-utf8_appendCharSafeBody(uint8_t *s, UTextOffset i, UTextOffset length, UChar32 c) {
+U_CAPI int32_t U_EXPORT2
+utf8_appendCharSafeBody(uint8_t *s, int32_t i, int32_t length, UChar32 c) {
     if((c)<=0x7ff) {
         if((i)+1<(length)) {
             (s)[(i)++]=(uint8_t)(((c)>>6)|0xc0);
@@ -185,7 +185,7 @@ utf8_appendCharSafeBody(uint8_t *s, UTextOffset i, UTextOffset length, UChar32 c
     /* c>0x10ffff or not enough space, write an error value */
     length-=i;
     if(length>0) {
-        UTextOffset offset;
+        int32_t offset;
         if(length>3) {
             length=3;
         }
@@ -199,8 +199,8 @@ utf8_appendCharSafeBody(uint8_t *s, UTextOffset i, UTextOffset length, UChar32 c
 }
 
 U_CAPI UChar32 U_EXPORT2
-utf8_prevCharSafeBody(const uint8_t *s, UTextOffset start, UTextOffset *pi, UChar32 c, UBool strict) {
-    UTextOffset i=*pi;
+utf8_prevCharSafeBody(const uint8_t *s, int32_t start, int32_t *pi, UChar32 c, UBool strict) {
+    int32_t i=*pi;
     uint8_t b, count=1, shift=6;
 
     /* extract value bits from the last trail byte */
@@ -265,10 +265,10 @@ utf8_prevCharSafeBody(const uint8_t *s, UTextOffset start, UTextOffset *pi, UCha
     return c;
 }
 
-U_CAPI UTextOffset U_EXPORT2
-utf8_back1SafeBody(const uint8_t *s, UTextOffset start, UTextOffset i) {
+U_CAPI int32_t U_EXPORT2
+utf8_back1SafeBody(const uint8_t *s, int32_t start, int32_t i) {
     /* i had been decremented once before the function call */
-    UTextOffset I=i, Z;
+    int32_t I=i, Z;
     uint8_t b;
 
     /* read at most the 6 bytes s[Z] to s[i], inclusively */
diff --git a/icu4c/source/i18n/coleitr.cpp b/icu4c/source/i18n/coleitr.cpp
index bcfc7313674..3f75a205316 100644
--- a/icu4c/source/i18n/coleitr.cpp
+++ b/icu4c/source/i18n/coleitr.cpp
@@ -58,7 +58,7 @@ CollationElementIterator::~CollationElementIterator()
 
 /* CollationElementIterator public methods --------------------------------- */
 
-UTextOffset CollationElementIterator::getOffset() const
+int32_t CollationElementIterator::getOffset() const
 {
   return ucol_getOffset(m_data_);
 }
@@ -145,7 +145,7 @@ void CollationElementIterator::reset()
   ucol_reset(m_data_);
 }
 
-void CollationElementIterator::setOffset(UTextOffset newOffset, 
+void CollationElementIterator::setOffset(int32_t newOffset, 
                                          UErrorCode& status)
 {
   ucol_setOffset(m_data_, newOffset, &status);
diff --git a/icu4c/source/i18n/decimfmt.cpp b/icu4c/source/i18n/decimfmt.cpp
index edb20c0c829..daedfd4e517 100644
--- a/icu4c/source/i18n/decimfmt.cpp
+++ b/icu4c/source/i18n/decimfmt.cpp
@@ -52,7 +52,7 @@ U_NAMESPACE_BEGIN
 #include 
 static void debugout(UnicodeString s) {
     char buf[2000];
-    s.extract((UTextOffset) 0, s.length(), buf);
+    s.extract((int32_t) 0, s.length(), buf);
     printf("%s", buf);
 }
 #define debug(x) printf("%s", x);
@@ -1117,8 +1117,8 @@ is here if we change our minds.
 UBool DecimalFormat::subparse(const UnicodeString& text, ParsePosition& parsePosition,
                                DigitList& digits, UBool* status) const
 {
-    UTextOffset position = parsePosition.getIndex();
-    UTextOffset oldStart = position;
+    int32_t position = parsePosition.getIndex();
+    int32_t oldStart = position;
 
     // check for positivePrefix; take longest
     UBool gotPositive = text.compare(position,fPositivePrefix.length(),fPositivePrefix,0,
@@ -1273,7 +1273,7 @@ UBool DecimalFormat::subparse(const UnicodeString& text, ParsePosition& parsePos
                 }
 
                 while (pos < textLength) {
-                    ch = text[(UTextOffset)pos];
+                    ch = text[(int32_t)pos];
                     digit = ch - zero;
 
                     if (digit < 0 || digit > 9) {
@@ -2207,8 +2207,8 @@ DecimalFormat::toPattern(UnicodeString& result, UBool localized) const
                 {
                     int32_t length = fPosPrefixPattern->length();
                     isDefault = fNegPrefixPattern->length() == (length+2) &&
-                        (*fNegPrefixPattern)[(UTextOffset)0] == kQuote &&
-                        (*fNegPrefixPattern)[(UTextOffset)1] == kPatternMinus &&
+                        (*fNegPrefixPattern)[(int32_t)0] == kQuote &&
+                        (*fNegPrefixPattern)[(int32_t)1] == kPatternMinus &&
                         fNegPrefixPattern->compare(2, length, *fPosPrefixPattern, 0, length) == 0;
                 }
                 if (!isDefault &&
@@ -2325,7 +2325,7 @@ DecimalFormat::applyPattern(const UnicodeString& pattern,
     int32_t groupSepLen = groupingSeparator.length();
     int32_t decimalSepLen = decimalSeparator.length();
 
-    UTextOffset pos = 0;
+    int32_t pos = 0;
     int32_t patLen = pattern.length();
     // Part 0 is the positive pattern.  Part 1, if present, is the negative
     // pattern.
@@ -2450,7 +2450,7 @@ DecimalFormat::applyPattern(const UnicodeString& pattern,
                         }
                         // Check for positive prefix
                         if ((pos+1) < patLen
-                            && pattern.compare((UTextOffset) (pos+1), plus.length(), plus) == 0)
+                            && pattern.compare((int32_t) (pos+1), plus.length(), plus) == 0)
                         {
                             expSignAlways = TRUE;
                             pos += plus.length();
@@ -2460,7 +2460,7 @@ DecimalFormat::applyPattern(const UnicodeString& pattern,
                         expDigits = 0;
                         pos += exponent.length() - 1;
                         while (++pos < patLen &&
-                               pattern[(UTextOffset) pos] == zeroDigit)
+                               pattern[(int32_t) pos] == zeroDigit)
                         {
                             ++expDigits;
                         }
diff --git a/icu4c/source/i18n/msgfmt.cpp b/icu4c/source/i18n/msgfmt.cpp
index a346aa0cbd3..0c971074b69 100644
--- a/icu4c/source/i18n/msgfmt.cpp
+++ b/icu4c/source/i18n/msgfmt.cpp
@@ -1332,7 +1332,7 @@ MessageFormat::copyAndFixQuotes(const UnicodeString& source,
 {
     UBool gotLB = FALSE;
     
-    for (UTextOffset i = start; i < end; ++i) {
+    for (int32_t i = start; i < end; ++i) {
         UChar ch = source[i];
         if (ch == LEFT_CURLY_BRACE) {
             target += SINGLE_QUOTE;
diff --git a/icu4c/source/i18n/nfrs.cpp b/icu4c/source/i18n/nfrs.cpp
index 69bbe1acab6..4acff4ced48 100644
--- a/icu4c/source/i18n/nfrs.cpp
+++ b/icu4c/source/i18n/nfrs.cpp
@@ -131,7 +131,7 @@ NFRuleSet::NFRuleSet(UnicodeString* descriptions, int32_t index, UErrorCode& sta
     // of only one rule set), copy it out into our "name" member
     // and delete it from the description
     if (description.charAt(0) == gPercent) {
-        UTextOffset pos = description.indexOf(gColon);
+        int32_t pos = description.indexOf(gColon);
         if (pos == -1) {
             // throw new IllegalArgumentException("Rule set name doesn't end in colon");
             status = U_PARSE_ERROR;
@@ -172,9 +172,9 @@ NFRuleSet::parseRules(UnicodeString& description, const RuleBasedNumberFormat* o
     // so I got rid of it.  The loop was too complex so I simplified it.
 
     UnicodeString currentDescription;
-    UTextOffset oldP = 0;
+    int32_t oldP = 0;
     while (oldP < description.length()) {
-        UTextOffset p = description.indexOf(gSemicolon, oldP);
+        int32_t p = description.indexOf(gSemicolon, oldP);
         if (p == -1) {
             p = description.length();
         }
diff --git a/icu4c/source/i18n/rbbi_bld.cpp b/icu4c/source/i18n/rbbi_bld.cpp
index 19800a821e4..8066b79b6fe 100644
--- a/icu4c/source/i18n/rbbi_bld.cpp
+++ b/icu4c/source/i18n/rbbi_bld.cpp
@@ -302,8 +302,8 @@ RuleBasedBreakIteratorBuilder::buildRuleList(UnicodeString& description,
     // punctuation
     UStack parenStack;
 
-    UTextOffset p = 0;
-    UTextOffset ruleStart = 0;
+    int32_t p = 0;
+    int32_t ruleStart = 0;
     UChar c = 0x0000;
     UChar lastC = 0x0000;
     UChar lastOpen = 0x0000;
@@ -532,9 +532,9 @@ RuleBasedBreakIteratorBuilder::buildRuleList(UnicodeString& description,
  */
 void
 RuleBasedBreakIteratorBuilder::processSubstitution(UnicodeString& description,
-                                                   UTextOffset ruleStart,
-                                                   UTextOffset ruleEnd,
-                                                   UTextOffset startPos,
+                                                   int32_t ruleStart,
+                                                   int32_t ruleEnd,
+                                                   int32_t startPos,
                                                    UErrorCode& err)
 {
     if (U_FAILURE(err))
@@ -546,7 +546,7 @@ RuleBasedBreakIteratorBuilder::processSubstitution(UnicodeString& description,
     UnicodeString replaceWith;
 
     description.extractBetween(ruleStart, ruleEnd, substitutionRule);
-    UTextOffset equalPos = substitutionRule.indexOf(EQUAL_SIGN);
+    int32_t equalPos = substitutionRule.indexOf(EQUAL_SIGN);
     substitutionRule.extractBetween(0, equalPos, replace);
     substitutionRule.extractBetween(equalPos + 1, substitutionRule.length() - 1, replaceWith);
 
@@ -580,8 +580,8 @@ RuleBasedBreakIteratorBuilder::processSubstitution(UnicodeString& description,
 
     description.removeBetween(ruleStart, ruleEnd);
 
-    UTextOffset lastPos = startPos;
-    UTextOffset pos = description.indexOf(replace, lastPos);
+    int32_t lastPos = startPos;
+    int32_t pos = description.indexOf(replace, lastPos);
     while (pos != -1) {
         description.replaceBetween(pos, pos + replace.length(), replaceWith);
         lastPos = pos + replace.length();
@@ -646,7 +646,7 @@ RuleBasedBreakIteratorBuilder::buildCharCategories(UErrorCode& err)
         return;
 
     int32_t bracketLevel = 0;
-    UTextOffset p = 0;
+    int32_t p = 0;
     int32_t lineNum = 0;
 
     // build hash table of every literal character or [] expression in the rule list
@@ -666,7 +666,7 @@ RuleBasedBreakIteratorBuilder::buildCharCategories(UErrorCode& err)
                 // and add the whole expression to the expression list
                 case OPEN_BRACKET:
                     {
-                        UTextOffset q = p + 1;
+                        int32_t q = p + 1;
                         ++bracketLevel;
                         while (q < line->length() && bracketLevel != 0) {
                             c = (*line)[q];
@@ -951,7 +951,7 @@ RuleBasedBreakIteratorBuilder::parseRule(const UnicodeString& rule,
     //   "a" rather than the last one.  Both of these are limitations in the design
     //   of RuleBasedBreakIterator and not limitations of the rule parser.
 
-    UTextOffset p = 0;
+    int32_t p = 0;
     int32_t currentState = 1;   // don't use state number 0; 0 means "stop"
     int32_t lastState = currentState;
     UnicodeString pendingChars;
@@ -988,7 +988,7 @@ RuleBasedBreakIteratorBuilder::parseRule(const UnicodeString& rule,
             // if we're not on a period, isolate the expression and look up
             // the corresponding category list
             if (c != PERIOD) {
-                UTextOffset q = p;
+                int32_t q = p;
 
                 // if we're on a backslash, the expression is the character
                 // after the backslash
diff --git a/icu4c/source/i18n/rbbi_bld.h b/icu4c/source/i18n/rbbi_bld.h
index a1db9262ec9..d390aebc29f 100644
--- a/icu4c/source/i18n/rbbi_bld.h
+++ b/icu4c/source/i18n/rbbi_bld.h
@@ -199,9 +199,9 @@ protected:
      * must be enclosed in either [] or () for this to work.)
      */
     virtual void processSubstitution(UnicodeString& description,
-                                     UTextOffset ruleStart,
-                                     UTextOffset ruleEnd,
-                                     UTextOffset startPos,
+                                     int32_t ruleStart,
+                                     int32_t ruleEnd,
+                                     int32_t startPos,
                                      UErrorCode& err);
 
     /**
diff --git a/icu4c/source/i18n/rbnf.cpp b/icu4c/source/i18n/rbnf.cpp
index 41ebdbaa8ad..541ed3cd477 100644
--- a/icu4c/source/i18n/rbnf.cpp
+++ b/icu4c/source/i18n/rbnf.cpp
@@ -394,7 +394,7 @@ RuleBasedNumberFormat::init(const UnicodeString& rules, UParseError& pErr, UErro
     // is, pull them out into our temporary holding place for them,
     // and delete them from the description before the real desciption-
     // parsing code sees them
-    UTextOffset lp = description.indexOf(gLenientParse);
+    int32_t lp = description.indexOf(gLenientParse);
     if (lp != -1) {
         // we've got to make sure we're not in the middle of a rule
         // (where "%%lenient-parse" would actually get treated as
@@ -426,7 +426,7 @@ RuleBasedNumberFormat::init(const UnicodeString& rules, UParseError& pErr, UErro
     // rule sets (";%" marks the end of one rule set and the beginning
     // of the next)
     int numRuleSets = 0;
-    for (UTextOffset p = description.indexOf(gSemiPercent); p != -1; p = description.indexOf(gSemiPercent, p)) {
+    for (int32_t p = description.indexOf(gSemiPercent); p != -1; p = description.indexOf(gSemiPercent, p)) {
         ++numRuleSets;
         ++p;
     }
@@ -449,8 +449,8 @@ RuleBasedNumberFormat::init(const UnicodeString& rules, UParseError& pErr, UErro
 
     {
         int curRuleSet = 0;
-        UTextOffset start = 0;
-        for (UTextOffset p = description.indexOf(gSemiPercent); p != -1; p = description.indexOf(gSemiPercent, start)) {
+        int32_t start = 0;
+        for (int32_t p = description.indexOf(gSemiPercent); p != -1; p = description.indexOf(gSemiPercent, start)) {
             ruleSetDescriptions[curRuleSet].setTo(description, start, p + 1 - start);
             ruleSets[curRuleSet] = new NFRuleSet(ruleSetDescriptions, curRuleSet, status);
             ++curRuleSet;
@@ -506,7 +506,7 @@ RuleBasedNumberFormat::stripWhitespace(UnicodeString& description)
 
         // locate the next semicolon in the text and copy the text from
         // our current position up to that semicolon into the result
-        UTextOffset p = description.indexOf(gSemiColon, start);
+        int32_t p = description.indexOf(gSemiColon, start);
         if (p == -1) {
             // or if we don't find a semicolon, just copy the rest of
             // the string into the result
diff --git a/icu4c/source/i18n/search.cpp b/icu4c/source/i18n/search.cpp
index 442559da487..e4b33dd09f1 100644
--- a/icu4c/source/i18n/search.cpp
+++ b/icu4c/source/i18n/search.cpp
@@ -75,7 +75,7 @@ USearchAttributeValue SearchIterator::getAttribute(
     }
 }
     
-UTextOffset SearchIterator::getMatchedStart() const
+int32_t SearchIterator::getMatchedStart() const
 {
     return m_search_->matchedIndex;
 }
@@ -87,7 +87,7 @@ int32_t SearchIterator::getMatchedLength() const
     
 void SearchIterator::getMatchedText(UnicodeString &result) const
 {
-    UTextOffset matchedindex  = m_search_->matchedIndex;
+    int32_t matchedindex  = m_search_->matchedIndex;
     int32_t     matchedlength = m_search_->matchedLength;
     if (matchedindex != USEARCH_DONE && matchedlength != 0) {
         result.setTo(m_search_->text + matchedindex, matchedlength); 
@@ -159,7 +159,7 @@ UBool SearchIterator::operator==(const SearchIterator &that) const
 
 // public methods ----------------------------------------------------
 
-UTextOffset SearchIterator::first(UErrorCode &status)
+int32_t SearchIterator::first(UErrorCode &status)
 {
     if (U_FAILURE(status)) {
         return USEARCH_DONE;
@@ -168,7 +168,7 @@ UTextOffset SearchIterator::first(UErrorCode &status)
     return handleNext(0, status);
 }
 
-UTextOffset SearchIterator::following(UTextOffset position, 
+int32_t SearchIterator::following(int32_t position, 
                                       UErrorCode &status)
 {
     if (U_FAILURE(status)) {
@@ -178,7 +178,7 @@ UTextOffset SearchIterator::following(UTextOffset position,
     return handleNext(position, status);
 }
     
-UTextOffset SearchIterator::last(UErrorCode &status)
+int32_t SearchIterator::last(UErrorCode &status)
 {
     if (U_FAILURE(status)) {
         return USEARCH_DONE;
@@ -187,7 +187,7 @@ UTextOffset SearchIterator::last(UErrorCode &status)
     return handlePrev(m_search_->textLength, status);
 }
 
-UTextOffset SearchIterator::preceding(UTextOffset position, 
+int32_t SearchIterator::preceding(int32_t position, 
                                       UErrorCode &status)
 {
     if (U_FAILURE(status)) {
@@ -197,11 +197,11 @@ UTextOffset SearchIterator::preceding(UTextOffset position,
     return handlePrev(position, status);
 }
 
-UTextOffset SearchIterator::next(UErrorCode &status)
+int32_t SearchIterator::next(UErrorCode &status)
 {
     if (U_SUCCESS(status)) {
-        UTextOffset offset      = getOffset();
-        UTextOffset matchindex  = m_search_->matchedIndex;
+        int32_t offset      = getOffset();
+        int32_t matchindex  = m_search_->matchedIndex;
         int32_t     matchlength = m_search_->matchedLength;
         m_search_->reset        = FALSE;
         if (m_search_->isForwardSearching == TRUE) {
@@ -236,10 +236,10 @@ UTextOffset SearchIterator::next(UErrorCode &status)
     return USEARCH_DONE;
 }
 
-UTextOffset SearchIterator::previous(UErrorCode &status)
+int32_t SearchIterator::previous(UErrorCode &status)
 {
     if (U_SUCCESS(status)) {
-        UTextOffset offset;
+        int32_t offset;
         if (m_search_->reset) {
             offset                       = m_search_->textLength;
             m_search_->isForwardSearching = FALSE;
@@ -250,7 +250,7 @@ UTextOffset SearchIterator::previous(UErrorCode &status)
             offset = getOffset();
         }
         
-        UTextOffset matchindex = m_search_->matchedIndex;
+        int32_t matchindex = m_search_->matchedIndex;
         if (m_search_->isForwardSearching == TRUE) {
             // switching direction. 
             // if matchedIndex == USEARCH_DONE, it means that either a 
@@ -361,7 +361,7 @@ void SearchIterator::setMatchLength(int32_t length)
     m_search_->matchedLength = length;
 }
 
-void SearchIterator::setMatchStart(UTextOffset position)
+void SearchIterator::setMatchStart(int32_t position)
 {
     m_search_->matchedIndex = position;
 }
diff --git a/icu4c/source/i18n/smpdtfmt.cpp b/icu4c/source/i18n/smpdtfmt.cpp
index ed367077c15..e9e45c22932 100644
--- a/icu4c/source/i18n/smpdtfmt.cpp
+++ b/icu4c/source/i18n/smpdtfmt.cpp
@@ -1414,7 +1414,7 @@ void SimpleDateFormat::translatePattern(const UnicodeString& originalPattern,
   
   translatedPattern.remove();
   UBool inQuote = FALSE;
-  for (UTextOffset i = 0; i < originalPattern.length(); ++i) {
+  for (int32_t i = 0; i < originalPattern.length(); ++i) {
     UChar c = originalPattern[i];
     if (inQuote) {
       if (c == 0x0027 /*'\''*/) 
@@ -1425,7 +1425,7 @@ void SimpleDateFormat::translatePattern(const UnicodeString& originalPattern,
     inQuote = TRUE;
       else if ((c >= 0x0061 /*'a'*/ && c <= 0x007A) /*'z'*/ 
            || (c >= 0x0041 /*'A'*/ && c <= 0x005A /*'Z'*/)) {
-    UTextOffset ci = from.indexOf(c);
+    int32_t ci = from.indexOf(c);
     if (ci == -1) {
       status = U_INVALID_FORMAT_ERROR;
       return;
diff --git a/icu4c/source/i18n/stsearch.cpp b/icu4c/source/i18n/stsearch.cpp
index e692d8c9aca..23f25f5139e 100644
--- a/icu4c/source/i18n/stsearch.cpp
+++ b/icu4c/source/i18n/stsearch.cpp
@@ -229,13 +229,13 @@ UBool StringSearch::operator==(const SearchIterator &that) const
 
 // public get and set methods ----------------------------------------
 
-void StringSearch::setOffset(UTextOffset position, UErrorCode &status)
+void StringSearch::setOffset(int32_t position, UErrorCode &status)
 {
     // status checked in usearch_setOffset
     usearch_setOffset(m_strsrch_, position, &status);
 }
 
-UTextOffset StringSearch::getOffset(void) const
+int32_t StringSearch::getOffset(void) const
 {
     return usearch_getOffset(m_strsrch_);
 }
@@ -311,7 +311,7 @@ SearchIterator * StringSearch::safeClone(void) const
     
 // protected method -------------------------------------------------
 
-UTextOffset StringSearch::handleNext(int32_t position, UErrorCode &status)
+int32_t StringSearch::handleNext(int32_t position, UErrorCode &status)
 {
     // values passed here are already in the pre-shift position
     if (U_SUCCESS(status)) {
@@ -360,7 +360,7 @@ UTextOffset StringSearch::handleNext(int32_t position, UErrorCode &status)
     return USEARCH_DONE;
 }
 
-UTextOffset StringSearch::handlePrev(int32_t position, UErrorCode &status)
+int32_t StringSearch::handlePrev(int32_t position, UErrorCode &status)
 {
     // values passed here are already in the pre-shift position
     if (U_SUCCESS(status)) {
diff --git a/icu4c/source/i18n/ucoleitr.cpp b/icu4c/source/i18n/ucoleitr.cpp
index 9098f05b1ad..5ba9bfc1777 100644
--- a/icu4c/source/i18n/ucoleitr.cpp
+++ b/icu4c/source/i18n/ucoleitr.cpp
@@ -192,7 +192,7 @@ ucol_setText(      UCollationElements *elems,
   elems->reset_   = TRUE;
 }
 
-U_CAPI UTextOffset U_EXPORT2
+U_CAPI int32_t U_EXPORT2
 ucol_getOffset(const UCollationElements *elems)
 {
   const collIterate *ci = &(elems->iteratordata_);
@@ -214,7 +214,7 @@ ucol_getOffset(const UCollationElements *elems)
 
 U_CAPI void U_EXPORT2
 ucol_setOffset(UCollationElements    *elems,
-               UTextOffset           offset,
+               int32_t           offset,
                UErrorCode            *status)
 {
   if (U_FAILURE(*status)) {
diff --git a/icu4c/source/i18n/uni2name.cpp b/icu4c/source/i18n/uni2name.cpp
index 81cafc2b082..4bf5ed03120 100644
--- a/icu4c/source/i18n/uni2name.cpp
+++ b/icu4c/source/i18n/uni2name.cpp
@@ -88,7 +88,7 @@ void UnicodeNameTransliterator::handleTransliterate(Replaceable& text, UTransPos
 
     UnicodeString str(openDelimiter);
     UErrorCode status;
-    UTextOffset len;
+    int32_t len;
 
     while (cursor < limit) {
         UChar32 c = text.char32At(cursor);
diff --git a/icu4c/source/i18n/unicode/coleitr.h b/icu4c/source/i18n/unicode/coleitr.h
index 3f66803790f..50b6b7215af 100644
--- a/icu4c/source/i18n/unicode/coleitr.h
+++ b/icu4c/source/i18n/unicode/coleitr.h
@@ -243,7 +243,7 @@ public:
   * @return the offset of the character.
   * @stable
   */
-  UTextOffset getOffset(void) const;
+  int32_t getOffset(void) const;
 
   /**
   * Sets the offset of the currently processed character in the source string.
@@ -252,7 +252,7 @@ public:
   * @return the offset of the character.
   * @stable
   */
-  void setOffset(UTextOffset newOffset, UErrorCode& status);
+  void setOffset(int32_t newOffset, UErrorCode& status);
 
 protected:
   
diff --git a/icu4c/source/i18n/unicode/dcfmtsym.h b/icu4c/source/i18n/unicode/dcfmtsym.h
index 8c8e543f2bb..c9f3405ec19 100644
--- a/icu4c/source/i18n/unicode/dcfmtsym.h
+++ b/icu4c/source/i18n/unicode/dcfmtsym.h
@@ -306,7 +306,7 @@ public:
      *      text starts with the inifinity string, otherwise it returns 0.
      * @deprecated remove after 2000-dec-31. See UNumberFormatSymbol and getSymbol() for a replacement.
      */
-    int32_t compareInfinity(const UnicodeString& text, UTextOffset offset) const;
+    int32_t compareInfinity(const UnicodeString& text, int32_t offset) const;
 
     /**
      * character used to represent NaN (Not A Number). Almost always left
@@ -326,7 +326,7 @@ public:
      *      text starts with the NaN string, otherwise it returns 0.
      * @deprecated remove after 2000-dec-31. See UNumberFormatSymbol and getSymbol() for a replacement.
      */
-    int32_t compareNaN(const UnicodeString& text, UTextOffset offset) const;
+    int32_t compareNaN(const UnicodeString& text, int32_t offset) const;
 
     /**
      * character used to represent plus sign
@@ -396,7 +396,7 @@ public:
      *      0.
      * @deprecated remove after 2000-dec-31. See UNumberFormatSymbol and getSymbol() for a replacement.
      */
-    int32_t compareCurrencySymbol(const UnicodeString& text, UTextOffset offset) const;
+    int32_t compareCurrencySymbol(const UnicodeString& text, int32_t offset) const;
 
     /**
      * The international string denoting the local currency.
@@ -416,7 +416,7 @@ public:
      *      Symbol string, otherwise it returns 0.
      * @deprecated remove after 2000-dec-31. See UNumberFormatSymbol and getSymbol() for a replacement.
      */
-    int32_t compareInternationalCurrencySymbol(const UnicodeString& text, UTextOffset offset) const;
+    int32_t compareInternationalCurrencySymbol(const UnicodeString& text, int32_t offset) const;
 
     /**
      * The monetary decimal separator.
@@ -643,7 +643,7 @@ DecimalFormatSymbols::setInfinity(const UnicodeString& infinity)
 
 inline int32_t
 DecimalFormatSymbols::compareInfinity(const UnicodeString& text,
-                                      UTextOffset offset) const
+                                      int32_t offset) const
 {
     int32_t symbolLength = fSymbols[kInfinitySymbol].length();
     return text.compare(offset,
@@ -673,7 +673,7 @@ DecimalFormatSymbols::setNaN(const UnicodeString& NaN)
 // -------------------------------------
 
 inline int32_t
-DecimalFormatSymbols::compareNaN(const UnicodeString& text, UTextOffset offset) const
+DecimalFormatSymbols::compareNaN(const UnicodeString& text, int32_t offset) const
 {
     int32_t symbolLength = fSymbols[kNaNSymbol].length();
     return text.compare(offset,
@@ -752,7 +752,7 @@ DecimalFormatSymbols::setCurrencySymbol(const UnicodeString& str)
 
 inline int32_t
 DecimalFormatSymbols::compareCurrencySymbol(const UnicodeString& text,
-                                            UTextOffset offset) const
+                                            int32_t offset) const
 {
     int32_t symbolLength = fSymbols[kCurrencySymbol].length();
     return text.compare(offset,
@@ -783,7 +783,7 @@ DecimalFormatSymbols::setInternationalCurrencySymbol(const UnicodeString& str)
 
 inline int32_t
 DecimalFormatSymbols::compareInternationalCurrencySymbol(const UnicodeString& text,
-                                                         UTextOffset offset) const
+                                                         int32_t offset) const
 {
     int32_t symbolLength = fSymbols[kIntlCurrencySymbol].length();
     return text.compare(offset,
diff --git a/icu4c/source/i18n/unicode/parseerr.h b/icu4c/source/i18n/unicode/parseerr.h
index 3dfb165fc4e..71a175e2329 100644
--- a/icu4c/source/i18n/unicode/parseerr.h
+++ b/icu4c/source/i18n/unicode/parseerr.h
@@ -69,7 +69,7 @@ typedef struct _UParseError {
      * is -1. It will be set to appropriate value by the code that 
      * populating the struct.
      */
-    UTextOffset    offset;
+    int32_t    offset;
 
     /**
      * Textual context before the error.  Null-terminated.
diff --git a/icu4c/source/i18n/unicode/parsepos.h b/icu4c/source/i18n/unicode/parsepos.h
index 17cedacd24b..96149d86f85 100644
--- a/icu4c/source/i18n/unicode/parsepos.h
+++ b/icu4c/source/i18n/unicode/parsepos.h
@@ -50,7 +50,7 @@ public:
      * @param newIndex the new text offset.
      * @stable
      */
-    ParsePosition(UTextOffset newIndex)
+    ParsePosition(int32_t newIndex)
       {    this->index = newIndex; this->errorIndex = -1; }
 
     /**
@@ -94,14 +94,14 @@ public:
      * @return the current index.
      * @stable
      */
-    UTextOffset getIndex(void) const;
+    int32_t getIndex(void) const;
 
     /**
      * Set the current parse position.
      * @param index the new index.
      * @stable
      */
-    void setIndex(UTextOffset index);
+    void setIndex(int32_t index);
 
     /**
      * Set the index at which a parse error occurred.  Formatters
@@ -110,14 +110,14 @@ public:
      * set.
      * @stable
      */
-    void setErrorIndex(UTextOffset ei);
+    void setErrorIndex(int32_t ei);
 
     /**
      * Retrieve the index at which an error occurred, or -1 if the
      * error index has not been set.
      * @stable
      */
-    UTextOffset getErrorIndex(void) const;
+    int32_t getErrorIndex(void) const;
 
 private:
     /**
@@ -126,12 +126,12 @@ private:
      * This is designed to be used serially,
      * with each call setting index up for the next one.
      */
-    UTextOffset index;
+    int32_t index;
 
     /**
      * The index at which a parse error occurred.
      */
-    UTextOffset errorIndex;
+    int32_t errorIndex;
 };
 
 inline ParsePosition&
@@ -157,26 +157,26 @@ ParsePosition::operator!=(const ParsePosition& copy) const
   return !operator==(copy);
 }
 
-inline UTextOffset
+inline int32_t
 ParsePosition::getIndex() const
 {
   return index;
 }
 
 inline void
-ParsePosition::setIndex(UTextOffset offset)
+ParsePosition::setIndex(int32_t offset)
 {
   this->index = offset;
 }
 
-inline UTextOffset
+inline int32_t
 ParsePosition::getErrorIndex() const
 {
   return errorIndex;
 }
 
 inline void
-ParsePosition::setErrorIndex(UTextOffset ei)
+ParsePosition::setErrorIndex(int32_t ei)
 {
   this->errorIndex = ei;
 }
diff --git a/icu4c/source/i18n/unicode/search.h b/icu4c/source/i18n/unicode/search.h
index 5d2f623e527..af1d7bc25dc 100644
--- a/icu4c/source/i18n/unicode/search.h
+++ b/icu4c/source/i18n/unicode/search.h
@@ -91,7 +91,7 @@ public:
      * @param status for errors if it occurs
      * @draft ICU 2.0
      */
-    virtual void setOffset(UTextOffset position, UErrorCode &status) = 0;
+    virtual void setOffset(int32_t position, UErrorCode &status) = 0;
 
     /**
      * Return the current index in the text being searched.
@@ -101,7 +101,7 @@ public:
      * @return current index in the text being searched.
      * @draft ICU 2.0
      */
-    virtual UTextOffset getOffset(void) const = 0;
+    virtual int32_t getOffset(void) const = 0;
 
     /**
     * Sets the text searching attributes located in the enum 
@@ -136,7 +136,7 @@ public:
     *         searched.
     * @draft ICU 2.0
     */
-    UTextOffset getMatchedStart(void) const;
+    int32_t getMatchedStart(void) const;
 
     /**
      * Returns the length of text in the string which matches the search 
@@ -268,7 +268,7 @@ public:
      *         USEARCH_DONE if there are no matches.
      * @draft ICU 2.0
      */
-    UTextOffset first(UErrorCode &status);
+    int32_t first(UErrorCode &status);
 
     /**
      * Returns the first index greater than position at which the 
@@ -284,7 +284,7 @@ public:
      *         matches.
      * @draft ICU 2.0
      */
-    UTextOffset following(UTextOffset position, UErrorCode &status);
+    int32_t following(int32_t position, UErrorCode &status);
     
     /**
      * Returns the last index in the target text at which it matches the 
@@ -298,7 +298,7 @@ public:
      *         there are no matches.
      * @draft ICU 2.0
      */
-    UTextOffset last(UErrorCode &status);
+    int32_t last(UErrorCode &status);
 
     /**
      * Returns the first index less than position at which the string 
@@ -314,7 +314,7 @@ public:
      *         no matches.
      * @draft ICU 2.0
      */
-    UTextOffset preceding(UTextOffset position, UErrorCode &status);
+    int32_t preceding(int32_t position, UErrorCode &status);
 
     /**
      * Returns the index of the next point at which the text matches the
@@ -329,7 +329,7 @@ public:
      *          or USEARCH_DONE if there are no more matches.
      * @draft ICU 2.0
      */
-     UTextOffset next(UErrorCode &status);
+     int32_t next(UErrorCode &status);
 
     /**
      * Returns the index of the previous point at which the string text 
@@ -343,7 +343,7 @@ public:
      *          or USEARCH_DONE if there are no more matches.
      * @draft ICU 2.0
      */
-    UTextOffset previous(UErrorCode &status);
+    int32_t previous(UErrorCode &status);
 
     /** 
     * Resets the iteration.
@@ -444,7 +444,7 @@ protected:
      * @return index at which the match starts, else if match is not found 
      *         USEARCH_DONE is returned
      */
-    virtual UTextOffset handleNext(UTextOffset position, UErrorCode &status) 
+    virtual int32_t handleNext(int32_t position, UErrorCode &status) 
                                                                          = 0;
 
     /**
@@ -464,7 +464,7 @@ protected:
      * @return index at which the match starts, else if match is not found 
      *         USEARCH_DONE is returned
      */
-     virtual UTextOffset handlePrev(UTextOffset position, UErrorCode &status) 
+     virtual int32_t handlePrev(int32_t position, UErrorCode &status) 
                                                                          = 0;
 
     /**
@@ -483,7 +483,7 @@ protected:
      * methods should call this when they find a match in the target text.
      * @param position start offset of the matched text.
      */
-    virtual void setMatchStart(UTextOffset position);
+    virtual void setMatchStart(int32_t position);
 
     /**
     * sets match not found 
diff --git a/icu4c/source/i18n/unicode/smpdtfmt.h b/icu4c/source/i18n/unicode/smpdtfmt.h
index 68e32eca67b..ff979b3bce7 100644
--- a/icu4c/source/i18n/unicode/smpdtfmt.h
+++ b/icu4c/source/i18n/unicode/smpdtfmt.h
@@ -623,7 +623,7 @@ private:
      * @return the new start position if matching succeeded; a negative number
      * indicating matching failure, otherwise.
      */
-    int32_t matchString(const UnicodeString& text, UTextOffset start, Calendar::EDateFields field,
+    int32_t matchString(const UnicodeString& text, int32_t start, Calendar::EDateFields field,
                         const UnicodeString* stringArray, int32_t stringArrayCount, Calendar& cal) const;
 
     /**
diff --git a/icu4c/source/i18n/unicode/stsearch.h b/icu4c/source/i18n/unicode/stsearch.h
index e8866562cb2..bfa5684a510 100644
--- a/icu4c/source/i18n/unicode/stsearch.h
+++ b/icu4c/source/i18n/unicode/stsearch.h
@@ -284,7 +284,7 @@ public:
      * @param status for errors if it occurs
      * @draft ICU 2.0
      */
-    virtual void setOffset(UTextOffset position, UErrorCode &status);
+    virtual void setOffset(int32_t position, UErrorCode &status);
 
     /**
      * Return the current index in the text being searched.
@@ -294,7 +294,7 @@ public:
      * @return current index in the text being searched.
      * @draft ICU 2.0
      */
-    virtual UTextOffset getOffset(void) const;
+    virtual int32_t getOffset(void) const;
 
     /**
      * Set the target text to be searched.
@@ -413,7 +413,7 @@ protected:
      * @return The index at which the matched text in the target starts, or 
      *         USEARCH_DONE if no match was found.
      */
-    virtual UTextOffset handleNext(UTextOffset position, UErrorCode &status);
+    virtual int32_t handleNext(int32_t position, UErrorCode &status);
 
     /**
      * Search backward for matching text, starting at a given location.
@@ -436,7 +436,7 @@ protected:
      * @return The index at which the matched text in the target starts, or 
      *         USEARCH_DONE if no match was found.
      */
-    virtual UTextOffset handlePrev(UTextOffset position, UErrorCode &status);
+    virtual int32_t handlePrev(int32_t position, UErrorCode &status);
     
 private :
 
diff --git a/icu4c/source/i18n/unicode/ucoleitr.h b/icu4c/source/i18n/unicode/ucoleitr.h
index 083c67b757d..d03f490eb29 100644
--- a/icu4c/source/i18n/unicode/ucoleitr.h
+++ b/icu4c/source/i18n/unicode/ucoleitr.h
@@ -207,7 +207,7 @@ ucol_setText(      UCollationElements *elems,
  * @see ucol_setOffset
  * @stable
  */
-U_CAPI UTextOffset U_EXPORT2 
+U_CAPI int32_t U_EXPORT2 
 ucol_getOffset(const UCollationElements *elems);
 
 /**
@@ -224,7 +224,7 @@ ucol_getOffset(const UCollationElements *elems);
  */
 U_CAPI void U_EXPORT2 
 ucol_setOffset(UCollationElements *elems,
-               UTextOffset        offset,
+               int32_t        offset,
                UErrorCode         *status);
 
 #endif
diff --git a/icu4c/source/i18n/unicode/usearch.h b/icu4c/source/i18n/unicode/usearch.h
index 8fd86fe71f6..ba59385a107 100644
--- a/icu4c/source/i18n/unicode/usearch.h
+++ b/icu4c/source/i18n/unicode/usearch.h
@@ -239,7 +239,7 @@ U_CAPI void U_EXPORT2 usearch_close(UStringSearch *strsrch);
 * @draft ICU 2.0
 */
 U_CAPI void U_EXPORT2 usearch_setOffset(UStringSearch *strsrch, 
-                                        UTextOffset    position,
+                                        int32_t    position,
                                         UErrorCode    *status);
 
 /**
@@ -249,7 +249,7 @@ U_CAPI void U_EXPORT2 usearch_setOffset(UStringSearch *strsrch,
 * @param strsrch search iterator data struct
 * @draft ICU 2.0
 */
-U_CAPI UTextOffset U_EXPORT2 usearch_getOffset(const UStringSearch *strsrch);
+U_CAPI int32_t U_EXPORT2 usearch_getOffset(const UStringSearch *strsrch);
     
 /**
 * Sets the text searching attributes located in the enum USearchAttribute
@@ -293,7 +293,7 @@ U_CAPI USearchAttributeValue U_EXPORT2 usearch_getAttribute(
 *         searched.
 * @draft ICU 2.0
 */
-U_CAPI UTextOffset U_EXPORT2 usearch_getMatchedStart(
+U_CAPI int32_t U_EXPORT2 usearch_getMatchedStart(
                                                const UStringSearch *strsrch);
     
 /**
@@ -469,7 +469,7 @@ U_CAPI const UChar * U_EXPORT2 usearch_getPattern(
 * USEARCH_DONE if there are no matches.
 * @draft ICU 2.0
 */
-U_CAPI UTextOffset U_EXPORT2 usearch_first(UStringSearch *strsrch, 
+U_CAPI int32_t U_EXPORT2 usearch_first(UStringSearch *strsrch, 
                                            UErrorCode    *status);
 
 /**
@@ -490,8 +490,8 @@ U_CAPI UTextOffset U_EXPORT2 usearch_first(UStringSearch *strsrch,
 *         or USEARCH_DONE if there are no matches.
 * @draft ICU 2.0
 */
-U_CAPI UTextOffset U_EXPORT2 usearch_following(UStringSearch *strsrch, 
-                                               UTextOffset    position, 
+U_CAPI int32_t U_EXPORT2 usearch_following(UStringSearch *strsrch, 
+                                               int32_t    position, 
                                                UErrorCode    *status);
     
 /**
@@ -507,7 +507,7 @@ U_CAPI UTextOffset U_EXPORT2 usearch_following(UStringSearch *strsrch,
 *         are no matches.
 * @draft ICU 2.0
 */
-U_CAPI UTextOffset U_EXPORT2 usearch_last(UStringSearch *strsrch, 
+U_CAPI int32_t U_EXPORT2 usearch_last(UStringSearch *strsrch, 
                                           UErrorCode    *status);
 
 /**
@@ -527,8 +527,8 @@ U_CAPI UTextOffset U_EXPORT2 usearch_last(UStringSearch *strsrch,
 *         or USEARCH_DONE if there are no matches.
 * @draft ICU 2.0
 */
-U_CAPI UTextOffset U_EXPORT2 usearch_preceding(UStringSearch *strsrch, 
-                                               UTextOffset    position, 
+U_CAPI int32_t U_EXPORT2 usearch_preceding(UStringSearch *strsrch, 
+                                               int32_t    position, 
                                                UErrorCode    *status);
     
 /**
@@ -546,7 +546,7 @@ U_CAPI UTextOffset U_EXPORT2 usearch_preceding(UStringSearch *strsrch,
 * @see #usearch_first
 * @draft ICU 2.0
 */
-U_CAPI UTextOffset U_EXPORT2 usearch_next(UStringSearch *strsrch, 
+U_CAPI int32_t U_EXPORT2 usearch_next(UStringSearch *strsrch, 
                                           UErrorCode    *status);
 
 /**
@@ -563,7 +563,7 @@ U_CAPI UTextOffset U_EXPORT2 usearch_next(UStringSearch *strsrch,
 *         or USEARCH_DONE if there are no more matches.
 * @draft ICU 2.0
 */
-U_CAPI UTextOffset U_EXPORT2 usearch_previous(UStringSearch *strsrch, 
+U_CAPI int32_t U_EXPORT2 usearch_previous(UStringSearch *strsrch, 
                                               UErrorCode    *status);
     
 /** 
diff --git a/icu4c/source/i18n/usearch.cpp b/icu4c/source/i18n/usearch.cpp
index de2975229f7..5584becb519 100644
--- a/icu4c/source/i18n/usearch.cpp
+++ b/icu4c/source/i18n/usearch.cpp
@@ -85,10 +85,10 @@ inline void initializeFCD(UErrorCode *status)
 * @return fcd value
 */
 static
-inline uint16_t getFCD(const UChar   *str, UTextOffset *offset, 
+inline uint16_t getFCD(const UChar   *str, int32_t *offset, 
                              int32_t  strlength)
 {
-    UTextOffset temp = *offset;
+    int32_t temp = *offset;
     uint16_t    result;
     UChar       ch   = str[temp];
     result = unorm_getFCD16(FCD_, ch);
@@ -283,7 +283,7 @@ inline int16_t initializePattern(UStringSearch *strsrch, UErrorCode *status)
           UPattern   *pattern     = &(strsrch->pattern);
     const UChar      *patterntext = pattern->text;
           int32_t     length      = pattern->textLength;
-          UTextOffset index       = 0;
+          int32_t index       = 0;
 
     pattern->hasPrefixAccents = getFCD(patterntext, &index, length) >> 
                                                      SECOND_LAST_BYTE_SHIFT_;
@@ -397,13 +397,13 @@ inline void initialize(UStringSearch *strsrch, UErrorCode *status)
 * @param end target text end offset
 */
 static
-inline UBool isBreakUnit(const UStringSearch *strsrch, UTextOffset start, 
-                               UTextOffset    end)
+inline UBool isBreakUnit(const UStringSearch *strsrch, int32_t start, 
+                               int32_t    end)
 {
     UBreakIterator *breakiterator = strsrch->search->breakIter;
     if (breakiterator) {
-        UTextOffset startindex = ubrk_first(breakiterator);
-        UTextOffset endindex   = ubrk_last(breakiterator);
+        int32_t startindex = ubrk_first(breakiterator);
+        int32_t endindex   = ubrk_last(breakiterator);
         
         // out-of-range indexes are never boundary positions
         if (start < startindex || start > endindex ||
@@ -432,15 +432,15 @@ inline UBool isBreakUnit(const UStringSearch *strsrch, UTextOffset start,
 *         if the current character is contains a base character.
 */
 static
-inline UTextOffset getNextBaseOffset(const UChar       *text, 
-                                           UTextOffset  textoffset,
+inline int32_t getNextBaseOffset(const UChar       *text, 
+                                           int32_t  textoffset,
                                            int32_t      textlength)
 {
     if (textoffset < textlength) {
-        UTextOffset temp = textoffset;
+        int32_t temp = textoffset;
         if (getFCD(text, &temp, textlength) >> SECOND_LAST_BYTE_SHIFT_) {
             while (temp < textlength) { 
-                UTextOffset result = temp;
+                int32_t result = temp;
                 if ((getFCD(text, &temp, textlength) >> 
                      SECOND_LAST_BYTE_SHIFT_) == 0) {
                     return result;
@@ -462,13 +462,13 @@ inline UTextOffset getNextBaseOffset(const UChar       *text,
 *         if the current character is contains a base character.
 */
 static
-inline UTextOffset getNextUStringSearchBaseOffset(UStringSearch *strsrch, 
-                                                  UTextOffset    textoffset)
+inline int32_t getNextUStringSearchBaseOffset(UStringSearch *strsrch, 
+                                                  int32_t    textoffset)
 {
     if (strsrch->pattern.hasSuffixAccents && 
         textoffset < strsrch->search->textLength) {
               int32_t      textlength = strsrch->search->textLength;
-              UTextOffset  temp       = textoffset;
+              int32_t  temp       = textoffset;
         const UChar       *text       = strsrch->search->text;
         UTF_BACK_1(text, 0, temp);
         if (getFCD(text, &temp, textlength) & LAST_BYTE_MASK_) {
@@ -493,8 +493,8 @@ inline UTextOffset getNextUStringSearchBaseOffset(UStringSearch *strsrch,
 * @return final offset
 */
 static
-inline UTextOffset shiftForward(UStringSearch *strsrch,
-                                UTextOffset    textoffset,
+inline int32_t shiftForward(UStringSearch *strsrch,
+                                int32_t    textoffset,
                                 uint32_t       ce,
                                 int32_t        patternceindex,
                                 UErrorCode    *status)
@@ -567,12 +567,12 @@ inline void setMatchNotFound(UStringSearch *strsrch, UErrorCode *status)
 * @return offset to the next safe character
 */
 static
-inline UTextOffset getNextSafeOffset(const UCollator   *collator, 
+inline int32_t getNextSafeOffset(const UCollator   *collator, 
                                      const UChar       *text,
-                                           UTextOffset  textoffset,
+                                           int32_t  textoffset,
                                            int32_t      textlength)
 {
-    UTextOffset result = textoffset; // first contraction character
+    int32_t result = textoffset; // first contraction character
     while (result != textlength && ucol_unsafeCP(text[result], collator)) {
         result ++;
     }
@@ -605,20 +605,20 @@ inline UTextOffset getNextSafeOffset(const UCollator   *collator,
 */
 
 static
-UBool checkExtraMatchAccents(const UStringSearch *strsrch, UTextOffset start,
-                                   UTextOffset    end,     
+UBool checkExtraMatchAccents(const UStringSearch *strsrch, int32_t start,
+                                   int32_t    end,     
                                    UErrorCode    *status)
 {
     UBool result = FALSE;
     if (strsrch->pattern.hasPrefixAccents) {
-              UTextOffset  length = end - start;
-              UTextOffset  offset = 0;
+              int32_t  length = end - start;
+              int32_t  offset = 0;
         const UChar       *text   = strsrch->search->text + start;
         
         UTF_FWD_1(text, offset, length);
         // we are only concerned with the first composite character
         if (unorm_quickCheck(text, offset, UNORM_NFD, status) == UNORM_NO) {
-            UTextOffset safeoffset = getNextSafeOffset(strsrch->collator, 
+            int32_t safeoffset = getNextSafeOffset(strsrch->collator, 
                                                        text, 0, length);
             if (safeoffset != length) {
                 safeoffset ++;
@@ -695,8 +695,8 @@ UBool checkExtraMatchAccents(const UStringSearch *strsrch, UTextOffset start,
 *         FALSE otherwise
 */
 static
-UBool hasAccentsBeforeMatch(const UStringSearch *strsrch, UTextOffset start,
-                                  UTextOffset    end) 
+UBool hasAccentsBeforeMatch(const UStringSearch *strsrch, int32_t start,
+                                  int32_t    end) 
 {
     if (strsrch->pattern.hasPrefixAccents) {
         UCollationElements *coleiter  = strsrch->textIter;
@@ -725,7 +725,7 @@ UBool hasAccentsBeforeMatch(const UStringSearch *strsrch, UTextOffset start,
         }
 
         // within text
-        UTextOffset temp = start;
+        int32_t temp = start;
         UBool accent = (getFCD(strsrch->search->text, &temp, 
                                strsrch->search->textLength) >> 
                                                     SECOND_LAST_BYTE_SHIFT_); 
@@ -770,12 +770,12 @@ UBool hasAccentsBeforeMatch(const UStringSearch *strsrch, UTextOffset start,
 *         FALSE otherwise
 */
 static
-UBool hasAccentsAfterMatch(const UStringSearch *strsrch, UTextOffset start,               
-                                 UTextOffset    end) 
+UBool hasAccentsAfterMatch(const UStringSearch *strsrch, int32_t start,               
+                                 int32_t    end) 
 {
     if (strsrch->pattern.hasSuffixAccents) {
         const UChar       *text       = strsrch->search->text;
-              UTextOffset  temp       = end;
+              int32_t  temp       = end;
               int32_t      textlength = strsrch->search->textLength;
         UTF_BACK_1(text, 0, temp);
         if (getFCD(text, &temp, textlength) & LAST_BYTE_MASK_) {
@@ -820,7 +820,7 @@ UBool hasAccentsAfterMatch(const UStringSearch *strsrch, UTextOffset start,
 * @return TRUE if offset is out of bounds, FALSE otherwise
 */
 static
-inline UBool isOutOfBounds(int32_t textlength, UTextOffset offset)
+inline UBool isOutOfBounds(int32_t textlength, int32_t offset)
 {
     return offset < 0 || offset > textlength;
 }
@@ -833,8 +833,8 @@ inline UBool isOutOfBounds(int32_t textlength, UTextOffset offset)
 * @return TRUE if identical match is found
 */
 static
-inline UBool checkIdentical(const UStringSearch *strsrch, UTextOffset start, 
-                                  UTextOffset    end) 
+inline UBool checkIdentical(const UStringSearch *strsrch, int32_t start, 
+                                  int32_t    end) 
 {
     int32_t length = end - start;
     if (strsrch->strength != UCOL_IDENTICAL) {
@@ -858,10 +858,10 @@ inline UBool checkIdentical(const UStringSearch *strsrch, UTextOffset start,
 */
 static
 inline UBool checkRepeatedMatch(UStringSearch *strsrch,
-                                UTextOffset    start,
-                                UTextOffset    end)
+                                int32_t    start,
+                                int32_t    end)
 {
-    UTextOffset lastmatchindex = strsrch->search->matchedIndex;
+    int32_t lastmatchindex = strsrch->search->matchedIndex;
     UBool       result;
     if (lastmatchindex == USEARCH_DONE) {
         return FALSE;
@@ -890,10 +890,10 @@ inline UBool checkRepeatedMatch(UStringSearch *strsrch,
 * @return current offset 
 */
 static
-inline UTextOffset getColElemIterOffset(const UCollationElements *coleiter,
+inline int32_t getColElemIterOffset(const UCollationElements *coleiter,
                                               UBool               forwards)
 {
-    UTextOffset result = ucol_getOffset(coleiter);
+    int32_t result = ucol_getOffset(coleiter);
     // intricacies of the the backwards collation element iterator
     if (!forwards && inNormBuf(coleiter) && !isFCDPointerNull(coleiter)) {
         result ++;
@@ -917,12 +917,12 @@ inline UTextOffset getColElemIterOffset(const UCollationElements *coleiter,
 
 static
 UBool checkNextExactContractionMatch(UStringSearch *strsrch, 
-                                     UTextOffset   *start, 
-                                     UTextOffset   *end, UErrorCode  *status) 
+                                     int32_t   *start, 
+                                     int32_t   *end, UErrorCode  *status) 
 {
           UCollationElements *coleiter   = strsrch->textIter;
           int32_t             textlength = strsrch->search->textLength;
-          UTextOffset         temp       = *start;
+          int32_t         temp       = *start;
     const UCollator          *collator   = strsrch->collator;
     const UChar              *text       = strsrch->search->text;
     // This part checks if either ends of the match contains potential 
@@ -997,10 +997,10 @@ UBool checkNextExactContractionMatch(UStringSearch *strsrch,
 */
 static
 inline UBool checkNextExactMatch(UStringSearch *strsrch, 
-                                 UTextOffset   *textoffset, UErrorCode *status)
+                                 int32_t   *textoffset, UErrorCode *status)
 {
     UCollationElements *coleiter = strsrch->textIter;
-    UTextOffset         start    = getColElemIterOffset(coleiter, FALSE);        
+    int32_t         start    = getColElemIterOffset(coleiter, FALSE);        
         
     if (!checkNextExactContractionMatch(strsrch, &start, textoffset, status)) {
         return FALSE;
@@ -1032,14 +1032,14 @@ inline UBool checkNextExactMatch(UStringSearch *strsrch,
 *         composed character with accents
 */
 static
-inline UTextOffset getPreviousBaseOffset(const UChar       *text, 
-                                               UTextOffset  textoffset)
+inline int32_t getPreviousBaseOffset(const UChar       *text, 
+                                               int32_t  textoffset)
 {
     if (textoffset > 0) {
         while (TRUE) {
-            UTextOffset result = textoffset;
+            int32_t result = textoffset;
             UTF_BACK_1(text, 0, textoffset);
-            UTextOffset temp = textoffset;
+            int32_t temp = textoffset;
             uint16_t fcd = getFCD(text, &temp, result);
             if ((fcd >> SECOND_LAST_BYTE_SHIFT_) == 0) {
                 if (fcd & LAST_BYTE_MASK_) {
@@ -1062,14 +1062,14 @@ inline UTextOffset getPreviousBaseOffset(const UChar       *text,
 * @param accentsindex array of indexes of the accents that are not blocked
 */
 static
-inline int getUnblockedAccentIndex(UChar *accents, UTextOffset *accentsindex)
+inline int getUnblockedAccentIndex(UChar *accents, int32_t *accentsindex)
 {
-    UTextOffset index     = 0;
+    int32_t index     = 0;
     int32_t     length    = u_strlen(accents);
     UChar32     codepoint = 0;
     int         cclass    = 0;
     int         result    = 0;
-    UTextOffset temp;
+    int32_t temp;
     while (index < length) {
         temp = index;
         UTF_NEXT_CHAR(accents, index, length, codepoint);
@@ -1186,21 +1186,21 @@ inline UBool checkCollationMatch(const UStringSearch      *strsrch,
 *         offset of the match. Note this start includes all preceding accents.
 */
 static
-UTextOffset doNextCanonicalPrefixMatch(UStringSearch *strsrch, 
-                                       UTextOffset    start,
-                                       UTextOffset    end,     
+int32_t doNextCanonicalPrefixMatch(UStringSearch *strsrch, 
+                                       int32_t    start,
+                                       int32_t    end,     
                                        UErrorCode    *status)
 {
     const UChar       *text       = strsrch->search->text;
           int32_t      textlength = strsrch->search->textLength;
-          UTextOffset  tempstart  = start;
+          int32_t  tempstart  = start;
 
     if ((getFCD(text, &tempstart, textlength) & LAST_BYTE_MASK_) == 0) {
         // die... failed at a base character
         return USEARCH_DONE;
     }
 
-    UTextOffset offset = getNextBaseOffset(text, tempstart, textlength);
+    int32_t offset = getNextBaseOffset(text, tempstart, textlength);
     start = getPreviousBaseOffset(text, tempstart);
 
     UChar       accents[INITIAL_ARRAY_SIZE_];
@@ -1211,10 +1211,10 @@ UTextOffset doNextCanonicalPrefixMatch(UStringSearch *strsrch,
         return USEARCH_DONE;
     }
         
-    UTextOffset         accentsindex[INITIAL_ARRAY_SIZE_];      
-    UTextOffset         accentsize = getUnblockedAccentIndex(accents, 
+    int32_t         accentsindex[INITIAL_ARRAY_SIZE_];      
+    int32_t         accentsize = getUnblockedAccentIndex(accents, 
                                                                  accentsindex);
-    UTextOffset         count      = (2 << (accentsize - 1)) - 2;  
+    int32_t         count      = (2 << (accentsize - 1)) - 2;  
     UChar               buffer[INITIAL_ARRAY_SIZE_];
     UCollationElements *coleiter   = strsrch->utilIter;
     while (U_SUCCESS(*status) && count > 0) {
@@ -1226,7 +1226,7 @@ UTextOffset doNextCanonicalPrefixMatch(UStringSearch *strsrch,
         // forming all possible canonical rearrangement by dropping
         // sets of accents
         for (int i = 0; i <= accentsize - 1; i ++) {
-            UTextOffset mask = 1 << (accentsize - i - 1);
+            int32_t mask = 1 << (accentsize - i - 1);
             if (count & mask) {
                 for (int j = accentsindex[i]; j < accentsindex[i + 1]; j ++) {
                     *rearrange ++ = accents[j];
@@ -1271,9 +1271,9 @@ UTextOffset doNextCanonicalPrefixMatch(UStringSearch *strsrch,
 static
 inline uint32_t getPreviousSafeOffset(const UCollator   *collator, 
                                       const UChar       *text,
-                                            UTextOffset  textoffset)
+                                            int32_t  textoffset)
 {
-    UTextOffset result = textoffset; // first contraction character
+    int32_t result = textoffset; // first contraction character
     while (result != 0 && ucol_unsafeCP(text[result - 1], collator)) {
         result --;
     }
@@ -1317,8 +1317,8 @@ inline void cleanUpSafeText(const UStringSearch *strsrch, UChar *safetext,
 *         offset of the match. Note this start includes all preceding accents.
 */
 static
-UTextOffset doNextCanonicalSuffixMatch(UStringSearch *strsrch, 
-                                       UTextOffset    textoffset,
+int32_t doNextCanonicalSuffixMatch(UStringSearch *strsrch, 
+                                       int32_t    textoffset,
                                        UErrorCode    *status)
 {
     const UChar              *text           = strsrch->search->text;
@@ -1328,7 +1328,7 @@ UTextOffset doNextCanonicalSuffixMatch(UStringSearch *strsrch,
           int32_t             safetextlength;
           UChar               safebuffer[INITIAL_ARRAY_SIZE_];
           UCollationElements *coleiter       = strsrch->utilIter;
-          UTextOffset         safeoffset     = textoffset;
+          int32_t         safeoffset     = textoffset;
 
     if (textoffset != 0 && ucol_unsafeCP(strsrch->canonicalSuffixAccents[0], 
                                          collator)) {
@@ -1379,7 +1379,7 @@ UTextOffset doNextCanonicalSuffixMatch(UStringSearch *strsrch,
         textce = getCE(strsrch, textce);
         if (textce != UCOL_IGNORABLE && textce != ce[ceindex]) {
             // do the beginning stuff
-            UTextOffset failedoffset = getColElemIterOffset(coleiter, FALSE);
+            int32_t failedoffset = getColElemIterOffset(coleiter, FALSE);
             if (isSafe && failedoffset >= safelength) {
                 // alas... no hope. failed at rearranged accent set
                 cleanUpSafeText(strsrch, safetext, safebuffer);
@@ -1392,7 +1392,7 @@ UTextOffset doNextCanonicalSuffixMatch(UStringSearch *strsrch,
                 }
                 
                 // try rearranging the front accents
-                UTextOffset result = doNextCanonicalPrefixMatch(strsrch, 
+                int32_t result = doNextCanonicalPrefixMatch(strsrch, 
                                         failedoffset, textoffset, status);
                 if (result != USEARCH_DONE) {
                     // if status is a failure, ucol_setOffset does nothing
@@ -1410,7 +1410,7 @@ UTextOffset doNextCanonicalSuffixMatch(UStringSearch *strsrch,
     }
     // set offset here
     if (isSafe) {
-        UTextOffset result     = getColElemIterOffset(coleiter, FALSE);
+        int32_t result     = getColElemIterOffset(coleiter, FALSE);
         // sets the text iterator here with the correct expansion and offset
         int32_t    leftoverces = getExpansionPrefix(coleiter);
         cleanUpSafeText(strsrch, safetext, safebuffer);
@@ -1454,15 +1454,15 @@ UTextOffset doNextCanonicalSuffixMatch(UStringSearch *strsrch,
 */
 static
 UBool doNextCanonicalMatch(UStringSearch *strsrch, 
-                           UTextOffset    textoffset, 
+                           int32_t    textoffset, 
                            UErrorCode    *status)
 {
     const UChar       *text = strsrch->search->text;
-          UTextOffset  temp = textoffset;
+          int32_t  temp = textoffset;
     UTF_BACK_1(text, 0, temp);
     if ((getFCD(text, &temp, textoffset) & LAST_BYTE_MASK_) == 0) {
         UCollationElements *coleiter = strsrch->textIter;
-        UTextOffset         offset   = getColElemIterOffset(coleiter, FALSE);
+        int32_t         offset   = getColElemIterOffset(coleiter, FALSE);
         if (strsrch->pattern.hasPrefixAccents) {
             offset = doNextCanonicalPrefixMatch(strsrch, offset, textoffset, 
                                                 status);
@@ -1480,17 +1480,17 @@ UBool doNextCanonicalMatch(UStringSearch *strsrch,
 
     UChar       accents[INITIAL_ARRAY_SIZE_];
     // offset to the last base character in substring to search
-    UTextOffset baseoffset = getPreviousBaseOffset(text, textoffset);
+    int32_t baseoffset = getPreviousBaseOffset(text, textoffset);
     // normalizing the offensive string
     unorm_normalize(text + baseoffset, textoffset - baseoffset, UNORM_NFD, 
                                0, accents, INITIAL_ARRAY_SIZE_, status);    
     // status checked in loop below
         
-    UTextOffset accentsindex[INITIAL_ARRAY_SIZE_];
-    UTextOffset size = getUnblockedAccentIndex(accents, accentsindex);
+    int32_t accentsindex[INITIAL_ARRAY_SIZE_];
+    int32_t size = getUnblockedAccentIndex(accents, accentsindex);
 
     // 2 power n - 1 minus the full set of accents
-    UTextOffset  count = (2 << (size - 1)) - 2;  
+    int32_t  count = (2 << (size - 1)) - 2;  
     while (U_SUCCESS(*status) && count > 0) {
         UChar *rearrange = strsrch->canonicalSuffixAccents;
         // copy the base characters
@@ -1500,7 +1500,7 @@ UBool doNextCanonicalMatch(UStringSearch *strsrch,
         // forming all possible canonical rearrangement by dropping
         // sets of accents
         for (int i = 0; i <= size - 1; i ++) {
-            UTextOffset mask = 1 << (size - i - 1);
+            int32_t mask = 1 << (size - i - 1);
             if (count & mask) {
                 for (int j = accentsindex[i]; j < accentsindex[i + 1]; j ++) {
                     *rearrange ++ = accents[j];
@@ -1508,7 +1508,7 @@ UBool doNextCanonicalMatch(UStringSearch *strsrch,
             }
         }
         *rearrange = 0;
-        UTextOffset offset = doNextCanonicalSuffixMatch(strsrch, baseoffset, 
+        int32_t offset = doNextCanonicalSuffixMatch(strsrch, baseoffset, 
                                                         status);
         if (offset != USEARCH_DONE) {
             return TRUE; // match found
@@ -1527,12 +1527,12 @@ UBool doNextCanonicalMatch(UStringSearch *strsrch,
 *         if it is a composed character with accents
 */
 static
-inline UTextOffset getPreviousUStringSearchBaseOffset(UStringSearch *strsrch, 
-                                                      UTextOffset textoffset)
+inline int32_t getPreviousUStringSearchBaseOffset(UStringSearch *strsrch, 
+                                                      int32_t textoffset)
 {
     if (strsrch->pattern.hasPrefixAccents && textoffset > 0) {
         const UChar       *text = strsrch->search->text;
-              UTextOffset  offset = textoffset;
+              int32_t  offset = textoffset;
         if (getFCD(text, &offset, strsrch->search->textLength) >> 
                                                    SECOND_LAST_BYTE_SHIFT_) {
             return getPreviousBaseOffset(text, textoffset);
@@ -1556,13 +1556,13 @@ inline UTextOffset getPreviousUStringSearchBaseOffset(UStringSearch *strsrch,
 */
 static
 UBool checkNextCanonicalContractionMatch(UStringSearch *strsrch, 
-                                         UTextOffset   *start, 
-                                         UTextOffset   *end, 
+                                         int32_t   *start, 
+                                         int32_t   *end, 
                                          UErrorCode    *status) 
 {
           UCollationElements *coleiter   = strsrch->textIter;
           int32_t             textlength = strsrch->search->textLength;
-          UTextOffset         temp       = *start;
+          int32_t         temp       = *start;
     const UCollator          *collator   = strsrch->collator;
     const UChar              *text       = strsrch->search->text;
     // This part checks if either ends of the match contains potential 
@@ -1654,7 +1654,7 @@ UBool checkNextCanonicalContractionMatch(UStringSearch *strsrch,
 */
 static
 inline UBool checkNextCanonicalMatch(UStringSearch *strsrch, 
-                                     UTextOffset   *textoffset, 
+                                     int32_t   *textoffset, 
                                      UErrorCode    *status)
 {
     // to ensure that the start and ends are not composite characters
@@ -1672,7 +1672,7 @@ inline UBool checkNextCanonicalMatch(UStringSearch *strsrch,
         return TRUE;
     }
 
-    UTextOffset start = getColElemIterOffset(coleiter, FALSE);
+    int32_t start = getColElemIterOffset(coleiter, FALSE);
     if (!checkNextCanonicalContractionMatch(strsrch, &start, textoffset, 
                                             status) || U_FAILURE(*status)) {
         return FALSE;
@@ -1709,8 +1709,8 @@ inline UBool checkNextCanonicalMatch(UStringSearch *strsrch,
 * @return final offset
 */
 static
-inline UTextOffset reverseShift(UStringSearch *strsrch,
-                                UTextOffset    textoffset,
+inline int32_t reverseShift(UStringSearch *strsrch,
+                                int32_t    textoffset,
                                 uint32_t       ce,
                                 int32_t        patternceindex,
                                 UErrorCode    *status)
@@ -1759,12 +1759,12 @@ inline UTextOffset reverseShift(UStringSearch *strsrch,
 */
 static
 UBool checkPreviousExactContractionMatch(UStringSearch *strsrch, 
-                                     UTextOffset   *start, 
-                                     UTextOffset   *end, UErrorCode  *status) 
+                                     int32_t   *start, 
+                                     int32_t   *end, UErrorCode  *status) 
 {
           UCollationElements *coleiter   = strsrch->textIter;
           int32_t             textlength = strsrch->search->textLength;
-          UTextOffset         temp       = *end;
+          int32_t         temp       = *end;
     const UCollator          *collator   = strsrch->collator;
     const UChar              *text       = strsrch->search->text;
     // This part checks if either ends of the match contains potential 
@@ -1844,11 +1844,11 @@ UBool checkPreviousExactContractionMatch(UStringSearch *strsrch,
 */
 static
 inline UBool checkPreviousExactMatch(UStringSearch *strsrch, 
-                                     UTextOffset   *textoffset, 
+                                     int32_t   *textoffset, 
                                      UErrorCode    *status)
 {
     // to ensure that the start and ends are not composite characters
-    UTextOffset end = ucol_getOffset(strsrch->textIter);        
+    int32_t end = ucol_getOffset(strsrch->textIter);        
     if (!checkPreviousExactContractionMatch(strsrch, textoffset, &end, status)
         || U_FAILURE(*status)) {
             return FALSE;
@@ -1891,13 +1891,13 @@ inline UBool checkPreviousExactMatch(UStringSearch *strsrch,
 *         offset of the match. Note this start includes all following accents.
 */
 static
-UTextOffset doPreviousCanonicalSuffixMatch(UStringSearch *strsrch, 
-                                           UTextOffset    start,
-                                           UTextOffset    end,     
+int32_t doPreviousCanonicalSuffixMatch(UStringSearch *strsrch, 
+                                           int32_t    start,
+                                           int32_t    end,     
                                            UErrorCode    *status)
 {
     const UChar       *text       = strsrch->search->text;
-          UTextOffset  tempend    = end;
+          int32_t  tempend    = end;
 
     UTF_BACK_1(text, 0, tempend);
     if (!(getFCD(text, &tempend, strsrch->search->textLength) & 
@@ -1909,15 +1909,15 @@ UTextOffset doPreviousCanonicalSuffixMatch(UStringSearch *strsrch,
 
     if (U_SUCCESS(*status)) {
         UChar       accents[INITIAL_ARRAY_SIZE_];
-        UTextOffset offset = getPreviousBaseOffset(text, end);
+        int32_t offset = getPreviousBaseOffset(text, end);
         // normalizing the offensive string
         unorm_normalize(text + offset, end - offset, UNORM_NFD, 0, accents, 
                         INITIAL_ARRAY_SIZE_, status);    
         
-        UTextOffset         accentsindex[INITIAL_ARRAY_SIZE_];      
-        UTextOffset         accentsize = getUnblockedAccentIndex(accents, 
+        int32_t         accentsindex[INITIAL_ARRAY_SIZE_];      
+        int32_t         accentsize = getUnblockedAccentIndex(accents, 
                                                          accentsindex);
-        UTextOffset         count      = (2 << (accentsize - 1)) - 2;  
+        int32_t         count      = (2 << (accentsize - 1)) - 2;  
         UChar               buffer[INITIAL_ARRAY_SIZE_];
         UCollationElements *coleiter = strsrch->utilIter;
         while (U_SUCCESS(*status) && count > 0) {
@@ -1929,7 +1929,7 @@ UTextOffset doPreviousCanonicalSuffixMatch(UStringSearch *strsrch,
             // forming all possible canonical rearrangement by dropping
             // sets of accents
             for (int i = 0; i <= accentsize - 1; i ++) {
-                UTextOffset mask = 1 << (accentsize - i - 1);
+                int32_t mask = 1 << (accentsize - i - 1);
                 if (count & mask) {
                     for (int j = accentsindex[i]; j < accentsindex[i + 1]; j ++) {
                         *rearrange ++ = accents[j];
@@ -1978,8 +1978,8 @@ UTextOffset doPreviousCanonicalSuffixMatch(UStringSearch *strsrch,
 *         offset of the match. Note this start includes all following accents.
 */
 static
-UTextOffset doPreviousCanonicalPrefixMatch(UStringSearch *strsrch, 
-                                           UTextOffset    textoffset,
+int32_t doPreviousCanonicalPrefixMatch(UStringSearch *strsrch, 
+                                           int32_t    textoffset,
                                            UErrorCode    *status)
 {
     const UChar       *text       = strsrch->search->text;
@@ -1988,7 +1988,7 @@ UTextOffset doPreviousCanonicalPrefixMatch(UStringSearch *strsrch,
           UChar       *safetext;
           int32_t      safetextlength;
           UChar        safebuffer[INITIAL_ARRAY_SIZE_];
-          UTextOffset  safeoffset = textoffset;
+          int32_t  safeoffset = textoffset;
 
     if (textoffset && 
         ucol_unsafeCP(strsrch->canonicalPrefixAccents[
@@ -2044,7 +2044,7 @@ UTextOffset doPreviousCanonicalPrefixMatch(UStringSearch *strsrch,
         textce = getCE(strsrch, textce);
         if (textce != UCOL_IGNORABLE && textce != ce[ceindex]) {
             // do the beginning stuff
-            UTextOffset failedoffset = ucol_getOffset(coleiter);
+            int32_t failedoffset = ucol_getOffset(coleiter);
             if (isSafe && failedoffset <= prefixlength) {
                 // alas... no hope. failed at rearranged accent set
                 cleanUpSafeText(strsrch, safetext, safebuffer);
@@ -2057,7 +2057,7 @@ UTextOffset doPreviousCanonicalPrefixMatch(UStringSearch *strsrch,
                 }
                 
                 // try rearranging the end accents
-                UTextOffset result = doPreviousCanonicalSuffixMatch(strsrch, 
+                int32_t result = doPreviousCanonicalSuffixMatch(strsrch, 
                                         textoffset, failedoffset, status);
                 if (result != USEARCH_DONE) {
                     // if status is a failure, ucol_setOffset does nothing
@@ -2075,7 +2075,7 @@ UTextOffset doPreviousCanonicalPrefixMatch(UStringSearch *strsrch,
     }
     // set offset here
     if (isSafe) {
-        UTextOffset result      = ucol_getOffset(coleiter);
+        int32_t result      = ucol_getOffset(coleiter);
         // sets the text iterator here with the correct expansion and offset
         int32_t     leftoverces = getExpansionSuffix(coleiter);
         cleanUpSafeText(strsrch, safetext, safebuffer);
@@ -2118,15 +2118,15 @@ UTextOffset doPreviousCanonicalPrefixMatch(UStringSearch *strsrch,
 */
 static
 UBool doPreviousCanonicalMatch(UStringSearch *strsrch, 
-                               UTextOffset    textoffset, 
+                               int32_t    textoffset, 
                                UErrorCode    *status)
 {
     const UChar       *text       = strsrch->search->text;
-          UTextOffset  temp       = textoffset;
+          int32_t  temp       = textoffset;
           int32_t      textlength = strsrch->search->textLength;
     if ((getFCD(text, &temp, textlength) >> SECOND_LAST_BYTE_SHIFT_) == 0) {
         UCollationElements *coleiter = strsrch->textIter;
-        UTextOffset         offset   = ucol_getOffset(coleiter);
+        int32_t         offset   = ucol_getOffset(coleiter);
         if (strsrch->pattern.hasSuffixAccents) {
             offset = doPreviousCanonicalSuffixMatch(strsrch, textoffset, 
                                                     offset, status);
@@ -2144,17 +2144,17 @@ UBool doPreviousCanonicalMatch(UStringSearch *strsrch,
 
     UChar       accents[INITIAL_ARRAY_SIZE_];
     // offset to the last base character in substring to search
-    UTextOffset baseoffset = getNextBaseOffset(text, textoffset, textlength);
+    int32_t baseoffset = getNextBaseOffset(text, textoffset, textlength);
     // normalizing the offensive string
     unorm_normalize(text + textoffset, baseoffset - textoffset, UNORM_NFD, 
                                0, accents, INITIAL_ARRAY_SIZE_, status);    
     // status checked in loop
         
-    UTextOffset accentsindex[INITIAL_ARRAY_SIZE_];
-    UTextOffset size = getUnblockedAccentIndex(accents, accentsindex);
+    int32_t accentsindex[INITIAL_ARRAY_SIZE_];
+    int32_t size = getUnblockedAccentIndex(accents, accentsindex);
 
     // 2 power n - 1 minus the full set of accents
-    UTextOffset  count = (2 << (size - 1)) - 2;  
+    int32_t  count = (2 << (size - 1)) - 2;  
     while (U_SUCCESS(*status) && count > 0) {
         UChar *rearrange = strsrch->canonicalPrefixAccents;
         // copy the base characters
@@ -2164,7 +2164,7 @@ UBool doPreviousCanonicalMatch(UStringSearch *strsrch,
         // forming all possible canonical rearrangement by dropping
         // sets of accents
         for (int i = 0; i <= size - 1; i ++) {
-            UTextOffset mask = 1 << (size - i - 1);
+            int32_t mask = 1 << (size - i - 1);
             if (count & mask) {
                 for (int j = accentsindex[i]; j < accentsindex[i + 1]; j ++) {
                     *rearrange ++ = accents[j];
@@ -2172,7 +2172,7 @@ UBool doPreviousCanonicalMatch(UStringSearch *strsrch,
             }
         }
         *rearrange = 0;
-        UTextOffset offset = doPreviousCanonicalPrefixMatch(strsrch, 
+        int32_t offset = doPreviousCanonicalPrefixMatch(strsrch, 
                                                           baseoffset, status);
         if (offset != USEARCH_DONE) {
             return TRUE; // match found
@@ -2195,12 +2195,12 @@ UBool doPreviousCanonicalMatch(UStringSearch *strsrch,
 */
 static
 UBool checkPreviousCanonicalContractionMatch(UStringSearch *strsrch, 
-                                     UTextOffset   *start, 
-                                     UTextOffset   *end, UErrorCode  *status) 
+                                     int32_t   *start, 
+                                     int32_t   *end, UErrorCode  *status) 
 {
           UCollationElements *coleiter   = strsrch->textIter;
           int32_t             textlength = strsrch->search->textLength;
-          UTextOffset         temp       = *end;
+          int32_t         temp       = *end;
     const UCollator          *collator   = strsrch->collator;
     const UChar              *text       = strsrch->search->text;
     // This part checks if either ends of the match contains potential 
@@ -2292,7 +2292,7 @@ UBool checkPreviousCanonicalContractionMatch(UStringSearch *strsrch,
 */
 static
 inline UBool checkPreviousCanonicalMatch(UStringSearch *strsrch, 
-                                         UTextOffset   *textoffset, 
+                                         int32_t   *textoffset, 
                                          UErrorCode    *status)
 {
     // to ensure that the start and ends are not composite characters
@@ -2310,7 +2310,7 @@ inline UBool checkPreviousCanonicalMatch(UStringSearch *strsrch,
         return TRUE;
     }
 
-    UTextOffset end = ucol_getOffset(coleiter);
+    int32_t end = ucol_getOffset(coleiter);
     if (!checkPreviousCanonicalContractionMatch(strsrch, textoffset, &end,
                                                 status) || 
          U_FAILURE(*status)) {
@@ -2493,7 +2493,7 @@ U_CAPI void U_EXPORT2 usearch_close(UStringSearch *strsrch)
 // set and get methods --------------------------------------------------
 
 U_CAPI void U_EXPORT2 usearch_setOffset(UStringSearch *strsrch, 
-                                        UTextOffset    position,
+                                        int32_t    position,
                                         UErrorCode    *status)
 {
     if (U_SUCCESS(*status) && strsrch) {
@@ -2509,10 +2509,10 @@ U_CAPI void U_EXPORT2 usearch_setOffset(UStringSearch *strsrch,
     }
 }
 
-U_CAPI UTextOffset U_EXPORT2 usearch_getOffset(const UStringSearch *strsrch)
+U_CAPI int32_t U_EXPORT2 usearch_getOffset(const UStringSearch *strsrch)
 {
     if (strsrch) {
-        UTextOffset result = ucol_getOffset(strsrch->textIter);
+        int32_t result = ucol_getOffset(strsrch->textIter);
         if (isOutOfBounds(strsrch->search->textLength, result)) {
             return USEARCH_DONE;
         }
@@ -2565,7 +2565,7 @@ U_CAPI USearchAttributeValue U_EXPORT2 usearch_getAttribute(
     return USEARCH_DEFAULT;
 }
 
-U_CAPI UTextOffset U_EXPORT2 usearch_getMatchedStart(
+U_CAPI int32_t U_EXPORT2 usearch_getMatchedStart(
                                                 const UStringSearch *strsrch)
 {
     if (strsrch == NULL) {
@@ -2590,7 +2590,7 @@ U_CAPI int32_t U_EXPORT2 usearch_getMatchedText(const UStringSearch *strsrch,
     }
 
     int32_t     copylength = strsrch->search->matchedLength;
-    UTextOffset copyindex  = strsrch->search->matchedIndex;
+    int32_t copyindex  = strsrch->search->matchedIndex;
     if (copyindex == USEARCH_DONE) {
         u_terminateUChars(result, resultCapacity, 0, status);
         return USEARCH_DONE;
@@ -2755,7 +2755,7 @@ usearch_getPattern(const UStringSearch *strsrch,
 
 // miscellanous methods --------------------------------------------------
 
-U_CAPI UTextOffset U_EXPORT2 usearch_first(UStringSearch *strsrch, 
+U_CAPI int32_t U_EXPORT2 usearch_first(UStringSearch *strsrch, 
                                            UErrorCode    *status) 
 {
     if (strsrch && U_SUCCESS(*status)) {
@@ -2768,8 +2768,8 @@ U_CAPI UTextOffset U_EXPORT2 usearch_first(UStringSearch *strsrch,
     return USEARCH_DONE;
 }
 
-U_CAPI UTextOffset U_EXPORT2 usearch_following(UStringSearch *strsrch, 
-                                               UTextOffset    position,
+U_CAPI int32_t U_EXPORT2 usearch_following(UStringSearch *strsrch, 
+                                               int32_t    position,
                                                UErrorCode    *status)
 {
     if (strsrch && U_SUCCESS(*status)) {
@@ -2783,7 +2783,7 @@ U_CAPI UTextOffset U_EXPORT2 usearch_following(UStringSearch *strsrch,
     return USEARCH_DONE;
 }
     
-U_CAPI UTextOffset U_EXPORT2 usearch_last(UStringSearch *strsrch, 
+U_CAPI int32_t U_EXPORT2 usearch_last(UStringSearch *strsrch, 
                                           UErrorCode    *status)
 {
     if (strsrch && U_SUCCESS(*status)) {
@@ -2796,8 +2796,8 @@ U_CAPI UTextOffset U_EXPORT2 usearch_last(UStringSearch *strsrch,
     return USEARCH_DONE;
 }
 
-U_CAPI UTextOffset U_EXPORT2 usearch_preceding(UStringSearch *strsrch, 
-                                               UTextOffset    position,
+U_CAPI int32_t U_EXPORT2 usearch_preceding(UStringSearch *strsrch, 
+                                               int32_t    position,
                                                UErrorCode    *status)
 {
     if (strsrch && U_SUCCESS(*status)) {
@@ -2833,15 +2833,15 @@ U_CAPI UTextOffset U_EXPORT2 usearch_preceding(UStringSearch *strsrch,
 * iterator. Callers of this API would have to set the offset in the collation
 * element iterator before using this method.
 */
-U_CAPI UTextOffset U_EXPORT2 usearch_next(UStringSearch *strsrch,
+U_CAPI int32_t U_EXPORT2 usearch_next(UStringSearch *strsrch,
                                           UErrorCode    *status)
 { 
     if (U_SUCCESS(*status) && strsrch) {
-        UTextOffset  offset     = usearch_getOffset(strsrch);
+        int32_t  offset     = usearch_getOffset(strsrch);
         USearch     *search     = strsrch->search;
         search->reset           = FALSE;
         int32_t      textlength = search->textLength;
-        UTextOffset  matchedindex = search->matchedIndex;
+        int32_t  matchedindex = search->matchedIndex;
         if (search->isForwardSearching) {
             if (offset == textlength || matchedindex == textlength || 
                 (!search->isOverlap && 
@@ -2902,11 +2902,11 @@ U_CAPI UTextOffset U_EXPORT2 usearch_next(UStringSearch *strsrch,
     return USEARCH_DONE;
 }
 
-U_CAPI UTextOffset U_EXPORT2 usearch_previous(UStringSearch *strsrch,
+U_CAPI int32_t U_EXPORT2 usearch_previous(UStringSearch *strsrch,
                                               UErrorCode *status)
 {
     if (U_SUCCESS(*status) && strsrch) {
-        UTextOffset offset;
+        int32_t offset;
         USearch *search = strsrch->search;
         if (search->reset) {
             offset                     = search->textLength;
@@ -2921,7 +2921,7 @@ U_CAPI UTextOffset U_EXPORT2 usearch_previous(UStringSearch *strsrch,
             offset = usearch_getOffset(strsrch);
         }
         
-        UTextOffset matchedindex = search->matchedIndex;
+        int32_t matchedindex = search->matchedIndex;
         if (search->isForwardSearching == TRUE) {
             // switching direction. 
             // if matchedIndex == USEARCH_DONE, it means that either a 
@@ -3050,7 +3050,7 @@ UBool usearch_handleNextExact(UStringSearch *strsrch, UErrorCode *status)
     int32_t             textlength      = strsrch->search->textLength;
     uint32_t           *patternce       = strsrch->pattern.CE;
     int32_t             patterncelength = strsrch->pattern.CELength;
-    UTextOffset         textoffset      = ucol_getOffset(coleiter);
+    int32_t         textoffset      = ucol_getOffset(coleiter);
 
     // shifting it check for setting offset
     // if setOffset is called previously or there was no previous match, we
@@ -3151,7 +3151,7 @@ UBool usearch_handleNextCanonical(UStringSearch *strsrch, UErrorCode *status)
     int32_t             textlength      = strsrch->search->textLength;
     uint32_t           *patternce       = strsrch->pattern.CE;
     int32_t             patterncelength = strsrch->pattern.CELength;
-    UTextOffset         textoffset      = ucol_getOffset(coleiter);
+    int32_t         textoffset      = ucol_getOffset(coleiter);
     UBool               hasPatternAccents = 
        strsrch->pattern.hasSuffixAccents || strsrch->pattern.hasPrefixAccents;
           
@@ -3261,7 +3261,7 @@ UBool usearch_handlePreviousExact(UStringSearch *strsrch, UErrorCode *status)
     UCollationElements *coleiter        = strsrch->textIter;
     uint32_t           *patternce       = strsrch->pattern.CE;
     int32_t             patterncelength = strsrch->pattern.CELength;
-    UTextOffset         textoffset      = ucol_getOffset(coleiter);
+    int32_t         textoffset      = ucol_getOffset(coleiter);
 
     // shifting it check for setting offset
     // if setOffset is called previously or there was no previous match, we
@@ -3361,7 +3361,7 @@ UBool usearch_handlePreviousCanonical(UStringSearch *strsrch,
     UCollationElements *coleiter        = strsrch->textIter;
     uint32_t           *patternce       = strsrch->pattern.CE;
     int32_t             patterncelength = strsrch->pattern.CELength;
-    UTextOffset         textoffset      = ucol_getOffset(coleiter);
+    int32_t         textoffset      = ucol_getOffset(coleiter);
     UBool               hasPatternAccents = 
        strsrch->pattern.hasSuffixAccents || strsrch->pattern.hasPrefixAccents;
           
diff --git a/icu4c/source/i18n/usrchimp.h b/icu4c/source/i18n/usrchimp.h
index 987d826a53e..cde59a6c427 100644
--- a/icu4c/source/i18n/usrchimp.h
+++ b/icu4c/source/i18n/usrchimp.h
@@ -28,7 +28,7 @@ struct USearch {
     // if we are not at the start of the text or the end of the text, 
     // depending on the iteration direction and matchedIndex is USEARCH_DONE 
     // it means that we can find any more matches in that particular direction
-          UTextOffset         matchedIndex; 
+          int32_t         matchedIndex; 
           int32_t             matchedLength;
           UBool               isForwardSearching;
           UBool               reset;
diff --git a/icu4c/source/i18n/utrans.cpp b/icu4c/source/i18n/utrans.cpp
index c3e37b8ad2d..d1b6bf4be24 100644
--- a/icu4c/source/i18n/utrans.cpp
+++ b/icu4c/source/i18n/utrans.cpp
@@ -45,12 +45,12 @@ public:
 
     virtual ~ReplaceableGlue();
 
-    virtual void handleReplaceBetween(UTextOffset start,
-                                      UTextOffset limit,
+    virtual void handleReplaceBetween(int32_t start,
+                                      int32_t limit,
                                       const UnicodeString& text);
 
-    virtual void extractBetween(UTextOffset start,
-                                UTextOffset limit,
+    virtual void extractBetween(int32_t start,
+                                int32_t limit,
                                 UnicodeString& target) const;
 
     virtual void copy(int32_t start, int32_t limit, int32_t dest);
@@ -59,9 +59,9 @@ protected:
 
     virtual int32_t getLength() const;
 
-    virtual UChar getCharAt(UTextOffset offset) const;
+    virtual UChar getCharAt(int32_t offset) const;
 
-    virtual UChar32 getChar32At(UTextOffset offset) const;
+    virtual UChar32 getChar32At(int32_t offset) const;
 };
 
 
@@ -83,16 +83,16 @@ int32_t ReplaceableGlue::getLength() const {
     return (*func->length)(rep);
 }
 
-UChar ReplaceableGlue::getCharAt(UTextOffset offset) const {
+UChar ReplaceableGlue::getCharAt(int32_t offset) const {
     return (*func->charAt)(rep, offset);
 }
 
-UChar32 ReplaceableGlue::getChar32At(UTextOffset offset) const {
+UChar32 ReplaceableGlue::getChar32At(int32_t offset) const {
     return (*func->char32At)(rep, offset);
 }
 
-void ReplaceableGlue::handleReplaceBetween(UTextOffset start,
-                          UTextOffset limit,
+void ReplaceableGlue::handleReplaceBetween(int32_t start,
+                          int32_t limit,
                           const UnicodeString& text) {
     int32_t len = text.length();
     if (buf == 0 || bufLen < len) {
@@ -104,8 +104,8 @@ void ReplaceableGlue::handleReplaceBetween(UTextOffset start,
     (*func->replace)(rep, start, limit, buf, len);
 }
 
-void ReplaceableGlue::extractBetween(UTextOffset start,
-                                     UTextOffset limit,
+void ReplaceableGlue::extractBetween(int32_t start,
+                                     int32_t limit,
                                      UnicodeString& target) const {
     (*func->extract)(rep, start, limit, target.getBuffer(limit-start));
     target.releaseBuffer(limit-start);
diff --git a/icu4c/source/layout/unicode/loengine.h b/icu4c/source/layout/unicode/loengine.h
index ef914bc4354..30337e7f153 100644
--- a/icu4c/source/layout/unicode/loengine.h
+++ b/icu4c/source/layout/unicode/loengine.h
@@ -104,9 +104,9 @@ public:
 	 * using the getter method below.
 	 */
     int32_t layoutChars(const UChar chars[],
-						UTextOffset startOffset,
-						UTextOffset endOffset,
-						UTextOffset maxOffset,
+						int32_t startOffset,
+						int32_t endOffset,
+						int32_t maxOffset,
 						UBool rightToLeft,
 						float x, float y,
 						UErrorCode &success);
@@ -130,8 +130,8 @@ public:
 	 * using the getter method below.
 	 */
 	int32_t layoutString(const UnicodeString &str,
-						 UTextOffset startOffset,
-						 UTextOffset endOffset,
+						 int32_t startOffset,
+						 int32_t endOffset,
 						 UBool rightToLeft,
 						 float x, float y,
 						 UErrorCode &success);
@@ -240,9 +240,9 @@ inline ICULayoutEngine::~ICULayoutEngine()
 }
 
 inline int32_t ICULayoutEngine::layoutChars(const UChar chars[],
-											UTextOffset startOffset,
-											UTextOffset endOffset,
-											UTextOffset maxOffset,
+											int32_t startOffset,
+											int32_t endOffset,
+											int32_t maxOffset,
 											UBool rightToLeft,
 											float x, float y,
 											UErrorCode &success)
@@ -259,8 +259,8 @@ inline int32_t ICULayoutEngine::layoutChars(const UChar chars[],
 }
 
 inline int32_t ICULayoutEngine::layoutString(const UnicodeString &str,
-											UTextOffset startOffset,
-											UTextOffset endOffset,
+											int32_t startOffset,
+											int32_t endOffset,
 											UBool rightToLeft,
 											float x, float y,
 											UErrorCode &success)
diff --git a/icu4c/source/samples/layout/paragraph.cpp b/icu4c/source/samples/layout/paragraph.cpp
index ab53b1c69b3..f4a0ac71454 100644
--- a/icu4c/source/samples/layout/paragraph.cpp
+++ b/icu4c/source/samples/layout/paragraph.cpp
@@ -430,7 +430,7 @@ void Paragraph::draw(void *surface, int32_t firstLine, int32_t lastLine)
         dirCount = ubidi_countRuns(lBidi, &bidiStatus);
 
         for (dirRun = 0; dirRun < dirCount; dirRun += 1) {
-            UTextOffset relStart = 0, runLength = 0;
+            int32_t relStart = 0, runLength = 0;
             UBiDiDirection runDirection = ubidi_getVisualRun(lBidi, dirRun, &relStart, &runLength);
             int32_t runStart  = relStart + firstChar;
             int32_t runEnd    = runStart + runLength - 1;
@@ -483,7 +483,7 @@ Paragraph *Paragraph::paragraphFactory(const char *fileName, FontMap *fontMap, G
     dirCount = ubidi_countRuns(pBidi, &bidiStatus);
 
     for (dirRun = 0; dirRun < dirCount; dirRun += 1) {
-        UTextOffset runStart = 0, runLength = 0;
+        int32_t runStart = 0, runLength = 0;
         UBiDiDirection runDirection = ubidi_getVisualRun(pBidi, dirRun, &runStart, &runLength);
         
         scriptRun.reset(runStart, runLength);
diff --git a/icu4c/source/samples/scsu/compsamp.cpp b/icu4c/source/samples/scsu/compsamp.cpp
index 788c6f90a30..25829005cee 100644
--- a/icu4c/source/samples/scsu/compsamp.cpp
+++ b/icu4c/source/samples/scsu/compsamp.cpp
@@ -46,7 +46,7 @@ static void prettyPrintUChar(UChar c)
   } else if ( c > 0x007F ) {
     char buf[100];
     UErrorCode status = U_ZERO_ERROR;
-    UTextOffset o;
+    int32_t o;
     
     o = u_charName(c, U_UNICODE_CHAR_NAME, buf, 100, &status);
     if(U_SUCCESS(status)) {
diff --git a/icu4c/source/samples/ucnv/convsamp.cpp b/icu4c/source/samples/ucnv/convsamp.cpp
index 668f52940d1..b3aae080de8 100644
--- a/icu4c/source/samples/ucnv/convsamp.cpp
+++ b/icu4c/source/samples/ucnv/convsamp.cpp
@@ -56,7 +56,7 @@ void prettyPrintUChar(UChar c)
   } else if ( c > 0x007F ) {
     char buf[1000];
     UErrorCode status = U_ZERO_ERROR;
-    UTextOffset o;
+    int32_t o;
     
     o = u_charName(c, U_UNICODE_CHAR_NAME, buf, 1000, &status);
     if(U_SUCCESS(status) && (o>0) ) {
diff --git a/icu4c/source/samples/ustring/ustring.cpp b/icu4c/source/samples/ustring/ustring.cpp
index 2eb855f77de..5a0eb41bfd8 100644
--- a/icu4c/source/samples/ustring/ustring.cpp
+++ b/icu4c/source/samples/ustring/ustring.cpp
@@ -85,7 +85,7 @@ demoStorage() {
     // * UnicodeString using readonly-alias to a const UChar array
     // construct a string that aliases a readonly buffer
     UnicodeString three(FALSE, readonly, LENGTHOF(readonly));
-    UTextOffset i;
+    int32_t i;
     for(i=0; itext+lineStart;
     const UBiDiLevel *levels=test->levels;
     const uint8_t *visualMap=test->visualMap;
-    UTextOffset i, len=ubidi_getLength(pBiDi), logicalIndex, runCount;
+    int32_t i, len=ubidi_getLength(pBiDi), logicalIndex, runCount;
     UErrorCode errorCode=U_ZERO_ERROR;
     UBiDiLevel level, level2;
 
@@ -240,13 +240,13 @@ doTest(UBiDi *pBiDi, int testNumber, BiDiTestData *test, UTextOffset lineStart)
 
 static void
 testReordering(UBiDi *pBiDi, int testNumber) {
-    UTextOffset
+    int32_t
         logicalMap1[200], logicalMap2[200], logicalMap3[200],
         visualMap1[200], visualMap2[200], visualMap3[200], visualMap4[200];
     UErrorCode errorCode=U_ZERO_ERROR;
     UBiDiLevel levels[200];
-    UTextOffset i, length=ubidi_getLength(pBiDi);
-    UTextOffset runCount, visualIndex, logicalStart, runLength;
+    int32_t i, length=ubidi_getLength(pBiDi);
+    int32_t runCount, visualIndex, logicalStart, runLength;
     UBool odd;
 
     if(length<=0) {
@@ -1057,9 +1057,9 @@ doLOGICALArabicDeShapingTest() {
 
 /* return a string with characters according to the desired directional properties */
 static UChar *
-getStringFromDirProps(const uint8_t *dirProps, UTextOffset length) {
+getStringFromDirProps(const uint8_t *dirProps, int32_t length) {
     static UChar s[MAX_STRING_LENGTH];
-    UTextOffset i;
+    int32_t i;
 
     /* this part would have to be modified for UTF-x */
     for(i=0; ilast != (int32_t) code - 1) {
@@ -1484,7 +1484,7 @@ TestCharNames() {
     static char name[80];
     UErrorCode errorCode=U_ZERO_ERROR;
     struct enumExtCharNamesContext extContext;
-    UTextOffset length;
+    int32_t length;
     UChar32 c;
     int i;
 
diff --git a/icu4c/source/test/cintltst/usrchdat.c b/icu4c/source/test/cintltst/usrchdat.c
index 78ee5915a49..2efd9e5e76a 100644
--- a/icu4c/source/test/cintltst/usrchdat.c
+++ b/icu4c/source/test/cintltst/usrchdat.c
@@ -20,7 +20,7 @@ struct SearchData {
     const char               *collator;
           UCollationStrength  strength;
     const char               *breaker;
-          UTextOffset         offset[32];
+          int32_t         offset[32];
           uint32_t            size[32];
 };
 
diff --git a/icu4c/source/test/cintltst/usrchtst.c b/icu4c/source/test/cintltst/usrchtst.c
index 928058ded64..8339bed842d 100644
--- a/icu4c/source/test/cintltst/usrchtst.c
+++ b/icu4c/source/test/cintltst/usrchtst.c
@@ -287,7 +287,7 @@ static UBool assertEqualWithUStringSearch(      UStringSearch *strsrch,
     int         count       = 0;
     int         matchlimit  = 0;
     UErrorCode  status      = U_ZERO_ERROR;
-    UTextOffset matchindex  = search.offset[count];
+    int32_t matchindex  = search.offset[count];
     int32_t     textlength;
     UChar       matchtext[128];
 
@@ -1001,7 +1001,7 @@ static void TestGetSetOffset()
     while (BASIC[index].text != NULL) {
         int         count       = 0;
         SearchData  search      = BASIC[index ++];
-        UTextOffset matchindex  = search.offset[count];
+        int32_t matchindex  = search.offset[count];
         int32_t     textlength;
     
         u_unescape(search.text, text, 128);
@@ -1154,7 +1154,7 @@ static void TestGetMatch()
     UChar          text[128];
     UChar          pattern[32];
     SearchData     search      = MATCH[0];
-    UTextOffset    matchindex  = search.offset[count];
+    int32_t    matchindex  = search.offset[count];
     UStringSearch *strsrch;
     int32_t        textlength;
     UChar          matchtext[128];
@@ -1878,7 +1878,7 @@ static void TestGetSetOffsetCanonical()
     while (BASICCANONICAL[index].text != NULL) {
         int         count       = 0;
         SearchData  search      = BASICCANONICAL[index ++];
-        UTextOffset matchindex  = search.offset[count];
+        int32_t matchindex  = search.offset[count];
         int32_t     textlength;
 
         if (BASICCANONICAL[index].text == NULL) {
diff --git a/icu4c/source/test/cintltst/utf8tst.c b/icu4c/source/test/cintltst/utf8tst.c
index a6df25011c6..c302a662a4e 100644
--- a/icu4c/source/test/cintltst/utf8tst.c
+++ b/icu4c/source/test/cintltst/utf8tst.c
@@ -188,7 +188,7 @@ static void TestNextPrevChar(){
         0x0840,        UTF8_ERROR_VALUE_1, UTF8_ERROR_VALUE_1,  0xf0,         UTF8_ERROR_VALUE_1, UTF8_ERROR_VALUE_1,
         0x0000,        0x0000,             0x0000,              0x0061,       0x0061,             0x0061
     };
-    static UTextOffset movedOffset[]={
+    static int32_t movedOffset[]={
    /*next_unsafe    next_safe_ns  next_safe_s       prev_unsafe   prev_safe_ns     prev_safe_s*/
         1,            1,           1,                15,           15,               15,
         5,            5,           5,                14,           14 ,              14, 
@@ -214,7 +214,7 @@ static void TestNextPrevChar(){
     UChar32 c=0x0000;
     uint32_t i=0;
     uint32_t offset=0;
-    UTextOffset setOffset=0;
+    int32_t setOffset=0;
     for(offset=0; offsetcreateCollationElementIterator(testString1);
     CollationElementIterator *iterator3 = ((RuleBasedCollator*)col)->createCollationElementIterator(testString2);
 
-    UTextOffset offset = iterator1->getOffset();
+    int32_t offset = iterator1->getOffset();
     if (offset != 0) {
         errln("Error in getOffset for collation element iterator\n");
         return;
diff --git a/icu4c/source/test/intltest/citrtest.cpp b/icu4c/source/test/intltest/citrtest.cpp
index 9ee9a8c58a0..538681779be 100644
--- a/icu4c/source/test/intltest/citrtest.cpp
+++ b/icu4c/source/test/intltest/citrtest.cpp
@@ -215,7 +215,7 @@ void CharIterTest::TestIteration() {
     UnicodeString text("Now is the time for all good men to come to the aid of their country.");
 
     UChar c;
-    UTextOffset i;
+    int32_t i;
     {
         StringCharacterIterator   iter(text, 5);
 
@@ -224,7 +224,7 @@ void CharIterTest::TestIteration() {
         if (iterText != text)
           errln("iter.getText() failed");
 
-        if (iter.current() != text[(UTextOffset)5])
+        if (iter.current() != text[(int32_t)5])
             errln("Iterator didn't start out in the right place.");
 
         c = iter.first();
@@ -329,7 +329,7 @@ void CharIterTest::TestIteration() {
         if (iter.startIndex() != 5 || iter.endIndex() != 15)
             errln("creation of a restricted-range iterator failed");
 
-        if (iter.getIndex() != 10 || iter.current() != text[(UTextOffset)10])
+        if (iter.getIndex() != 10 || iter.current() != text[(int32_t)10])
             errln("starting the iterator in the middle didn't work");
 
         c = iter.first();
@@ -389,7 +389,7 @@ void CharIterTest::TestIterationUChar32() {
     UChar textChars[]={ 0x0061, 0x0062, 0xd841, 0xdc02, 0x20ac, 0xd7ff, 0xd842, 0xdc06, 0xd801, 0xdc00, 0x0061, 0x0000};
     UnicodeString text(textChars);
     UChar32 c;
-    UTextOffset i;
+    int32_t i;
     {
         StringCharacterIterator   iter(text, 1);
 
@@ -398,7 +398,7 @@ void CharIterTest::TestIterationUChar32() {
         if (iterText != text)
           errln("iter.getText() failed");
 
-        if (iter.current32() != text[(UTextOffset)1])
+        if (iter.current32() != text[(int32_t)1])
             errln("Iterator didn't start out in the right place.");
  
         c=iter.setToStart();
diff --git a/icu4c/source/test/intltest/dtfmttst.cpp b/icu4c/source/test/intltest/dtfmttst.cpp
index 13743e0e63f..566c415eae3 100644
--- a/icu4c/source/test/intltest/dtfmttst.cpp
+++ b/icu4c/source/test/intltest/dtfmttst.cpp
@@ -191,7 +191,7 @@ DateFormatTest::escape(UnicodeString& s)
     UnicodeString buf;
     for (int32_t i=0; isetText( words3 );
     e->first();
-    UTextOffset p1 = e->next();
-    UTextOffset p2 = e->next();
-    UTextOffset p3 = e->next();
-    UTextOffset p4 = e->next();
+    int32_t p1 = e->next();
+    int32_t p2 = e->next();
+    int32_t p3 = e->next();
+    int32_t p4 = e->next();
 
-    UTextOffset f = e->following(p2+1);
-    UTextOffset p = e->preceding(p2+1);
+    int32_t f = e->following(p2+1);
+    int32_t p = e->preceding(p2+1);
     if (f!=p3)
         errln("IntlTestTextBoundary::TestPreceding: f!=p3");
     if (p!=p2)
@@ -1461,7 +1461,7 @@ void IntlTestTextBoundary::doBreakInvariantTest(BreakIterator& tb, UnicodeString
 
     // a break should always occur after CR (unless followed by LF), LF, PS, and LS
     UnicodeString breaks = CharsToUnicodeString("\r\n\\u2029\\u2028");
-    UTextOffset i, j;
+    int32_t i, j;
 
     breaksLen = breaks.length();
     for (i = 0; i < breaksLen; i++) {
@@ -1502,7 +1502,7 @@ void IntlTestTextBoundary::doOtherInvariantTest(BreakIterator& tb, UnicodeString
 {
     UnicodeString work("a\r\na");
     int32_t errCount = 0, testCharsLen = testChars.length();
-    UTextOffset i, j;
+    int32_t i, j;
     int8_t type;
 
     // a break should never occur between CR and LF
diff --git a/icu4c/source/test/intltest/numfmtst.cpp b/icu4c/source/test/intltest/numfmtst.cpp
index f8218e5d3f3..84e511d63ee 100644
--- a/icu4c/source/test/intltest/numfmtst.cpp
+++ b/icu4c/source/test/intltest/numfmtst.cpp
@@ -382,7 +382,7 @@ NumberFormatTest::escape(UnicodeString& s)
     UnicodeString buf;
     for (int32_t i=0; iformat(1.23, str, pos);
     UnicodeString monStr("1x23");
-    monStr.replace((UTextOffset)1, 1, monSep);
+    monStr.replace((int32_t)1, 1, monSep);
     UnicodeString decStr("1x23");
-    decStr.replace((UTextOffset)1, 1, decSep);
+    decStr.replace((int32_t)1, 1, decSep);
     if (str.indexOf(monStr) >= 0 && str.indexOf(decStr) < 0) {
         logln(UnicodeString("OK: 1.23 -> \"") + str + "\" contains \"" +
               monStr + "\" and not \"" + decStr + '"');
diff --git a/icu4c/source/test/intltest/pptest.cpp b/icu4c/source/test/intltest/pptest.cpp
index 0419262131d..ebb0d1dca52 100644
--- a/icu4c/source/test/intltest/pptest.cpp
+++ b/icu4c/source/test/intltest/pptest.cpp
@@ -52,9 +52,9 @@ void ParsePositionTest::TestParsePosition()
         int to = 5;
         ParsePosition pp2( to );
         if (pp2.getIndex() == 5) {
-            logln("PP getIndex and constructor(UTextOffset) tested.");
+            logln("PP getIndex and constructor(int32_t) tested.");
         }else{
-            errln("*** PP getIndex or constructor(UTextOffset) result");
+            errln("*** PP getIndex or constructor(int32_t) result");
         }
         pp2.setIndex( 3 );
         if (pp2.getIndex() == 3) {
diff --git a/icu4c/source/test/intltest/reptest.cpp b/icu4c/source/test/intltest/reptest.cpp
index 7eb5faca5fd..0a932d86a16 100644
--- a/icu4c/source/test/intltest/reptest.cpp
+++ b/icu4c/source/test/intltest/reptest.cpp
@@ -66,7 +66,7 @@ public:
         return s;
     }
 
-    void extractBetween(UTextOffset start, UTextOffset limit, UnicodeString& result) const {
+    void extractBetween(int32_t start, int32_t limit, UnicodeString& result) const {
         chars.extractBetween(start, limit, result);
     }
 
@@ -75,15 +75,15 @@ protected:
         return chars.length();
     }
 
-    virtual UChar getCharAt(UTextOffset offset) const{
+    virtual UChar getCharAt(int32_t offset) const{
         return chars.charAt(offset);
     }
 
-    virtual UChar32 getChar32At(UTextOffset offset) const{
+    virtual UChar32 getChar32At(int32_t offset) const{
         return chars.char32At(offset);
     }
 
-    virtual void handleReplaceBetween(UTextOffset start, UTextOffset limit, const UnicodeString& text) {
+    virtual void handleReplaceBetween(int32_t start, int32_t limit, const UnicodeString& text) {
         UnicodeString s;
         this->extractBetween(start, limit, s);
         if (s == text) return; // NO ACTION!
@@ -92,7 +92,7 @@ protected:
     }
     
 
-    void fixStyles(UTextOffset start, UTextOffset limit, int32_t newLen) {
+    void fixStyles(int32_t start, int32_t limit, int32_t newLen) {
         UChar newStyle = defaultStyle;
         if (start != limit) {
             newStyle = styles.charAt(start);
diff --git a/icu4c/source/test/intltest/srchtest.cpp b/icu4c/source/test/intltest/srchtest.cpp
index ce6dc712531..43c29c1ced3 100644
--- a/icu4c/source/test/intltest/srchtest.cpp
+++ b/icu4c/source/test/intltest/srchtest.cpp
@@ -209,7 +209,7 @@ UBool StringSearchTest::assertEqualWithStringSearch(StringSearch *strsrch,
 {
     int           count       = 0;
     UErrorCode    status      = U_ZERO_ERROR;
-    UTextOffset   matchindex  = search->offset[count];
+    int32_t   matchindex  = search->offset[count];
     UnicodeString matchtext;
     
     if (strsrch->getMatchedStart() != USEARCH_DONE ||
@@ -1104,7 +1104,7 @@ void StringSearchTest::TestGetSetOffset()
         strsrch->setPattern(pattern, status);
 
         int count = 0;
-        UTextOffset matchindex  = search.offset[count];
+        int32_t matchindex  = search.offset[count];
         while (U_SUCCESS(status) && matchindex >= 0) {
             int32_t matchlength = search.size[count];
             strsrch->next(status);
@@ -1231,7 +1231,7 @@ void StringSearchTest::TestGetMatch()
     }
     
     int           count      = 0;
-    UTextOffset   matchindex = search.offset[count];
+    int32_t   matchindex = search.offset[count];
     UnicodeString matchtext;
     while (U_SUCCESS(status) && matchindex >= 0) {
         int32_t matchlength = search.size[count];
@@ -1883,7 +1883,7 @@ void StringSearchTest::TestGetSetOffsetCanonical()
         strsrch->setPattern(pattern, status);
 
         int         count       = 0;
-        UTextOffset matchindex  = search.offset[count];
+        int32_t matchindex  = search.offset[count];
         while (U_SUCCESS(status) && matchindex >= 0) {
             int32_t matchlength = search.size[count];
             strsrch->next(status);
@@ -1982,12 +1982,12 @@ public:
     TempSearch();
     TempSearch(TempSearch &search);
     ~TempSearch();
-    void            setOffset(UTextOffset position, UErrorCode &status);
-    UTextOffset     getOffset() const;
+    void            setOffset(int32_t position, UErrorCode &status);
+    int32_t     getOffset() const;
     SearchIterator* safeClone() const;
 protected:
-    UTextOffset     handleNext(UTextOffset position, UErrorCode &status);
-    UTextOffset     handlePrev(UTextOffset position, UErrorCode &status);
+    int32_t     handleNext(int32_t position, UErrorCode &status);
+    int32_t     handlePrev(int32_t position, UErrorCode &status);
 };
 
 TempSearch::TempSearch() : SearchIterator()
@@ -2002,11 +2002,11 @@ TempSearch::~TempSearch()
 {
 }
 
-void TempSearch::setOffset(UTextOffset /*position*/, UErrorCode &/*status*/)
+void TempSearch::setOffset(int32_t /*position*/, UErrorCode &/*status*/)
 {
 }
 
-UTextOffset TempSearch::getOffset() const
+int32_t TempSearch::getOffset() const
 {
     return USEARCH_DONE;
 }
@@ -2016,12 +2016,12 @@ SearchIterator * TempSearch::safeClone() const
     return NULL;
 }
 
-UTextOffset TempSearch::handleNext(UTextOffset /*position*/, UErrorCode &/*status*/)
+int32_t TempSearch::handleNext(int32_t /*position*/, UErrorCode &/*status*/)
 {
     return USEARCH_DONE;
 }
 
-UTextOffset TempSearch::handlePrev(UTextOffset /*position*/, UErrorCode &/*status*/)
+int32_t TempSearch::handlePrev(int32_t /*position*/, UErrorCode &/*status*/)
 {
     return USEARCH_DONE;
 }
diff --git a/icu4c/source/test/intltest/tfsmalls.cpp b/icu4c/source/test/intltest/tfsmalls.cpp
index 33a51dd9130..346792cbea2 100644
--- a/icu4c/source/test/intltest/tfsmalls.cpp
+++ b/icu4c/source/test/intltest/tfsmalls.cpp
@@ -38,12 +38,12 @@ void test_ParsePosition( void )
 
 
     {
-        UTextOffset to = 5;
+        int32_t to = 5;
         ParsePosition pp2( to );
         if (pp2.getIndex() == 5) {
-            it_out << "PP getIndex and constructor(UTextOffset) tested." << endl;
+            it_out << "PP getIndex and constructor(int32_t) tested." << endl;
         }else{
-            it_errln("*** PP getIndex or constructor(UTextOffset) result");
+            it_errln("*** PP getIndex or constructor(int32_t) result");
         }
         pp2.setIndex( 3 );
         if (pp2.getIndex() == 3) {
@@ -98,7 +98,7 @@ void test_FieldPosition_example( void )
         //ToCharString(fmt->format(doubleNum[i], buf, pos), fmtText);
         UnicodeString res = fmt->format(doubleNum[i], buf, pos);
         for (int32_t j=0; jfile!=NULL) {
         if(length>0) {
             T_FileStream_write(pData->file, s, length);
@@ -166,7 +166,7 @@ udata_writeBlock(UNewDataMemory *pData, const void *s, UTextOffset length) {
 }
 
 U_CAPI void U_EXPORT2
-udata_writePadding(UNewDataMemory *pData, UTextOffset length) {
+udata_writePadding(UNewDataMemory *pData, int32_t length) {
     static uint8_t padding[16]={
         0xaa, 0xaa, 0xaa, 0xaa,
         0xaa, 0xaa, 0xaa, 0xaa,
@@ -185,7 +185,7 @@ udata_writePadding(UNewDataMemory *pData, UTextOffset length) {
 }
 
 U_CAPI void U_EXPORT2
-udata_writeString(UNewDataMemory *pData, const char *s, UTextOffset length) {
+udata_writeString(UNewDataMemory *pData, const char *s, int32_t length) {
     if(pData!=NULL && pData->file!=NULL) {
         if(length==-1) {
             length=uprv_strlen(s);
@@ -197,7 +197,7 @@ udata_writeString(UNewDataMemory *pData, const char *s, UTextOffset length) {
 }
 
 U_CAPI void U_EXPORT2
-udata_writeUString(UNewDataMemory *pData, const UChar *s, UTextOffset length) {
+udata_writeUString(UNewDataMemory *pData, const UChar *s, int32_t length) {
     if(pData!=NULL && pData->file!=NULL) {
         if(length==-1) {
             length=u_strlen(s);
diff --git a/icu4c/source/tools/toolutil/unewdata.h b/icu4c/source/tools/toolutil/unewdata.h
index 515d2478a44..fb190e6f89d 100644
--- a/icu4c/source/tools/toolutil/unewdata.h
+++ b/icu4c/source/tools/toolutil/unewdata.h
@@ -80,19 +80,19 @@ udata_write32(UNewDataMemory *pData, uint32_t wyde);
 
 /** @memo Write a block of bytes to the file. */
 U_CAPI void U_EXPORT2
-udata_writeBlock(UNewDataMemory *pData, const void *s, UTextOffset length);
+udata_writeBlock(UNewDataMemory *pData, const void *s, int32_t length);
 
 /** @memo Write a block of arbitrary padding bytes to the file. */
 U_CAPI void U_EXPORT2
-udata_writePadding(UNewDataMemory *pData, UTextOffset length);
+udata_writePadding(UNewDataMemory *pData, int32_t length);
 
 /** @memo Write a char* string of platform "invariant characters" to the file. */
 U_CAPI void U_EXPORT2
-udata_writeString(UNewDataMemory *pData, const char *s, UTextOffset length);
+udata_writeString(UNewDataMemory *pData, const char *s, int32_t length);
 
 /** @memo Write a UChar* string of Unicode character code units to the file. */
 U_CAPI void U_EXPORT2
-udata_writeUString(UNewDataMemory *pData, const UChar *s, UTextOffset length);
+udata_writeUString(UNewDataMemory *pData, const UChar *s, int32_t length);
 
 
 /*