diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2004-06-25 14:15:36 +0000 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2004-06-25 14:15:36 +0000 |
| commit | d86b35fa39bf9c69aad212332c50595a03baceb6 (patch) | |
| tree | 8ffd4c8b77ee417b470d67bfe3918fee75e2ff7d /vcl | |
| parent | 875739c549f8579a3e584bff6ec8611fb1c35e35 (diff) | |
INTEGRATION: CWS mergebuild (1.44.8); FILE MERGED
2004/06/10 19:22:43 pl 1.44.8.1: move fontcfg to locales instead of language types
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/app/settings.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index 288485b86ad6..43978a72a46e 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -2,9 +2,9 @@ * * $RCSfile: settings.cxx,v $ * - * $Revision: 1.45 $ + * $Revision: 1.46 $ * - * last change: $Author: kz $ $Date: 2004-06-10 17:17:57 $ + * last change: $Author: hjs $ $Date: 2004-06-25 15:15:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -590,7 +590,7 @@ void ImplStyleData::SetStandardStyles() Font aStdFont( FAMILY_SWISS, Size( 0, 8 ) ); aStdFont.SetCharSet( gsl_getSystemTextEncoding() ); aStdFont.SetWeight( WEIGHT_NORMAL ); - aStdFont.SetName( vcl::DefaultFontConfigItem::get()->getUserInterfaceFont(LANGUAGE_ENGLISH) ); + aStdFont.SetName( vcl::DefaultFontConfigItem::get()->getUserInterfaceFont(com::sun::star::lang::Locale( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("en") ), rtl::OUString(), rtl::OUString() ) ) ); maAppFont = aStdFont; maHelpFont = aStdFont; maMenuFont = aStdFont; @@ -604,7 +604,6 @@ void ImplStyleData::SetStandardStyles() maIconFont = aStdFont; maFloatTitleFont = aStdFont; aStdFont.SetWeight( WEIGHT_BOLD ); - aStdFont.SetName( vcl::DefaultFontConfigItem::get()->getUserInterfaceFont(LANGUAGE_ENGLISH) ); maTitleFont = aStdFont; maFaceColor = Color( COL_LIGHTGRAY ); |