diff options
author | Noel Grandin <noel@peralex.com> | 2014-04-23 13:25:43 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-04-24 10:53:16 +0200 |
commit | 2ff8ae7c9e9b36d187abef9e163f47a740d51214 (patch) | |
tree | 396e0282ff80c5a2976ed113e292688bc83b7bf0 /scripting/source/stringresource | |
parent | 65afee03aeb14a3296bbe9a5bc39716abe5fd189 (diff) |
scripting: sal_Bool->bool
Change-Id: I1550c49cce2ad64f9d62b06ec20512a750f83b84
Diffstat (limited to 'scripting/source/stringresource')
-rw-r--r-- | scripting/source/stringresource/stringresource.cxx | 14 | ||||
-rw-r--r-- | scripting/source/stringresource/stringresource.hxx | 8 |
2 files changed, 11 insertions, 11 deletions
diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx index feac457a444f..910a165d44fa 100644 --- a/scripting/source/stringresource/stringresource.cxx +++ b/scripting/source/stringresource/stringresource.cxx @@ -215,7 +215,7 @@ OUString StringResourceImpl::resolveStringForLocale( const OUString& ResourceID, return implResolveString( ResourceID, pLocaleItem ); } -sal_Bool StringResourceImpl::implHasEntryForId( const OUString& ResourceID, LocaleItem* pLocaleItem ) +bool StringResourceImpl::implHasEntryForId( const OUString& ResourceID, LocaleItem* pLocaleItem ) { bool bSuccess = false; if( pLocaleItem != NULL && loadLocale( pLocaleItem ) ) @@ -341,7 +341,7 @@ sal_Bool StringResourceImpl::isReadOnly() } void StringResourceImpl::implSetCurrentLocale( const Locale& locale, - sal_Bool FindClosestMatch, sal_Bool bUseDefaultIfNoMatch ) + bool FindClosestMatch, bool bUseDefaultIfNoMatch ) throw (IllegalArgumentException, RuntimeException) { ::osl::MutexGuard aGuard( getMutex() ); @@ -368,7 +368,7 @@ void StringResourceImpl::implSetCurrentLocale( const Locale& locale, void StringResourceImpl::setCurrentLocale( const Locale& locale, sal_Bool FindClosestMatch ) throw (IllegalArgumentException, RuntimeException, std::exception) { - sal_Bool bUseDefaultIfNoMatch = false; + bool bUseDefaultIfNoMatch = false; implSetCurrentLocale( locale, FindClosestMatch, bUseDefaultIfNoMatch ); } @@ -559,7 +559,7 @@ void StringResourceImpl::removeLocale( const Locale& locale ) } if( m_pCurrentLocaleItem == pRemoveItem ) { - sal_Bool FindClosestMatch = false; + bool FindClosestMatch = false; setCurrentLocale( pFallbackItem->m_locale, FindClosestMatch ); } if( m_pDefaultLocaleItem == pRemoveItem ) @@ -642,7 +642,7 @@ sal_Int32 StringResourceImpl::getUniqueNumericId( ) // Private helper methods LocaleItem* StringResourceImpl::getItemForLocale - ( const Locale& locale, sal_Bool bException ) + ( const Locale& locale, bool bException ) throw (::com::sun::star::lang::IllegalArgumentException) { LocaleItem* pRetItem = NULL; @@ -839,8 +839,8 @@ void StringResourcePersistenceImpl::implInitializeCommonParameters implScanLocales(); - sal_Bool FindClosestMatch = true; - sal_Bool bUseDefaultIfNoMatch = true; + bool FindClosestMatch = true; + bool bUseDefaultIfNoMatch = true; implSetCurrentLocale( aCurrentLocale, FindClosestMatch, bUseDefaultIfNoMatch ); } diff --git a/scripting/source/stringresource/stringresource.hxx b/scripting/source/stringresource/stringresource.hxx index b0e6a37023ac..5a74e6e43eaa 100644 --- a/scripting/source/stringresource/stringresource.hxx +++ b/scripting/source/stringresource/stringresource.hxx @@ -63,7 +63,7 @@ struct hashName_Impl struct eqName_Impl { - sal_Bool operator()(const OUString& Str1, const OUString& Str2) const + bool operator()(const OUString& Str1, const OUString& Str2) const { return ( Str1 == Str2 ); } @@ -148,14 +148,14 @@ protected: // Returns the LocalItem for a given locale, if it exists, otherwise NULL // This method compares the locales exactly, no closest match search is performed - LocaleItem* getItemForLocale( const ::com::sun::star::lang::Locale& locale, sal_Bool bException ) + LocaleItem* getItemForLocale( const ::com::sun::star::lang::Locale& locale, bool bException ) throw (::com::sun::star::lang::IllegalArgumentException); // Returns the LocalItem for a given locale, if it exists, otherwise NULL // This method performes a closest match search, at least the language must match LocaleItem* getClosestMatchItemForLocale( const ::com::sun::star::lang::Locale& locale ); void implSetCurrentLocale( const ::com::sun::star::lang::Locale& locale, - sal_Bool FindClosestMatch, sal_Bool bUseDefaultIfNoMatch ) + bool FindClosestMatch, bool bUseDefaultIfNoMatch ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); void implModified( void ); @@ -164,7 +164,7 @@ protected: //=== Impl methods for ...ForLocale methods === OUString SAL_CALL implResolveString( const OUString& ResourceID, LocaleItem* pLocaleItem ) throw (::com::sun::star::resource::MissingResourceException); - sal_Bool implHasEntryForId( const OUString& ResourceID, LocaleItem* pLocaleItem ); + bool implHasEntryForId( const OUString& ResourceID, LocaleItem* pLocaleItem ); ::com::sun::star::uno::Sequence< OUString > implGetResourceIDs( LocaleItem* pLocaleItem ); void implSetString( const OUString& ResourceID, const OUString& Str, LocaleItem* pLocaleItem ); |