Kaydet (Commit) c9023129 authored tarafından Eike Rathke's avatar Eike Rathke

use LanguageTag

Change-Id: Ie3079b1acde5cc98e0cffb37e3ff696aac8fe5f2
üst 08bece4a
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
#include <tools/debug.hxx> #include <tools/debug.hxx>
#include <tools/wintypes.hxx> #include <tools/wintypes.hxx>
#include <i18npool/mslangid.hxx> #include <i18npool/languagetag.hxx>
#include <rtl/textenc.h> #include <rtl/textenc.h>
#include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/sdbc/DataType.hpp>
#include <com/sun/star/util/NumberFormat.hpp> #include <com/sun/star/util/NumberFormat.hpp>
...@@ -150,7 +150,7 @@ Reference< XNumberFormatsSupplier > StandardFormatsSupplier::get( const Referenc ...@@ -150,7 +150,7 @@ Reference< XNumberFormatsSupplier > StandardFormatsSupplier::get( const Referenc
// get the Office's locale // get the Office's locale
const Locale& rSysLocale = SvtSysLocale().GetLocaleData().getLocale(); const Locale& rSysLocale = SvtSysLocale().GetLocaleData().getLocale();
// translate // translate
eSysLanguage = MsLangId::convertLocaleToLanguage( rSysLocale ); eSysLanguage = LanguageTag( rSysLocale ).getLanguageType( false);
} }
StandardFormatsSupplier* pSupplier = new StandardFormatsSupplier( _rxORB, eSysLanguage ); StandardFormatsSupplier* pSupplier = new StandardFormatsSupplier( _rxORB, eSysLanguage );
...@@ -856,7 +856,7 @@ void OFormattedModel::write(const Reference<XObjectOutputStream>& _rxOutStream) ...@@ -856,7 +856,7 @@ void OFormattedModel::write(const Reference<XObjectOutputStream>& _rxOutStream)
if (isA(aLocale, static_cast<Locale*>(NULL))) if (isA(aLocale, static_cast<Locale*>(NULL)))
{ {
Locale* pLocale = (Locale*)aLocale.getValue(); Locale* pLocale = (Locale*)aLocale.getValue();
eFormatLanguage = MsLangId::convertLocaleToLanguage( *pLocale ); eFormatLanguage = LanguageTag( *pLocale ).getLanguageType( false);
} }
} }
...@@ -940,7 +940,7 @@ void OFormattedModel::read(const Reference<XObjectInputStream>& _rxInStream) thr ...@@ -940,7 +940,7 @@ void OFormattedModel::read(const Reference<XObjectInputStream>& _rxInStream) thr
if (xFormats.is()) if (xFormats.is())
{ {
Locale aDescriptionLanguage( MsLangId::convertLanguageToLocale(eDescriptionLanguage)); Locale aDescriptionLanguage( LanguageTag(eDescriptionLanguage).getLocale());
nKey = xFormats->queryKey(sFormatDescription, aDescriptionLanguage, sal_False); nKey = xFormats->queryKey(sFormatDescription, aDescriptionLanguage, sal_False);
if (nKey == (sal_Int32)-1) if (nKey == (sal_Int32)-1)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment