i18npool/inc/breakiterator_cjk.hxx | 3 i18npool/inc/chartonum.hxx | 3 i18npool/inc/numtochar.hxx | 3 i18npool/inc/numtotext_cjk.hxx | 3 i18npool/inc/textToPronounce_zh.hxx | 3 i18npool/inc/texttonum.hxx | 3 i18npool/inc/transliteration_Ignore.hxx | 44 ---------- i18npool/inc/transliteration_OneToOne.hxx | 22 ----- i18npool/inc/transliteration_body.hxx | 7 - i18npool/source/breakiterator/breakiterator_cjk.cxx | 2 i18npool/source/registerservices/registerservices.cxx | 2 i18npool/source/transliteration/chartonum.cxx | 5 - i18npool/source/transliteration/data/numberchar.h | 2 i18npool/source/transliteration/fullwidthToHalfwidth.cxx | 9 -- i18npool/source/transliteration/halfwidthToFullwidth.cxx | 8 - i18npool/source/transliteration/hiraganaToKatakana.cxx | 5 - i18npool/source/transliteration/ignoreBaFa_ja_JP.cxx | 5 - i18npool/source/transliteration/ignoreDiacritics_CTL.cxx | 1 i18npool/source/transliteration/ignoreHyuByu_ja_JP.cxx | 5 - i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx | 6 - i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx | 5 - i18npool/source/transliteration/ignoreKana.cxx | 8 - i18npool/source/transliteration/ignoreKashida_CTL.cxx | 1 i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx | 5 - i18npool/source/transliteration/ignoreMiddleDot_ja_JP.cxx | 5 - i18npool/source/transliteration/ignoreMinusSign_ja_JP.cxx | 5 - i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx | 5 - i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx | 5 - i18npool/source/transliteration/ignoreSeparator_ja_JP.cxx | 5 - i18npool/source/transliteration/ignoreSize_ja_JP.cxx | 8 - i18npool/source/transliteration/ignoreSpace_ja_JP.cxx | 5 - i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx | 6 - i18npool/source/transliteration/ignoreTraditionalKana_ja_JP.cxx | 5 - i18npool/source/transliteration/ignoreTraditionalKanji_ja_JP.cxx | 5 - i18npool/source/transliteration/ignoreWidth.cxx | 7 - i18npool/source/transliteration/ignoreZiZu_ja_JP.cxx | 5 - i18npool/source/transliteration/katakanaToHiragana.cxx | 5 - i18npool/source/transliteration/largeToSmall_ja_JP.cxx | 6 - i18npool/source/transliteration/numtochar.cxx | 8 - i18npool/source/transliteration/numtotext_cjk.cxx | 5 - i18npool/source/transliteration/smallToLarge_ja_JP.cxx | 6 - i18npool/source/transliteration/textToPronounce_zh.cxx | 9 -- i18npool/source/transliteration/texttonum.cxx | 6 - i18npool/source/transliteration/transliteration_Ignore.cxx | 3 i18npool/source/transliteration/transliteration_OneToOne.cxx | 4 i18npool/source/transliteration/transliteration_body.cxx | 1 i18npool/source/transliteration/transliteration_caseignore.cxx | 5 - 47 files changed, 32 insertions(+), 252 deletions(-)
New commits: commit bb2f13b473f87ec75366dad5aa318b1e24893735 Author: Tor Lillqvist <t...@collabora.com> Date: Wed Apr 23 09:29:09 2014 +0300 Avoid cargo cult rites Change-Id: I39fee26048d5b4ddb03217309b7117bef9ec4cd8 diff --git a/i18npool/inc/breakiterator_cjk.hxx b/i18npool/inc/breakiterator_cjk.hxx index dce0f55..4a0c93d 100644 --- a/i18npool/inc/breakiterator_cjk.hxx +++ b/i18npool/inc/breakiterator_cjk.hxx @@ -57,12 +57,11 @@ public:\ virtual ~BreakIterator_##lang (); \ }; -#ifdef BREAKITERATOR_ALL BREAKITERATOR_CJK( zh ) BREAKITERATOR_CJK( zh_TW ) BREAKITERATOR_CJK( ja ) BREAKITERATOR_CJK( ko ) -#endif + #undef BREAKITERATOR__CJK } } } } diff --git a/i18npool/inc/chartonum.hxx b/i18npool/inc/chartonum.hxx index f899b73..2a2e2c2 100644 --- a/i18npool/inc/chartonum.hxx +++ b/i18npool/inc/chartonum.hxx @@ -30,7 +30,6 @@ public: \ CharToNum##name (); \ }; -#ifdef TRANSLITERATION_ALL TRANSLITERATION_CHARTONUM(Lower_zh_CN) TRANSLITERATION_CHARTONUM(Upper_zh_CN) TRANSLITERATION_CHARTONUM(Lower_zh_TW) @@ -45,7 +44,7 @@ TRANSLITERATION_CHARTONUM(Indic_ar) TRANSLITERATION_CHARTONUM(EastIndic_ar) TRANSLITERATION_CHARTONUM(Indic_hi) TRANSLITERATION_CHARTONUM(_th) -#endif + #undef TRANSLITERATION_CHARTONUM } } } } diff --git a/i18npool/inc/numtochar.hxx b/i18npool/inc/numtochar.hxx index 6363451..e64e520 100644 --- a/i18npool/inc/numtochar.hxx +++ b/i18npool/inc/numtochar.hxx @@ -30,7 +30,6 @@ public: \ NumToChar##name (); \ }; -#ifdef TRANSLITERATION_ALL TRANSLITERATION_NUMTOCHAR(Lower_zh_CN) TRANSLITERATION_NUMTOCHAR(Upper_zh_CN) TRANSLITERATION_NUMTOCHAR(Lower_zh_TW) @@ -46,7 +45,7 @@ TRANSLITERATION_NUMTOCHAR(EastIndic_ar) TRANSLITERATION_NUMTOCHAR(Indic_hi) TRANSLITERATION_NUMTOCHAR(_th) TRANSLITERATION_NUMTOCHAR(Halfwidth) -#endif + #undef TRANSLITERATION_NUMTOCHAR } } } } diff --git a/i18npool/inc/numtotext_cjk.hxx b/i18npool/inc/numtotext_cjk.hxx index 413e4b4..dfdcf83 100644 --- a/i18npool/inc/numtotext_cjk.hxx +++ b/i18npool/inc/numtotext_cjk.hxx @@ -30,7 +30,6 @@ public: \ NumToText##name (); \ }; -#ifdef TRANSLITERATION_ALL TRANSLITERATION_NUMTOTEXT_CJK ( Lower_zh_CN ) TRANSLITERATION_NUMTOTEXT_CJK ( Upper_zh_CN ) TRANSLITERATION_NUMTOTEXT_CJK ( Lower_zh_TW ) @@ -61,7 +60,7 @@ TRANSLITERATION_NUMTOTEXT_CJK ( HangulJamo_ko ) TRANSLITERATION_NUMTOTEXT_CJK ( HangulSyllable_ko ) TRANSLITERATION_NUMTOTEXT_CJK ( HangulCircledJamo_ko ) TRANSLITERATION_NUMTOTEXT_CJK ( HangulCircledSyllable_ko ) -#endif + #undef TRANSLITERATION_NUMTOTEXT } } } } diff --git a/i18npool/inc/textToPronounce_zh.hxx b/i18npool/inc/textToPronounce_zh.hxx index 6bea259..0addc1b 100644 --- a/i18npool/inc/textToPronounce_zh.hxx +++ b/i18npool/inc/textToPronounce_zh.hxx @@ -68,10 +68,9 @@ public: \ name (); \ }; -#ifdef TRANSLITERATION_ALL TRANSLITERATION_TextToPronounce_zh( TextToPinyin_zh_CN) TRANSLITERATION_TextToPronounce_zh( TextToChuyin_zh_TW) -#endif + #undef TRANSLITERATION_TextToPronounce_zh } } } } diff --git a/i18npool/inc/texttonum.hxx b/i18npool/inc/texttonum.hxx index eaaaa41..cb74803 100644 --- a/i18npool/inc/texttonum.hxx +++ b/i18npool/inc/texttonum.hxx @@ -30,7 +30,6 @@ public: \ TextToNum##name (); \ }; -#ifdef TRANSLITERATION_ALL TRANSLITERATION_TEXTTONUM(Lower_zh_CN) TRANSLITERATION_TEXTTONUM(Upper_zh_CN) TRANSLITERATION_TEXTTONUM(Lower_zh_TW) @@ -43,7 +42,7 @@ TRANSLITERATION_TEXTTONUM(FormalUpper_ko) TRANSLITERATION_TEXTTONUM(FormalHangul_ko) TRANSLITERATION_TEXTTONUM(KanjiLongModern_ja_JP) TRANSLITERATION_TEXTTONUM(KanjiLongTraditional_ja_JP) -#endif + #undef TRANSLITERATION_TEXTTONUM } } } } diff --git a/i18npool/inc/transliteration_Ignore.hxx b/i18npool/inc/transliteration_Ignore.hxx index 691b867..ea6e3b3 100644 --- a/i18npool/inc/transliteration_Ignore.hxx +++ b/i18npool/inc/transliteration_Ignore.hxx @@ -80,47 +80,19 @@ public:\ ignore##name ();\ }; -#if defined( TRANSLITERATION_BaFa_ja_JP ) || defined( TRANSLITERATION_ALL ) TRANSLITERATION_IGNORE(BaFa_ja_JP) -#endif -#if defined( TRANSLITERATION_HyuByu_ja_JP ) || defined( TRANSLITERATION_ALL ) TRANSLITERATION_IGNORE(HyuByu_ja_JP) -#endif -#if defined( TRANSLITERATION_SeZe_ja_JP ) || defined( TRANSLITERATION_ALL ) TRANSLITERATION_IGNORE(SeZe_ja_JP) -#endif -#if defined( TRANSLITERATION_TiJi_ja_JP ) || defined( TRANSLITERATION_ALL ) TRANSLITERATION_IGNORE(TiJi_ja_JP) -#endif -#if defined( TRANSLITERATION_MiddleDot_ja_JP ) || defined( TRANSLITERATION_ALL ) TRANSLITERATION_IGNORE(MiddleDot_ja_JP) -#endif -#if defined( TRANSLITERATION_MinusSign_ja_JP ) || defined( TRANSLITERATION_ALL ) TRANSLITERATION_IGNORE(MinusSign_ja_JP) -#endif -#if defined( TRANSLITERATION_Separator_ja_JP ) || defined( TRANSLITERATION_ALL ) TRANSLITERATION_IGNORE(Separator_ja_JP) -#endif -#if defined( TRANSLITERATION_Space_ja_JP ) || defined( TRANSLITERATION_ALL ) TRANSLITERATION_IGNORE(Space_ja_JP) -#endif -#if defined( TRANSLITERATION_TraditionalKana_ja_JP ) || defined( TRANSLITERATION_ALL ) TRANSLITERATION_IGNORE(TraditionalKana_ja_JP) -#endif -#if defined( TRANSLITERATION_TraditionalKanji_ja_JP ) || defined( TRANSLITERATION_ALL ) TRANSLITERATION_IGNORE(TraditionalKanji_ja_JP) -#endif -#if defined( TRANSLITERATION_ZiZu_ja_JP ) || defined( TRANSLITERATION_ALL ) TRANSLITERATION_IGNORE(ZiZu_ja_JP) -#endif - -#if defined( TRANSLITERATION_Diacritics_CTL ) || defined( TRANSLITERATION_ALL ) TRANSLITERATION_IGNORE(Diacritics_CTL) -#endif - -#if defined( TRANSLITERATION_Kashida_CTL ) || defined( TRANSLITERATION_ALL ) TRANSLITERATION_IGNORE(Kashida_CTL) -#endif #undef TRANSLITERATION_IGNORE @@ -138,18 +110,11 @@ public:\ com::sun::star::uno::Sequence< sal_Int32 >& offset) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; \ }; -#if defined( TRANSLITERATION_KiKuFollowedBySa_ja_JP ) || defined( TRANSLITERATION_ALL ) TRANSLITERATION_IGNORE(KiKuFollowedBySa_ja_JP) -#endif -#if defined( TRANSLITERATION_IandEfollowedByYa_ja_JP ) || defined( TRANSLITERATION_ALL ) TRANSLITERATION_IGNORE(IandEfollowedByYa_ja_JP) -#endif -#if defined( TRANSLITERATION_IterationMark_ja_JP ) || defined( TRANSLITERATION_ALL ) TRANSLITERATION_IGNORE(IterationMark_ja_JP) -#endif -#if defined( TRANSLITERATION_ProlongedSoundMark_ja_JP ) || defined( TRANSLITERATION_ALL ) TRANSLITERATION_IGNORE(ProlongedSoundMark_ja_JP) -#endif + #undef TRANSLITERATION_IGNORE #define TRANSLITERATION_IGNORE( name ) \ @@ -173,15 +138,10 @@ public:\ com::sun::star::i18n::MultipleCharsOutputException, std::exception) SAL_OVERRIDE;\ }; -#if defined( TRANSLITERATION_Kana ) || defined( TRANSLITERATION_ALL ) TRANSLITERATION_IGNORE(Kana) -#endif -#if defined( TRANSLITERATION_Width ) || defined( TRANSLITERATION_ALL ) TRANSLITERATION_IGNORE(Width) -#endif -#if defined( TRANSLITERATION_Size_ja_JP ) || defined( TRANSLITERATION_ALL ) TRANSLITERATION_IGNORE(Size_ja_JP) -#endif + #undef TRANSLITERATION_IGNORE } } } } diff --git a/i18npool/inc/transliteration_OneToOne.hxx b/i18npool/inc/transliteration_OneToOne.hxx index 76d59bc..db6b116 100644 --- a/i18npool/inc/transliteration_OneToOne.hxx +++ b/i18npool/inc/transliteration_OneToOne.hxx @@ -73,24 +73,13 @@ public: \ com::sun::star::i18n::MultipleCharsOutputException, std::exception) SAL_OVERRIDE; \ }; -#if defined( TRANSLITERATION_fullwidthToHalfwidth ) || defined( TRANSLITERATION_ALL ) TRANSLITERATION_ONETOONE( fullwidthToHalfwidth ) -#endif -#if defined( TRANSLITERATION_halfwidthToFullwidth ) || defined( TRANSLITERATION_ALL ) TRANSLITERATION_ONETOONE(halfwidthToFullwidth) -#endif -#if defined( TRANSLITERATION_fullwidthKatakanaToHalfwidthKatakana ) || defined( TRANSLITERATION_ALL ) TRANSLITERATION_ONETOONE( fullwidthKatakanaToHalfwidthKatakana ) -#endif -#if defined( TRANSLITERATION_halfwidthKatakanaToFullwidthKatakana ) || defined( TRANSLITERATION_ALL ) TRANSLITERATION_ONETOONE(halfwidthKatakanaToFullwidthKatakana) -#endif -#if defined( TRANSLITERATION_fullwidthToHalfwidthLikeASC ) || defined( TRANSLITERATION_ALL ) TRANSLITERATION_ONETOONE( fullwidthToHalfwidthLikeASC ) -#endif -#if defined( TRANSLITERATION_halfwidthToFullwidthLikeJIS ) || defined( TRANSLITERATION_ALL ) TRANSLITERATION_ONETOONE( halfwidthToFullwidthLikeJIS ) -#endif + #undef TRANSLITERATION_ONETOONE #define TRANSLITERATION_ONETOONE( name ) \ @@ -100,18 +89,11 @@ public: \ name (); \ }; -#if defined( TRANSLITERATION_hiraganaToKatakana ) || defined( TRANSLITERATION_ALL ) TRANSLITERATION_ONETOONE(hiraganaToKatakana) -#endif -#if defined( TRANSLITERATION_katakanaToHiragana ) || defined( TRANSLITERATION_ALL ) TRANSLITERATION_ONETOONE(katakanaToHiragana) -#endif -#if defined( TRANSLITERATION_largeToSmall_ja_JP ) || defined( TRANSLITERATION_ALL ) TRANSLITERATION_ONETOONE(largeToSmall_ja_JP) -#endif -#if defined( TRANSLITERATION_smallToLarge_ja_JP ) || defined( TRANSLITERATION_ALL ) TRANSLITERATION_ONETOONE(smallToLarge_ja_JP) -#endif + #undef TRANSLITERATION_ONETOONE } } } } diff --git a/i18npool/inc/transliteration_body.hxx b/i18npool/inc/transliteration_body.hxx index ebcee79..4f4b218 100644 --- a/i18npool/inc/transliteration_body.hxx +++ b/i18npool/inc/transliteration_body.hxx @@ -59,7 +59,6 @@ protected: sal_uInt8 nMappingType; }; -#if defined( TRANSLITERATION_UPPER_LOWER ) || defined( TRANSLITERATION_ALL ) class Transliteration_u2l : public Transliteration_body { public: @@ -71,19 +70,14 @@ class Transliteration_l2u : public Transliteration_body public: Transliteration_l2u(); }; -#endif -#if defined( TRANSLITERATION_casemapping ) || defined( TRANSLITERATION_ALL ) class Transliteration_casemapping : public Transliteration_body { public: Transliteration_casemapping(); void SAL_CALL setMappingType(const sal_uInt8 rMappingType, const com::sun::star::lang::Locale& rLocale ); }; -#endif - -#if defined( TRANSLITERATION_ALL ) class Transliteration_togglecase : public Transliteration_body { public: @@ -105,7 +99,6 @@ public: virtual OUString SAL_CALL transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset ) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; -#endif } } } } diff --git a/i18npool/source/breakiterator/breakiterator_cjk.cxx b/i18npool/source/breakiterator/breakiterator_cjk.cxx index ada4c2c..939e2d2 100644 --- a/i18npool/source/breakiterator/breakiterator_cjk.cxx +++ b/i18npool/source/breakiterator/breakiterator_cjk.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -#define BREAKITERATOR_ALL #include <breakiterator_cjk.hxx> #include <localedata.hxx> #include <i18nutil/unicode.hxx> diff --git a/i18npool/source/registerservices/registerservices.cxx b/i18npool/source/registerservices/registerservices.cxx index 67c59e6..9c8bb0f 100644 --- a/i18npool/source/registerservices/registerservices.cxx +++ b/i18npool/source/registerservices/registerservices.cxx @@ -28,7 +28,6 @@ #include <servicename.hxx> -#define TRANSLITERATION_ALL #include <transliteration_body.hxx> #include <transliteration_OneToOne.hxx> #include <textToPronounce_zh.hxx> @@ -42,7 +41,6 @@ #include <calendar_hijri.hxx> #include <calendar_jewish.hxx> -#define BREAKITERATOR_ALL #include <breakiterator_cjk.hxx> #include <breakiterator_th.hxx> diff --git a/i18npool/source/transliteration/chartonum.cxx b/i18npool/source/transliteration/chartonum.cxx index f51d203..00f2e73 100644 --- a/i18npool/source/transliteration/chartonum.cxx +++ b/i18npool/source/transliteration/chartonum.cxx @@ -17,11 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <rtl/ustrbuf.hxx> -#define TRANSLITERATION_ALL #include <chartonum.hxx> #include <data/numberchar.h> -#include <rtl/ustrbuf.hxx> using namespace com::sun::star::uno; @@ -34,6 +33,7 @@ CharToNum##name::CharToNum##name() \ tableSize = 0; \ implementationName = "com.sun.star.i18n.Transliteration.CharToNum"#name; \ } + TRANSLITERATION_CHARTONUM( Fullwidth) TRANSLITERATION_CHARTONUM( Lower_zh_CN) TRANSLITERATION_CHARTONUM( Lower_zh_TW) @@ -48,6 +48,7 @@ TRANSLITERATION_CHARTONUM( Indic_ar) TRANSLITERATION_CHARTONUM( EastIndic_ar) TRANSLITERATION_CHARTONUM( Indic_hi) TRANSLITERATION_CHARTONUM( _th) + #undef TRANSLITERATION_CHARTONUM } } } } diff --git a/i18npool/source/transliteration/data/numberchar.h b/i18npool/source/transliteration/data/numberchar.h index 37f8d17..c9cbd38 100644 --- a/i18npool/source/transliteration/data/numberchar.h +++ b/i18npool/source/transliteration/data/numberchar.h @@ -19,6 +19,8 @@ #ifndef _L10N_TRANSLITERATION_NUMTOCHAR_H_ #define _L10N_TRANSLITERATION_NUMTOCHAR_H_ +#include <sal/types.h> + namespace com { namespace sun { namespace star { namespace i18n { static const sal_Int16 NumberChar_HalfWidth = 0; diff --git a/i18npool/source/transliteration/fullwidthToHalfwidth.cxx b/i18npool/source/transliteration/fullwidthToHalfwidth.cxx index f1c3c22..1f8a8a6 100644 --- a/i18npool/source/transliteration/fullwidthToHalfwidth.cxx +++ b/i18npool/source/transliteration/fullwidthToHalfwidth.cxx @@ -17,20 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -// prevent internal compiler error with MSVC6SP3 -#include <utility> - #include <i18nutil/widthfolding.hxx> -#define TRANSLITERATION_fullwidthToHalfwidth -#define TRANSLITERATION_fullwidthKatakanaToHalfwidthKatakana -#define TRANSLITERATION_fullwidthToHalfwidthLikeASC + #include <transliteration_OneToOne.hxx> using namespace com::sun::star::uno; using namespace com::sun::star::lang; - namespace com { namespace sun { namespace star { namespace i18n { fullwidthToHalfwidth::fullwidthToHalfwidth() diff --git a/i18npool/source/transliteration/halfwidthToFullwidth.cxx b/i18npool/source/transliteration/halfwidthToFullwidth.cxx index 72857f6..2bfa467 100644 --- a/i18npool/source/transliteration/halfwidthToFullwidth.cxx +++ b/i18npool/source/transliteration/halfwidthToFullwidth.cxx @@ -17,14 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -// prevent internal compiler error with MSVC6SP3 -#include <utility> - #include <i18nutil/widthfolding.hxx> -#define TRANSLITERATION_halfwidthToFullwidth -#define TRANSLITERATION_halfwidthKatakanaToFullwidthKatakana -#define TRANSLITERATION_halfwidthToFullwidthLikeJIS + #include <transliteration_OneToOne.hxx> using namespace com::sun::star::uno; diff --git a/i18npool/source/transliteration/hiraganaToKatakana.cxx b/i18npool/source/transliteration/hiraganaToKatakana.cxx index f9afa35..ec64885 100644 --- a/i18npool/source/transliteration/hiraganaToKatakana.cxx +++ b/i18npool/source/transliteration/hiraganaToKatakana.cxx @@ -17,11 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -// prevent internal compiler error with MSVC6SP3 -#include <utility> - -#define TRANSLITERATION_hiraganaToKatakana #include <transliteration_OneToOne.hxx> using namespace com::sun::star::uno; diff --git a/i18npool/source/transliteration/ignoreBaFa_ja_JP.cxx b/i18npool/source/transliteration/ignoreBaFa_ja_JP.cxx index 076df1b..2ba0dc9 100644 --- a/i18npool/source/transliteration/ignoreBaFa_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreBaFa_ja_JP.cxx @@ -17,11 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -// prevent internal compiler error with MSVC6SP3 -#include <utility> - -#define TRANSLITERATION_BaFa_ja_JP #include <transliteration_Ignore.hxx> using namespace com::sun::star::uno; diff --git a/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx b/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx index 7f0b0ce..8d6022d 100644 --- a/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx +++ b/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx @@ -7,7 +7,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#define TRANSLITERATION_Diacritics_CTL #include <transliteration_Ignore.hxx> #include <unicode/uchar.h> diff --git a/i18npool/source/transliteration/ignoreHyuByu_ja_JP.cxx b/i18npool/source/transliteration/ignoreHyuByu_ja_JP.cxx index 6af92f4..ac7ce2c 100644 --- a/i18npool/source/transliteration/ignoreHyuByu_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreHyuByu_ja_JP.cxx @@ -17,11 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -// prevent internal compiler error with MSVC6SP3 -#include <utility> - -#define TRANSLITERATION_HyuByu_ja_JP #include <transliteration_Ignore.hxx> using namespace com::sun::star::uno; diff --git a/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx b/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx index 8f06681..6154ad2 100644 --- a/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx @@ -17,17 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -#include <utility> -#include <comphelper/string.hxx> #include <i18nutil/oneToOneMapping.hxx> -#define TRANSLITERATION_IandEfollowedByYa_ja_JP + #include <transliteration_Ignore.hxx> using namespace com::sun::star::uno; using namespace com::sun::star::lang; - namespace com { namespace sun { namespace star { namespace i18n { OneToOneMappingTable_t IandE[] = { diff --git a/i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx b/i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx index 4388beb..da9bd8a 100644 --- a/i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx @@ -17,11 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -#include <utility> -#include <comphelper/string.hxx> #include <i18nutil/oneToOneMapping.hxx> -#define TRANSLITERATION_IterationMark_ja_JP + #include <transliteration_Ignore.hxx> using namespace com::sun::star::uno; diff --git a/i18npool/source/transliteration/ignoreKana.cxx b/i18npool/source/transliteration/ignoreKana.cxx index 64652d2..d468ecf 100644 --- a/i18npool/source/transliteration/ignoreKana.cxx +++ b/i18npool/source/transliteration/ignoreKana.cxx @@ -17,22 +17,14 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -// prevent internal compiler error with MSVC6SP3 -#include <utility> - #include <com/sun/star/uno/XComponentContext.hpp> -#define TRANSLITERATION_Kana #include <transliteration_Ignore.hxx> -#define TRANSLITERATION_hiraganaToKatakana -#define TRANSLITERATION_katakanaToHiragana #include <transliteration_OneToOne.hxx> using namespace com::sun::star::uno; using namespace com::sun::star::lang; - namespace com { namespace sun { namespace star { namespace i18n { OUString SAL_CALL diff --git a/i18npool/source/transliteration/ignoreKashida_CTL.cxx b/i18npool/source/transliteration/ignoreKashida_CTL.cxx index ff0303d..564590b 100644 --- a/i18npool/source/transliteration/ignoreKashida_CTL.cxx +++ b/i18npool/source/transliteration/ignoreKashida_CTL.cxx @@ -7,7 +7,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#define TRANSLITERATION_Kashida_CTL #include <transliteration_Ignore.hxx> namespace com { namespace sun { namespace star { namespace i18n { diff --git a/i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx b/i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx index 0ccb8f9..fcec447 100644 --- a/i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx @@ -17,16 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -#include <utility> -#include <comphelper/string.hxx> -#define TRANSLITERATION_KiKuFollowedBySa_ja_JP #include <transliteration_Ignore.hxx> using namespace com::sun::star::uno; using namespace com::sun::star::lang; - namespace com { namespace sun { namespace star { namespace i18n { OUString SAL_CALL diff --git a/i18npool/source/transliteration/ignoreMiddleDot_ja_JP.cxx b/i18npool/source/transliteration/ignoreMiddleDot_ja_JP.cxx index a9b5e9d..73f7d00 100644 --- a/i18npool/source/transliteration/ignoreMiddleDot_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreMiddleDot_ja_JP.cxx @@ -17,11 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -// prevent internal compiler error with MSVC6SP3 -#include <utility> - -#define TRANSLITERATION_MiddleDot_ja_JP #include <transliteration_Ignore.hxx> namespace com { namespace sun { namespace star { namespace i18n { diff --git a/i18npool/source/transliteration/ignoreMinusSign_ja_JP.cxx b/i18npool/source/transliteration/ignoreMinusSign_ja_JP.cxx index 4a3d049..80b58f2 100644 --- a/i18npool/source/transliteration/ignoreMinusSign_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreMinusSign_ja_JP.cxx @@ -17,11 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -// prevent internal compiler error with MSVC6SP3 -#include <utility> - -#define TRANSLITERATION_MinusSign_ja_JP #include <transliteration_Ignore.hxx> namespace com { namespace sun { namespace star { namespace i18n { diff --git a/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx b/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx index 82ab466..7ff63b7 100644 --- a/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx @@ -17,16 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -#include <utility> -#include <comphelper/string.hxx> -#define TRANSLITERATION_ProlongedSoundMark_ja_JP #include <transliteration_Ignore.hxx> using namespace com::sun::star::uno; using namespace com::sun::star::lang; - namespace com { namespace sun { namespace star { namespace i18n { static const sal_Unicode table_normalwidth[] = { diff --git a/i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx b/i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx index eeeea2f..602818d 100644 --- a/i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx @@ -17,11 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -// prevent internal compiler error with MSVC6SP3 -#include <utility> - -#define TRANSLITERATION_SeZe_ja_JP #include <transliteration_Ignore.hxx> using namespace com::sun::star::uno; diff --git a/i18npool/source/transliteration/ignoreSeparator_ja_JP.cxx b/i18npool/source/transliteration/ignoreSeparator_ja_JP.cxx index ade020c..2665c5a 100644 --- a/i18npool/source/transliteration/ignoreSeparator_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreSeparator_ja_JP.cxx @@ -17,11 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -// prevent internal compiler error with MSVC6SP3 -#include <utility> - -#define TRANSLITERATION_Separator_ja_JP #include <transliteration_Ignore.hxx> namespace com { namespace sun { namespace star { namespace i18n { diff --git a/i18npool/source/transliteration/ignoreSize_ja_JP.cxx b/i18npool/source/transliteration/ignoreSize_ja_JP.cxx index fb56bd5..e5645ad0 100644 --- a/i18npool/source/transliteration/ignoreSize_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreSize_ja_JP.cxx @@ -17,20 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -// prevent internal compiler error with MSVC6SP3 -#include <utility> - -#define TRANSLITERATION_Size_ja_JP #include <transliteration_Ignore.hxx> -#define TRANSLITERATION_smallToLarge_ja_JP -#define TRANSLITERATION_largeToSmall_ja_JP #include <transliteration_OneToOne.hxx> using namespace com::sun::star::uno; using namespace com::sun::star::lang; - namespace com { namespace sun { namespace star { namespace i18n { OUString SAL_CALL diff --git a/i18npool/source/transliteration/ignoreSpace_ja_JP.cxx b/i18npool/source/transliteration/ignoreSpace_ja_JP.cxx index 9f8f75d..4a38eb7 100644 --- a/i18npool/source/transliteration/ignoreSpace_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreSpace_ja_JP.cxx @@ -17,11 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -// prevent internal compiler error with MSVC6SP3 -#include <utility> - -#define TRANSLITERATION_Space_ja_JP #include <transliteration_Ignore.hxx> namespace com { namespace sun { namespace star { namespace i18n { diff --git a/i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx b/i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx index 799b3e1..bdc58dd 100644 --- a/i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx @@ -17,11 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -// prevent internal compiler error with MSVC6SP3 -#include <utility> - -#define TRANSLITERATION_TiJi_ja_JP #include <transliteration_Ignore.hxx> using namespace com::sun::star::uno; @@ -29,7 +24,6 @@ using namespace com::sun::star::lang; namespace com { namespace sun { namespace star { namespace i18n { - static const Mapping TiJi[] = { // TU + I --> TI { 0x30C4, 0x30A3, 0x30C1, sal_True }, diff --git a/i18npool/source/transliteration/ignoreTraditionalKana_ja_JP.cxx b/i18npool/source/transliteration/ignoreTraditionalKana_ja_JP.cxx index e2bc44a..ad90801 100644 --- a/i18npool/source/transliteration/ignoreTraditionalKana_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreTraditionalKana_ja_JP.cxx @@ -17,11 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -// prevent internal compiler error with MSVC6SP3 -#include <utility> - -#define TRANSLITERATION_TraditionalKana_ja_JP #include <transliteration_Ignore.hxx> namespace com { namespace sun { namespace star { namespace i18n { diff --git a/i18npool/source/transliteration/ignoreTraditionalKanji_ja_JP.cxx b/i18npool/source/transliteration/ignoreTraditionalKanji_ja_JP.cxx index d19a1f7..aca992d 100644 --- a/i18npool/source/transliteration/ignoreTraditionalKanji_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreTraditionalKanji_ja_JP.cxx @@ -17,11 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -// prevent internal compiler error with MSVC6SP3 -#include <utility> - -#define TRANSLITERATION_TraditionalKanji_ja_JP #include <transliteration_Ignore.hxx> namespace com { namespace sun { namespace star { namespace i18n { diff --git a/i18npool/source/transliteration/ignoreWidth.cxx b/i18npool/source/transliteration/ignoreWidth.cxx index 489ac75..ebe640c 100644 --- a/i18npool/source/transliteration/ignoreWidth.cxx +++ b/i18npool/source/transliteration/ignoreWidth.cxx @@ -17,21 +17,14 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -// prevent internal compiler error with MSVC6SP3 -#include <utility> - #include <com/sun/star/uno/XComponentContext.hpp> -#define TRANSLITERATION_Width #include <transliteration_Ignore.hxx> -#define TRANSLITERATION_fullwidthToHalfwidth -#define TRANSLITERATION_halfwidthToFullwidth #include <transliteration_OneToOne.hxx> using namespace com::sun::star::uno; using namespace com::sun::star::lang; - namespace com { namespace sun { namespace star { namespace i18n { OUString SAL_CALL diff --git a/i18npool/source/transliteration/ignoreZiZu_ja_JP.cxx b/i18npool/source/transliteration/ignoreZiZu_ja_JP.cxx index e9362b0..58f8cc8 100644 --- a/i18npool/source/transliteration/ignoreZiZu_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreZiZu_ja_JP.cxx @@ -17,11 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -// prevent internal compiler error with MSVC6SP3 -#include <utility> - -#define TRANSLITERATION_ZiZu_ja_JP #include <transliteration_Ignore.hxx> namespace com { namespace sun { namespace star { namespace i18n { diff --git a/i18npool/source/transliteration/katakanaToHiragana.cxx b/i18npool/source/transliteration/katakanaToHiragana.cxx index 2d43c82..386dc79 100644 --- a/i18npool/source/transliteration/katakanaToHiragana.cxx +++ b/i18npool/source/transliteration/katakanaToHiragana.cxx @@ -17,11 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -// prevent internal compiler error with MSVC6SP3 -#include <utility> - -#define TRANSLITERATION_katakanaToHiragana #include <transliteration_OneToOne.hxx> namespace com { namespace sun { namespace star { namespace i18n { diff --git a/i18npool/source/transliteration/largeToSmall_ja_JP.cxx b/i18npool/source/transliteration/largeToSmall_ja_JP.cxx index ce0e6d1..3b42ec6 100644 --- a/i18npool/source/transliteration/largeToSmall_ja_JP.cxx +++ b/i18npool/source/transliteration/largeToSmall_ja_JP.cxx @@ -17,12 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -// prevent internal compiler error with MSVC6SP3 -#include <utility> - #include <i18nutil/oneToOneMapping.hxx> -#define TRANSLITERATION_largeToSmall_ja_JP + #include <transliteration_OneToOne.hxx> using namespace com::sun::star::uno; diff --git a/i18npool/source/transliteration/numtochar.cxx b/i18npool/source/transliteration/numtochar.cxx index cfcb588..ccdcd74 100644 --- a/i18npool/source/transliteration/numtochar.cxx +++ b/i18npool/source/transliteration/numtochar.cxx @@ -17,17 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <com/sun/star/i18n/NativeNumberMode.hpp> -// prevent internal compiler error with MSVC6SP3 -#include <utility> - -#define TRANSLITERATION_ALL #include <numtochar.hxx> -#include <com/sun/star/i18n/NativeNumberMode.hpp> namespace com { namespace sun { namespace star { namespace i18n { - #define TRANSLITERATION_NUMTOCHAR( name, number ) \ NumToChar##name::NumToChar##name() \ { \ @@ -54,6 +49,7 @@ TRANSLITERATION_NUMTOCHAR( Indic_ar, NATNUM1 ) TRANSLITERATION_NUMTOCHAR( EastIndic_ar, NATNUM1 ) TRANSLITERATION_NUMTOCHAR( Indic_hi, NATNUM1 ) TRANSLITERATION_NUMTOCHAR( _th, NATNUM1 ) + #undef TRANSLITERATION_NUMTOCHAR } } } } diff --git a/i18npool/source/transliteration/numtotext_cjk.cxx b/i18npool/source/transliteration/numtotext_cjk.cxx index 6b7f4e2..617fe25 100644 --- a/i18npool/source/transliteration/numtotext_cjk.cxx +++ b/i18npool/source/transliteration/numtotext_cjk.cxx @@ -17,11 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <com/sun/star/i18n/NativeNumberMode.hpp> -#define TRANSLITERATION_ALL #include <numtotext_cjk.hxx> #include <bullet.h> -#include <com/sun/star/i18n/NativeNumberMode.hpp> namespace com { namespace sun { namespace star { namespace i18n { @@ -54,6 +53,7 @@ TRANSLITERATION_NUMTOTEXT( KanjiLongModern_ja_JP, NATNUM4) TRANSLITERATION_NUMTOTEXT( Date_zh, NATNUM7) TRANSLITERATION_NUMTOTEXT( KanjiShortTraditional_ja_JP, NATNUM8) TRANSLITERATION_NUMTOTEXT( KanjiShortModern_ja_JP, NATNUM7) + #undef TRANSLITERATION_NUMTOTEXT #define TRANSLITERATION_NUMTOTEXT( name, _table, recycle ) \ @@ -77,6 +77,7 @@ TRANSLITERATION_NUMTOTEXT ( HangulJamo_ko, table_HangulJamo_ko, sal_True) TRANSLITERATION_NUMTOTEXT ( HangulSyllable_ko, table_HangulSyllable_ko, sal_True) TRANSLITERATION_NUMTOTEXT ( HangulCircledJamo_ko, table_HangulCircledJamo_ko, sal_True) TRANSLITERATION_NUMTOTEXT ( HangulCircledSyllable_ko, table_HangulCircledSyllable_ko, sal_True) + #undef TRANSLITERATION_NUMTOTEXT } } } } diff --git a/i18npool/source/transliteration/smallToLarge_ja_JP.cxx b/i18npool/source/transliteration/smallToLarge_ja_JP.cxx index 7cd9eae..1ec47c0 100644 --- a/i18npool/source/transliteration/smallToLarge_ja_JP.cxx +++ b/i18npool/source/transliteration/smallToLarge_ja_JP.cxx @@ -17,12 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -// prevent internal compiler error with MSVC6SP3 -#include <utility> - #include <i18nutil/oneToOneMapping.hxx> -#define TRANSLITERATION_smallToLarge_ja_JP + #include <transliteration_OneToOne.hxx> using namespace com::sun::star::uno; diff --git a/i18npool/source/transliteration/textToPronounce_zh.cxx b/i18npool/source/transliteration/textToPronounce_zh.cxx index 8fecdcb..cc2b8ee 100644 --- a/i18npool/source/transliteration/textToPronounce_zh.cxx +++ b/i18npool/source/transliteration/textToPronounce_zh.cxx @@ -17,18 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -// prevent internal compiler error with MSVC6SP3 -#include <utility> - -#include <rtl/string.hxx> +#include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> -#define TRANSLITERATION_ALL + #include <textToPronounce_zh.hxx> using namespace com::sun::star::uno; - namespace com { namespace sun { namespace star { namespace i18n { sal_Int16 SAL_CALL TextToPronounce_zh::getType() throw (RuntimeException, std::exception) diff --git a/i18npool/source/transliteration/texttonum.cxx b/i18npool/source/transliteration/texttonum.cxx index 11d6513..25301dd 100644 --- a/i18npool/source/transliteration/texttonum.cxx +++ b/i18npool/source/transliteration/texttonum.cxx @@ -17,12 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -#define TRANSLITERATION_ALL -#include <texttonum.hxx> #include <data/numberchar.h> #include <rtl/ustrbuf.hxx> +#include <texttonum.hxx> + using namespace com::sun::star::uno; namespace com { namespace sun { namespace star { namespace i18n { @@ -48,6 +47,7 @@ TRANSLITERATION_TEXTTONUM( InformalUpper_ko) TRANSLITERATION_TEXTTONUM( InformalHangul_ko) TRANSLITERATION_TEXTTONUM( KanjiLongTraditional_ja_JP) TRANSLITERATION_TEXTTONUM( KanjiLongModern_ja_JP) + #undef TRANSLITERATION_TEXTTONUM } } } } diff --git a/i18npool/source/transliteration/transliteration_Ignore.cxx b/i18npool/source/transliteration/transliteration_Ignore.cxx index f4633d1..dc2f251 100644 --- a/i18npool/source/transliteration/transliteration_Ignore.cxx +++ b/i18npool/source/transliteration/transliteration_Ignore.cxx @@ -17,9 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -#include <utility> -#include <comphelper/string.hxx> #include <transliteration_Ignore.hxx> using namespace com::sun::star::uno; diff --git a/i18npool/source/transliteration/transliteration_OneToOne.cxx b/i18npool/source/transliteration/transliteration_OneToOne.cxx index 394a20c..9b22772 100644 --- a/i18npool/source/transliteration/transliteration_OneToOne.cxx +++ b/i18npool/source/transliteration/transliteration_OneToOne.cxx @@ -17,14 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -#include <utility> -#include <comphelper/string.hxx> #include <transliteration_OneToOne.hxx> using namespace com::sun::star::uno; - namespace com { namespace sun { namespace star { namespace i18n { sal_Int16 SAL_CALL transliteration_OneToOne::getType() throw(RuntimeException, std::exception) diff --git a/i18npool/source/transliteration/transliteration_body.cxx b/i18npool/source/transliteration/transliteration_body.cxx index da795fd..ec3f6fc 100644 --- a/i18npool/source/transliteration/transliteration_body.cxx +++ b/i18npool/source/transliteration/transliteration_body.cxx @@ -30,7 +30,6 @@ #include "characterclassificationImpl.hxx" #include "breakiteratorImpl.hxx" -#define TRANSLITERATION_ALL #include "transliteration_body.hxx" #include <boost/scoped_array.hpp> diff --git a/i18npool/source/transliteration/transliteration_caseignore.cxx b/i18npool/source/transliteration/transliteration_caseignore.cxx index e537e3f..5eb1cc6 100644 --- a/i18npool/source/transliteration/transliteration_caseignore.cxx +++ b/i18npool/source/transliteration/transliteration_caseignore.cxx @@ -17,14 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -// prevent internal compiler error with MSVC6SP3 -#include <utility> - #include <com/sun/star/uno/XComponentContext.hpp> #include <i18nutil/oneToOneMapping.hxx> #include <i18nutil/casefolding.hxx> + #include "transliteration_caseignore.hxx" using namespace ::com::sun::star::uno; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits