diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-04-17 09:23:35 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-04-17 09:23:35 +0000 |
| commit | e7c68a82b2df73a840b80c00f2ebb23fb913247e (patch) | |
| tree | a09e7046b76580613969f44258b28bed57bd3901 | |
| parent | 02f6d9f3b765df1972557288efef7aa51142ebae (diff) | |
INTEGRATION: CWS sw009 (1.3.2.1.28); FILE MERGED
2003/03/18 09:56:16 oj 1.3.2.1.28.1: #107657# moved GetScriptTypeOfLanguage to svtools SvtLanguageOptions
| -rw-r--r-- | svtools/source/config/ctloptions.cxx | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/svtools/source/config/ctloptions.cxx b/svtools/source/config/ctloptions.cxx index 073c7ce6786e..d031c4049d9b 100644 --- a/svtools/source/config/ctloptions.cxx +++ b/svtools/source/config/ctloptions.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ctloptions.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: hr $ $Date: 2003-03-27 14:37:33 $ + * last change: $Author: vg $ $Date: 2003-04-17 10:23:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,6 +61,11 @@ #pragma hdrstop +#include "languageoptions.hxx" +#ifndef _LANG_HXX +#include <tools/lang.hxx> +#endif + #ifndef _SVTOOLS_CTLOPTIONS_HXX #include "ctloptions.hxx" #endif @@ -76,6 +81,7 @@ #ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_ #include <com/sun/star/uno/Sequence.hxx> #endif + #ifndef _OSL_MUTEX_HXX_ #include <osl/mutex.hxx> #endif @@ -286,6 +292,12 @@ void SvtCTLOptions_Impl::Load() } } } + sal_uInt16 nType = SvtLanguageOptions::GetScriptTypeOfLanguage(LANGUAGE_SYSTEM); + if ( !m_bCTLFontEnabled && ( nType & SCRIPTTYPE_COMPLEX ) ) + { + m_bCTLFontEnabled = sal_True; + } + m_bIsLoaded = sal_True; } //------------------------------------------------------------------------------ @@ -409,3 +421,5 @@ sal_Bool SvtCTLOptions::IsReadOnly(EOption eOption) const DBG_ASSERT( pCTLOptions->IsLoaded(), "CTL options not loaded" ); return pCTLOptions->IsReadOnly(eOption); } +// ----------------------------------------------------------------------------- + |