From c90231291b5fa033ec3b079427c522177083a585 Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Sat, 17 Nov 2012 03:30:11 +0100 Subject: use LanguageTag Change-Id: Ie3079b1acde5cc98e0cffb37e3ff696aac8fe5f2 --- forms/source/component/FormattedField.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'forms') diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx index aabe3592bc93..91faaa6c01e4 100644 --- a/forms/source/component/FormattedField.cxx +++ b/forms/source/component/FormattedField.cxx @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include #include #include @@ -150,7 +150,7 @@ Reference< XNumberFormatsSupplier > StandardFormatsSupplier::get( const Referenc // get the Office's locale const Locale& rSysLocale = SvtSysLocale().GetLocaleData().getLocale(); // translate - eSysLanguage = MsLangId::convertLocaleToLanguage( rSysLocale ); + eSysLanguage = LanguageTag( rSysLocale ).getLanguageType( false); } StandardFormatsSupplier* pSupplier = new StandardFormatsSupplier( _rxORB, eSysLanguage ); @@ -856,7 +856,7 @@ void OFormattedModel::write(const Reference& _rxOutStream) if (isA(aLocale, static_cast(NULL))) { Locale* pLocale = (Locale*)aLocale.getValue(); - eFormatLanguage = MsLangId::convertLocaleToLanguage( *pLocale ); + eFormatLanguage = LanguageTag( *pLocale ).getLanguageType( false); } } @@ -940,7 +940,7 @@ void OFormattedModel::read(const Reference& _rxInStream) thr if (xFormats.is()) { - Locale aDescriptionLanguage( MsLangId::convertLanguageToLocale(eDescriptionLanguage)); + Locale aDescriptionLanguage( LanguageTag(eDescriptionLanguage).getLocale()); nKey = xFormats->queryKey(sFormatDescription, aDescriptionLanguage, sal_False); if (nKey == (sal_Int32)-1) -- cgit