From f66f896657967c0ce3c75680e956cad918a632d3 Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Fri, 12 Jul 2013 00:08:32 +0200 Subject: DefaultFontConfiguration and FontSubstConfiguration with LanguageTag Change-Id: I6c111392537d114358d0574f2dbdf40f684b5103 --- include/unotools/fontcfg.hxx | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'include') diff --git a/include/unotools/fontcfg.hxx b/include/unotools/fontcfg.hxx index 5e63ddb7fbdf..e33397f289c6 100644 --- a/include/unotools/fontcfg.hxx +++ b/include/unotools/fontcfg.hxx @@ -19,6 +19,7 @@ #ifndef _UNOTOOLS_FONTCFG_HXX #define _UNOTOOLS_FONTCFG_HXX +#include #include #include #include @@ -59,8 +60,8 @@ class UNOTOOLS_DLLPUBLIC DefaultFontConfiguration static DefaultFontConfiguration& get(); - OUString getDefaultFont( const com::sun::star::lang::Locale& rLocale, int nType ) const; - OUString getUserInterfaceFont( const com::sun::star::lang::Locale& rLocale ) const; + OUString getDefaultFont( const LanguageTag& rLanguageTag, int nType ) const; + OUString getUserInterfaceFont( const LanguageTag& rLanguageTag ) const; }; // IMPL_FONT_ATTR_DEFAULT - Default-Font like Andale Sans UI, Palace Script, Albany, Thorndale, Cumberland, ... @@ -175,10 +176,7 @@ public: const FontNameAttr* getSubstInfo( const OUString& rFontName, - const com::sun::star::lang::Locale& rLocale = - com::sun::star::lang::Locale( OUString( "en" ), - OUString(), - OUString() ) + const LanguageTag& rLanguageTag = LanguageTag( OUString( "en")) ) const; static void getMapName( const OUString& rOrgName, OUString& rShortName, OUString& rFamilyName, FontWeight& rWeight, FontWidth& rWidth, sal_uLong& rType ); }; -- cgit