diff options
| author | Kohei Yoshida <kyoshida@novell.com> | 2009-09-30 00:18:39 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kyoshida@novell.com> | 2009-09-30 00:18:39 -0400 |
| commit | c363eab53e44378091b4bb7ab653d1eb074d0094 (patch) | |
| tree | d8e286a48ed97f06cd597e7ede326900e64ad463 /sc/inc/global.hxx | |
| parent | ddf9f3eea0511c5971f88c9b4eb08a63a8a8d7fd (diff) | |
| parent | c4c825af22a19fa4aeb17c86df03256a081cb83a (diff) | |
rebased to DEV300_m60.
Diffstat (limited to 'sc/inc/global.hxx')
| -rw-r--r-- | sc/inc/global.hxx | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx index 9aa264e38931..4028c69adc80 100644 --- a/sc/inc/global.hxx +++ b/sc/inc/global.hxx @@ -541,9 +541,15 @@ class ScGlobal static SvNumberFormatter* pEnglishFormatter; // for UNO / XML export static ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XOrdinalSuffix> xOrdinalSuffix; + static CalendarWrapper* pCalendar; + static CollatorWrapper* pCaseCollator; + static CollatorWrapper* pCollator; + static ::utl::TransliterationWrapper* pTransliteration; + static ::utl::TransliterationWrapper* pCaseTransliteration; + static IntlWrapper* pScIntlWrapper; + static ::com::sun::star::lang::Locale* pLocale; public: - static ::com::sun::star::lang::Locale* pLocale; static SvtSysLocale* pSysLocale; // for faster access a pointer to the single instance provided by SvtSysLocale SC_DLLPUBLIC static const CharClass* pCharClass; @@ -551,15 +557,15 @@ public: SC_DLLPUBLIC static const LocaleDataWrapper* pLocaleData; SC_DLLPUBLIC static const LocaleDataWrapper* GetpLocaleData(); - static CalendarWrapper* pCalendar; - SC_DLLPUBLIC static CollatorWrapper* pCollator; - static CollatorWrapper* pCaseCollator; + static CalendarWrapper* GetCalendar(); + SC_DLLPUBLIC static CollatorWrapper* GetCollator(); + static CollatorWrapper* GetCaseCollator(); + static IntlWrapper* GetScIntlWrapper(); + static ::com::sun::star::lang::Locale* GetLocale(); - static ::utl::TransliterationWrapper* pTransliteration; SC_DLLPUBLIC static ::utl::TransliterationWrapper* GetpTransliteration(); //CHINA001 + static ::utl::TransliterationWrapper* GetCaseTransliteration(); - static ::utl::TransliterationWrapper* pCaseTransliteration; - static IntlWrapper* pScIntlWrapper; SC_DLLPUBLIC static LanguageType eLnge; static sal_Unicode cListDelimiter; |