mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use LanguageTag

Browse Source 
Change-Id: Ibe18dc1b768c928e8f53ff4bf98adab40d808025
This commit is contained in:
Eike Rathke
2012-11-17 02:00:31 +01:00
parent cd52a285c1
commit 2b0a014dce
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
svx/source/form/fmcontrollayout.cxx
View File

@@ -41,6 +41,7 @@
#include <comphelper/processfactory.hxx> #include <comphelper/processfactory.hxx>
#include <i18npool/mslangid.hxx> #include <i18npool/mslangid.hxx>
#include <i18npool/languagetag.hxx>
#include <unotools/syslocale.hxx> #include <unotools/syslocale.hxx>
#include <toolkit/helper/vclunohelper.hxx> #include <toolkit/helper/vclunohelper.hxx>
@@ -142,7 +143,7 @@ namespace svxform
// determine the script type associated with the system locale // determine the script type associated with the system locale
const SvtSysLocale aSysLocale; const SvtSysLocale aSysLocale;
const LocaleDataWrapper& rSysLocaleData = aSysLocale.GetLocaleData(); const LocaleDataWrapper& rSysLocaleData = aSysLocale.GetLocaleData();
const sal_Int16 eSysLocaleScriptType = MsLangId::getScriptType( MsLangId::convertLocaleToLanguage( rSysLocaleData.getLocale() ) ); const sal_Int16 eSysLocaleScriptType = MsLangId::getScriptType( LanguageTag( rSysLocaleData.getLocale() ).getLanguageType() );
// depending on this script type, use the right property from the document's style which controls the // depending on this script type, use the right property from the document's style which controls the
// default locale for document content // default locale for document content
@@ -185,7 +186,7 @@ namespace svxform
} }
// retrieve a default font for this locale, and set it at the control // retrieve a default font for this locale, and set it at the control
Font aFont = OutputDevice::GetDefaultFont( DEFAULTFONT_SANS, MsLangId::convertLocaleToLanguage( aDocumentCharLocale ), DEFAULTFONT_FLAGS_ONLYONE ); Font aFont = OutputDevice::GetDefaultFont( DEFAULTFONT_SANS, LanguageTag( aDocumentCharLocale ).getLanguageType(), DEFAULTFONT_FLAGS_ONLYONE );
FontDescriptor aFontDesc = VCLUnoHelper::CreateFontDescriptor( aFont ); FontDescriptor aFontDesc = VCLUnoHelper::CreateFontDescriptor( aFont );
_rxModel->setPropertyValue( _rxModel->setPropertyValue(
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FontDescriptor" ) ), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FontDescriptor" ) ),