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

yet another Windows build fix

'Locale' : ambiguous symbol, could be 'com::sun::star::lang::Locale' or 'icu_54::Locale'

Change-Id: Id5688195907624467d3956aff4b27f6839e03015
üst 6cd10125
......@@ -87,7 +87,7 @@ void SAL_CALL SvNumberFormatsSupplierServiceObject::initialize( const Sequence<
SetNumberFormatter(m_pOwnFormatter);
}
Type aExpectedArgType = ::cppu::UnoType<Locale>::get();
Type aExpectedArgType = ::cppu::UnoType<css::lang::Locale>::get();
LanguageType eNewFormatterLanguage = LANGUAGE_ENGLISH_US;
// the default
......@@ -96,7 +96,7 @@ void SAL_CALL SvNumberFormatsSupplierServiceObject::initialize( const Sequence<
{
if (pArgs->getValueType().equals(aExpectedArgType))
{
Locale aLocale;
css::lang::Locale aLocale;
*pArgs >>= aLocale;
eNewFormatterLanguage = LanguageTag::convertToLanguageType( aLocale, false);
}
......@@ -159,7 +159,7 @@ void SvNumberFormatsSupplierServiceObject::implEnsureFormatter()
{
// get the office's UI locale
SvtSysLocale aSysLocale;
Locale aOfficeLocale = aSysLocale.GetLocaleData().getLanguageTag().getLocale();
css::lang::Locale aOfficeLocale = aSysLocale.GetLocaleData().getLanguageTag().getLocale();
// initi with this locale
Sequence< Any > aFakedInitProps( 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