diff options
Diffstat (limited to 'sc/inc/global.hxx')
| -rw-r--r-- | sc/inc/global.hxx | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx index e329f477d824..1f6dc13d04ce 100644 --- a/sc/inc/global.hxx +++ b/sc/inc/global.hxx @@ -86,13 +86,6 @@ extern "C" { #define SC_TRANSLITERATION_CASESENSE 0 #endif -// Remove the old pivot table implementation that the current data pilot -// implementation has effectively replaced. The old pivot code was still -// around to handle loading of the old binary format. Now that the old -// binary filter is handled by binfilter, we can safely remove the old pivot -// handling code. -#define OLD_PIVOT_IMPLEMENTATION 0 - //------------------------------------------------------------------------ struct LabelData; //------------------------------------------------------------------------ @@ -467,7 +460,7 @@ struct ScImportParam ScImportParam& operator= ( const ScImportParam& r ); BOOL operator== ( const ScImportParam& r ) const; - void Clear (); +//UNUSED2009-05 void Clear (); }; struct ScStringHashCode @@ -548,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; @@ -558,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; |