mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improvement on previous commit

Browse Source 
Change-Id: I609961ece562b7e02c542cfeb23d7c584a9663d9
This commit is contained in:
Stephan Bergmann
2012-09-17 13:54:01 +02:00
parent 369e3fdcda
commit e3c05e34fd
1 changed files with 13 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
unotools/source/i18n/localedatawrapper.cxx
View File

@@ -71,11 +71,11 @@ LocaleDataWrapper::LocaleDataWrapper(
) )
: :
xSMgr( xSF ), xSMgr( xSF ),
xLD( LocaleData::create(comphelper::ComponentContext(xSMgr).getUNOContext()) ),
bLocaleDataItemValid( sal_False ), bLocaleDataItemValid( sal_False ),
bReservedWordValid( sal_False ) bReservedWordValid( sal_False )
{ {
setLocale( rLocale ); setLocale( rLocale );
xLD = LocaleData::create(comphelper::ComponentContext(xSMgr).getUNOContext());
} }
@@ -131,8 +131,7 @@ void LocaleDataWrapper::invalidateData()
{ {
try try
{ {
if ( xLD.is() ) return xLD->getLanguageCountryInfo( getLocale() );
return xLD->getLanguageCountryInfo( getLocale() );
} }
catch (const Exception& e) catch (const Exception& e)
{ {
@@ -146,8 +145,7 @@ void LocaleDataWrapper::invalidateData()
{ {
try try
{ {
if ( xLD.is() ) return xLD->getLocaleItem( getLocale() );
return xLD->getLocaleItem( getLocale() );
} }
catch (const Exception& e) catch (const Exception& e)
{ {
@@ -161,8 +159,7 @@ void LocaleDataWrapper::invalidateData()
{ {
try try
{ {
if ( xLD.is() ) return xLD->getAllCurrencies2( getLocale() );
return xLD->getAllCurrencies2( getLocale() );
} }
catch (const Exception& e) catch (const Exception& e)
{ {
@@ -176,8 +173,7 @@ void LocaleDataWrapper::invalidateData()
{ {
try try
{ {
if ( xLD.is() ) return xLD->getAllFormats( getLocale() );
return xLD->getAllFormats( getLocale() );
} }
catch (const Exception& e) catch (const Exception& e)
{ {
@@ -191,8 +187,7 @@ void LocaleDataWrapper::invalidateData()
{ {
try try
{ {
if ( xLD.is() ) return xLD->getForbiddenCharacters( getLocale() );
return xLD->getForbiddenCharacters( getLocale() );
} }
catch (const Exception& e) catch (const Exception& e)
{ {
@@ -206,8 +201,7 @@ void LocaleDataWrapper::invalidateData()
{ {
try try
{ {
if ( xLD.is() ) return xLD->getReservedWord( getLocale() );
return xLD->getReservedWord( getLocale() );
} }
catch ( const Exception& e ) catch ( const Exception& e )
{ {
@@ -226,8 +220,7 @@ void LocaleDataWrapper::invalidateData()
try try
{ {
if ( xLD.is() ) rInstalledLocales = xLD->getAllInstalledLocaleNames();
rInstalledLocales = xLD->getAllInstalledLocaleNames();
} }
catch ( const Exception& e ) catch ( const Exception& e )
{ {
@@ -1832,8 +1825,7 @@ void LocaleDataWrapper::evaluateLocaleDataChecking()
{ {
try try
{ {
if ( xLD.is() ) return xLD->getAllCalendars2( getLocale() );
return xLD->getAllCalendars2( getLocale() );
} }
catch (const Exception& e) catch (const Exception& e)
{ {
@@ -1856,12 +1848,9 @@ void LocaleDataWrapper::evaluateLocaleDataChecking()
try try
{ {
if ( xLD.is() ) const_cast<LocaleDataWrapper*>(this)->aDateAcceptancePatterns =
{ xLD->getDateAcceptancePatterns( getLocale() );
const_cast<LocaleDataWrapper*>(this)->aDateAcceptancePatterns = return aDateAcceptancePatterns;
xLD->getDateAcceptancePatterns( getLocale() );
return aDateAcceptancePatterns;
}
} }
catch (const Exception& e) catch (const Exception& e)
{ {
@@ -1881,8 +1870,7 @@ void LocaleDataWrapper::setDateAcceptancePatterns(
{ {
try try
{ {
if ( xLD.is() ) aDateAcceptancePatterns = xLD->getDateAcceptancePatterns( getLocale() );
aDateAcceptancePatterns = xLD->getDateAcceptancePatterns( getLocale() );
} }
catch (const Exception& e) catch (const Exception& e)
{ {