diff options
| author | Eike Rathke <erack@redhat.com> | 2015-02-05 18:06:51 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2015-02-05 18:07:05 +0100 |
| commit | eb6659dc5d1ddf6ea2a0396f158bccdc4b7d5b3c (patch) | |
| tree | 514486ccd600fb51f14049c5264dd5d23043a0d3 /editeng | |
| parent | 7cff4cc2e8f75f1aa308463562cf7fff2ef99a33 (diff) | |
yet yet yet yet another Windows build 'Locale' ambiguous symbol
Change-Id: I8ceaa2544cef8119cb394a2f4aebea066d04609e
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/misc/unolingu.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx index 28a885c4781e..de31456c8586 100644 --- a/editeng/source/misc/unolingu.cxx +++ b/editeng/source/misc/unolingu.cxx @@ -75,7 +75,7 @@ class ThesDummy_Impl : public cppu::WeakImplHelper1< XThesaurus > { uno::Reference< XThesaurus > xThes; // the real one... - Sequence< Locale > *pLocaleSeq; + Sequence< lang::Locale > *pLocaleSeq; void GetCfgLocales(); @@ -121,8 +121,8 @@ void ThesDummy_Impl::GetCfgLocales() Sequence < OUString > aNodeNames( aCfg.GetNodeNames( aNode ) ); const OUString *pNodeNames = aNodeNames.getConstArray(); sal_Int32 nLen = aNodeNames.getLength(); - pLocaleSeq = new Sequence< Locale >( nLen ); - Locale *pLocale = pLocaleSeq->getArray(); + pLocaleSeq = new Sequence< lang::Locale >( nLen ); + lang::Locale *pLocale = pLocaleSeq->getArray(); for (sal_Int32 i = 0; i < nLen; ++i) { pLocale[i] = LanguageTag::convertToLocaleWithFallback( pNodeNames[i] ); @@ -171,8 +171,8 @@ sal_Bool SAL_CALL GetCfgLocales(); bool bFound = false; sal_Int32 nLen = pLocaleSeq->getLength(); - const Locale *pLocale = pLocaleSeq->getConstArray(); - const Locale *pEnd = pLocale + nLen; + const lang::Locale *pLocale = pLocaleSeq->getConstArray(); + const lang::Locale *pEnd = pLocale + nLen; for ( ; pLocale < pEnd && !bFound; ++pLocale) { bFound = pLocale->Language == rLocale.Language && |