diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-05-04 14:10:37 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-05-04 14:10:37 +0000 |
| commit | 3d26b67afba9521ce373f289ee6daba19dfae0f4 (patch) | |
| tree | fc46bc579fcbe7f880ae927fe92156e45628ad2c /vcl/source/app/settings.cxx | |
| parent | f042e5e8593a4d9815ff80932e5e80350ee6ff97 (diff) | |
INTEGRATION: CWS perform07 (1.54.82); FILE MERGED
2006/03/28 19:52:32 mt 1.54.82.2: RESYNC: (1.54-1.58); FILE MERGED
2005/11/03 12:20:01 pl 1.54.82.1: #i56265# bye bye DefaultFontConfigItem, welcome DefaultFontConfiguration
Diffstat (limited to 'vcl/source/app/settings.cxx')
| -rw-r--r-- | vcl/source/app/settings.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index 435bebd8bf84..60eed6d495d5 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -4,9 +4,9 @@ * * $RCSfile: settings.cxx,v $ * - * $Revision: 1.60 $ + * $Revision: 1.61 $ * - * last change: $Author: rt $ $Date: 2006-05-04 08:55:33 $ + * last change: $Author: rt $ $Date: 2006-05-04 15:10:37 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -580,7 +580,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(com::sun::star::lang::Locale( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("en") ), rtl::OUString(), rtl::OUString() ) ) ); + aStdFont.SetName( vcl::DefaultFontConfiguration::get()->getUserInterfaceFont(com::sun::star::lang::Locale( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("en") ), rtl::OUString(), rtl::OUString() ) ) ); maAppFont = aStdFont; maHelpFont = aStdFont; maMenuFont = aStdFont; |