diff options
| author | Eike Rathke <erack@redhat.com> | 2015-02-05 18:34:12 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2015-02-05 18:35:08 +0100 |
| commit | 9abd38ec81beda6fee18e791a1e573c6cfabf8a1 (patch) | |
| tree | 578dd8fe52d13d1266eb35d8d07af01bd6ce10fe /svx | |
| parent | 4dc659e2d80940a3c4c5327d14ad918ab6e3fe48 (diff) | |
yet yet yet yet yet yet another Windows build 'Locale' ambiguous symbol
Change-Id: I910c37a19c1f627ec0c92dcb044db92e9e24c25e
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/dialog/langbox.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx index e8a0128c86db..9ada26bb61ac 100644 --- a/svx/source/dialog/langbox.cxx +++ b/svx/source/dialog/langbox.cxx @@ -35,7 +35,6 @@ #include <vcl/i18nhelp.hxx> using namespace ::com::sun::star::util; -using namespace ::com::sun::star::lang; using namespace ::com::sun::star::linguistic2; using namespace ::com::sun::star::uno; @@ -73,9 +72,9 @@ OUString GetDicInfoStr( const OUString& rName, const sal_uInt16 nLang, bool bNeg // misc local helper functions -static Sequence< sal_Int16 > lcl_LocaleSeqToLangSeq( Sequence< Locale > &rSeq ) +static Sequence< sal_Int16 > lcl_LocaleSeqToLangSeq( Sequence< css::lang::Locale > &rSeq ) { - const Locale *pLocale = rSeq.getConstArray(); + const css::lang::Locale *pLocale = rSeq.getConstArray(); sal_Int32 nCount = rSeq.getLength(); Sequence< sal_Int16 > aLangs( nCount ); @@ -201,7 +200,7 @@ void SvxLanguageBoxBase::SetLanguageList( sal_Int16 nLangList, Reference< XAvailableLocales > xAvail( LinguMgr::GetLngSvcMgr(), UNO_QUERY ); if (xAvail.is()) { - Sequence< Locale > aTmp; + Sequence< css::lang::Locale > aTmp; if (LANG_LIST_SPELL_AVAIL & nLangList) { @@ -229,7 +228,7 @@ void SvxLanguageBoxBase::SetLanguageList( sal_Int16 nLangList, { Reference< XHyphenator > xTmp( SvxGetHyphenator() ); if (xTmp.is()) { - Sequence < Locale > aLocaleSequence( xTmp->getLocales() ); + Sequence < css::lang::Locale > aLocaleSequence( xTmp->getLocales() ); aHyphUsedLang = lcl_LocaleSeqToLangSeq( aLocaleSequence ); } } @@ -237,7 +236,7 @@ void SvxLanguageBoxBase::SetLanguageList( sal_Int16 nLangList, { Reference< XThesaurus > xTmp( SvxGetThesaurus() ); if (xTmp.is()) { - Sequence < Locale > aLocaleSequence( xTmp->getLocales() ); + Sequence < css::lang::Locale > aLocaleSequence( xTmp->getLocales() ); aThesUsedLang = lcl_LocaleSeqToLangSeq( aLocaleSequence ); } } |