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

yet yet yet yet yet another Windows build 'Locale' ambiguous symbol

Change-Id: I99281928665f6738a7f8d5fd04104445c06b17e8
üst eb6659dc
...@@ -43,7 +43,7 @@ void SvxUnoForbiddenCharsTable::onChange() ...@@ -43,7 +43,7 @@ void SvxUnoForbiddenCharsTable::onChange()
{ {
} }
ForbiddenCharacters SvxUnoForbiddenCharsTable::getForbiddenCharacters( const Locale& rLocale ) ForbiddenCharacters SvxUnoForbiddenCharsTable::getForbiddenCharacters( const lang::Locale& rLocale )
throw(NoSuchElementException, RuntimeException, std::exception) throw(NoSuchElementException, RuntimeException, std::exception)
{ {
SolarMutexGuard aGuard; SolarMutexGuard aGuard;
...@@ -59,7 +59,7 @@ ForbiddenCharacters SvxUnoForbiddenCharsTable::getForbiddenCharacters( const Loc ...@@ -59,7 +59,7 @@ ForbiddenCharacters SvxUnoForbiddenCharsTable::getForbiddenCharacters( const Loc
return *pForbidden; return *pForbidden;
} }
sal_Bool SvxUnoForbiddenCharsTable::hasForbiddenCharacters( const Locale& rLocale ) sal_Bool SvxUnoForbiddenCharsTable::hasForbiddenCharacters( const lang::Locale& rLocale )
throw(RuntimeException, std::exception) throw(RuntimeException, std::exception)
{ {
SolarMutexGuard aGuard; SolarMutexGuard aGuard;
...@@ -73,7 +73,7 @@ sal_Bool SvxUnoForbiddenCharsTable::hasForbiddenCharacters( const Locale& rLocal ...@@ -73,7 +73,7 @@ sal_Bool SvxUnoForbiddenCharsTable::hasForbiddenCharacters( const Locale& rLocal
return NULL != pForbidden; return NULL != pForbidden;
} }
void SvxUnoForbiddenCharsTable::setForbiddenCharacters(const Locale& rLocale, const ForbiddenCharacters& rForbiddenCharacters ) void SvxUnoForbiddenCharsTable::setForbiddenCharacters(const lang::Locale& rLocale, const ForbiddenCharacters& rForbiddenCharacters )
throw(RuntimeException, std::exception) throw(RuntimeException, std::exception)
{ {
SolarMutexGuard aGuard; SolarMutexGuard aGuard;
...@@ -87,7 +87,7 @@ void SvxUnoForbiddenCharsTable::setForbiddenCharacters(const Locale& rLocale, co ...@@ -87,7 +87,7 @@ void SvxUnoForbiddenCharsTable::setForbiddenCharacters(const Locale& rLocale, co
onChange(); onChange();
} }
void SvxUnoForbiddenCharsTable::removeForbiddenCharacters( const Locale& rLocale ) void SvxUnoForbiddenCharsTable::removeForbiddenCharacters( const lang::Locale& rLocale )
throw(RuntimeException, std::exception) throw(RuntimeException, std::exception)
{ {
SolarMutexGuard aGuard; SolarMutexGuard aGuard;
...@@ -102,17 +102,17 @@ void SvxUnoForbiddenCharsTable::removeForbiddenCharacters( const Locale& rLocale ...@@ -102,17 +102,17 @@ void SvxUnoForbiddenCharsTable::removeForbiddenCharacters( const Locale& rLocale
} }
// XSupportedLocales // XSupportedLocales
Sequence< Locale > SAL_CALL SvxUnoForbiddenCharsTable::getLocales() Sequence< lang::Locale > SAL_CALL SvxUnoForbiddenCharsTable::getLocales()
throw(RuntimeException, std::exception) throw(RuntimeException, std::exception)
{ {
SolarMutexGuard aGuard; SolarMutexGuard aGuard;
const sal_Int32 nCount = mxForbiddenChars.is() ? mxForbiddenChars->GetMap().size() : 0; const sal_Int32 nCount = mxForbiddenChars.is() ? mxForbiddenChars->GetMap().size() : 0;
Sequence< Locale > aLocales( nCount ); Sequence< lang::Locale > aLocales( nCount );
if( nCount ) if( nCount )
{ {
Locale* pLocales = aLocales.getArray(); lang::Locale* pLocales = aLocales.getArray();
for( SvxForbiddenCharactersTable::Map::iterator it = mxForbiddenChars->GetMap().begin(); for( SvxForbiddenCharactersTable::Map::iterator it = mxForbiddenChars->GetMap().begin();
it != mxForbiddenChars->GetMap().end(); ++it ) it != mxForbiddenChars->GetMap().end(); ++it )
...@@ -125,7 +125,7 @@ Sequence< Locale > SAL_CALL SvxUnoForbiddenCharsTable::getLocales() ...@@ -125,7 +125,7 @@ Sequence< Locale > SAL_CALL SvxUnoForbiddenCharsTable::getLocales()
return aLocales; return aLocales;
} }
sal_Bool SAL_CALL SvxUnoForbiddenCharsTable::hasLocale( const Locale& aLocale ) sal_Bool SAL_CALL SvxUnoForbiddenCharsTable::hasLocale( const lang::Locale& aLocale )
throw(RuntimeException, std::exception) throw(RuntimeException, std::exception)
{ {
SolarMutexGuard aGuard; SolarMutexGuard aGuard;
......
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