summaryrefslogtreecommitdiff
path: root/svl
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2015-02-05 16:18:08 +0100
committerEike Rathke <erack@redhat.com>2015-02-05 16:26:25 +0100
commit38b46a4a629f38c982e047da9a94ec28f6fe39c5 (patch)
tree82a08ec4b9105abb90a09303958aed04bd857ac1 /svl
parent6cd1012563902e273eeef0d4250729c6fb0e5641 (diff)
yet another Windows build fix
'Locale' : ambiguous symbol, could be 'com::sun::star::lang::Locale' or 'icu_54::Locale' Change-Id: Id5688195907624467d3956aff4b27f6839e03015
Diffstat (limited to 'svl')
-rw-r--r--svl/source/numbers/supservs.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/svl/source/numbers/supservs.cxx b/svl/source/numbers/supservs.cxx
index 0234b1e0f8c3..a2f609914f3a 100644
--- a/svl/source/numbers/supservs.cxx
+++ b/svl/source/numbers/supservs.cxx
@@ -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 );