Kaydet (Commit) bb2f13b4 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Avoid cargo cult rites

Change-Id: I39fee26048d5b4ddb03217309b7117bef9ec4cd8
üst f420a49a
...@@ -57,12 +57,11 @@ public:\ ...@@ -57,12 +57,11 @@ public:\
virtual ~BreakIterator_##lang (); \ virtual ~BreakIterator_##lang (); \
}; };
#ifdef BREAKITERATOR_ALL
BREAKITERATOR_CJK( zh ) BREAKITERATOR_CJK( zh )
BREAKITERATOR_CJK( zh_TW ) BREAKITERATOR_CJK( zh_TW )
BREAKITERATOR_CJK( ja ) BREAKITERATOR_CJK( ja )
BREAKITERATOR_CJK( ko ) BREAKITERATOR_CJK( ko )
#endif
#undef BREAKITERATOR__CJK #undef BREAKITERATOR__CJK
} } } } } } } }
......
...@@ -30,7 +30,6 @@ public: \ ...@@ -30,7 +30,6 @@ public: \
CharToNum##name (); \ CharToNum##name (); \
}; };
#ifdef TRANSLITERATION_ALL
TRANSLITERATION_CHARTONUM(Lower_zh_CN) TRANSLITERATION_CHARTONUM(Lower_zh_CN)
TRANSLITERATION_CHARTONUM(Upper_zh_CN) TRANSLITERATION_CHARTONUM(Upper_zh_CN)
TRANSLITERATION_CHARTONUM(Lower_zh_TW) TRANSLITERATION_CHARTONUM(Lower_zh_TW)
...@@ -45,7 +44,7 @@ TRANSLITERATION_CHARTONUM(Indic_ar) ...@@ -45,7 +44,7 @@ TRANSLITERATION_CHARTONUM(Indic_ar)
TRANSLITERATION_CHARTONUM(EastIndic_ar) TRANSLITERATION_CHARTONUM(EastIndic_ar)
TRANSLITERATION_CHARTONUM(Indic_hi) TRANSLITERATION_CHARTONUM(Indic_hi)
TRANSLITERATION_CHARTONUM(_th) TRANSLITERATION_CHARTONUM(_th)
#endif
#undef TRANSLITERATION_CHARTONUM #undef TRANSLITERATION_CHARTONUM
} } } } } } } }
......
...@@ -30,7 +30,6 @@ public: \ ...@@ -30,7 +30,6 @@ public: \
NumToChar##name (); \ NumToChar##name (); \
}; };
#ifdef TRANSLITERATION_ALL
TRANSLITERATION_NUMTOCHAR(Lower_zh_CN) TRANSLITERATION_NUMTOCHAR(Lower_zh_CN)
TRANSLITERATION_NUMTOCHAR(Upper_zh_CN) TRANSLITERATION_NUMTOCHAR(Upper_zh_CN)
TRANSLITERATION_NUMTOCHAR(Lower_zh_TW) TRANSLITERATION_NUMTOCHAR(Lower_zh_TW)
...@@ -46,7 +45,7 @@ TRANSLITERATION_NUMTOCHAR(EastIndic_ar) ...@@ -46,7 +45,7 @@ TRANSLITERATION_NUMTOCHAR(EastIndic_ar)
TRANSLITERATION_NUMTOCHAR(Indic_hi) TRANSLITERATION_NUMTOCHAR(Indic_hi)
TRANSLITERATION_NUMTOCHAR(_th) TRANSLITERATION_NUMTOCHAR(_th)
TRANSLITERATION_NUMTOCHAR(Halfwidth) TRANSLITERATION_NUMTOCHAR(Halfwidth)
#endif
#undef TRANSLITERATION_NUMTOCHAR #undef TRANSLITERATION_NUMTOCHAR
} } } } } } } }
......
...@@ -30,7 +30,6 @@ public: \ ...@@ -30,7 +30,6 @@ public: \
NumToText##name (); \ NumToText##name (); \
}; };
#ifdef TRANSLITERATION_ALL
TRANSLITERATION_NUMTOTEXT_CJK ( Lower_zh_CN ) TRANSLITERATION_NUMTOTEXT_CJK ( Lower_zh_CN )
TRANSLITERATION_NUMTOTEXT_CJK ( Upper_zh_CN ) TRANSLITERATION_NUMTOTEXT_CJK ( Upper_zh_CN )
TRANSLITERATION_NUMTOTEXT_CJK ( Lower_zh_TW ) TRANSLITERATION_NUMTOTEXT_CJK ( Lower_zh_TW )
...@@ -61,7 +60,7 @@ TRANSLITERATION_NUMTOTEXT_CJK ( HangulJamo_ko ) ...@@ -61,7 +60,7 @@ TRANSLITERATION_NUMTOTEXT_CJK ( HangulJamo_ko )
TRANSLITERATION_NUMTOTEXT_CJK ( HangulSyllable_ko ) TRANSLITERATION_NUMTOTEXT_CJK ( HangulSyllable_ko )
TRANSLITERATION_NUMTOTEXT_CJK ( HangulCircledJamo_ko ) TRANSLITERATION_NUMTOTEXT_CJK ( HangulCircledJamo_ko )
TRANSLITERATION_NUMTOTEXT_CJK ( HangulCircledSyllable_ko ) TRANSLITERATION_NUMTOTEXT_CJK ( HangulCircledSyllable_ko )
#endif
#undef TRANSLITERATION_NUMTOTEXT #undef TRANSLITERATION_NUMTOTEXT
} } } } } } } }
......
...@@ -68,10 +68,9 @@ public: \ ...@@ -68,10 +68,9 @@ public: \
name (); \ name (); \
}; };
#ifdef TRANSLITERATION_ALL
TRANSLITERATION_TextToPronounce_zh( TextToPinyin_zh_CN) TRANSLITERATION_TextToPronounce_zh( TextToPinyin_zh_CN)
TRANSLITERATION_TextToPronounce_zh( TextToChuyin_zh_TW) TRANSLITERATION_TextToPronounce_zh( TextToChuyin_zh_TW)
#endif
#undef TRANSLITERATION_TextToPronounce_zh #undef TRANSLITERATION_TextToPronounce_zh
} } } } } } } }
......
...@@ -30,7 +30,6 @@ public: \ ...@@ -30,7 +30,6 @@ public: \
TextToNum##name (); \ TextToNum##name (); \
}; };
#ifdef TRANSLITERATION_ALL
TRANSLITERATION_TEXTTONUM(Lower_zh_CN) TRANSLITERATION_TEXTTONUM(Lower_zh_CN)
TRANSLITERATION_TEXTTONUM(Upper_zh_CN) TRANSLITERATION_TEXTTONUM(Upper_zh_CN)
TRANSLITERATION_TEXTTONUM(Lower_zh_TW) TRANSLITERATION_TEXTTONUM(Lower_zh_TW)
...@@ -43,7 +42,7 @@ TRANSLITERATION_TEXTTONUM(FormalUpper_ko) ...@@ -43,7 +42,7 @@ TRANSLITERATION_TEXTTONUM(FormalUpper_ko)
TRANSLITERATION_TEXTTONUM(FormalHangul_ko) TRANSLITERATION_TEXTTONUM(FormalHangul_ko)
TRANSLITERATION_TEXTTONUM(KanjiLongModern_ja_JP) TRANSLITERATION_TEXTTONUM(KanjiLongModern_ja_JP)
TRANSLITERATION_TEXTTONUM(KanjiLongTraditional_ja_JP) TRANSLITERATION_TEXTTONUM(KanjiLongTraditional_ja_JP)
#endif
#undef TRANSLITERATION_TEXTTONUM #undef TRANSLITERATION_TEXTTONUM
} } } } } } } }
......
...@@ -80,47 +80,19 @@ public:\ ...@@ -80,47 +80,19 @@ public:\
ignore##name ();\ ignore##name ();\
}; };
#if defined( TRANSLITERATION_BaFa_ja_JP ) || defined( TRANSLITERATION_ALL )
TRANSLITERATION_IGNORE(BaFa_ja_JP) TRANSLITERATION_IGNORE(BaFa_ja_JP)
#endif
#if defined( TRANSLITERATION_HyuByu_ja_JP ) || defined( TRANSLITERATION_ALL )
TRANSLITERATION_IGNORE(HyuByu_ja_JP) TRANSLITERATION_IGNORE(HyuByu_ja_JP)
#endif
#if defined( TRANSLITERATION_SeZe_ja_JP ) || defined( TRANSLITERATION_ALL )
TRANSLITERATION_IGNORE(SeZe_ja_JP) TRANSLITERATION_IGNORE(SeZe_ja_JP)
#endif
#if defined( TRANSLITERATION_TiJi_ja_JP ) || defined( TRANSLITERATION_ALL )
TRANSLITERATION_IGNORE(TiJi_ja_JP) TRANSLITERATION_IGNORE(TiJi_ja_JP)
#endif
#if defined( TRANSLITERATION_MiddleDot_ja_JP ) || defined( TRANSLITERATION_ALL )
TRANSLITERATION_IGNORE(MiddleDot_ja_JP) TRANSLITERATION_IGNORE(MiddleDot_ja_JP)
#endif
#if defined( TRANSLITERATION_MinusSign_ja_JP ) || defined( TRANSLITERATION_ALL )
TRANSLITERATION_IGNORE(MinusSign_ja_JP) TRANSLITERATION_IGNORE(MinusSign_ja_JP)
#endif
#if defined( TRANSLITERATION_Separator_ja_JP ) || defined( TRANSLITERATION_ALL )
TRANSLITERATION_IGNORE(Separator_ja_JP) TRANSLITERATION_IGNORE(Separator_ja_JP)
#endif
#if defined( TRANSLITERATION_Space_ja_JP ) || defined( TRANSLITERATION_ALL )
TRANSLITERATION_IGNORE(Space_ja_JP) TRANSLITERATION_IGNORE(Space_ja_JP)
#endif
#if defined( TRANSLITERATION_TraditionalKana_ja_JP ) || defined( TRANSLITERATION_ALL )
TRANSLITERATION_IGNORE(TraditionalKana_ja_JP) TRANSLITERATION_IGNORE(TraditionalKana_ja_JP)
#endif
#if defined( TRANSLITERATION_TraditionalKanji_ja_JP ) || defined( TRANSLITERATION_ALL )
TRANSLITERATION_IGNORE(TraditionalKanji_ja_JP) TRANSLITERATION_IGNORE(TraditionalKanji_ja_JP)
#endif
#if defined( TRANSLITERATION_ZiZu_ja_JP ) || defined( TRANSLITERATION_ALL )
TRANSLITERATION_IGNORE(ZiZu_ja_JP) TRANSLITERATION_IGNORE(ZiZu_ja_JP)
#endif
#if defined( TRANSLITERATION_Diacritics_CTL ) || defined( TRANSLITERATION_ALL )
TRANSLITERATION_IGNORE(Diacritics_CTL) TRANSLITERATION_IGNORE(Diacritics_CTL)
#endif
#if defined( TRANSLITERATION_Kashida_CTL ) || defined( TRANSLITERATION_ALL )
TRANSLITERATION_IGNORE(Kashida_CTL) TRANSLITERATION_IGNORE(Kashida_CTL)
#endif
#undef TRANSLITERATION_IGNORE #undef TRANSLITERATION_IGNORE
...@@ -138,18 +110,11 @@ public:\ ...@@ -138,18 +110,11 @@ public:\
com::sun::star::uno::Sequence< sal_Int32 >& offset) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; \ 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) TRANSLITERATION_IGNORE(KiKuFollowedBySa_ja_JP)
#endif
#if defined( TRANSLITERATION_IandEfollowedByYa_ja_JP ) || defined( TRANSLITERATION_ALL )
TRANSLITERATION_IGNORE(IandEfollowedByYa_ja_JP) TRANSLITERATION_IGNORE(IandEfollowedByYa_ja_JP)
#endif
#if defined( TRANSLITERATION_IterationMark_ja_JP ) || defined( TRANSLITERATION_ALL )
TRANSLITERATION_IGNORE(IterationMark_ja_JP) TRANSLITERATION_IGNORE(IterationMark_ja_JP)
#endif
#if defined( TRANSLITERATION_ProlongedSoundMark_ja_JP ) || defined( TRANSLITERATION_ALL )
TRANSLITERATION_IGNORE(ProlongedSoundMark_ja_JP) TRANSLITERATION_IGNORE(ProlongedSoundMark_ja_JP)
#endif
#undef TRANSLITERATION_IGNORE #undef TRANSLITERATION_IGNORE
#define TRANSLITERATION_IGNORE( name ) \ #define TRANSLITERATION_IGNORE( name ) \
...@@ -173,15 +138,10 @@ public:\ ...@@ -173,15 +138,10 @@ public:\
com::sun::star::i18n::MultipleCharsOutputException, std::exception) SAL_OVERRIDE;\ com::sun::star::i18n::MultipleCharsOutputException, std::exception) SAL_OVERRIDE;\
}; };
#if defined( TRANSLITERATION_Kana ) || defined( TRANSLITERATION_ALL )
TRANSLITERATION_IGNORE(Kana) TRANSLITERATION_IGNORE(Kana)
#endif
#if defined( TRANSLITERATION_Width ) || defined( TRANSLITERATION_ALL )
TRANSLITERATION_IGNORE(Width) TRANSLITERATION_IGNORE(Width)
#endif
#if defined( TRANSLITERATION_Size_ja_JP ) || defined( TRANSLITERATION_ALL )
TRANSLITERATION_IGNORE(Size_ja_JP) TRANSLITERATION_IGNORE(Size_ja_JP)
#endif
#undef TRANSLITERATION_IGNORE #undef TRANSLITERATION_IGNORE
} } } } } } } }
......
...@@ -73,24 +73,13 @@ public: \ ...@@ -73,24 +73,13 @@ public: \
com::sun::star::i18n::MultipleCharsOutputException, std::exception) SAL_OVERRIDE; \ com::sun::star::i18n::MultipleCharsOutputException, std::exception) SAL_OVERRIDE; \
}; };
#if defined( TRANSLITERATION_fullwidthToHalfwidth ) || defined( TRANSLITERATION_ALL )
TRANSLITERATION_ONETOONE( fullwidthToHalfwidth ) TRANSLITERATION_ONETOONE( fullwidthToHalfwidth )
#endif
#if defined( TRANSLITERATION_halfwidthToFullwidth ) || defined( TRANSLITERATION_ALL )
TRANSLITERATION_ONETOONE(halfwidthToFullwidth) TRANSLITERATION_ONETOONE(halfwidthToFullwidth)
#endif
#if defined( TRANSLITERATION_fullwidthKatakanaToHalfwidthKatakana ) || defined( TRANSLITERATION_ALL )
TRANSLITERATION_ONETOONE( fullwidthKatakanaToHalfwidthKatakana ) TRANSLITERATION_ONETOONE( fullwidthKatakanaToHalfwidthKatakana )
#endif
#if defined( TRANSLITERATION_halfwidthKatakanaToFullwidthKatakana ) || defined( TRANSLITERATION_ALL )
TRANSLITERATION_ONETOONE(halfwidthKatakanaToFullwidthKatakana) TRANSLITERATION_ONETOONE(halfwidthKatakanaToFullwidthKatakana)
#endif
#if defined( TRANSLITERATION_fullwidthToHalfwidthLikeASC ) || defined( TRANSLITERATION_ALL )
TRANSLITERATION_ONETOONE( fullwidthToHalfwidthLikeASC ) TRANSLITERATION_ONETOONE( fullwidthToHalfwidthLikeASC )
#endif
#if defined( TRANSLITERATION_halfwidthToFullwidthLikeJIS ) || defined( TRANSLITERATION_ALL )
TRANSLITERATION_ONETOONE( halfwidthToFullwidthLikeJIS ) TRANSLITERATION_ONETOONE( halfwidthToFullwidthLikeJIS )
#endif
#undef TRANSLITERATION_ONETOONE #undef TRANSLITERATION_ONETOONE
#define TRANSLITERATION_ONETOONE( name ) \ #define TRANSLITERATION_ONETOONE( name ) \
...@@ -100,18 +89,11 @@ public: \ ...@@ -100,18 +89,11 @@ public: \
name (); \ name (); \
}; };
#if defined( TRANSLITERATION_hiraganaToKatakana ) || defined( TRANSLITERATION_ALL )
TRANSLITERATION_ONETOONE(hiraganaToKatakana) TRANSLITERATION_ONETOONE(hiraganaToKatakana)
#endif
#if defined( TRANSLITERATION_katakanaToHiragana ) || defined( TRANSLITERATION_ALL )
TRANSLITERATION_ONETOONE(katakanaToHiragana) TRANSLITERATION_ONETOONE(katakanaToHiragana)
#endif
#if defined( TRANSLITERATION_largeToSmall_ja_JP ) || defined( TRANSLITERATION_ALL )
TRANSLITERATION_ONETOONE(largeToSmall_ja_JP) TRANSLITERATION_ONETOONE(largeToSmall_ja_JP)
#endif
#if defined( TRANSLITERATION_smallToLarge_ja_JP ) || defined( TRANSLITERATION_ALL )
TRANSLITERATION_ONETOONE(smallToLarge_ja_JP) TRANSLITERATION_ONETOONE(smallToLarge_ja_JP)
#endif
#undef TRANSLITERATION_ONETOONE #undef TRANSLITERATION_ONETOONE
} } } } } } } }
......
...@@ -59,7 +59,6 @@ protected: ...@@ -59,7 +59,6 @@ protected:
sal_uInt8 nMappingType; sal_uInt8 nMappingType;
}; };
#if defined( TRANSLITERATION_UPPER_LOWER ) || defined( TRANSLITERATION_ALL )
class Transliteration_u2l : public Transliteration_body class Transliteration_u2l : public Transliteration_body
{ {
public: public:
...@@ -71,19 +70,14 @@ class Transliteration_l2u : public Transliteration_body ...@@ -71,19 +70,14 @@ class Transliteration_l2u : public Transliteration_body
public: public:
Transliteration_l2u(); Transliteration_l2u();
}; };
#endif
#if defined( TRANSLITERATION_casemapping ) || defined( TRANSLITERATION_ALL )
class Transliteration_casemapping : public Transliteration_body class Transliteration_casemapping : public Transliteration_body
{ {
public: public:
Transliteration_casemapping(); Transliteration_casemapping();
void SAL_CALL setMappingType(const sal_uInt8 rMappingType, const com::sun::star::lang::Locale& rLocale ); 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 class Transliteration_togglecase : public Transliteration_body
{ {
public: public:
...@@ -105,7 +99,6 @@ 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; 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
} } } } } } } }
......
...@@ -17,8 +17,6 @@ ...@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#define BREAKITERATOR_ALL
#include <breakiterator_cjk.hxx> #include <breakiterator_cjk.hxx>
#include <localedata.hxx> #include <localedata.hxx>
#include <i18nutil/unicode.hxx> #include <i18nutil/unicode.hxx>
......
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
#include <servicename.hxx> #include <servicename.hxx>
#define TRANSLITERATION_ALL
#include <transliteration_body.hxx> #include <transliteration_body.hxx>
#include <transliteration_OneToOne.hxx> #include <transliteration_OneToOne.hxx>
#include <textToPronounce_zh.hxx> #include <textToPronounce_zh.hxx>
...@@ -42,7 +41,6 @@ ...@@ -42,7 +41,6 @@
#include <calendar_hijri.hxx> #include <calendar_hijri.hxx>
#include <calendar_jewish.hxx> #include <calendar_jewish.hxx>
#define BREAKITERATOR_ALL
#include <breakiterator_cjk.hxx> #include <breakiterator_cjk.hxx>
#include <breakiterator_th.hxx> #include <breakiterator_th.hxx>
......
...@@ -17,11 +17,10 @@ ...@@ -17,11 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include <rtl/ustrbuf.hxx>
#define TRANSLITERATION_ALL
#include <chartonum.hxx> #include <chartonum.hxx>
#include <data/numberchar.h> #include <data/numberchar.h>
#include <rtl/ustrbuf.hxx>
using namespace com::sun::star::uno; using namespace com::sun::star::uno;
...@@ -34,6 +33,7 @@ CharToNum##name::CharToNum##name() \ ...@@ -34,6 +33,7 @@ CharToNum##name::CharToNum##name() \
tableSize = 0; \ tableSize = 0; \
implementationName = "com.sun.star.i18n.Transliteration.CharToNum"#name; \ implementationName = "com.sun.star.i18n.Transliteration.CharToNum"#name; \
} }
TRANSLITERATION_CHARTONUM( Fullwidth) TRANSLITERATION_CHARTONUM( Fullwidth)
TRANSLITERATION_CHARTONUM( Lower_zh_CN) TRANSLITERATION_CHARTONUM( Lower_zh_CN)
TRANSLITERATION_CHARTONUM( Lower_zh_TW) TRANSLITERATION_CHARTONUM( Lower_zh_TW)
...@@ -48,6 +48,7 @@ TRANSLITERATION_CHARTONUM( Indic_ar) ...@@ -48,6 +48,7 @@ TRANSLITERATION_CHARTONUM( Indic_ar)
TRANSLITERATION_CHARTONUM( EastIndic_ar) TRANSLITERATION_CHARTONUM( EastIndic_ar)
TRANSLITERATION_CHARTONUM( Indic_hi) TRANSLITERATION_CHARTONUM( Indic_hi)
TRANSLITERATION_CHARTONUM( _th) TRANSLITERATION_CHARTONUM( _th)
#undef TRANSLITERATION_CHARTONUM #undef TRANSLITERATION_CHARTONUM
} } } } } } } }
......
...@@ -19,6 +19,8 @@ ...@@ -19,6 +19,8 @@
#ifndef _L10N_TRANSLITERATION_NUMTOCHAR_H_ #ifndef _L10N_TRANSLITERATION_NUMTOCHAR_H_
#define _L10N_TRANSLITERATION_NUMTOCHAR_H_ #define _L10N_TRANSLITERATION_NUMTOCHAR_H_
#include <sal/types.h>
namespace com { namespace sun { namespace star { namespace i18n { namespace com { namespace sun { namespace star { namespace i18n {
static const sal_Int16 NumberChar_HalfWidth = 0; static const sal_Int16 NumberChar_HalfWidth = 0;
......
...@@ -17,20 +17,13 @@ ...@@ -17,20 +17,13 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
// prevent internal compiler error with MSVC6SP3
#include <utility>
#include <i18nutil/widthfolding.hxx> #include <i18nutil/widthfolding.hxx>
#define TRANSLITERATION_fullwidthToHalfwidth
#define TRANSLITERATION_fullwidthKatakanaToHalfwidthKatakana
#define TRANSLITERATION_fullwidthToHalfwidthLikeASC
#include <transliteration_OneToOne.hxx> #include <transliteration_OneToOne.hxx>
using namespace com::sun::star::uno; using namespace com::sun::star::uno;
using namespace com::sun::star::lang; using namespace com::sun::star::lang;
namespace com { namespace sun { namespace star { namespace i18n { namespace com { namespace sun { namespace star { namespace i18n {
fullwidthToHalfwidth::fullwidthToHalfwidth() fullwidthToHalfwidth::fullwidthToHalfwidth()
......
...@@ -17,14 +17,8 @@ ...@@ -17,14 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
// prevent internal compiler error with MSVC6SP3
#include <utility>
#include <i18nutil/widthfolding.hxx> #include <i18nutil/widthfolding.hxx>
#define TRANSLITERATION_halfwidthToFullwidth
#define TRANSLITERATION_halfwidthKatakanaToFullwidthKatakana
#define TRANSLITERATION_halfwidthToFullwidthLikeJIS
#include <transliteration_OneToOne.hxx> #include <transliteration_OneToOne.hxx>
using namespace com::sun::star::uno; using namespace com::sun::star::uno;
......
...@@ -17,11 +17,6 @@ ...@@ -17,11 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * 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> #include <transliteration_OneToOne.hxx>
using namespace com::sun::star::uno; using namespace com::sun::star::uno;
......
...@@ -17,11 +17,6 @@ ...@@ -17,11 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * 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> #include <transliteration_Ignore.hxx>
using namespace com::sun::star::uno; using namespace com::sun::star::uno;
......
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. * file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/ */
#define TRANSLITERATION_Diacritics_CTL
#include <transliteration_Ignore.hxx> #include <transliteration_Ignore.hxx>
#include <unicode/uchar.h> #include <unicode/uchar.h>
......
...@@ -17,11 +17,6 @@ ...@@ -17,11 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * 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> #include <transliteration_Ignore.hxx>
using namespace com::sun::star::uno; using namespace com::sun::star::uno;
......
...@@ -17,17 +17,13 @@ ...@@ -17,17 +17,13 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include <utility>
#include <comphelper/string.hxx>
#include <i18nutil/oneToOneMapping.hxx> #include <i18nutil/oneToOneMapping.hxx>
#define TRANSLITERATION_IandEfollowedByYa_ja_JP
#include <transliteration_Ignore.hxx> #include <transliteration_Ignore.hxx>
using namespace com::sun::star::uno; using namespace com::sun::star::uno;
using namespace com::sun::star::lang; using namespace com::sun::star::lang;
namespace com { namespace sun { namespace star { namespace i18n { namespace com { namespace sun { namespace star { namespace i18n {
OneToOneMappingTable_t IandE[] = { OneToOneMappingTable_t IandE[] = {
......
...@@ -17,11 +17,8 @@ ...@@ -17,11 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include <utility>
#include <comphelper/string.hxx>
#include <i18nutil/oneToOneMapping.hxx> #include <i18nutil/oneToOneMapping.hxx>
#define TRANSLITERATION_IterationMark_ja_JP
#include <transliteration_Ignore.hxx> #include <transliteration_Ignore.hxx>
using namespace com::sun::star::uno; using namespace com::sun::star::uno;
......
...@@ -17,22 +17,14 @@ ...@@ -17,22 +17,14 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * 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 <com/sun/star/uno/XComponentContext.hpp>
#define TRANSLITERATION_Kana
#include <transliteration_Ignore.hxx> #include <transliteration_Ignore.hxx>
#define TRANSLITERATION_hiraganaToKatakana
#define TRANSLITERATION_katakanaToHiragana
#include <transliteration_OneToOne.hxx> #include <transliteration_OneToOne.hxx>
using namespace com::sun::star::uno; using namespace com::sun::star::uno;
using namespace com::sun::star::lang; using namespace com::sun::star::lang;
namespace com { namespace sun { namespace star { namespace i18n { namespace com { namespace sun { namespace star { namespace i18n {
OUString SAL_CALL OUString SAL_CALL
......
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. * file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/ */
#define TRANSLITERATION_Kashida_CTL
#include <transliteration_Ignore.hxx> #include <transliteration_Ignore.hxx>
namespace com { namespace sun { namespace star { namespace i18n { namespace com { namespace sun { namespace star { namespace i18n {
......
...@@ -17,16 +17,11 @@ ...@@ -17,16 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * 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> #include <transliteration_Ignore.hxx>
using namespace com::sun::star::uno; using namespace com::sun::star::uno;
using namespace com::sun::star::lang; using namespace com::sun::star::lang;
namespace com { namespace sun { namespace star { namespace i18n { namespace com { namespace sun { namespace star { namespace i18n {
OUString SAL_CALL OUString SAL_CALL
......
...@@ -17,11 +17,6 @@ ...@@ -17,11 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * 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> #include <transliteration_Ignore.hxx>
namespace com { namespace sun { namespace star { namespace i18n { namespace com { namespace sun { namespace star { namespace i18n {
......
...@@ -17,11 +17,6 @@ ...@@ -17,11 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * 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> #include <transliteration_Ignore.hxx>
namespace com { namespace sun { namespace star { namespace i18n { namespace com { namespace sun { namespace star { namespace i18n {
......
...@@ -17,16 +17,11 @@ ...@@ -17,16 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * 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> #include <transliteration_Ignore.hxx>
using namespace com::sun::star::uno; using namespace com::sun::star::uno;
using namespace com::sun::star::lang; using namespace com::sun::star::lang;
namespace com { namespace sun { namespace star { namespace i18n { namespace com { namespace sun { namespace star { namespace i18n {
static const sal_Unicode table_normalwidth[] = { static const sal_Unicode table_normalwidth[] = {
......
...@@ -17,11 +17,6 @@ ...@@ -17,11 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * 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> #include <transliteration_Ignore.hxx>
using namespace com::sun::star::uno; using namespace com::sun::star::uno;
......
...@@ -17,11 +17,6 @@ ...@@ -17,11 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * 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> #include <transliteration_Ignore.hxx>
namespace com { namespace sun { namespace star { namespace i18n { namespace com { namespace sun { namespace star { namespace i18n {
......
...@@ -17,20 +17,12 @@ ...@@ -17,20 +17,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * 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> #include <transliteration_Ignore.hxx>
#define TRANSLITERATION_smallToLarge_ja_JP
#define TRANSLITERATION_largeToSmall_ja_JP
#include <transliteration_OneToOne.hxx> #include <transliteration_OneToOne.hxx>
using namespace com::sun::star::uno; using namespace com::sun::star::uno;
using namespace com::sun::star::lang; using namespace com::sun::star::lang;
namespace com { namespace sun { namespace star { namespace i18n { namespace com { namespace sun { namespace star { namespace i18n {
OUString SAL_CALL OUString SAL_CALL
......
...@@ -17,11 +17,6 @@ ...@@ -17,11 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * 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> #include <transliteration_Ignore.hxx>
namespace com { namespace sun { namespace star { namespace i18n { namespace com { namespace sun { namespace star { namespace i18n {
......
...@@ -17,11 +17,6 @@ ...@@ -17,11 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * 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> #include <transliteration_Ignore.hxx>
using namespace com::sun::star::uno; using namespace com::sun::star::uno;
...@@ -29,7 +24,6 @@ using namespace com::sun::star::lang; ...@@ -29,7 +24,6 @@ using namespace com::sun::star::lang;
namespace com { namespace sun { namespace star { namespace i18n { namespace com { namespace sun { namespace star { namespace i18n {
static const Mapping TiJi[] = { static const Mapping TiJi[] = {
// TU + I --> TI // TU + I --> TI
{ 0x30C4, 0x30A3, 0x30C1, sal_True }, { 0x30C4, 0x30A3, 0x30C1, sal_True },
......
...@@ -17,11 +17,6 @@ ...@@ -17,11 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * 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> #include <transliteration_Ignore.hxx>
namespace com { namespace sun { namespace star { namespace i18n { namespace com { namespace sun { namespace star { namespace i18n {
......
...@@ -17,11 +17,6 @@ ...@@ -17,11 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * 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> #include <transliteration_Ignore.hxx>
namespace com { namespace sun { namespace star { namespace i18n { namespace com { namespace sun { namespace star { namespace i18n {
......
...@@ -17,21 +17,14 @@ ...@@ -17,21 +17,14 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * 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 <com/sun/star/uno/XComponentContext.hpp>
#define TRANSLITERATION_Width
#include <transliteration_Ignore.hxx> #include <transliteration_Ignore.hxx>
#define TRANSLITERATION_fullwidthToHalfwidth
#define TRANSLITERATION_halfwidthToFullwidth
#include <transliteration_OneToOne.hxx> #include <transliteration_OneToOne.hxx>
using namespace com::sun::star::uno; using namespace com::sun::star::uno;
using namespace com::sun::star::lang; using namespace com::sun::star::lang;
namespace com { namespace sun { namespace star { namespace i18n { namespace com { namespace sun { namespace star { namespace i18n {
OUString SAL_CALL OUString SAL_CALL
......
...@@ -17,11 +17,6 @@ ...@@ -17,11 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * 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> #include <transliteration_Ignore.hxx>
namespace com { namespace sun { namespace star { namespace i18n { namespace com { namespace sun { namespace star { namespace i18n {
......
...@@ -17,11 +17,6 @@ ...@@ -17,11 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * 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> #include <transliteration_OneToOne.hxx>
namespace com { namespace sun { namespace star { namespace i18n { namespace com { namespace sun { namespace star { namespace i18n {
......
...@@ -17,12 +17,8 @@ ...@@ -17,12 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
// prevent internal compiler error with MSVC6SP3
#include <utility>
#include <i18nutil/oneToOneMapping.hxx> #include <i18nutil/oneToOneMapping.hxx>
#define TRANSLITERATION_largeToSmall_ja_JP
#include <transliteration_OneToOne.hxx> #include <transliteration_OneToOne.hxx>
using namespace com::sun::star::uno; using namespace com::sun::star::uno;
......
...@@ -17,17 +17,12 @@ ...@@ -17,17 +17,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * 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 <numtochar.hxx>
#include <com/sun/star/i18n/NativeNumberMode.hpp>
namespace com { namespace sun { namespace star { namespace i18n { namespace com { namespace sun { namespace star { namespace i18n {
#define TRANSLITERATION_NUMTOCHAR( name, number ) \ #define TRANSLITERATION_NUMTOCHAR( name, number ) \
NumToChar##name::NumToChar##name() \ NumToChar##name::NumToChar##name() \
{ \ { \
...@@ -54,6 +49,7 @@ TRANSLITERATION_NUMTOCHAR( Indic_ar, NATNUM1 ) ...@@ -54,6 +49,7 @@ TRANSLITERATION_NUMTOCHAR( Indic_ar, NATNUM1 )
TRANSLITERATION_NUMTOCHAR( EastIndic_ar, NATNUM1 ) TRANSLITERATION_NUMTOCHAR( EastIndic_ar, NATNUM1 )
TRANSLITERATION_NUMTOCHAR( Indic_hi, NATNUM1 ) TRANSLITERATION_NUMTOCHAR( Indic_hi, NATNUM1 )
TRANSLITERATION_NUMTOCHAR( _th, NATNUM1 ) TRANSLITERATION_NUMTOCHAR( _th, NATNUM1 )
#undef TRANSLITERATION_NUMTOCHAR #undef TRANSLITERATION_NUMTOCHAR
} } } } } } } }
......
...@@ -17,11 +17,10 @@ ...@@ -17,11 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * 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 <numtotext_cjk.hxx>
#include <bullet.h> #include <bullet.h>
#include <com/sun/star/i18n/NativeNumberMode.hpp>
namespace com { namespace sun { namespace star { namespace i18n { namespace com { namespace sun { namespace star { namespace i18n {
...@@ -54,6 +53,7 @@ TRANSLITERATION_NUMTOTEXT( KanjiLongModern_ja_JP, NATNUM4) ...@@ -54,6 +53,7 @@ TRANSLITERATION_NUMTOTEXT( KanjiLongModern_ja_JP, NATNUM4)
TRANSLITERATION_NUMTOTEXT( Date_zh, NATNUM7) TRANSLITERATION_NUMTOTEXT( Date_zh, NATNUM7)
TRANSLITERATION_NUMTOTEXT( KanjiShortTraditional_ja_JP, NATNUM8) TRANSLITERATION_NUMTOTEXT( KanjiShortTraditional_ja_JP, NATNUM8)
TRANSLITERATION_NUMTOTEXT( KanjiShortModern_ja_JP, NATNUM7) TRANSLITERATION_NUMTOTEXT( KanjiShortModern_ja_JP, NATNUM7)
#undef TRANSLITERATION_NUMTOTEXT #undef TRANSLITERATION_NUMTOTEXT
#define TRANSLITERATION_NUMTOTEXT( name, _table, recycle ) \ #define TRANSLITERATION_NUMTOTEXT( name, _table, recycle ) \
...@@ -77,6 +77,7 @@ TRANSLITERATION_NUMTOTEXT ( HangulJamo_ko, table_HangulJamo_ko, sal_True) ...@@ -77,6 +77,7 @@ TRANSLITERATION_NUMTOTEXT ( HangulJamo_ko, table_HangulJamo_ko, sal_True)
TRANSLITERATION_NUMTOTEXT ( HangulSyllable_ko, table_HangulSyllable_ko, sal_True) TRANSLITERATION_NUMTOTEXT ( HangulSyllable_ko, table_HangulSyllable_ko, sal_True)
TRANSLITERATION_NUMTOTEXT ( HangulCircledJamo_ko, table_HangulCircledJamo_ko, sal_True) TRANSLITERATION_NUMTOTEXT ( HangulCircledJamo_ko, table_HangulCircledJamo_ko, sal_True)
TRANSLITERATION_NUMTOTEXT ( HangulCircledSyllable_ko, table_HangulCircledSyllable_ko, sal_True) TRANSLITERATION_NUMTOTEXT ( HangulCircledSyllable_ko, table_HangulCircledSyllable_ko, sal_True)
#undef TRANSLITERATION_NUMTOTEXT #undef TRANSLITERATION_NUMTOTEXT
} } } } } } } }
......
...@@ -17,12 +17,8 @@ ...@@ -17,12 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
// prevent internal compiler error with MSVC6SP3
#include <utility>
#include <i18nutil/oneToOneMapping.hxx> #include <i18nutil/oneToOneMapping.hxx>
#define TRANSLITERATION_smallToLarge_ja_JP
#include <transliteration_OneToOne.hxx> #include <transliteration_OneToOne.hxx>
using namespace com::sun::star::uno; using namespace com::sun::star::uno;
......
...@@ -17,18 +17,13 @@ ...@@ -17,18 +17,13 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include <rtl/ustring.hxx>
// prevent internal compiler error with MSVC6SP3
#include <utility>
#include <rtl/string.hxx>
#include <rtl/ustrbuf.hxx> #include <rtl/ustrbuf.hxx>
#define TRANSLITERATION_ALL
#include <textToPronounce_zh.hxx> #include <textToPronounce_zh.hxx>
using namespace com::sun::star::uno; using namespace com::sun::star::uno;
namespace com { namespace sun { namespace star { namespace i18n { namespace com { namespace sun { namespace star { namespace i18n {
sal_Int16 SAL_CALL TextToPronounce_zh::getType() throw (RuntimeException, std::exception) sal_Int16 SAL_CALL TextToPronounce_zh::getType() throw (RuntimeException, std::exception)
......
...@@ -17,12 +17,11 @@ ...@@ -17,12 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#define TRANSLITERATION_ALL
#include <texttonum.hxx>
#include <data/numberchar.h> #include <data/numberchar.h>
#include <rtl/ustrbuf.hxx> #include <rtl/ustrbuf.hxx>
#include <texttonum.hxx>
using namespace com::sun::star::uno; using namespace com::sun::star::uno;
namespace com { namespace sun { namespace star { namespace i18n { namespace com { namespace sun { namespace star { namespace i18n {
...@@ -48,6 +47,7 @@ TRANSLITERATION_TEXTTONUM( InformalUpper_ko) ...@@ -48,6 +47,7 @@ TRANSLITERATION_TEXTTONUM( InformalUpper_ko)
TRANSLITERATION_TEXTTONUM( InformalHangul_ko) TRANSLITERATION_TEXTTONUM( InformalHangul_ko)
TRANSLITERATION_TEXTTONUM( KanjiLongTraditional_ja_JP) TRANSLITERATION_TEXTTONUM( KanjiLongTraditional_ja_JP)
TRANSLITERATION_TEXTTONUM( KanjiLongModern_ja_JP) TRANSLITERATION_TEXTTONUM( KanjiLongModern_ja_JP)
#undef TRANSLITERATION_TEXTTONUM #undef TRANSLITERATION_TEXTTONUM
} } } } } } } }
......
...@@ -17,9 +17,6 @@ ...@@ -17,9 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include <utility>
#include <comphelper/string.hxx>
#include <transliteration_Ignore.hxx> #include <transliteration_Ignore.hxx>
using namespace com::sun::star::uno; using namespace com::sun::star::uno;
......
...@@ -17,14 +17,10 @@ ...@@ -17,14 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include <utility>
#include <comphelper/string.hxx>
#include <transliteration_OneToOne.hxx> #include <transliteration_OneToOne.hxx>
using namespace com::sun::star::uno; using namespace com::sun::star::uno;
namespace com { namespace sun { namespace star { namespace i18n { namespace com { namespace sun { namespace star { namespace i18n {
sal_Int16 SAL_CALL transliteration_OneToOne::getType() throw(RuntimeException, std::exception) sal_Int16 SAL_CALL transliteration_OneToOne::getType() throw(RuntimeException, std::exception)
......
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
#include "characterclassificationImpl.hxx" #include "characterclassificationImpl.hxx"
#include "breakiteratorImpl.hxx" #include "breakiteratorImpl.hxx"
#define TRANSLITERATION_ALL
#include "transliteration_body.hxx" #include "transliteration_body.hxx"
#include <boost/scoped_array.hpp> #include <boost/scoped_array.hpp>
......
...@@ -17,14 +17,11 @@ ...@@ -17,14 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * 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 <com/sun/star/uno/XComponentContext.hpp>
#include <i18nutil/oneToOneMapping.hxx> #include <i18nutil/oneToOneMapping.hxx>
#include <i18nutil/casefolding.hxx> #include <i18nutil/casefolding.hxx>
#include "transliteration_caseignore.hxx" #include "transliteration_caseignore.hxx"
using namespace ::com::sun::star::uno; using namespace ::com::sun::star::uno;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment