INTEGRATION: CWS calc06 (1.2.42); FILE MERGED

2003/03/21 22:08:10 khong 1.2.42.1: #106680# Implementing new XExtendedTransliteration interface

1 files changed, 55 insertions, 58 deletions

diff --git a/i18npool/source/transliteration/ignoreSeparator_ja_JP.cxx b/i18npool/source/transliteration/ignoreSeparator_ja_JP.cxx
index b93007c85c6d..6e7afe407fe0 100644
--- a/i18npool/source/transliteration/ignoreSeparator_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreSeparator_ja_JP.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ignoreSeparator_ja_JP.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: hr $ $Date: 2003-03-26 10:54:48 $
+ *  last change: $Author: rt $ $Date: 2003-04-08 16:03:47 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,71 +62,68 @@
 // prevent internal compiler error with MSVC6SP3
 #include <stl/utility>
 
-#include <oneToOneMapping.hxx>
 #define TRANSLITERATION_Separator_ja_JP
 #include <transliteration_Ignore.hxx>
 
-using namespace com::sun::star::uno;
-using namespace com::sun::star::lang;
-using namespace rtl;
-
 namespace com { namespace sun { namespace star { namespace i18n {
 
 OneToOneMappingTable_t ignoreSeparatorTable[] = {
-  MAKE_PAIR( 0x0021, 0x002C ),  // EXCLAMATION MARK
-  MAKE_PAIR( 0x0023, 0x002C ),  // NUMBER SIGN
-  MAKE_PAIR( 0x0024, 0x002C ),  // DOLLAR SIGN
-  MAKE_PAIR( 0x0025, 0x002C ),  // PERCENT SIGN
-  MAKE_PAIR( 0x0026, 0x002C ),  // AMPERSAND
-  MAKE_PAIR( 0x002A, 0x002C ),  // ASTERISK
-  MAKE_PAIR( 0x002B, 0x002C ),  // PLUS SIGN
-  MAKE_PAIR( 0x002C, 0x002C ),  // COMMA
-  MAKE_PAIR( 0x002D, 0x002C ),  // HYPHEN-MINUS
-  MAKE_PAIR( 0x002E, 0x002C ),  // FULL STOP
-  MAKE_PAIR( 0x002F, 0x002C ),  // SOLIDUS
-  MAKE_PAIR( 0x003A, 0x002C ),  // COLON
-  MAKE_PAIR( 0x003B, 0x002C ),  // SEMICOLON
-  MAKE_PAIR( 0x003C, 0x002C ),  // LESS-THAN SIGN
-  MAKE_PAIR( 0x003D, 0x002C ),  // EQUALS SIGN
-  MAKE_PAIR( 0x003E, 0x002C ),  // GREATER-THAN SIGN
-  MAKE_PAIR( 0x005C, 0x002C ),  // REVERSE SOLIDUS
-  MAKE_PAIR( 0x005F, 0x002C ),  // LOW LINE
-  MAKE_PAIR( 0x007B, 0x002C ),  // LEFT CURLY BRACKET
-  MAKE_PAIR( 0x007C, 0x002C ),  // VERTICAL LINE
-  MAKE_PAIR( 0x007D, 0x002C ),  // RIGHT CURLY BRACKET
-  MAKE_PAIR( 0x007E, 0x002C ),  // TILDE
-  MAKE_PAIR( 0x00A5, 0x002C ),  // YEN SIGN
-  MAKE_PAIR( 0xFF01, 0x002C ),  // FULLWIDTH EXCLAMATION MARK
-  MAKE_PAIR( 0xFF03, 0x002C ),  // FULLWIDTH NUMBER SIGN
-  MAKE_PAIR( 0xFF04, 0x002C ),  // FULLWIDTH DOLLAR SIGN
-  MAKE_PAIR( 0xFF05, 0x002C ),  // FULLWIDTH PERCENT SIGN
-  MAKE_PAIR( 0xFF06, 0x002C ),  // FULLWIDTH AMPERSAND
-  MAKE_PAIR( 0xFF0A, 0x002C ),  // FULLWIDTH ASTERISK
-  MAKE_PAIR( 0xFF0B, 0x002C ),  // FULLWIDTH PLUS SIGN
-  MAKE_PAIR( 0xFF0C, 0x002C ),  // FULLWIDTH COMMA
-  MAKE_PAIR( 0xFF0D, 0x002C ),  // FULLWIDTH HYPHEN-MINUS
-  MAKE_PAIR( 0xFF0E, 0x002C ),  // FULLWIDTH FULL STOP
-  MAKE_PAIR( 0xFF0F, 0x002C ),  // FULLWIDTH SOLIDUS
-  MAKE_PAIR( 0xFF1A, 0x002C ),  // FULLWIDTH COLON
-  MAKE_PAIR( 0xFF1B, 0x002C ),  // FULLWIDTH SEMICOLON
-  MAKE_PAIR( 0xFF1C, 0x002C ),  // FULLWIDTH LESS-THAN SIGN
-  MAKE_PAIR( 0xFF1D, 0x002C ),  // FULLWIDTH EQUALS SIGN
-  MAKE_PAIR( 0xFF1E, 0x002C ),  // FULLWIDTH GREATER-THAN SIGN
-  MAKE_PAIR( 0xFF3C, 0x002C ),  // FULLWIDTH REVERSE SOLIDUS
-  MAKE_PAIR( 0xFF3F, 0x002C ),  // FULLWIDTH LOW LINE
-  MAKE_PAIR( 0xFF5B, 0x002C ),  // FULLWIDTH LEFT CURLY BRACKET
-  MAKE_PAIR( 0xFF5C, 0x002C ),  // FULLWIDTH VERTICAL LINE
-  MAKE_PAIR( 0xFF5D, 0x002C ),  // FULLWIDTH RIGHT CURLY BRACKET
-  MAKE_PAIR( 0xFF5E, 0x002C ),  // FULLWIDTH TILDE
-  MAKE_PAIR( 0xFFE5, 0x002C ),  // FULLWIDTH YEN SIGN
+    MAKE_PAIR( 0x0021, 0x002C ),  // EXCLAMATION MARK
+    MAKE_PAIR( 0x0023, 0x002C ),  // NUMBER SIGN
+    MAKE_PAIR( 0x0024, 0x002C ),  // DOLLAR SIGN
+    MAKE_PAIR( 0x0025, 0x002C ),  // PERCENT SIGN
+    MAKE_PAIR( 0x0026, 0x002C ),  // AMPERSAND
+    MAKE_PAIR( 0x002A, 0x002C ),  // ASTERISK
+    MAKE_PAIR( 0x002B, 0x002C ),  // PLUS SIGN
+    MAKE_PAIR( 0x002C, 0x002C ),  // COMMA
+    MAKE_PAIR( 0x002D, 0x002C ),  // HYPHEN-MINUS
+    MAKE_PAIR( 0x002E, 0x002C ),  // FULL STOP
+    MAKE_PAIR( 0x002F, 0x002C ),  // SOLIDUS
+    MAKE_PAIR( 0x003A, 0x002C ),  // COLON
+    MAKE_PAIR( 0x003B, 0x002C ),  // SEMICOLON
+    MAKE_PAIR( 0x003C, 0x002C ),  // LESS-THAN SIGN
+    MAKE_PAIR( 0x003D, 0x002C ),  // EQUALS SIGN
+    MAKE_PAIR( 0x003E, 0x002C ),  // GREATER-THAN SIGN
+    MAKE_PAIR( 0x005C, 0x002C ),  // REVERSE SOLIDUS
+    MAKE_PAIR( 0x005F, 0x002C ),  // LOW LINE
+    MAKE_PAIR( 0x007B, 0x002C ),  // LEFT CURLY BRACKET
+    MAKE_PAIR( 0x007C, 0x002C ),  // VERTICAL LINE
+    MAKE_PAIR( 0x007D, 0x002C ),  // RIGHT CURLY BRACKET
+    MAKE_PAIR( 0x007E, 0x002C ),  // TILDE
+    MAKE_PAIR( 0x00A5, 0x002C ),  // YEN SIGN
+    MAKE_PAIR( 0xFF01, 0x002C ),  // FULLWIDTH EXCLAMATION MARK
+    MAKE_PAIR( 0xFF03, 0x002C ),  // FULLWIDTH NUMBER SIGN
+    MAKE_PAIR( 0xFF04, 0x002C ),  // FULLWIDTH DOLLAR SIGN
+    MAKE_PAIR( 0xFF05, 0x002C ),  // FULLWIDTH PERCENT SIGN
+    MAKE_PAIR( 0xFF06, 0x002C ),  // FULLWIDTH AMPERSAND
+    MAKE_PAIR( 0xFF0A, 0x002C ),  // FULLWIDTH ASTERISK
+    MAKE_PAIR( 0xFF0B, 0x002C ),  // FULLWIDTH PLUS SIGN
+    MAKE_PAIR( 0xFF0C, 0x002C ),  // FULLWIDTH COMMA
+    MAKE_PAIR( 0xFF0D, 0x002C ),  // FULLWIDTH HYPHEN-MINUS
+    MAKE_PAIR( 0xFF0E, 0x002C ),  // FULLWIDTH FULL STOP
+    MAKE_PAIR( 0xFF0F, 0x002C ),  // FULLWIDTH SOLIDUS
+    MAKE_PAIR( 0xFF1A, 0x002C ),  // FULLWIDTH COLON
+    MAKE_PAIR( 0xFF1B, 0x002C ),  // FULLWIDTH SEMICOLON
+    MAKE_PAIR( 0xFF1C, 0x002C ),  // FULLWIDTH LESS-THAN SIGN
+    MAKE_PAIR( 0xFF1D, 0x002C ),  // FULLWIDTH EQUALS SIGN
+    MAKE_PAIR( 0xFF1E, 0x002C ),  // FULLWIDTH GREATER-THAN SIGN
+    MAKE_PAIR( 0xFF3C, 0x002C ),  // FULLWIDTH REVERSE SOLIDUS
+    MAKE_PAIR( 0xFF3F, 0x002C ),  // FULLWIDTH LOW LINE
+    MAKE_PAIR( 0xFF5B, 0x002C ),  // FULLWIDTH LEFT CURLY BRACKET
+    MAKE_PAIR( 0xFF5C, 0x002C ),  // FULLWIDTH VERTICAL LINE
+    MAKE_PAIR( 0xFF5D, 0x002C ),  // FULLWIDTH RIGHT CURLY BRACKET
+    MAKE_PAIR( 0xFF5E, 0x002C ),  // FULLWIDTH TILDE
+    MAKE_PAIR( 0xFFE5, 0x002C ),  // FULLWIDTH YEN SIGN
 };
 
-OUString SAL_CALL
-ignoreSeparator_ja_JP::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset )
-  throw(RuntimeException)
+ignoreSeparator_ja_JP::ignoreSeparator_ja_JP()
 {
-  oneToOneMapping table(ignoreSeparatorTable, sizeof(ignoreSeparatorTable));
-  return transliteration_Ignore::transliterate( inStr, startPos, nCount, offset, table );
+        static oneToOneMapping _table(ignoreSeparatorTable, sizeof(ignoreSeparatorTable));
+        func = (TransFunc) 0;
+        table = &_table;
+        map = 0;
+        transliterationName = "ignoreSeparator_ja_JP";
+        implementationName = "com.sun.star.i18n.Transliteration.ignoreSeparator_ja_JP";
 }
 
 } } } }