From e57ca02849c3d87142ff5ff9099a212e72b8139c Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 26 Jan 2017 12:28:58 +0100 Subject: Remove dynamic exception specifications ...(for now, from LIBO_INTERNAL_CODE only). See the mail thread starting at "Dynamic Exception Specifications" for details. Most changes have been done automatically by the rewriting loplugin:dynexcspec (after enabling the rewriting mode, to be committed shortly). The way it only removes exception specs from declarations if it also sees a definition, it identified some dead declarations-w/o-definitions (that have been removed manually) and some cases where a definition appeared in multiple include files (which have also been cleaned up manually). There's also been cases of macro paramters (that were used to abstract over exception specs) that have become unused now (and been removed). Furthermore, some code needed to be cleaned up manually (avmedia/source/quicktime/ and connectivity/source/drivers/kab/), as I had no configurations available that would actually build that code. Missing @throws documentation has not been applied in such manual clean-up. Change-Id: I3408691256c9b0c12bc5332de976743626e13960 Reviewed-on: https://gerrit.libreoffice.org/33574 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- scripting/source/stringresource/stringresource.cxx | 148 +------ scripting/source/stringresource/stringresource.hxx | 434 +++++++-------------- 2 files changed, 146 insertions(+), 436 deletions(-) (limited to 'scripting/source/stringresource') diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx index 49f7f823d451..190fabdde719 100644 --- a/scripting/source/stringresource/stringresource.cxx +++ b/scripting/source/stringresource/stringresource.cxx @@ -124,17 +124,17 @@ StringResourceImpl::~StringResourceImpl() // XServiceInfo -OUString StringResourceImpl::getImplementationName( ) throw (RuntimeException, std::exception) +OUString StringResourceImpl::getImplementationName( ) { return getImplementationName_StringResourceImpl(); } -sal_Bool StringResourceImpl::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception) +sal_Bool StringResourceImpl::supportsService( const OUString& rServiceName ) { return cppu::supportsService(this, rServiceName); } -Sequence< OUString > StringResourceImpl::getSupportedServiceNames( ) throw (RuntimeException, std::exception) +Sequence< OUString > StringResourceImpl::getSupportedServiceNames( ) { return getSupportedServiceNames_StringResourceImpl(); } @@ -143,7 +143,6 @@ Sequence< OUString > StringResourceImpl::getSupportedServiceNames( ) throw (Run // XModifyBroadcaster void StringResourceImpl::addModifyListener( const Reference< XModifyListener >& aListener ) - throw (RuntimeException, std::exception) { if( !aListener.is() ) throw RuntimeException(); @@ -153,7 +152,6 @@ void StringResourceImpl::addModifyListener( const Reference< XModifyListener >& } void StringResourceImpl::removeModifyListener( const Reference< XModifyListener >& aListener ) - throw (RuntimeException, std::exception) { if( !aListener.is() ) throw RuntimeException(); @@ -167,7 +165,6 @@ void StringResourceImpl::removeModifyListener( const Reference< XModifyListener OUString StringResourceImpl::implResolveString ( const OUString& ResourceID, LocaleItem* pLocaleItem ) - throw (css::resource::MissingResourceException) { OUString aRetStr; bool bSuccess = false; @@ -190,14 +187,12 @@ OUString StringResourceImpl::implResolveString } OUString StringResourceImpl::resolveString( const OUString& ResourceID ) - throw (css::resource::MissingResourceException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); return implResolveString( ResourceID, m_pCurrentLocaleItem ); } OUString StringResourceImpl::resolveStringForLocale( const OUString& ResourceID, const Locale& locale ) - throw ( css::resource::MissingResourceException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); LocaleItem* pLocaleItem = getItemForLocale( locale, false ); @@ -217,7 +212,6 @@ bool StringResourceImpl::implHasEntryForId( const OUString& ResourceID, LocaleIt } sal_Bool StringResourceImpl::hasEntryForId( const OUString& ResourceID ) - throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); return implHasEntryForId( ResourceID, m_pCurrentLocaleItem ); @@ -225,7 +219,6 @@ sal_Bool StringResourceImpl::hasEntryForId( const OUString& ResourceID ) sal_Bool StringResourceImpl::hasEntryForIdAndLocale( const OUString& ResourceID, const Locale& locale ) - throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); LocaleItem* pLocaleItem = getItemForLocale( locale, false ); @@ -255,7 +248,7 @@ Sequence< OUString > StringResourceImpl::implGetResourceIDs( LocaleItem* pLocale } Sequence< OUString > StringResourceImpl::getResourceIDsForLocale - ( const Locale& locale ) throw (css::uno::RuntimeException, std::exception) + ( const Locale& locale ) { ::osl::MutexGuard aGuard( getMutex() ); LocaleItem* pLocaleItem = getItemForLocale( locale, false ); @@ -263,14 +256,12 @@ Sequence< OUString > StringResourceImpl::getResourceIDsForLocale } Sequence< OUString > StringResourceImpl::getResourceIDs( ) - throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); return implGetResourceIDs( m_pCurrentLocaleItem ); } Locale StringResourceImpl::getCurrentLocale() - throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); @@ -281,7 +272,6 @@ Locale StringResourceImpl::getCurrentLocale() } Locale StringResourceImpl::getDefaultLocale( ) - throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); @@ -292,7 +282,6 @@ Locale StringResourceImpl::getDefaultLocale( ) } Sequence< Locale > StringResourceImpl::getLocales( ) - throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); @@ -313,7 +302,6 @@ Sequence< Locale > StringResourceImpl::getLocales( ) // XStringResourceManager void StringResourceImpl::implCheckReadOnly( const sal_Char* pExceptionMsg ) - throw (NoSupportException) { if( m_bReadOnly ) { @@ -323,14 +311,12 @@ void StringResourceImpl::implCheckReadOnly( const sal_Char* pExceptionMsg ) } sal_Bool StringResourceImpl::isReadOnly() - throw (RuntimeException, std::exception) { return m_bReadOnly; } void StringResourceImpl::implSetCurrentLocale( const Locale& locale, bool FindClosestMatch, bool bUseDefaultIfNoMatch ) - throw (IllegalArgumentException, RuntimeException) { ::osl::MutexGuard aGuard( getMutex() ); @@ -354,14 +340,12 @@ void StringResourceImpl::implSetCurrentLocale( const Locale& locale, } void StringResourceImpl::setCurrentLocale( const Locale& locale, sal_Bool FindClosestMatch ) - throw (IllegalArgumentException, RuntimeException, std::exception) { bool bUseDefaultIfNoMatch = false; implSetCurrentLocale( locale, FindClosestMatch, bUseDefaultIfNoMatch ); } void StringResourceImpl::setDefaultLocale( const Locale& locale ) - throw (IllegalArgumentException, RuntimeException,NoSupportException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); implCheckReadOnly( "StringResourceImpl::setDefaultLocale(): Read only" ); @@ -403,7 +387,6 @@ void StringResourceImpl::implSetString( const OUString& ResourceID, } void StringResourceImpl::setString( const OUString& ResourceID, const OUString& Str ) - throw (NoSupportException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); implCheckReadOnly( "StringResourceImpl::setString(): Read only" ); @@ -412,7 +395,6 @@ void StringResourceImpl::setString( const OUString& ResourceID, const OUString& void StringResourceImpl::setStringForLocale ( const OUString& ResourceID, const OUString& Str, const Locale& locale ) - throw (NoSupportException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); implCheckReadOnly( "StringResourceImpl::setStringForLocale(): Read only" ); @@ -421,7 +403,6 @@ void StringResourceImpl::setStringForLocale } void StringResourceImpl::implRemoveId( const OUString& ResourceID, LocaleItem* pLocaleItem ) - throw (css::resource::MissingResourceException) { if( pLocaleItem != nullptr && loadLocale( pLocaleItem ) ) { @@ -440,7 +421,6 @@ void StringResourceImpl::implRemoveId( const OUString& ResourceID, LocaleItem* p } void StringResourceImpl::removeId( const OUString& ResourceID ) - throw (css::resource::MissingResourceException, RuntimeException, NoSupportException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); implCheckReadOnly( "StringResourceImpl::removeId(): Read only" ); @@ -448,7 +428,6 @@ void StringResourceImpl::removeId( const OUString& ResourceID ) } void StringResourceImpl::removeIdForLocale( const OUString& ResourceID, const Locale& locale ) - throw (css::resource::MissingResourceException, RuntimeException, NoSupportException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); implCheckReadOnly( "StringResourceImpl::removeIdForLocale(): Read only" ); @@ -457,7 +436,6 @@ void StringResourceImpl::removeIdForLocale( const OUString& ResourceID, const Lo } void StringResourceImpl::newLocale( const Locale& locale ) - throw (ElementExistException, IllegalArgumentException, RuntimeException, NoSupportException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); implCheckReadOnly( "StringResourceImpl::newLocale(): Read only" ); @@ -520,7 +498,6 @@ void StringResourceImpl::newLocale( const Locale& locale ) } void StringResourceImpl::removeLocale( const Locale& locale ) - throw (IllegalArgumentException, RuntimeException, NoSupportException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); implCheckReadOnly( "StringResourceImpl::removeLocale(): Read only" ); @@ -609,7 +586,6 @@ void StringResourceImpl::implScanIdForNumber( const OUString& ResourceID ) } sal_Int32 StringResourceImpl::getUniqueNumericId( ) - throw (RuntimeException, NoSupportException, std::exception) { if( m_nNextUniqueNumericId == UNIQUE_NUMBER_NEEDS_INITIALISATION ) { @@ -630,7 +606,6 @@ sal_Int32 StringResourceImpl::getUniqueNumericId( ) LocaleItem* StringResourceImpl::getItemForLocale ( const Locale& locale, bool bException ) - throw (css::lang::IllegalArgumentException) { LocaleItem* pRetItem = nullptr; @@ -740,21 +715,18 @@ StringResourcePersistenceImpl::~StringResourcePersistenceImpl() OUString StringResourcePersistenceImpl::getImplementationName( ) - throw (RuntimeException, std::exception) { return OUString( "com.sun.star.comp.scripting.StringResource"); } sal_Bool StringResourcePersistenceImpl::supportsService( const OUString& rServiceName ) - throw (RuntimeException, std::exception) { return cppu::supportsService( this, rServiceName ); } Sequence< OUString > StringResourcePersistenceImpl::getSupportedServiceNames( ) - throw (RuntimeException, std::exception) { return StringResourceImpl::getSupportedServiceNames(); } @@ -767,7 +739,6 @@ static const char aNameBaseDefaultStr[] = "strings"; void StringResourcePersistenceImpl::implInitializeCommonParameters ( const Sequence< Any >& aArguments ) - throw (Exception, RuntimeException) { bool bReadOnlyOk = (aArguments[1] >>= m_bReadOnly); if( !bReadOnlyOk ) @@ -812,113 +783,93 @@ void StringResourcePersistenceImpl::implInitializeCommonParameters // XModifyBroadcaster void StringResourcePersistenceImpl::addModifyListener( const Reference< XModifyListener >& aListener ) - throw (RuntimeException, std::exception) { StringResourceImpl::addModifyListener( aListener ); } void StringResourcePersistenceImpl::removeModifyListener( const Reference< XModifyListener >& aListener ) - throw (RuntimeException, std::exception) { StringResourceImpl::removeModifyListener( aListener ); } // XStringResourceResolver OUString StringResourcePersistenceImpl::resolveString( const OUString& ResourceID ) - throw (css::resource::MissingResourceException, RuntimeException, std::exception) { return StringResourceImpl::resolveString( ResourceID ) ; } OUString StringResourcePersistenceImpl::resolveStringForLocale( const OUString& ResourceID, const Locale& locale ) - throw ( css::resource::MissingResourceException, RuntimeException, std::exception) { return StringResourceImpl::resolveStringForLocale( ResourceID, locale ); } sal_Bool StringResourcePersistenceImpl::hasEntryForId( const OUString& ResourceID ) - throw (RuntimeException, std::exception) { return StringResourceImpl::hasEntryForId( ResourceID ) ; } sal_Bool StringResourcePersistenceImpl::hasEntryForIdAndLocale( const OUString& ResourceID, const Locale& locale ) - throw (RuntimeException, std::exception) { return StringResourceImpl::hasEntryForIdAndLocale( ResourceID, locale ); } Locale StringResourcePersistenceImpl::getCurrentLocale() - throw (RuntimeException, std::exception) { return StringResourceImpl::getCurrentLocale(); } Locale StringResourcePersistenceImpl::getDefaultLocale( ) - throw (RuntimeException, std::exception) { return StringResourceImpl::getDefaultLocale(); } Sequence< Locale > StringResourcePersistenceImpl::getLocales( ) - throw (RuntimeException, std::exception) { return StringResourceImpl::getLocales(); } // XStringResourceManager sal_Bool StringResourcePersistenceImpl::isReadOnly() - throw (RuntimeException, std::exception) { return StringResourceImpl::isReadOnly(); } void StringResourcePersistenceImpl::setCurrentLocale( const Locale& locale, sal_Bool FindClosestMatch ) - throw (IllegalArgumentException, RuntimeException, std::exception) { StringResourceImpl::setCurrentLocale( locale, FindClosestMatch ); } void StringResourcePersistenceImpl::setDefaultLocale( const Locale& locale ) - throw (IllegalArgumentException, RuntimeException,NoSupportException, std::exception) { StringResourceImpl::setDefaultLocale( locale ); } Sequence< OUString > StringResourcePersistenceImpl::getResourceIDs( ) - throw (RuntimeException, std::exception) { return StringResourceImpl::getResourceIDs(); } void StringResourcePersistenceImpl::setString( const OUString& ResourceID, const OUString& Str ) - throw (NoSupportException, RuntimeException, std::exception) { StringResourceImpl::setString( ResourceID, Str ); } void StringResourcePersistenceImpl::setStringForLocale ( const OUString& ResourceID, const OUString& Str, const Locale& locale ) - throw (NoSupportException, RuntimeException, std::exception) { StringResourceImpl::setStringForLocale( ResourceID, Str, locale ); } Sequence< OUString > StringResourcePersistenceImpl::getResourceIDsForLocale - ( const Locale& locale ) throw (css::uno::RuntimeException, std::exception) + ( const Locale& locale ) { return StringResourceImpl::getResourceIDsForLocale( locale ); } void StringResourcePersistenceImpl::removeId( const OUString& ResourceID ) - throw (css::resource::MissingResourceException, RuntimeException, NoSupportException, std::exception) { StringResourceImpl::removeId( ResourceID ); } void StringResourcePersistenceImpl::removeIdForLocale( const OUString& ResourceID, const Locale& locale ) - throw (css::resource::MissingResourceException, RuntimeException, NoSupportException, std::exception) { StringResourceImpl::removeIdForLocale( ResourceID, locale ); } void StringResourcePersistenceImpl::newLocale( const Locale& locale ) - throw (ElementExistException, IllegalArgumentException, RuntimeException, NoSupportException, std::exception) { StringResourceImpl::newLocale( locale ); } void StringResourcePersistenceImpl::removeLocale( const Locale& locale ) - throw (IllegalArgumentException, RuntimeException, NoSupportException, std::exception) { StringResourceImpl::removeLocale( locale ); } sal_Int32 StringResourcePersistenceImpl::getUniqueNumericId( ) - throw (RuntimeException, NoSupportException, std::exception) { return StringResourceImpl::getUniqueNumericId(); } @@ -927,12 +878,10 @@ sal_Int32 StringResourcePersistenceImpl::getUniqueNumericId( ) // XStringResourcePersistence void StringResourcePersistenceImpl::store() - throw (NoSupportException, Exception, RuntimeException, std::exception) { } sal_Bool StringResourcePersistenceImpl::isModified( ) - throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); @@ -940,14 +889,12 @@ sal_Bool StringResourcePersistenceImpl::isModified( ) } void StringResourcePersistenceImpl::setComment( const OUString& Comment ) - throw (css::uno::RuntimeException, std::exception) { m_aComment = Comment; } void StringResourcePersistenceImpl::storeToStorage( const Reference< XStorage >& Storage, const OUString& NameBase, const OUString& Comment ) - throw (Exception, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); @@ -964,7 +911,6 @@ void StringResourcePersistenceImpl::implStoreAtStorage bool bUsedForStore, bool bStoreAll ) - throw (Exception, RuntimeException, std::exception) { // Delete files for deleted locales if( bUsedForStore ) @@ -1072,7 +1018,6 @@ void StringResourcePersistenceImpl::implStoreAtStorage void StringResourcePersistenceImpl::storeToURL( const OUString& URL, const OUString& NameBase, const OUString& Comment, const Reference< css::task::XInteractionHandler >& Handler ) - throw (Exception, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); @@ -1092,7 +1037,6 @@ void StringResourcePersistenceImpl::implKillRemovedLocaleFiles const OUString& aNameBase, const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& xFileAccess ) - throw (Exception, RuntimeException, std::exception) { // Delete files for deleted locales while( m_aDeletedLocaleItemVector.size() > 0 ) @@ -1118,7 +1062,6 @@ void StringResourcePersistenceImpl::implKillChangedDefaultFiles const OUString& aNameBase, const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& xFileAccess ) - throw (Exception, RuntimeException, std::exception) { // Delete files for changed defaults for( LocaleItemVectorIt it = m_aChangedDefaultLocaleVector.begin(); @@ -1148,7 +1091,6 @@ void StringResourcePersistenceImpl::implStoreAtLocation bool bStoreAll, bool bKillAll ) - throw (Exception, RuntimeException, std::exception) { // Delete files for deleted locales if( bUsedForStore || bKillAll ) @@ -1339,7 +1281,6 @@ Sequence< ::sal_Int8 > BinaryOutput::closeAndGetData() // pos3 Properties file written by implWritePropertiesFile Sequence< sal_Int8 > StringResourcePersistenceImpl::exportBinary( ) - throw (RuntimeException, std::exception) { BinaryOutput aOut( m_xContext ); @@ -1546,7 +1487,6 @@ OUString BinaryInput::readString() } void StringResourcePersistenceImpl::importBinary( const Sequence< ::sal_Int8 >& Data ) - throw (IllegalArgumentException, RuntimeException, std::exception) { // Init: Remove all locales sal_Int32 nOldLocaleCount = 0; @@ -2239,17 +2179,17 @@ StringResourceWithStorageImpl::~StringResourceWithStorageImpl() // XServiceInfo -OUString StringResourceWithStorageImpl::getImplementationName( ) throw (RuntimeException, std::exception) +OUString StringResourceWithStorageImpl::getImplementationName( ) { return getImplementationName_StringResourceWithStorageImpl(); } -sal_Bool StringResourceWithStorageImpl::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception) +sal_Bool StringResourceWithStorageImpl::supportsService( const OUString& rServiceName ) { return cppu::supportsService(this, rServiceName); } -Sequence< OUString > StringResourceWithStorageImpl::getSupportedServiceNames( ) throw (RuntimeException, std::exception) +Sequence< OUString > StringResourceWithStorageImpl::getSupportedServiceNames( ) { return getSupportedServiceNames_StringResourceWithStorageImpl(); } @@ -2259,7 +2199,6 @@ Sequence< OUString > StringResourceWithStorageImpl::getSupportedServiceNames( ) void StringResourceWithStorageImpl::initialize( const Sequence< Any >& aArguments ) - throw (Exception, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); @@ -2287,120 +2226,99 @@ void StringResourceWithStorageImpl::initialize( const Sequence< Any >& aArgument // XModifyBroadcaster void StringResourceWithStorageImpl::addModifyListener( const Reference< XModifyListener >& aListener ) - throw (RuntimeException, std::exception) { StringResourceImpl::addModifyListener( aListener ); } void StringResourceWithStorageImpl::removeModifyListener( const Reference< XModifyListener >& aListener ) - throw (RuntimeException, std::exception) { StringResourceImpl::removeModifyListener( aListener ); } // XStringResourceResolver OUString StringResourceWithStorageImpl::resolveString( const OUString& ResourceID ) - throw (css::resource::MissingResourceException, RuntimeException, std::exception) { return StringResourceImpl::resolveString( ResourceID ) ; } OUString StringResourceWithStorageImpl::resolveStringForLocale( const OUString& ResourceID, const Locale& locale ) - throw ( css::resource::MissingResourceException, RuntimeException, std::exception) { return StringResourceImpl::resolveStringForLocale( ResourceID, locale ); } sal_Bool StringResourceWithStorageImpl::hasEntryForId( const OUString& ResourceID ) - throw (RuntimeException, std::exception) { return StringResourceImpl::hasEntryForId( ResourceID ) ; } sal_Bool StringResourceWithStorageImpl::hasEntryForIdAndLocale( const OUString& ResourceID, const Locale& locale ) - throw (RuntimeException, std::exception) { return StringResourceImpl::hasEntryForIdAndLocale( ResourceID, locale ); } Sequence< OUString > StringResourceWithStorageImpl::getResourceIDs( ) - throw (RuntimeException, std::exception) { return StringResourceImpl::getResourceIDs(); } Sequence< OUString > StringResourceWithStorageImpl::getResourceIDsForLocale - ( const Locale& locale ) throw (css::uno::RuntimeException, std::exception) + ( const Locale& locale ) { return StringResourceImpl::getResourceIDsForLocale( locale ); } Locale StringResourceWithStorageImpl::getCurrentLocale() - throw (RuntimeException, std::exception) { return StringResourceImpl::getCurrentLocale(); } Locale StringResourceWithStorageImpl::getDefaultLocale( ) - throw (RuntimeException, std::exception) { return StringResourceImpl::getDefaultLocale(); } Sequence< Locale > StringResourceWithStorageImpl::getLocales( ) - throw (RuntimeException, std::exception) { return StringResourceImpl::getLocales(); } // XStringResourceManager sal_Bool StringResourceWithStorageImpl::isReadOnly() - throw (RuntimeException, std::exception) { return StringResourceImpl::isReadOnly(); } void StringResourceWithStorageImpl::setCurrentLocale( const Locale& locale, sal_Bool FindClosestMatch ) - throw (IllegalArgumentException, RuntimeException, std::exception) { StringResourceImpl::setCurrentLocale( locale, FindClosestMatch ); } void StringResourceWithStorageImpl::setDefaultLocale( const Locale& locale ) - throw (IllegalArgumentException, RuntimeException,NoSupportException, std::exception) { StringResourceImpl::setDefaultLocale( locale ); } void StringResourceWithStorageImpl::setString( const OUString& ResourceID, const OUString& Str ) - throw (NoSupportException, RuntimeException, std::exception) { StringResourceImpl::setString( ResourceID, Str ); } void StringResourceWithStorageImpl::setStringForLocale ( const OUString& ResourceID, const OUString& Str, const Locale& locale ) - throw (NoSupportException, RuntimeException, std::exception) { StringResourceImpl::setStringForLocale( ResourceID, Str, locale ); } void StringResourceWithStorageImpl::removeId( const OUString& ResourceID ) - throw (css::resource::MissingResourceException, RuntimeException, NoSupportException, std::exception) { StringResourceImpl::removeId( ResourceID ); } void StringResourceWithStorageImpl::removeIdForLocale( const OUString& ResourceID, const Locale& locale ) - throw (css::resource::MissingResourceException, RuntimeException, NoSupportException, std::exception) { StringResourceImpl::removeIdForLocale( ResourceID, locale ); } void StringResourceWithStorageImpl::newLocale( const Locale& locale ) - throw (ElementExistException, IllegalArgumentException, RuntimeException, NoSupportException, std::exception) { StringResourceImpl::newLocale( locale ); } void StringResourceWithStorageImpl::removeLocale( const Locale& locale ) - throw (IllegalArgumentException, RuntimeException, NoSupportException, std::exception) { StringResourceImpl::removeLocale( locale ); } sal_Int32 StringResourceWithStorageImpl::getUniqueNumericId( ) - throw (RuntimeException, NoSupportException, std::exception) { return StringResourceImpl::getUniqueNumericId(); } // XStringResourcePersistence void StringResourceWithStorageImpl::store() - throw (NoSupportException, Exception, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); implCheckReadOnly( "StringResourceWithStorageImpl::store(): Read only" ); @@ -2416,35 +2334,29 @@ void StringResourceWithStorageImpl::store() } sal_Bool StringResourceWithStorageImpl::isModified( ) - throw (RuntimeException, std::exception) { return StringResourcePersistenceImpl::isModified(); } void StringResourceWithStorageImpl::setComment( const OUString& Comment ) - throw (css::uno::RuntimeException, std::exception) { StringResourcePersistenceImpl::setComment( Comment ); } void StringResourceWithStorageImpl::storeToStorage( const Reference< XStorage >& Storage, const OUString& NameBase, const OUString& Comment ) - throw (Exception, RuntimeException, std::exception) { StringResourcePersistenceImpl::storeToStorage( Storage, NameBase, Comment ); } void StringResourceWithStorageImpl::storeToURL( const OUString& URL, const OUString& NameBase, const OUString& Comment, const Reference< css::task::XInteractionHandler >& Handler ) - throw (Exception, RuntimeException, std::exception) { StringResourcePersistenceImpl::storeToURL( URL, NameBase, Comment, Handler ); } Sequence< ::sal_Int8 > StringResourceWithStorageImpl::exportBinary( ) - throw (RuntimeException, std::exception) { return StringResourcePersistenceImpl::exportBinary(); } void StringResourceWithStorageImpl::importBinary( const Sequence< ::sal_Int8 >& Data ) - throw (IllegalArgumentException, RuntimeException, std::exception) { StringResourcePersistenceImpl::importBinary( Data ); } @@ -2453,14 +2365,12 @@ void StringResourceWithStorageImpl::importBinary( const Sequence< ::sal_Int8 >& // XStringResourceWithStorage void StringResourceWithStorageImpl::storeAsStorage( const Reference< XStorage >& Storage ) - throw (Exception, RuntimeException, std::exception) { setStorage( Storage ); store(); } void StringResourceWithStorageImpl::setStorage( const Reference< XStorage >& Storage ) - throw (IllegalArgumentException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); @@ -2559,17 +2469,17 @@ StringResourceWithLocationImpl::~StringResourceWithLocationImpl() // XServiceInfo -OUString StringResourceWithLocationImpl::getImplementationName( ) throw (RuntimeException, std::exception) +OUString StringResourceWithLocationImpl::getImplementationName( ) { return getImplementationName_StringResourceWithLocationImpl(); } -sal_Bool StringResourceWithLocationImpl::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception) +sal_Bool StringResourceWithLocationImpl::supportsService( const OUString& rServiceName ) { return cppu::supportsService(this, rServiceName); } -Sequence< OUString > StringResourceWithLocationImpl::getSupportedServiceNames( ) throw (RuntimeException, std::exception) +Sequence< OUString > StringResourceWithLocationImpl::getSupportedServiceNames( ) { return getSupportedServiceNames_StringResourceWithLocationImpl(); } @@ -2579,7 +2489,6 @@ Sequence< OUString > StringResourceWithLocationImpl::getSupportedServiceNames( void StringResourceWithLocationImpl::initialize( const Sequence< Any >& aArguments ) - throw (Exception, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); @@ -2623,120 +2532,99 @@ void StringResourceWithLocationImpl::initialize( const Sequence< Any >& aArgumen // XModifyBroadcaster void StringResourceWithLocationImpl::addModifyListener( const Reference< XModifyListener >& aListener ) - throw (RuntimeException, std::exception) { StringResourceImpl::addModifyListener( aListener ); } void StringResourceWithLocationImpl::removeModifyListener( const Reference< XModifyListener >& aListener ) - throw (RuntimeException, std::exception) { StringResourceImpl::removeModifyListener( aListener ); } // XStringResourceResolver OUString StringResourceWithLocationImpl::resolveString( const OUString& ResourceID ) - throw (css::resource::MissingResourceException, RuntimeException, std::exception) { return StringResourceImpl::resolveString( ResourceID ) ; } OUString StringResourceWithLocationImpl::resolveStringForLocale( const OUString& ResourceID, const Locale& locale ) - throw ( css::resource::MissingResourceException, RuntimeException, std::exception) { return StringResourceImpl::resolveStringForLocale( ResourceID, locale ); } sal_Bool StringResourceWithLocationImpl::hasEntryForId( const OUString& ResourceID ) - throw (RuntimeException, std::exception) { return StringResourceImpl::hasEntryForId( ResourceID ) ; } sal_Bool StringResourceWithLocationImpl::hasEntryForIdAndLocale( const OUString& ResourceID, const Locale& locale ) - throw (RuntimeException, std::exception) { return StringResourceImpl::hasEntryForIdAndLocale( ResourceID, locale ); } Sequence< OUString > StringResourceWithLocationImpl::getResourceIDs( ) - throw (RuntimeException, std::exception) { return StringResourceImpl::getResourceIDs(); } Sequence< OUString > StringResourceWithLocationImpl::getResourceIDsForLocale - ( const Locale& locale ) throw (css::uno::RuntimeException, std::exception) + ( const Locale& locale ) { return StringResourceImpl::getResourceIDsForLocale( locale ); } Locale StringResourceWithLocationImpl::getCurrentLocale() - throw (RuntimeException, std::exception) { return StringResourceImpl::getCurrentLocale(); } Locale StringResourceWithLocationImpl::getDefaultLocale( ) - throw (RuntimeException, std::exception) { return StringResourceImpl::getDefaultLocale(); } Sequence< Locale > StringResourceWithLocationImpl::getLocales( ) - throw (RuntimeException, std::exception) { return StringResourceImpl::getLocales(); } // XStringResourceManager sal_Bool StringResourceWithLocationImpl::isReadOnly() - throw (RuntimeException, std::exception) { return StringResourceImpl::isReadOnly(); } void StringResourceWithLocationImpl::setCurrentLocale( const Locale& locale, sal_Bool FindClosestMatch ) - throw (IllegalArgumentException, RuntimeException, std::exception) { StringResourceImpl::setCurrentLocale( locale, FindClosestMatch ); } void StringResourceWithLocationImpl::setDefaultLocale( const Locale& locale ) - throw (IllegalArgumentException, RuntimeException,NoSupportException, std::exception) { StringResourceImpl::setDefaultLocale( locale ); } void StringResourceWithLocationImpl::setString( const OUString& ResourceID, const OUString& Str ) - throw (NoSupportException, RuntimeException, std::exception) { StringResourceImpl::setString( ResourceID, Str ); } void StringResourceWithLocationImpl::setStringForLocale ( const OUString& ResourceID, const OUString& Str, const Locale& locale ) - throw (NoSupportException, RuntimeException, std::exception) { StringResourceImpl::setStringForLocale( ResourceID, Str, locale ); } void StringResourceWithLocationImpl::removeId( const OUString& ResourceID ) - throw (css::resource::MissingResourceException, RuntimeException, NoSupportException, std::exception) { StringResourceImpl::removeId( ResourceID ); } void StringResourceWithLocationImpl::removeIdForLocale( const OUString& ResourceID, const Locale& locale ) - throw (css::resource::MissingResourceException, RuntimeException, NoSupportException, std::exception) { StringResourceImpl::removeIdForLocale( ResourceID, locale ); } void StringResourceWithLocationImpl::newLocale( const Locale& locale ) - throw (ElementExistException, IllegalArgumentException, RuntimeException, NoSupportException, std::exception) { StringResourceImpl::newLocale( locale ); } void StringResourceWithLocationImpl::removeLocale( const Locale& locale ) - throw (IllegalArgumentException, RuntimeException, NoSupportException, std::exception) { StringResourceImpl::removeLocale( locale ); } sal_Int32 StringResourceWithLocationImpl::getUniqueNumericId( ) - throw (RuntimeException, NoSupportException, std::exception) { return StringResourceImpl::getUniqueNumericId(); } // XStringResourcePersistence void StringResourceWithLocationImpl::store() - throw (NoSupportException, Exception, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); implCheckReadOnly( "StringResourceWithLocationImpl::store(): Read only" ); @@ -2754,35 +2642,29 @@ void StringResourceWithLocationImpl::store() } sal_Bool StringResourceWithLocationImpl::isModified( ) - throw (RuntimeException, std::exception) { return StringResourcePersistenceImpl::isModified(); } void StringResourceWithLocationImpl::setComment( const OUString& Comment ) - throw (css::uno::RuntimeException, std::exception) { StringResourcePersistenceImpl::setComment( Comment ); } void StringResourceWithLocationImpl::storeToStorage( const Reference< XStorage >& Storage, const OUString& NameBase, const OUString& Comment ) - throw (Exception, RuntimeException, std::exception) { StringResourcePersistenceImpl::storeToStorage( Storage, NameBase, Comment ); } void StringResourceWithLocationImpl::storeToURL( const OUString& URL, const OUString& NameBase, const OUString& Comment, const Reference< css::task::XInteractionHandler >& Handler ) - throw (Exception, RuntimeException, std::exception) { StringResourcePersistenceImpl::storeToURL( URL, NameBase, Comment, Handler ); } Sequence< ::sal_Int8 > StringResourceWithLocationImpl::exportBinary( ) - throw (RuntimeException, std::exception) { return StringResourcePersistenceImpl::exportBinary(); } void StringResourceWithLocationImpl::importBinary( const Sequence< ::sal_Int8 >& Data ) - throw (IllegalArgumentException, RuntimeException, std::exception) { StringResourcePersistenceImpl::importBinary( Data ); } @@ -2792,16 +2674,12 @@ void StringResourceWithLocationImpl::importBinary( const Sequence< ::sal_Int8 >& // XStringResourceWithLocation void StringResourceWithLocationImpl::storeAsURL( const OUString& URL ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { setURL( URL ); store(); } void StringResourceWithLocationImpl::setURL( const OUString& URL ) - throw (css::lang::IllegalArgumentException, - css::lang::NoSupportException, - css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); implCheckReadOnly( "StringResourceWithLocationImpl::setURL(): Read only" ); diff --git a/scripting/source/stringresource/stringresource.hxx b/scripting/source/stringresource/stringresource.hxx index b67403937217..c4754b02864a 100644 --- a/scripting/source/stringresource/stringresource.hxx +++ b/scripting/source/stringresource/stringresource.hxx @@ -118,14 +118,12 @@ protected: // Checks read only status and throws exception if it's true /// @throws css::lang::NoSupportException - void implCheckReadOnly( const sal_Char* pExceptionMsg ) - throw (css::lang::NoSupportException); + void implCheckReadOnly( const sal_Char* pExceptionMsg ); // Returns the LocalItem for a given locale, if it exists, otherwise NULL // This method compares the locales exactly, no closest match search is performed /// @throws css::lang::IllegalArgumentException - LocaleItem* getItemForLocale( const css::lang::Locale& locale, bool bException ) - throw (css::lang::IllegalArgumentException); + LocaleItem* getItemForLocale( const css::lang::Locale& locale, bool bException ); // Returns the LocalItem for a given locale, if it exists, otherwise NULL // This method performs a closest match search, at least the language must match @@ -133,23 +131,20 @@ protected: /// @throws css::lang::IllegalArgumentException /// @throws css::uno::RuntimeException void implSetCurrentLocale( const css::lang::Locale& locale, - bool FindClosestMatch, bool bUseDefaultIfNoMatch ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); + bool FindClosestMatch, bool bUseDefaultIfNoMatch ); void implModified(); void implNotifyListeners(); //=== Impl methods for ...ForLocale methods === /// @throws css::resource::MissingResourceException - OUString SAL_CALL implResolveString( const OUString& ResourceID, LocaleItem* pLocaleItem ) - throw (css::resource::MissingResourceException); + OUString SAL_CALL implResolveString( const OUString& ResourceID, LocaleItem* pLocaleItem ); bool implHasEntryForId( const OUString& ResourceID, LocaleItem* pLocaleItem ); css::uno::Sequence< OUString > implGetResourceIDs( LocaleItem* pLocaleItem ); void implSetString( const OUString& ResourceID, const OUString& Str, LocaleItem* pLocaleItem ); /// @throws css::resource::MissingResourceException - void implRemoveId( const OUString& ResourceID, LocaleItem* pLocaleItem ) - throw (css::resource::MissingResourceException); + void implRemoveId( const OUString& ResourceID, LocaleItem* pLocaleItem ); // Method to load a locale if necessary, returns true if loading was // successful. Default implementation in base class just returns true. @@ -163,72 +158,41 @@ public: virtual ~StringResourceImpl() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XModifyBroadcaster - virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override; + virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override; // XStringResourceResolver - virtual OUString SAL_CALL resolveString( const OUString& ResourceID ) - throw (css::resource::MissingResourceException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL resolveString( const OUString& ResourceID ) override; virtual OUString SAL_CALL resolveStringForLocale( const OUString& ResourceID, - const css::lang::Locale& locale ) - throw ( css::resource::MissingResourceException, - css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasEntryForId( const OUString& ResourceID ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::Locale& locale ) override; + virtual sal_Bool SAL_CALL hasEntryForId( const OUString& ResourceID ) override; virtual sal_Bool SAL_CALL hasEntryForIdAndLocale( const OUString& ResourceID, - const css::lang::Locale& locale ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getResourceIDs( ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::Locale& locale ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getResourceIDs( ) override; virtual css::uno::Sequence< OUString > SAL_CALL getResourceIDsForLocale - ( const css::lang::Locale& locale ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::lang::Locale SAL_CALL getCurrentLocale( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::lang::Locale SAL_CALL getDefaultLocale( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getLocales( ) - throw (css::uno::RuntimeException, std::exception) override; + ( const css::lang::Locale& locale ) override; + virtual css::lang::Locale SAL_CALL getCurrentLocale( ) override; + virtual css::lang::Locale SAL_CALL getDefaultLocale( ) override; + virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getLocales( ) override; // XStringResourceManager - virtual sal_Bool SAL_CALL isReadOnly() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCurrentLocale( const css::lang::Locale& locale, sal_Bool FindClosestMatch ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDefaultLocale( const css::lang::Locale& locale ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, - css::lang::NoSupportException, std::exception) override; - virtual void SAL_CALL setString( const OUString& ResourceID, const OUString& Str ) - throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isReadOnly() override; + virtual void SAL_CALL setCurrentLocale( const css::lang::Locale& locale, sal_Bool FindClosestMatch ) override; + virtual void SAL_CALL setDefaultLocale( const css::lang::Locale& locale ) override; + virtual void SAL_CALL setString( const OUString& ResourceID, const OUString& Str ) override; virtual void SAL_CALL setStringForLocale( const OUString& ResourceID, const OUString& Str, - const css::lang::Locale& locale ) - throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeId( const OUString& ResourceID ) - throw (css::resource::MissingResourceException, css::uno::RuntimeException, - css::lang::NoSupportException, std::exception) override; + const css::lang::Locale& locale ) override; + virtual void SAL_CALL removeId( const OUString& ResourceID ) override; virtual void SAL_CALL removeIdForLocale( const OUString& ResourceID, - const css::lang::Locale& locale ) - throw (css::resource::MissingResourceException, css::uno::RuntimeException, - css::lang::NoSupportException, std::exception) override; - virtual void SAL_CALL newLocale( const css::lang::Locale& locale ) - throw (css::container::ElementExistException, css::lang::IllegalArgumentException, - css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeLocale( const css::lang::Locale& locale ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, - css::lang::NoSupportException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getUniqueNumericId( ) - throw (css::lang::NoSupportException, - css::uno::RuntimeException, std::exception) override; + const css::lang::Locale& locale ) override; + virtual void SAL_CALL newLocale( const css::lang::Locale& locale ) override; + virtual void SAL_CALL removeLocale( const css::lang::Locale& locale ) override; + virtual ::sal_Int32 SAL_CALL getUniqueNumericId( ) override; }; typedef ::cppu::ImplInheritanceHelper< @@ -245,8 +209,7 @@ protected: /// @throws css::uno::Exception /// @throws css::uno::RuntimeException - void SAL_CALL implInitializeCommonParameters( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw (css::uno::Exception, css::uno::RuntimeException); + void SAL_CALL implInitializeCommonParameters( const css::uno::Sequence< css::uno::Any >& aArguments ); // Scan locale properties files virtual void implScanLocales(); @@ -282,8 +245,7 @@ protected: const css::uno::Reference< css::embed::XStorage >& Storage, bool bUsedForStore, bool bStoreAll - ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception); + ); /// @throws css::uno::Exception /// @throws css::uno::RuntimeException @@ -292,8 +254,7 @@ protected: const OUString& Location, const OUString& aNameBase, const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& xFileAccess - ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception); + ); /// @throws css::uno::Exception /// @throws css::uno::RuntimeException @@ -302,8 +263,7 @@ protected: const OUString& Location, const OUString& aNameBase, const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& xFileAccess - ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception); + ); /// @throws css::uno::Exception /// @throws css::uno::RuntimeException @@ -316,8 +276,7 @@ protected: bool bUsedForStore, bool bStoreAll, bool bKillAll = false - ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception); + ); public: explicit StringResourcePersistenceImpl( @@ -325,94 +284,54 @@ public: virtual ~StringResourcePersistenceImpl() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XModifyBroadcaster - virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override; + virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override; // XStringResourceResolver - virtual OUString SAL_CALL resolveString( const OUString& ResourceID ) - throw (css::resource::MissingResourceException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL resolveString( const OUString& ResourceID ) override; virtual OUString SAL_CALL resolveStringForLocale( const OUString& ResourceID, - const css::lang::Locale& locale ) - throw ( css::resource::MissingResourceException, - css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasEntryForId( const OUString& ResourceID ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::Locale& locale ) override; + virtual sal_Bool SAL_CALL hasEntryForId( const OUString& ResourceID ) override; virtual sal_Bool SAL_CALL hasEntryForIdAndLocale( const OUString& ResourceID, - const css::lang::Locale& locale ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getResourceIDs( ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::Locale& locale ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getResourceIDs( ) override; virtual css::uno::Sequence< OUString > SAL_CALL getResourceIDsForLocale - ( const css::lang::Locale& locale ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::lang::Locale SAL_CALL getCurrentLocale( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::lang::Locale SAL_CALL getDefaultLocale( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getLocales( ) - throw (css::uno::RuntimeException, std::exception) override; + ( const css::lang::Locale& locale ) override; + virtual css::lang::Locale SAL_CALL getCurrentLocale( ) override; + virtual css::lang::Locale SAL_CALL getDefaultLocale( ) override; + virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getLocales( ) override; // XStringResourceManager - virtual sal_Bool SAL_CALL isReadOnly() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCurrentLocale( const css::lang::Locale& locale, sal_Bool FindClosestMatch ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDefaultLocale( const css::lang::Locale& locale ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, - css::lang::NoSupportException, std::exception) override; - virtual void SAL_CALL setString( const OUString& ResourceID, const OUString& Str ) - throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isReadOnly() override; + virtual void SAL_CALL setCurrentLocale( const css::lang::Locale& locale, sal_Bool FindClosestMatch ) override; + virtual void SAL_CALL setDefaultLocale( const css::lang::Locale& locale ) override; + virtual void SAL_CALL setString( const OUString& ResourceID, const OUString& Str ) override; virtual void SAL_CALL setStringForLocale( const OUString& ResourceID, const OUString& Str, - const css::lang::Locale& locale ) - throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeId( const OUString& ResourceID ) - throw (css::resource::MissingResourceException, css::uno::RuntimeException, - css::lang::NoSupportException, std::exception) override; + const css::lang::Locale& locale ) override; + virtual void SAL_CALL removeId( const OUString& ResourceID ) override; virtual void SAL_CALL removeIdForLocale( const OUString& ResourceID, - const css::lang::Locale& locale ) - throw (css::resource::MissingResourceException, css::uno::RuntimeException, - css::lang::NoSupportException, std::exception) override; - virtual void SAL_CALL newLocale( const css::lang::Locale& locale ) - throw (css::container::ElementExistException, css::lang::IllegalArgumentException, - css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeLocale( const css::lang::Locale& locale ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, - css::lang::NoSupportException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getUniqueNumericId( ) - throw (css::lang::NoSupportException, - css::uno::RuntimeException, std::exception) override; + const css::lang::Locale& locale ) override; + virtual void SAL_CALL newLocale( const css::lang::Locale& locale ) override; + virtual void SAL_CALL removeLocale( const css::lang::Locale& locale ) override; + virtual ::sal_Int32 SAL_CALL getUniqueNumericId( ) override; // XStringResourcePersistence - virtual void SAL_CALL store( ) - throw (css::lang::NoSupportException, - css::uno::Exception, - css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isModified( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setComment( const OUString& Comment ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL store( ) override; + virtual sal_Bool SAL_CALL isModified( ) override; + virtual void SAL_CALL setComment( const OUString& Comment ) override; virtual void SAL_CALL storeToStorage ( const css::uno::Reference< css::embed::XStorage >& Storage, - const OUString& NameBase, const OUString& Comment ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + const OUString& NameBase, const OUString& Comment ) override; virtual void SAL_CALL storeToURL( const OUString& URL, const OUString& NameBase, const OUString& Comment, const css::uno::Reference - < css::task::XInteractionHandler >& Handler ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL exportBinary( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL importBinary( const css::uno::Sequence< ::sal_Int8 >& Data ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + < css::task::XInteractionHandler >& Handler ) override; + virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL exportBinary( ) override; + virtual void SAL_CALL importBinary( const css::uno::Sequence< ::sal_Int8 >& Data ) override; }; @@ -434,106 +353,63 @@ public: virtual ~StringResourceWithStorageImpl() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // XModifyBroadcaster - virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override; + virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override; // XStringResourceResolver - virtual OUString SAL_CALL resolveString( const OUString& ResourceID ) - throw (css::resource::MissingResourceException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL resolveString( const OUString& ResourceID ) override; virtual OUString SAL_CALL resolveStringForLocale( const OUString& ResourceID, - const css::lang::Locale& locale ) - throw ( css::resource::MissingResourceException, - css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasEntryForId( const OUString& ResourceID ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::Locale& locale ) override; + virtual sal_Bool SAL_CALL hasEntryForId( const OUString& ResourceID ) override; virtual sal_Bool SAL_CALL hasEntryForIdAndLocale( const OUString& ResourceID, - const css::lang::Locale& locale ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getResourceIDs( ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::Locale& locale ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getResourceIDs( ) override; virtual css::uno::Sequence< OUString > SAL_CALL getResourceIDsForLocale - ( const css::lang::Locale& locale ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::lang::Locale SAL_CALL getCurrentLocale( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::lang::Locale SAL_CALL getDefaultLocale( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getLocales( ) - throw (css::uno::RuntimeException, std::exception) override; + ( const css::lang::Locale& locale ) override; + virtual css::lang::Locale SAL_CALL getCurrentLocale( ) override; + virtual css::lang::Locale SAL_CALL getDefaultLocale( ) override; + virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getLocales( ) override; // XStringResourceManager - virtual sal_Bool SAL_CALL isReadOnly() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCurrentLocale( const css::lang::Locale& locale, sal_Bool FindClosestMatch ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDefaultLocale( const css::lang::Locale& locale ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, - css::lang::NoSupportException, std::exception) override; - virtual void SAL_CALL setString( const OUString& ResourceID, const OUString& Str ) - throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isReadOnly() override; + virtual void SAL_CALL setCurrentLocale( const css::lang::Locale& locale, sal_Bool FindClosestMatch ) override; + virtual void SAL_CALL setDefaultLocale( const css::lang::Locale& locale ) override; + virtual void SAL_CALL setString( const OUString& ResourceID, const OUString& Str ) override; virtual void SAL_CALL setStringForLocale( const OUString& ResourceID, const OUString& Str, - const css::lang::Locale& locale ) - throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeId( const OUString& ResourceID ) - throw (css::resource::MissingResourceException, css::uno::RuntimeException, - css::lang::NoSupportException, std::exception) override; + const css::lang::Locale& locale ) override; + virtual void SAL_CALL removeId( const OUString& ResourceID ) override; virtual void SAL_CALL removeIdForLocale( const OUString& ResourceID, - const css::lang::Locale& locale ) - throw (css::resource::MissingResourceException, css::uno::RuntimeException, - css::lang::NoSupportException, std::exception) override; - virtual void SAL_CALL newLocale( const css::lang::Locale& locale ) - throw (css::container::ElementExistException, css::lang::IllegalArgumentException, - css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeLocale( const css::lang::Locale& locale ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, - css::lang::NoSupportException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getUniqueNumericId( ) - throw (css::lang::NoSupportException, - css::uno::RuntimeException, std::exception) override; + const css::lang::Locale& locale ) override; + virtual void SAL_CALL newLocale( const css::lang::Locale& locale ) override; + virtual void SAL_CALL removeLocale( const css::lang::Locale& locale ) override; + virtual ::sal_Int32 SAL_CALL getUniqueNumericId( ) override; // XStringResourcePersistence - virtual void SAL_CALL store( ) - throw (css::lang::NoSupportException, - css::uno::Exception, - css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isModified( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setComment( const OUString& Comment ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL store( ) override; + virtual sal_Bool SAL_CALL isModified( ) override; + virtual void SAL_CALL setComment( const OUString& Comment ) override; virtual void SAL_CALL storeToStorage ( const css::uno::Reference< css::embed::XStorage >& Storage, - const OUString& NameBase, const OUString& Comment ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + const OUString& NameBase, const OUString& Comment ) override; virtual void SAL_CALL storeToURL( const OUString& URL, const OUString& NameBase, const OUString& Comment, const css::uno::Reference - < css::task::XInteractionHandler >& Handler ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL exportBinary( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL importBinary( const css::uno::Sequence< ::sal_Int8 >& Data ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + < css::task::XInteractionHandler >& Handler ) override; + virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL exportBinary( ) override; + virtual void SAL_CALL importBinary( const css::uno::Sequence< ::sal_Int8 >& Data ) override; // XStringResourceWithStorage virtual void SAL_CALL storeAsStorage - ( const css::uno::Reference< css::embed::XStorage >& Storage ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + ( const css::uno::Reference< css::embed::XStorage >& Storage ) override; virtual void SAL_CALL setStorage - ( const css::uno::Reference< css::embed::XStorage >& Storage ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + ( const css::uno::Reference< css::embed::XStorage >& Storage ) override; }; @@ -559,105 +435,61 @@ public: virtual ~StringResourceWithLocationImpl() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // XModifyBroadcaster - virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override; + virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override; // XStringResourceResolver - virtual OUString SAL_CALL resolveString( const OUString& ResourceID ) - throw (css::resource::MissingResourceException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL resolveString( const OUString& ResourceID ) override; virtual OUString SAL_CALL resolveStringForLocale( const OUString& ResourceID, - const css::lang::Locale& locale ) - throw ( css::resource::MissingResourceException, - css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasEntryForId( const OUString& ResourceID ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::Locale& locale ) override; + virtual sal_Bool SAL_CALL hasEntryForId( const OUString& ResourceID ) override; virtual sal_Bool SAL_CALL hasEntryForIdAndLocale( const OUString& ResourceID, - const css::lang::Locale& locale ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getResourceIDs( ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::Locale& locale ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getResourceIDs( ) override; virtual css::uno::Sequence< OUString > SAL_CALL getResourceIDsForLocale - ( const css::lang::Locale& locale ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::lang::Locale SAL_CALL getCurrentLocale( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::lang::Locale SAL_CALL getDefaultLocale( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getLocales( ) - throw (css::uno::RuntimeException, std::exception) override; + ( const css::lang::Locale& locale ) override; + virtual css::lang::Locale SAL_CALL getCurrentLocale( ) override; + virtual css::lang::Locale SAL_CALL getDefaultLocale( ) override; + virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getLocales( ) override; // XStringResourceManager - virtual sal_Bool SAL_CALL isReadOnly() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCurrentLocale( const css::lang::Locale& locale, sal_Bool FindClosestMatch ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDefaultLocale( const css::lang::Locale& locale ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, - css::lang::NoSupportException, std::exception) override; - virtual void SAL_CALL setString( const OUString& ResourceID, const OUString& Str ) - throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isReadOnly() override; + virtual void SAL_CALL setCurrentLocale( const css::lang::Locale& locale, sal_Bool FindClosestMatch ) override; + virtual void SAL_CALL setDefaultLocale( const css::lang::Locale& locale ) override; + virtual void SAL_CALL setString( const OUString& ResourceID, const OUString& Str ) override; virtual void SAL_CALL setStringForLocale( const OUString& ResourceID, const OUString& Str, - const css::lang::Locale& locale ) - throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeId( const OUString& ResourceID ) - throw (css::resource::MissingResourceException, css::uno::RuntimeException, - css::lang::NoSupportException, std::exception) override; + const css::lang::Locale& locale ) override; + virtual void SAL_CALL removeId( const OUString& ResourceID ) override; virtual void SAL_CALL removeIdForLocale( const OUString& ResourceID, - const css::lang::Locale& locale ) - throw (css::resource::MissingResourceException, css::uno::RuntimeException, - css::lang::NoSupportException, std::exception) override; - virtual void SAL_CALL newLocale( const css::lang::Locale& locale ) - throw (css::container::ElementExistException, css::lang::IllegalArgumentException, - css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeLocale( const css::lang::Locale& locale ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, - css::lang::NoSupportException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getUniqueNumericId( ) - throw (css::lang::NoSupportException, - css::uno::RuntimeException, std::exception) override; + const css::lang::Locale& locale ) override; + virtual void SAL_CALL newLocale( const css::lang::Locale& locale ) override; + virtual void SAL_CALL removeLocale( const css::lang::Locale& locale ) override; + virtual ::sal_Int32 SAL_CALL getUniqueNumericId( ) override; // XStringResourcePersistence - virtual void SAL_CALL store( ) - throw (css::lang::NoSupportException, - css::uno::Exception, - css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isModified( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setComment( const OUString& Comment ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL store( ) override; + virtual sal_Bool SAL_CALL isModified( ) override; + virtual void SAL_CALL setComment( const OUString& Comment ) override; virtual void SAL_CALL storeToStorage ( const css::uno::Reference< css::embed::XStorage >& Storage, - const OUString& NameBase, const OUString& Comment ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + const OUString& NameBase, const OUString& Comment ) override; virtual void SAL_CALL storeToURL( const OUString& URL, const OUString& NameBase, const OUString& Comment, const css::uno::Reference - < css::task::XInteractionHandler >& Handler ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL exportBinary( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL importBinary( const css::uno::Sequence< ::sal_Int8 >& Data ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + < css::task::XInteractionHandler >& Handler ) override; + virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL exportBinary( ) override; + virtual void SAL_CALL importBinary( const css::uno::Sequence< ::sal_Int8 >& Data ) override; // XStringResourceWithLocation - virtual void SAL_CALL storeAsURL( const OUString& URL ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setURL( const OUString& URL ) - throw (css::lang::IllegalArgumentException, css::lang::NoSupportException, - css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL storeAsURL( const OUString& URL ) override; + virtual void SAL_CALL setURL( const OUString& URL ) override; }; -- cgit