diff options
| -rw-r--r-- | i18npool/inc/numtotext_cjk.hxx | 7 | ||||
| -rw-r--r-- | i18npool/source/registerservices/registerservices.cxx | 10 | ||||
| -rw-r--r-- | i18npool/source/transliteration/numtotext_cjk.cxx | 41 |
3 files changed, 35 insertions, 23 deletions
diff --git a/i18npool/inc/numtotext_cjk.hxx b/i18npool/inc/numtotext_cjk.hxx index 98ef614a2928..6e445568f8d5 100644 --- a/i18npool/inc/numtotext_cjk.hxx +++ b/i18npool/inc/numtotext_cjk.hxx @@ -2,9 +2,9 @@ * * $RCSfile: numtotext_cjk.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: khong $ $Date: 2002-05-30 06:59:29 $ + * last change: $Author: khong $ $Date: 2002-05-31 06:41:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -97,6 +97,9 @@ TRANSLITERATION_NUMTOTEXT_CJK ( Lower_zh_CN ) TRANSLITERATION_NUMTOTEXT_CJK ( Upper_zh_CN ) TRANSLITERATION_NUMTOTEXT_CJK ( Lower_zh_TW ) TRANSLITERATION_NUMTOTEXT_CJK ( Upper_zh_TW ) +TRANSLITERATION_NUMTOTEXT_CJK ( Fullwidth_zh ) +TRANSLITERATION_NUMTOTEXT_CJK ( Fullwidth_ja ) +TRANSLITERATION_NUMTOTEXT_CJK ( Fullwidth_ko ) TRANSLITERATION_NUMTOTEXT_CJK ( Date_zh ) TRANSLITERATION_NUMTOTEXT_CJK ( InformalLower_ko ) TRANSLITERATION_NUMTOTEXT_CJK ( InformalUpper_ko ) diff --git a/i18npool/source/registerservices/registerservices.cxx b/i18npool/source/registerservices/registerservices.cxx index a1914778756d..c8ed150f7b15 100644 --- a/i18npool/source/registerservices/registerservices.cxx +++ b/i18npool/source/registerservices/registerservices.cxx @@ -2,9 +2,9 @@ * * $RCSfile: registerservices.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: khong $ $Date: 2002-05-30 06:57:59 $ + * last change: $Author: khong $ $Date: 2002-05-31 06:43:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -297,6 +297,9 @@ IMPL_CREATEINSTANCE( NumToTextLower_zh_CN ) IMPL_CREATEINSTANCE( NumToTextUpper_zh_CN ) IMPL_CREATEINSTANCE( NumToTextLower_zh_TW ) IMPL_CREATEINSTANCE( NumToTextUpper_zh_TW ) +IMPL_CREATEINSTANCE( NumToTextFullwidth_zh ) +IMPL_CREATEINSTANCE( NumToTextFullwidth_ja ) +IMPL_CREATEINSTANCE( NumToTextFullwidth_ko ) IMPL_CREATEINSTANCE( NumToTextKanjiLongModern_ja_JP ) IMPL_CREATEINSTANCE( NumToTextKanjiLongTraditional_ja_JP ) IMPL_CREATEINSTANCE( NumToTextKanjiShortModern_ja_JP ) @@ -598,6 +601,9 @@ static const struct InstancesArray { IMPL_TRANSLITERATION_ITEM (NumToTextLower_zh_CN), IMPL_TRANSLITERATION_ITEM (NumToTextUpper_zh_TW), IMPL_TRANSLITERATION_ITEM (NumToTextLower_zh_TW), + IMPL_TRANSLITERATION_ITEM (NumToTextFullwidth_zh), + IMPL_TRANSLITERATION_ITEM (NumToTextFullwidth_ja), + IMPL_TRANSLITERATION_ITEM (NumToTextFullwidth_ko), IMPL_TRANSLITERATION_ITEM (NumToTextKanjiLongModern_ja_JP), IMPL_TRANSLITERATION_ITEM (NumToTextKanjiLongTraditional_ja_JP), IMPL_TRANSLITERATION_ITEM (NumToTextKanjiShortModern_ja_JP), diff --git a/i18npool/source/transliteration/numtotext_cjk.cxx b/i18npool/source/transliteration/numtotext_cjk.cxx index e6e723079bce..515caaf02223 100644 --- a/i18npool/source/transliteration/numtotext_cjk.cxx +++ b/i18npool/source/transliteration/numtotext_cjk.cxx @@ -2,9 +2,9 @@ * * $RCSfile: numtotext_cjk.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: khong $ $Date: 2002-05-30 06:54:40 $ + * last change: $Author: khong $ $Date: 2002-05-31 06:40:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -226,36 +226,39 @@ sal_Bool SAL_CALL NumToText_CJK::numberMaker(const sal_Unicode *str, sal_Int32 b } } -#define TRANSLITERATION_NUMTOTEXT( name, _number, _short, flag ) \ +#define TRANSLITERATION_NUMTOTEXT( name, _number, _mult, _short, flag ) \ NumToText##name::NumToText##name() \ { \ number = NumberChar_##_number; \ numberChar = NumberChar[NumberChar_##_number]; \ - multiplierChar = MultiplierChar_##_short[Multiplier_##_number]; \ + multiplierChar = MultiplierChar_##_short[Multiplier_##_mult]; \ exponentCount = ExponentCount_##_short; \ multiplierExponent = MultiplierExponent_##_short; \ numberFlag = flag; \ transliterationName = "NumToText"#name; \ implementationName = "com.sun.star.i18n.Transliteration.NumToText"#name; \ } -TRANSLITERATION_NUMTOTEXT( Lower_zh_CN, Lower_zh, CJK, 0 ) -TRANSLITERATION_NUMTOTEXT( Upper_zh_CN, Upper_zh, CJK, 0 ) -TRANSLITERATION_NUMTOTEXT( Lower_zh_TW, Lower_zh, CJK, 0 ) -TRANSLITERATION_NUMTOTEXT( Upper_zh_TW, Upper_zh_TW, CJK, 0 ) +TRANSLITERATION_NUMTOTEXT( Lower_zh_CN, Lower_zh, Lower_zh, CJK, 0 ) +TRANSLITERATION_NUMTOTEXT( Upper_zh_CN, Upper_zh, Upper_zh, CJK, 0 ) +TRANSLITERATION_NUMTOTEXT( Lower_zh_TW, Lower_zh, Lower_zh, CJK, 0 ) +TRANSLITERATION_NUMTOTEXT( Upper_zh_TW, Upper_zh_TW, Upper_zh_TW, CJK, 0 ) +TRANSLITERATION_NUMTOTEXT( Fullwidth_zh, FullWidth, Lower_zh, CJK, 0 ) +TRANSLITERATION_NUMTOTEXT( Fullwidth_ja, FullWidth, Modern_ja, CJK, 0 ) +TRANSLITERATION_NUMTOTEXT( Fullwidth_ko, FullWidth, Hangul_ko, CJK, 0 ) #define Multiplier_Lower_ko Multiplier_Upper_zh_TW #define Multiplier_Upper_ko Multiplier_Upper_zh_TW -TRANSLITERATION_NUMTOTEXT( FormalLower_ko, Lower_ko, CJK, NUMBER_OMIT_ZERO ) -TRANSLITERATION_NUMTOTEXT( FormalUpper_ko, Upper_ko, CJK, NUMBER_OMIT_ZERO ) -TRANSLITERATION_NUMTOTEXT( FormalHangul_ko, Hangul_ko, CJK, NUMBER_OMIT_ZERO ) +TRANSLITERATION_NUMTOTEXT( FormalLower_ko, Lower_ko, Lower_ko, CJK, NUMBER_OMIT_ZERO ) +TRANSLITERATION_NUMTOTEXT( FormalUpper_ko, Upper_ko, Upper_ko, CJK, NUMBER_OMIT_ZERO ) +TRANSLITERATION_NUMTOTEXT( FormalHangul_ko, Hangul_ko, Hangul_ko, CJK, NUMBER_OMIT_ZERO ) #define NUMBER_OMIT_ALL ( NUMBER_OMIT_ZERO|NUMBER_OMIT_ONE|NUMBER_OMIT_ONLY_ZERO ) -TRANSLITERATION_NUMTOTEXT( InformalLower_ko, Lower_ko, CJK, NUMBER_OMIT_ALL ) -TRANSLITERATION_NUMTOTEXT( InformalUpper_ko, Upper_ko, CJK, NUMBER_OMIT_ALL ) -TRANSLITERATION_NUMTOTEXT( InformalHangul_ko, Hangul_ko, CJK, NUMBER_OMIT_ALL ) -TRANSLITERATION_NUMTOTEXT( KanjiLongTraditional_ja_JP, Traditional_ja, CJK, NUMBER_OMIT_ALL ) -TRANSLITERATION_NUMTOTEXT( KanjiLongModern_ja_JP, Modern_ja, CJK, NUMBER_OMIT_ALL ) -TRANSLITERATION_NUMTOTEXT( Date_zh, Lower_zh, CJK, NUMBER_OMIT_ALL ) -TRANSLITERATION_NUMTOTEXT( KanjiShortTraditional_ja_JP, Traditional_ja, short_CJK, NUMBER_OMIT_ALL ) -TRANSLITERATION_NUMTOTEXT( KanjiShortModern_ja_JP, Modern_ja, short_CJK, NUMBER_OMIT_ALL ) +TRANSLITERATION_NUMTOTEXT( InformalLower_ko, Lower_ko, Lower_ko, CJK, NUMBER_OMIT_ALL ) +TRANSLITERATION_NUMTOTEXT( InformalUpper_ko, Upper_ko, Upper_ko, CJK, NUMBER_OMIT_ALL ) +TRANSLITERATION_NUMTOTEXT( InformalHangul_ko, Hangul_ko, Hangul_ko, CJK, NUMBER_OMIT_ALL ) +TRANSLITERATION_NUMTOTEXT( KanjiLongTraditional_ja_JP, Traditional_ja, Traditional_ja, CJK, NUMBER_OMIT_ALL ) +TRANSLITERATION_NUMTOTEXT( KanjiLongModern_ja_JP, Modern_ja, Modern_ja, CJK, NUMBER_OMIT_ALL ) +TRANSLITERATION_NUMTOTEXT( Date_zh, Lower_zh, Lower_zh, CJK, NUMBER_OMIT_ALL ) +TRANSLITERATION_NUMTOTEXT( KanjiShortTraditional_ja_JP, Traditional_ja, Traditional_ja, short_CJK, NUMBER_OMIT_ALL ) +TRANSLITERATION_NUMTOTEXT( KanjiShortModern_ja_JP, Modern_ja, Modern_ja,short_CJK, NUMBER_OMIT_ALL ) #undef TRANSLITERATION_NUMTOTEXT #define TRANSLITERATION_NUMTOTEXT( name ) \ |