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

14
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,7 +131,6 @@ 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,7 +145,6 @@ 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,7 +159,6 @@ 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,7 +173,6 @@ 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,7 +187,6 @@ 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,7 +201,6 @@ 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,7 +220,6 @@ void LocaleDataWrapper::invalidateData()
try try
{ {
if ( xLD.is() )
rInstalledLocales = xLD->getAllInstalledLocaleNames(); rInstalledLocales = xLD->getAllInstalledLocaleNames();
} }
catch ( const Exception& e ) catch ( const Exception& e )
@@ -1832,7 +1825,6 @@ void LocaleDataWrapper::evaluateLocaleDataChecking()
{ {
try try
{ {
if ( xLD.is() )
return xLD->getAllCalendars2( getLocale() ); return xLD->getAllCalendars2( getLocale() );
} }
catch (const Exception& e) catch (const Exception& e)
@@ -1855,14 +1847,11 @@ void LocaleDataWrapper::evaluateLocaleDataChecking()
aGuard.changeReadToWrite(); aGuard.changeReadToWrite();
try try
{
if ( xLD.is() )
{ {
const_cast<LocaleDataWrapper*>(this)->aDateAcceptancePatterns = const_cast<LocaleDataWrapper*>(this)->aDateAcceptancePatterns =
xLD->getDateAcceptancePatterns( getLocale() ); xLD->getDateAcceptancePatterns( getLocale() );
return aDateAcceptancePatterns; return aDateAcceptancePatterns;
} }
}
catch (const Exception& e) catch (const Exception& e)
{ {
SAL_WARN( "unotools.i18n", "getDateAcceptancePatterns: Exception caught " << e.Message ); SAL_WARN( "unotools.i18n", "getDateAcceptancePatterns: Exception caught " << e.Message );
@@ -1881,7 +1870,6 @@ void LocaleDataWrapper::setDateAcceptancePatterns(
{ {
try try
{ {
if ( xLD.is() )
aDateAcceptancePatterns = xLD->getDateAcceptancePatterns( getLocale() ); aDateAcceptancePatterns = xLD->getDateAcceptancePatterns( getLocale() );
} }
catch (const Exception& e) catch (const Exception& e)