Index: svtools/source/config/ctloptions.cxx
===================================================================
RCS file: /cvsroot/thaioo/OpenOffice/svtools/source/config/ctloptions.cxx,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- svtools/source/config/ctloptions.cxx	12 Nov 2003 04:14:17 -0000	1.1.1.1
+++ svtools/source/config/ctloptions.cxx	16 Dec 2003 10:38:07 -0000	1.1.1.1.2.1
@@ -312,6 +312,9 @@
 	}
 
 	m_bIsLoaded = sal_True;
+
+    // Set CTL Numerals from setting value.
+    OutputCTLNumerals::SetOutputCTLNumerals((OutputCTLNumerals::TextNumerals)m_eCTLTextNumerals);
 }
 //------------------------------------------------------------------------------
 void SvtCTLOptions_Impl::SetCTLFontEnabled( sal_Bool _bEnabled )
@@ -422,12 +425,15 @@
 {
     DBG_ASSERT( pCTLOptions->IsLoaded(), "CTL options not loaded" );
     pCTLOptions->SetCTLTextNumerals( _eNumerals );
+    OutputCTLNumerals::SetOutputCTLNumerals((OutputCTLNumerals::TextNumerals)_eNumerals );
 }
 // -----------------------------------------------------------------------------
 SvtCTLOptions::TextNumerals SvtCTLOptions::GetCTLTextNumerals() const
 {
     DBG_ASSERT( pCTLOptions->IsLoaded(), "CTL options not loaded" );
-    return pCTLOptions->GetCTLTextNumerals();
+
+    SvtCTLOptions::TextNumerals pCTLNumerals = pCTLOptions->GetCTLTextNumerals();
+    return pCTLNumerals;
 }
 // -----------------------------------------------------------------------------
 sal_Bool SvtCTLOptions::IsReadOnly(EOption eOption) const
Index: vcl/inc/svapp.hxx
===================================================================
RCS file: /cvsroot/thaioo/OpenOffice/vcl/inc/svapp.hxx,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- vcl/inc/svapp.hxx	12 Nov 2003 04:12:32 -0000	1.1.1.1
+++ vcl/inc/svapp.hxx	16 Dec 2003 10:34:34 -0000	1.1.1.1.2.1
@@ -597,5 +597,27 @@
 #define GetDefModalDialogParent         GetDefDialogParent
 
 #endif
+
+// -----------------
+// - OutputCTLNumerals -
+// -----------------
+
+class OutputCTLNumerals
+{
+public:
+enum TextNumerals
+    {
+	NUMERALS_ARABIC = 0,
+	NUMERALS_HINDI,
+	NUMERALS_SYSTEM
+    };
+
+private:
+    static TextNumerals CTLNumerals;
+
+public:
+    static void SetOutputCTLNumerals(TextNumerals CTLNumerals);
+    static TextNumerals GetOutputCTLNumerals();
+};
 
 #endif // _APP_HXX
Index: vcl/source/app/svapp.cxx
===================================================================
RCS file: /cvsroot/thaioo/OpenOffice/vcl/source/app/svapp.cxx,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- vcl/source/app/svapp.cxx	12 Nov 2003 04:12:33 -0000	1.1.1.1
+++ vcl/source/app/svapp.cxx	16 Dec 2003 10:35:02 -0000	1.1.1.1.2.1
@@ -2363,3 +2363,16 @@
 
     return bRet;
 }
+
+// Body of OutputCTLNumerals
+OutputCTLNumerals::TextNumerals OutputCTLNumerals::CTLNumerals;
+static void OutputCTLNumerals::SetOutputCTLNumerals(TextNumerals aCTLNumerals)
+{
+	CTLNumerals = aCTLNumerals;
+}
+
+static OutputCTLNumerals::TextNumerals OutputCTLNumerals::GetOutputCTLNumerals()
+{
+	return CTLNumerals;
+}
+
Index: vcl/source/gdi/outdev3.cxx
===================================================================
RCS file: /cvsroot/thaioo/OpenOffice/vcl/source/gdi/outdev3.cxx,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- vcl/source/gdi/outdev3.cxx	12 Nov 2003 04:12:34 -0000	1.1.1.1
+++ vcl/source/gdi/outdev3.cxx	16 Dec 2003 10:02:03 -0000	1.1.1.1.2.1
@@ -5001,11 +5001,14 @@
     if( mpMetaFile )
         mpMetaFile->AddAction( new MetaTextLanguageAction( eTextLanguage ) );
 #endif
-
+ 
     if( eTextLanguage == LANGUAGE_SYSTEM )
         eTextLanguage = GetSystemLanguage();
 
-    meTextLanguage = eTextLanguage;
+    // Set CTL Numerals Language for output distplay.
+    OutputCTLNumerals::TextNumerals optNumerals = OutputCTLNumerals::GetOutputCTLNumerals();
+    meTextLanguage = ( optNumerals == OutputCTLNumerals::NUMERALS_ARABIC ) ? LANGUAGE_ENGLISH_US : 
+		   ( optNumerals == OutputCTLNumerals::NUMERALS_HINDI)   ? LANGUAGE_ARABIC : eTextLanguage;
 }
 
 // -----------------------------------------------------------------------