diff -ur ooo.orig/vcl/inc/svapp.hxx ooo/vcl/inc/svapp.hxx --- ooo.orig/vcl/inc/svapp.hxx 2005-02-01 18:30:33.150516800 +0700 +++ ooo/vcl/inc/svapp.hxx 2005-02-01 15:30:41.162501200 +0700 @@ -523,4 +523,27 @@ PostUserEvent( Link() ); } +// ----------------- +// - OutputCTLNumerals - +// ----------------- + +class OutputCTLNumerals +{ +public: +enum TextNumerals // Same as SvtCTLOptions::TextNumerals in svtools/inc/ctloptions.hxx + + { + NUMERALS_ARABIC = 0, + NUMERALS_HINDI, + NUMERALS_SYSTEM + }; + +private: + static TextNumerals CTLNumerals; + +public: + static void SetOutputCTLNumerals(TextNumerals CTLNumerals); + static TextNumerals GetOutputCTLNumerals(); +}; + #endif // _APP_HXX diff -ur ooo.orig/vcl/source/app/svapp.cxx ooo/vcl/source/app/svapp.cxx --- ooo.orig/vcl/source/app/svapp.cxx 2005-02-01 18:23:12.406758400 +0700 +++ ooo/vcl/source/app/svapp.cxx 2005-02-01 15:08:14.796522000 +0700 @@ -1921,3 +1921,16 @@ void Application::AppEvent( const ApplicationEvent& rAppEvent ) { } + +// OutputCTLNumerals +OutputCTLNumerals::TextNumerals OutputCTLNumerals::CTLNumerals; +void OutputCTLNumerals::SetOutputCTLNumerals(TextNumerals aCTLNumerals) +{ + CTLNumerals = aCTLNumerals; +} + +OutputCTLNumerals::TextNumerals OutputCTLNumerals::GetOutputCTLNumerals() +{ + return CTLNumerals; +} + diff -ur ooo.orig/vcl/source/gdi/outdev3.cxx ooo/vcl/source/gdi/outdev3.cxx --- ooo.orig/vcl/source/gdi/outdev3.cxx 2004-11-26 23:21:08.000000000 +0700 +++ ooo/vcl/source/gdi/outdev3.cxx 2005-02-01 21:26:27.748531200 +0700 @@ -5266,8 +5266,11 @@ if( eTextLanguage == LANGUAGE_SYSTEM ) eTextLanguage = GetSystemLanguage(); - meTextLanguage = eTextLanguage; - + //meTextLanguage = eTextLanguage; + OutputCTLNumerals::TextNumerals optNumerals = OutputCTLNumerals::GetOutputCTLNumerals(); + meTextLanguage = ( optNumerals == OutputCTLNumerals::NUMERALS_ARABIC ) ? LANGUAGE_ENGLISH_US : + ( optNumerals == OutputCTLNumerals::NUMERALS_HINDI) ? LANGUAGE_ARABIC : eTextLanguage; + if( mpAlphaVDev ) mpAlphaVDev->SetDigitLanguage( eTextLanguage ); } diff -ur ooo.orig/svtools/source/config/ctloptions.cxx ooo/svtools/source/config/ctloptions.cxx --- ooo.orig/svtools/source/config/ctloptions.cxx 2005-02-01 19:39:58.920600000 +0700 +++ ooo/svtools/source/config/ctloptions.cxx 2005-02-01 15:08:14.716406800 +0700 @@ -341,6 +341,8 @@ m_bIsLoaded = sal_True; + // Set CTL Numerals from setting value + OutputCTLNumerals::SetOutputCTLNumerals((OutputCTLNumerals::TextNumerals) m_eCTLTextNumerals ); } //------------------------------------------------------------------------------ void SvtCTLOptions_Impl::SetCTLFontEnabled( sal_Bool _bEnabled ) @@ -386,6 +388,7 @@ SetModified(); m_eCTLTextNumerals = _eNumerals; } + OutputCTLNumerals::SetOutputCTLNumerals((OutputCTLNumerals::TextNumerals)_eNumerals ); } // global ----------------------------------------------------------------