diff options
author | Tor Lillqvist <tml@collabora.com> | 2014-04-23 09:29:09 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2014-04-23 09:33:42 +0300 |
commit | bb2f13b473f87ec75366dad5aa318b1e24893735 (patch) | |
tree | 3ecae8633ca9af1dbcaa3776c0a6a33bed547621 /i18npool/inc | |
parent | Fix typo: s/potentioal/potential (diff) | |
download | core-bb2f13b473f87ec75366dad5aa318b1e24893735.tar.gz core-bb2f13b473f87ec75366dad5aa318b1e24893735.zip |
Avoid cargo cult rites
Change-Id: I39fee26048d5b4ddb03217309b7117bef9ec4cd8
Diffstat (limited to 'i18npool/inc')
-rw-r--r-- | i18npool/inc/breakiterator_cjk.hxx | 3 | ||||
-rw-r--r-- | i18npool/inc/chartonum.hxx | 3 | ||||
-rw-r--r-- | i18npool/inc/numtochar.hxx | 3 | ||||
-rw-r--r-- | i18npool/inc/numtotext_cjk.hxx | 3 | ||||
-rw-r--r-- | i18npool/inc/textToPronounce_zh.hxx | 3 | ||||
-rw-r--r-- | i18npool/inc/texttonum.hxx | 3 | ||||
-rw-r--r-- | i18npool/inc/transliteration_Ignore.hxx | 44 | ||||
-rw-r--r-- | i18npool/inc/transliteration_OneToOne.hxx | 22 | ||||
-rw-r--r-- | i18npool/inc/transliteration_body.hxx | 7 |
9 files changed, 10 insertions, 81 deletions
diff --git a/i18npool/inc/breakiterator_cjk.hxx b/i18npool/inc/breakiterator_cjk.hxx index dce0f5562391..4a0c93d8ca57 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 f899b738f076..2a2e2c2580a6 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 636345120d51..e64e52068b68 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 413e4b49df66..dfdcf8347d36 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 6bea259341c8..0addc1b006e4 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 eaaaa41b3357..cb7480391270 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 691b8677e1c0..ea6e3b36ac6a 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 76d59bc1cf22..db6b116407bc 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 ebcee7945ae8..4f4b2183a570 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 } } } } |