INTEGRATION: CWS calc06 (1.4.36); FILE MERGED

2003/03/21 22:08:16 khong 1.4.36.1: #106680# Implementing new XExtendedTransliteration interface

i18npool/source/transliteration/transliteration_Ignore.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: transliteration_Ignore.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: khong $ $Date: 2002-09-16 16:31:37 $
+ *  last change: $Author: rt $ $Date: 2003-04-08 16:06:57 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -64,6 +64,7 @@
 
 #include <transliteration_Ignore.hxx>
 
+using namespace drafts::com::sun::star::i18n;
 using namespace com::sun::star::uno;
 using namespace rtl;
 
@@ -161,8 +162,9 @@ transliteration_Ignore::transliterateRange( const OUString& str1, const OUString
 }
 
 OUString SAL_CALL
-transliteration_Ignore::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
-    Sequence< sal_Int32 >& offset, oneToOneMapping& table ) throw(RuntimeException)
+transliteration_Ignore::folding( const OUString& inStr, sal_Int32 startPos,
+    sal_Int32 nCount, Sequence< sal_Int32 >& offset)
+    throw(RuntimeException)
 {
     // Create a string buffer which can hold nCount + 1 characters.
     // The reference count is 0 now.
@@ -171,60 +173,69 @@ transliteration_Ignore::transliterate( const OUString& inStr, sal_Int32 startPos
     const sal_Unicode * src = inStr.getStr() + startPos;
 
     // Allocate nCount length to offset argument.
+    sal_Int32 *p, position;
+    if (useOffset) {
         offset.realloc( nCount );
-    sal_Int32 *p = offset.getArray();
-    sal_Int32 position = startPos;
-    sal_Int32 count = 0;
+        p = offset.getArray();
+        position = startPos;
+    }
+
+    if (map) {
+        sal_Unicode previousChar = *src ++;
+        sal_Unicode currentChar;
 
         // Translation
-    while (nCount -- > 0) {
-        sal_Unicode c = table[ *src++ ];
-        // if the "func" returns 0xffff, skip the character.
-        if (c != 0xffff) {
-        *dst ++ = c;
-        *p ++ = position;
-        count++;
+        while (-- nCount > 0) {
+            currentChar = *src ++;
+
+            Mapping *m;
+            for (m = map; m->replaceChar; m++) {
+                if (previousChar == m->previousChar &&  currentChar == m->currentChar ) {
+                    if (useOffset) {
+                        position++;
+                        *p++ = position++;
+                    }
+                    *dst++ = m->replaceChar;\
+                    previousChar = *src++;
+                    nCount--;
+                    break;
                 }
-        position ++;
             }
-    *dst = (sal_Unicode) 0;
-
-    offset.realloc(count);
-    return OUString( newStr->buffer, count); // defined in rtl/usrting. The reference count is increased from 0 to 1.
-}
-
-
-OUString SAL_CALL
-transliteration_Ignore::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
-    Sequence< sal_Int32 >& offset, sal_Unicode (*func)(const sal_Unicode) ) throw(RuntimeException)
-{
-    // Create a string buffer which can hold nCount + 1 characters.
-    // The reference count is 0 now.
-    rtl_uString * newStr = x_rtl_uString_new_WithLength( nCount ); // defined in x_rtl_ustring.h
-    sal_Unicode * dst = newStr->buffer;
-    const sal_Unicode * src = inStr.getStr() + startPos;
 
-    // Allocate nCount length to offset argument.
-    offset.realloc( nCount );
-    sal_Int32 *p = offset.getArray();
-    sal_Int32 position = startPos;
-    sal_Int32 count = 0;
+            if (! m->replaceChar) {
+                if (useOffset)
+                    *p ++ = position ++;
+                *dst ++ = previousChar;
+                previousChar = currentChar;
+            }
+        }
 
+        if (nCount == 0) {
+            if (useOffset)
+                *p = position;
+            *dst ++ = previousChar;
+        }
+        newStr->length = sal_Int32(dst - newStr->buffer);
+        if (useOffset)
+            offset.realloc(newStr->length);
+    } else {
         // Translation
         while (nCount -- > 0) {
-        sal_Unicode c = func( *src++ );
-        // if the "func" returns 0xffff, skip the character.
-        if (c != 0xffff) {
-        *dst ++ = c;
-        *p ++ = position;
-        count++;
+            sal_Unicode c = *src++;
+            *dst ++ = func ? func( c) : (*table)[ c ];
+            if (useOffset)
+                *p ++ = position ++;
         }
-        position ++;
     }
     *dst = (sal_Unicode) 0;
 
-    offset.realloc(count);
-    return OUString( newStr->buffer, count ); // defined in rtl/usrting. The reference count is increased from 0 to 1.
+    return OUString( newStr ); // defined in rtl/usrting. The reference count is increased from 0 to 1.
+}
+
+sal_Unicode SAL_CALL
+transliteration_Ignore::transliterateChar2Char( sal_Unicode inChar) throw(RuntimeException, MultipleCharsOutputException)
+{
+    return func ? func( inChar) : table ? (*table)[ inChar ] : inChar;
 }
 
 } } } }