diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-25 21:31:58 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-26 18:22:20 +0100 |
commit | 5e21a413c788f839a66d9e4c14e745ed18058db8 (patch) | |
tree | d4451246461346a425ad6f796e08bf1514cdd942 /basic/source | |
parent | 6fc2bd0094a23aafadeef3f4a8c2803d621a588d (diff) |
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'basic/source')
-rw-r--r-- | basic/source/basmgr/basmgr.cxx | 150 | ||||
-rw-r--r-- | basic/source/basmgr/vbahelper.cxx | 8 | ||||
-rw-r--r-- | basic/source/classes/errobject.cxx | 52 | ||||
-rw-r--r-- | basic/source/classes/eventatt.cxx | 12 | ||||
-rw-r--r-- | basic/source/classes/propacc.cxx | 24 | ||||
-rw-r--r-- | basic/source/classes/sb.cxx | 12 | ||||
-rw-r--r-- | basic/source/classes/sbunoobj.cxx | 72 | ||||
-rw-r--r-- | basic/source/classes/sbxmod.cxx | 60 | ||||
-rw-r--r-- | basic/source/inc/dlgcont.hxx | 10 | ||||
-rw-r--r-- | basic/source/inc/namecont.hxx | 144 | ||||
-rw-r--r-- | basic/source/inc/propacc.hxx | 24 | ||||
-rw-r--r-- | basic/source/inc/scriptcont.hxx | 22 | ||||
-rw-r--r-- | basic/source/runtime/comenumwrapper.cxx | 4 | ||||
-rw-r--r-- | basic/source/runtime/comenumwrapper.hxx | 4 | ||||
-rw-r--r-- | basic/source/uno/dlgcont.cxx | 10 | ||||
-rw-r--r-- | basic/source/uno/namecont.cxx | 138 | ||||
-rw-r--r-- | basic/source/uno/scriptcont.cxx | 22 |
17 files changed, 384 insertions, 384 deletions
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx index 3a79a7460e53..0718391941e7 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -158,15 +158,15 @@ public: // XEventListener virtual void SAL_CALL disposing( const lang::EventObject& Source ) - throw(uno::RuntimeException); + throw(uno::RuntimeException, std::exception); // XContainerListener virtual void SAL_CALL elementInserted( const container::ContainerEvent& Event ) - throw(uno::RuntimeException); + throw(uno::RuntimeException, std::exception); virtual void SAL_CALL elementReplaced( const container::ContainerEvent& Event ) - throw(uno::RuntimeException); + throw(uno::RuntimeException, std::exception); virtual void SAL_CALL elementRemoved( const container::ContainerEvent& Event ) - throw(uno::RuntimeException); + throw(uno::RuntimeException, std::exception); }; @@ -245,7 +245,7 @@ void BasMgrContainerListenerImpl::addLibraryModulesImpl( BasicManager* pMgr, void SAL_CALL BasMgrContainerListenerImpl::disposing( const lang::EventObject& Source ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { (void)Source; } @@ -254,7 +254,7 @@ void SAL_CALL BasMgrContainerListenerImpl::disposing( const lang::EventObject& S void SAL_CALL BasMgrContainerListenerImpl::elementInserted( const container::ContainerEvent& Event ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { bool bLibContainer = maLibName.isEmpty(); OUString aName; @@ -301,7 +301,7 @@ void SAL_CALL BasMgrContainerListenerImpl::elementInserted( const container::Con void SAL_CALL BasMgrContainerListenerImpl::elementReplaced( const container::ContainerEvent& Event ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { OUString aName; Event.Accessor >>= aName; @@ -331,7 +331,7 @@ void SAL_CALL BasMgrContainerListenerImpl::elementReplaced( const container::Con void SAL_CALL BasMgrContainerListenerImpl::elementRemoved( const container::ContainerEvent& Event ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { OUString aName; Event.Accessor >>= aName; @@ -1858,11 +1858,11 @@ public: : maName( aName ), maLanguage( aLanguage), maSource( aSource ) {} // Methods XStarBasicModuleInfo - virtual OUString SAL_CALL getName() throw(uno::RuntimeException) + virtual OUString SAL_CALL getName() throw(uno::RuntimeException, std::exception) { return maName; } - virtual OUString SAL_CALL getLanguage() throw(uno::RuntimeException) + virtual OUString SAL_CALL getLanguage() throw(uno::RuntimeException, std::exception) { return maLanguage; } - virtual OUString SAL_CALL getSource() throw(uno::RuntimeException) + virtual OUString SAL_CALL getSource() throw(uno::RuntimeException, std::exception) { return maSource; } }; @@ -1879,9 +1879,9 @@ public: : maName( aName ), mData( Data ) {} // Methods XStarBasicDialogInfo - virtual OUString SAL_CALL getName() throw(uno::RuntimeException) + virtual OUString SAL_CALL getName() throw(uno::RuntimeException, std::exception) { return maName; } - virtual uno::Sequence< sal_Int8 > SAL_CALL getData() throw(uno::RuntimeException) + virtual uno::Sequence< sal_Int8 > SAL_CALL getData() throw(uno::RuntimeException, std::exception) { return mData; } }; @@ -1916,17 +1916,17 @@ public: {} // Methods XStarBasicLibraryInfo - virtual OUString SAL_CALL getName() throw(uno::RuntimeException) + virtual OUString SAL_CALL getName() throw(uno::RuntimeException, std::exception) { return maName; } - virtual uno::Reference< container::XNameContainer > SAL_CALL getModuleContainer() throw(uno::RuntimeException) + virtual uno::Reference< container::XNameContainer > SAL_CALL getModuleContainer() throw(uno::RuntimeException, std::exception) { return mxModuleContainer; } - virtual uno::Reference< container::XNameContainer > SAL_CALL getDialogContainer() throw(uno::RuntimeException) + virtual uno::Reference< container::XNameContainer > SAL_CALL getDialogContainer() throw(uno::RuntimeException, std::exception) { return mxDialogContainer; } - virtual OUString SAL_CALL getPassword() throw(uno::RuntimeException) + virtual OUString SAL_CALL getPassword() throw(uno::RuntimeException, std::exception) { return maPassword; } - virtual OUString SAL_CALL getExternalSourceURL() throw(uno::RuntimeException) + virtual OUString SAL_CALL getExternalSourceURL() throw(uno::RuntimeException, std::exception) { return maExternaleSourceURL; } - virtual OUString SAL_CALL getLinkTargetURL() throw(uno::RuntimeException) + virtual OUString SAL_CALL getLinkTargetURL() throw(uno::RuntimeException, std::exception) { return maLinkTargetURL; } }; @@ -1942,41 +1942,41 @@ public: // Methods XElementAccess virtual uno::Type SAL_CALL getElementType() - throw(uno::RuntimeException); + throw(uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasElements() - throw(uno::RuntimeException); + throw(uno::RuntimeException, std::exception); // Methods XNameAccess virtual uno::Any SAL_CALL getByName( const OUString& aName ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException); + throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception); virtual uno::Sequence< OUString > SAL_CALL getElementNames() - throw(uno::RuntimeException); + throw(uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(uno::RuntimeException); + throw(uno::RuntimeException, std::exception); // Methods XNameReplace virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException); + lang::WrappedTargetException, uno::RuntimeException, std::exception); // Methods XNameContainer virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::ElementExistException, - lang::WrappedTargetException, uno::RuntimeException); + lang::WrappedTargetException, uno::RuntimeException, std::exception); virtual void SAL_CALL removeByName( const OUString& Name ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException); + throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception); }; // Methods XElementAccess uno::Type ModuleContainer_Impl::getElementType() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { uno::Type aModuleType = ::getCppuType( (const uno::Reference< script::XStarBasicModuleInfo > *)0 ); return aModuleType; } sal_Bool ModuleContainer_Impl::hasElements() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { SbxArray* pMods = mpLib ? mpLib->GetModules() : NULL; return pMods && pMods->Count() > 0; @@ -1984,7 +1984,7 @@ sal_Bool ModuleContainer_Impl::hasElements() // Methods XNameAccess uno::Any ModuleContainer_Impl::getByName( const OUString& aName ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SbModule* pMod = mpLib ? mpLib->FindModule( aName ) : NULL; if( !pMod ) @@ -1997,7 +1997,7 @@ uno::Any ModuleContainer_Impl::getByName( const OUString& aName ) } uno::Sequence< OUString > ModuleContainer_Impl::getElementNames() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { SbxArray* pMods = mpLib ? mpLib->GetModules() : NULL; sal_uInt16 nMods = pMods ? pMods->Count() : 0; @@ -2012,7 +2012,7 @@ uno::Sequence< OUString > ModuleContainer_Impl::getElementNames() } sal_Bool ModuleContainer_Impl::hasByName( const OUString& aName ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { SbModule* pMod = mpLib ? mpLib->FindModule( aName ) : NULL; sal_Bool bRet = (pMod != NULL); @@ -2022,7 +2022,7 @@ sal_Bool ModuleContainer_Impl::hasByName( const OUString& aName ) // Methods XNameReplace void ModuleContainer_Impl::replaceByName( const OUString& aName, const uno::Any& aElement ) - throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { removeByName( aName ); insertByName( aName, aElement ); @@ -2031,7 +2031,7 @@ void ModuleContainer_Impl::replaceByName( const OUString& aName, const uno::Any& // Methods XNameContainer void ModuleContainer_Impl::insertByName( const OUString& aName, const uno::Any& aElement ) - throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException) + throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { uno::Type aModuleType = ::getCppuType( (const uno::Reference< script::XStarBasicModuleInfo > *)0 ); uno::Type aAnyType = aElement.getValueType(); @@ -2045,7 +2045,7 @@ void ModuleContainer_Impl::insertByName( const OUString& aName, const uno::Any& } void ModuleContainer_Impl::removeByName( const OUString& Name ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SbModule* pMod = mpLib ? mpLib->FindModule( Name ) : NULL; if( !pMod ) @@ -2093,39 +2093,39 @@ public: // Methods XElementAccess virtual uno::Type SAL_CALL getElementType() - throw(uno::RuntimeException); + throw(uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasElements() - throw(uno::RuntimeException); + throw(uno::RuntimeException, std::exception); // Methods XNameAccess virtual uno::Any SAL_CALL getByName( const OUString& aName ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException); + throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception); virtual uno::Sequence< OUString > SAL_CALL getElementNames() - throw(uno::RuntimeException); + throw(uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(uno::RuntimeException); + throw(uno::RuntimeException, std::exception); // Methods XNameReplace virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) - throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException); + throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception); // Methods XNameContainer virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) - throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException); + throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception); virtual void SAL_CALL removeByName( const OUString& Name ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException); + throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception); }; // Methods XElementAccess uno::Type DialogContainer_Impl::getElementType() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { uno::Type aModuleType = ::getCppuType( (const uno::Reference< script::XStarBasicDialogInfo > *)0 ); return aModuleType; } sal_Bool DialogContainer_Impl::hasElements() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { sal_Bool bRet = sal_False; @@ -2145,7 +2145,7 @@ sal_Bool DialogContainer_Impl::hasElements() // Methods XNameAccess uno::Any DialogContainer_Impl::getByName( const OUString& aName ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SbxVariable* pVar = mpLib->GetObjects()->Find( aName, SbxCLASS_DONTCARE ); if( !( pVar && pVar->ISA( SbxObject ) && @@ -2164,7 +2164,7 @@ uno::Any DialogContainer_Impl::getByName( const OUString& aName ) } uno::Sequence< OUString > DialogContainer_Impl::getElementNames() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { mpLib->GetAll( SbxCLASS_OBJECT ); sal_Int16 nCount = mpLib->GetObjects()->Count(); @@ -2186,7 +2186,7 @@ uno::Sequence< OUString > DialogContainer_Impl::getElementNames() } sal_Bool DialogContainer_Impl::hasByName( const OUString& aName ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { sal_Bool bRet = sal_False; SbxVariable* pVar = mpLib->GetObjects()->Find( aName, SbxCLASS_DONTCARE ); @@ -2201,7 +2201,7 @@ sal_Bool DialogContainer_Impl::hasByName( const OUString& aName ) // Methods XNameReplace void DialogContainer_Impl::replaceByName( const OUString& aName, const uno::Any& aElement ) - throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { removeByName( aName ); insertByName( aName, aElement ); @@ -2210,7 +2210,7 @@ void DialogContainer_Impl::replaceByName( const OUString& aName, const uno::Any& // Methods XNameContainer void DialogContainer_Impl::insertByName( const OUString& aName, const uno::Any& aElement ) - throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException) + throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { (void)aName; uno::Type aModuleType = ::getCppuType( (const uno::Reference< script::XStarBasicDialogInfo > *)0 ); @@ -2226,7 +2226,7 @@ void DialogContainer_Impl::insertByName( const OUString& aName, const uno::Any& } void DialogContainer_Impl::removeByName( const OUString& Name ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { (void)Name; SbxVariable* pVar = mpLib->GetObjects()->Find( Name, SbxCLASS_DONTCARE ); @@ -2252,40 +2252,40 @@ public: // Methods XElementAccess virtual uno::Type SAL_CALL getElementType() - throw(uno::RuntimeException); + throw(uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasElements() - throw(uno::RuntimeException); + throw(uno::RuntimeException, std::exception); // Methods XNameAccess virtual uno::Any SAL_CALL getByName( const OUString& aName ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException); + throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception); virtual uno::Sequence< OUString > SAL_CALL getElementNames() - throw(uno::RuntimeException); + throw(uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(uno::RuntimeException); + throw(uno::RuntimeException, std::exception); // Methods XNameReplace virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) - throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException); + throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception); // Methods XNameContainer virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) - throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException); + throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception); virtual void SAL_CALL removeByName( const OUString& Name ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException); + throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception); }; // Methods XElementAccess uno::Type LibraryContainer_Impl::getElementType() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { uno::Type aType = ::getCppuType( (const uno::Reference< script::XStarBasicLibraryInfo > *)0 ); return aType; } sal_Bool LibraryContainer_Impl::hasElements() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { sal_Int32 nLibs = mpMgr->GetLibCount(); sal_Bool bRet = (nLibs > 0); @@ -2294,7 +2294,7 @@ sal_Bool LibraryContainer_Impl::hasElements() // Methods XNameAccess uno::Any LibraryContainer_Impl::getByName( const OUString& aName ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { uno::Any aRetAny; if( !mpMgr->HasLib( aName ) ) @@ -2337,7 +2337,7 @@ uno::Any LibraryContainer_Impl::getByName( const OUString& aName ) } uno::Sequence< OUString > LibraryContainer_Impl::getElementNames() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { sal_uInt16 nLibs = mpMgr->GetLibCount(); uno::Sequence< OUString > aRetSeq( nLibs ); @@ -2350,7 +2350,7 @@ uno::Sequence< OUString > LibraryContainer_Impl::getElementNames() } sal_Bool LibraryContainer_Impl::hasByName( const OUString& aName ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { sal_Bool bRet = mpMgr->HasLib( aName ); return bRet; @@ -2358,7 +2358,7 @@ sal_Bool LibraryContainer_Impl::hasByName( const OUString& aName ) // Methods XNameReplace void LibraryContainer_Impl::replaceByName( const OUString& aName, const uno::Any& aElement ) - throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { removeByName( aName ); insertByName( aName, aElement ); @@ -2366,7 +2366,7 @@ void LibraryContainer_Impl::replaceByName( const OUString& aName, const uno::Any // Methods XNameContainer void LibraryContainer_Impl::insertByName( const OUString& aName, const uno::Any& aElement ) - throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException) + throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { (void)aName; (void)aElement; @@ -2374,7 +2374,7 @@ void LibraryContainer_Impl::insertByName( const OUString& aName, const uno::Any& } void LibraryContainer_Impl::removeByName( const OUString& Name ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { StarBASIC* pLib = mpMgr->GetLib( Name ); if( !pLib ) @@ -2402,20 +2402,20 @@ public: public: // Methods virtual uno::Reference< container::XNameContainer > SAL_CALL getLibraryContainer() - throw(uno::RuntimeException); + throw(uno::RuntimeException, std::exception); virtual void SAL_CALL createLibrary( const OUString& LibName, const OUString& Password, const OUString& ExternalSourceURL, const OUString& LinkTargetURL ) - throw(container::ElementExistException, uno::RuntimeException); + throw(container::ElementExistException, uno::RuntimeException, std::exception); virtual void SAL_CALL addModule( const OUString& LibraryName, const OUString& ModuleName, const OUString& Language, const OUString& Source ) - throw(container::NoSuchElementException, uno::RuntimeException); + throw(container::NoSuchElementException, uno::RuntimeException, std::exception); virtual void SAL_CALL addDialog( const OUString& LibraryName, const OUString& DialogName, const uno::Sequence< sal_Int8 >& Data ) - throw(container::NoSuchElementException, uno::RuntimeException); + throw(container::NoSuchElementException, uno::RuntimeException, std::exception); }; uno::Reference< container::XNameContainer > SAL_CALL StarBasicAccess_Impl::getLibraryContainer() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { if( !mxLibContainer.is() ) mxLibContainer = (container::XNameContainer*)new LibraryContainer_Impl( mpMgr ); @@ -2429,7 +2429,7 @@ void SAL_CALL StarBasicAccess_Impl::createLibrary const OUString& ExternalSourceURL, const OUString& LinkTargetURL ) - throw(container::ElementExistException, uno::RuntimeException) + throw(container::ElementExistException, uno::RuntimeException, std::exception) { (void)ExternalSourceURL; #ifdef DBG_UTIL @@ -2446,7 +2446,7 @@ void SAL_CALL StarBasicAccess_Impl::addModule const OUString& Language, const OUString& Source ) - throw(container::NoSuchElementException, uno::RuntimeException) + throw(container::NoSuchElementException, uno::RuntimeException, std::exception) { (void)Language; StarBASIC* pLib = mpMgr->GetLib( LibraryName ); @@ -2463,7 +2463,7 @@ void SAL_CALL StarBasicAccess_Impl::addDialog const OUString& DialogName, const uno::Sequence< sal_Int8 >& Data ) - throw(container::NoSuchElementException, uno::RuntimeException) + throw(container::NoSuchElementException, uno::RuntimeException, std::exception) { (void)LibraryName; (void)DialogName; diff --git a/basic/source/basmgr/vbahelper.cxx b/basic/source/basmgr/vbahelper.cxx index 7434ba56a36a..b1af39fb979f 100644 --- a/basic/source/basmgr/vbahelper.cxx +++ b/basic/source/basmgr/vbahelper.cxx @@ -56,8 +56,8 @@ class DocumentsEnumeration : public ::cppu::WeakImplHelper1< container::XEnumera { public: DocumentsEnumeration( const uno::Reference< frame::XModel >& rxModel ); - virtual sal_Bool SAL_CALL hasMoreElements() throw (uno::RuntimeException); - virtual uno::Any SAL_CALL nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException); + virtual sal_Bool SAL_CALL hasMoreElements() throw (uno::RuntimeException, std::exception); + virtual uno::Any SAL_CALL nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception); private: typedef ::std::vector< uno::Reference< frame::XModel > > ModelVector; ModelVector maModels; @@ -86,12 +86,12 @@ DocumentsEnumeration::DocumentsEnumeration( const uno::Reference< frame::XModel maModelIt = maModels.begin(); } -sal_Bool SAL_CALL DocumentsEnumeration::hasMoreElements() throw (uno::RuntimeException) +sal_Bool SAL_CALL DocumentsEnumeration::hasMoreElements() throw (uno::RuntimeException, std::exception) { return maModelIt != maModels.end(); } -uno::Any SAL_CALL DocumentsEnumeration::nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) +uno::Any SAL_CALL DocumentsEnumeration::nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { if( maModelIt == maModels.end() ) throw container::NoSuchElementException(); diff --git a/basic/source/classes/errobject.cxx b/basic/source/classes/errobject.cxx index 4043549be109..1eec72926949 100644 --- a/basic/source/classes/errobject.cxx +++ b/basic/source/classes/errobject.cxx @@ -41,22 +41,22 @@ public: ErrObject(); ~ErrObject(); // Attributes - virtual ::sal_Int32 SAL_CALL getNumber() throw (uno::RuntimeException); - virtual void SAL_CALL setNumber( ::sal_Int32 _number ) throw (uno::RuntimeException); - virtual ::sal_Int32 SAL_CALL getHelpContext() throw (uno::RuntimeException); - virtual void SAL_CALL setHelpContext( ::sal_Int32 _helpcontext ) throw (uno::RuntimeException); - virtual OUString SAL_CALL getHelpFile() throw (uno::RuntimeException); - virtual void SAL_CALL setHelpFile( const OUString& _helpfile ) throw (uno::RuntimeException); - virtual OUString SAL_CALL getDescription() throw (uno::RuntimeException); - virtual void SAL_CALL setDescription( const OUString& _description ) throw (uno::RuntimeException); - virtual OUString SAL_CALL getSource() throw (uno::RuntimeException); - virtual void SAL_CALL setSource( const OUString& _source ) throw (uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getNumber() throw (uno::RuntimeException, std::exception); + virtual void SAL_CALL setNumber( ::sal_Int32 _number ) throw (uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getHelpContext() throw (uno::RuntimeException, std::exception); + virtual void SAL_CALL setHelpContext( ::sal_Int32 _helpcontext ) throw (uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getHelpFile() throw (uno::RuntimeException, std::exception); + virtual void SAL_CALL setHelpFile( const OUString& _helpfile ) throw (uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getDescription() throw (uno::RuntimeException, std::exception); + virtual void SAL_CALL setDescription( const OUString& _description ) throw (uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getSource() throw (uno::RuntimeException, std::exception); + virtual void SAL_CALL setSource( const OUString& _source ) throw (uno::RuntimeException, std::exception); // Methods - virtual void SAL_CALL Clear( ) throw (uno::RuntimeException); - virtual void SAL_CALL Raise( const uno::Any& Number, const uno::Any& Source, const uno::Any& Description, const uno::Any& HelpFile, const uno::Any& HelpContext ) throw (uno::RuntimeException); + virtual void SAL_CALL Clear( ) throw (uno::RuntimeException, std::exception); + virtual void SAL_CALL Raise( const uno::Any& Number, const uno::Any& Source, const uno::Any& Description, const uno::Any& HelpFile, const uno::Any& HelpContext ) throw (uno::RuntimeException, std::exception); // XDefaultProperty - virtual OUString SAL_CALL getDefaultPropertyName( ) throw (uno::RuntimeException); + virtual OUString SAL_CALL getDefaultPropertyName( ) throw (uno::RuntimeException, std::exception); // Helper method void setData( const uno::Any& Number, const uno::Any& Source, const uno::Any& Description, @@ -73,13 +73,13 @@ ErrObject::ErrObject() : m_nNumber(0), m_nHelpContext(0) } sal_Int32 SAL_CALL -ErrObject::getNumber() throw (uno::RuntimeException) +ErrObject::getNumber() throw (uno::RuntimeException, std::exception) { return m_nNumber; } void SAL_CALL -ErrObject::setNumber( ::sal_Int32 _number ) throw (uno::RuntimeException) +ErrObject::setNumber( ::sal_Int32 _number ) throw (uno::RuntimeException, std::exception) { GetSbData()->pInst->setErrorVB( _number, OUString() ); OUString _description = GetSbData()->pInst->GetErrorMsg(); @@ -87,55 +87,55 @@ ErrObject::setNumber( ::sal_Int32 _number ) throw (uno::RuntimeException) } ::sal_Int32 SAL_CALL -ErrObject::getHelpContext() throw (uno::RuntimeException) +ErrObject::getHelpContext() throw (uno::RuntimeException, std::exception) { return m_nHelpContext; } void SAL_CALL -ErrObject::setHelpContext( ::sal_Int32 _helpcontext ) throw (uno::RuntimeException) +ErrObject::setHelpContext( ::sal_Int32 _helpcontext ) throw (uno::RuntimeException, std::exception) { m_nHelpContext = _helpcontext; } OUString SAL_CALL -ErrObject::getHelpFile() throw (uno::RuntimeException) +ErrObject::getHelpFile() throw (uno::RuntimeException, std::exception) { return m_sHelpFile; } void SAL_CALL -ErrObject::setHelpFile( const OUString& _helpfile ) throw (uno::RuntimeException) +ErrObject::setHelpFile( const OUString& _helpfile ) throw (uno::RuntimeException, std::exception) { m_sHelpFile = _helpfile; } OUString SAL_CALL -ErrObject::getDescription() throw (uno::RuntimeException) +ErrObject::getDescription() throw (uno::RuntimeException, std::exception) { return m_sDescription; } void SAL_CALL -ErrObject::setDescription( const OUString& _description ) throw (uno::RuntimeException) +ErrObject::setDescription( const OUString& _description ) throw (uno::RuntimeException, std::exception) { m_sDescription = _description; } OUString SAL_CALL -ErrObject::getSource() throw (uno::RuntimeException) +ErrObject::getSource() throw (uno::RuntimeException, std::exception) { return m_sSource; } void SAL_CALL -ErrObject::setSource( const OUString& _source ) throw (uno::RuntimeException) +ErrObject::setSource( const OUString& _source ) throw (uno::RuntimeException, std::exception) { m_sSource = _source; } // Methods void SAL_CALL -ErrObject::Clear( ) throw (uno::RuntimeException) +ErrObject::Clear( ) throw (uno::RuntimeException, std::exception) { m_sHelpFile = OUString(); m_sSource = m_sHelpFile; @@ -145,7 +145,7 @@ ErrObject::Clear( ) throw (uno::RuntimeException) } void SAL_CALL -ErrObject::Raise( const uno::Any& Number, const uno::Any& Source, const uno::Any& Description, const uno::Any& HelpFile, const uno::Any& HelpContext ) throw (uno::RuntimeException) +ErrObject::Raise( const uno::Any& Number, const uno::Any& Source, const uno::Any& Description, const uno::Any& HelpFile, const uno::Any& HelpContext ) throw (uno::RuntimeException, std::exception) { setData( Number, Source, Description, HelpFile, HelpContext ); if ( m_nNumber ) @@ -154,7 +154,7 @@ ErrObject::Raise( const uno::Any& Number, const uno::Any& Source, const uno::Any // XDefaultProperty OUString SAL_CALL -ErrObject::getDefaultPropertyName( ) throw (uno::RuntimeException) +ErrObject::getDefaultPropertyName( ) throw (uno::RuntimeException, std::exception) { static OUString sDfltPropName( "Number" ); return sDfltPropName; diff --git a/basic/source/classes/eventatt.cxx b/basic/source/classes/eventatt.cxx index b9d44ac26139..39b43108a02c 100644 --- a/basic/source/classes/eventatt.cxx +++ b/basic/source/classes/eventatt.cxx @@ -155,23 +155,23 @@ public: // Methods of XAllListener virtual void SAL_CALL firing(const ScriptEvent& aScriptEvent) - throw( RuntimeException ); + throw( RuntimeException, std::exception ); virtual Any SAL_CALL approveFiring(const ScriptEvent& aScriptEvent) - throw( InvocationTargetException, RuntimeException ); + throw( InvocationTargetException, RuntimeException, std::exception ); // Methods of XEventListener virtual void SAL_CALL disposing(const EventObject& Source) - throw( RuntimeException ); + throw( RuntimeException, std::exception ); }; // Methods XAllListener -void BasicScriptListener_Impl::firing( const ScriptEvent& aScriptEvent ) throw ( RuntimeException ) +void BasicScriptListener_Impl::firing( const ScriptEvent& aScriptEvent ) throw ( RuntimeException, std::exception ) { firing_impl( aScriptEvent, NULL ); } Any BasicScriptListener_Impl::approveFiring( const ScriptEvent& aScriptEvent ) - throw ( InvocationTargetException, RuntimeException ) + throw ( InvocationTargetException, RuntimeException, std::exception ) { Any aRetAny; firing_impl( aScriptEvent, &aRetAny ); @@ -179,7 +179,7 @@ Any BasicScriptListener_Impl::approveFiring( const ScriptEvent& aScriptEvent ) } // Methods XEventListener -void BasicScriptListener_Impl::disposing(const EventObject& ) throw ( RuntimeException ) +void BasicScriptListener_Impl::disposing(const EventObject& ) throw ( RuntimeException, std::exception ) { // TODO: ??? //SolarMutexGuard aGuard; diff --git a/basic/source/classes/propacc.cxx b/basic/source/classes/propacc.cxx index 3ca1e296c0a9..0713a72b58fe 100644 --- a/basic/source/classes/propacc.cxx +++ b/basic/source/classes/propacc.cxx @@ -72,7 +72,7 @@ SbPropertyValues::~SbPropertyValues() -Reference< XPropertySetInfo > SbPropertyValues::getPropertySetInfo(void) throw( RuntimeException ) +Reference< XPropertySetInfo > SbPropertyValues::getPropertySetInfo(void) throw( RuntimeException, std::exception ) { // create on demand? if (!m_xInfo.is()) @@ -108,7 +108,7 @@ void SbPropertyValues::setPropertyValue( ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { size_t const nIndex = GetIndex_Impl( aPropertyName ); PropertyValue & rPropVal = m_aPropVals[nIndex]; @@ -121,7 +121,7 @@ Any SbPropertyValues::getPropertyValue( const OUString& aPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { size_t const nIndex = GetIndex_Impl( aPropertyName ); return m_aPropVals[nIndex].Value; @@ -132,7 +132,7 @@ Any SbPropertyValues::getPropertyValue( void SbPropertyValues::addPropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& ) - throw () + throw (std::exception) { (void)aPropertyName; } @@ -142,7 +142,7 @@ void SbPropertyValues::addPropertyChangeListener( void SbPropertyValues::removePropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& ) - throw () + throw (std::exception) { (void)aPropertyName; } @@ -152,7 +152,7 @@ void SbPropertyValues::removePropertyChangeListener( void SbPropertyValues::addVetoableChangeListener( const OUString& aPropertyName, const Reference< XVetoableChangeListener >& ) - throw() + throw(std::exception) { (void)aPropertyName; } @@ -162,14 +162,14 @@ void SbPropertyValues::addVetoableChangeListener( void SbPropertyValues::removeVetoableChangeListener( const OUString& aPropertyName, const Reference< XVetoableChangeListener >& ) - throw() + throw(std::exception) { (void)aPropertyName; } -Sequence< PropertyValue > SbPropertyValues::getPropertyValues(void) throw (::com::sun::star::uno::RuntimeException) +Sequence< PropertyValue > SbPropertyValues::getPropertyValues(void) throw (::com::sun::star::uno::RuntimeException, std::exception) { Sequence<PropertyValue> aRet( m_aPropVals.size() ); for (size_t n = 0; n < m_aPropVals.size(); ++n) @@ -184,7 +184,7 @@ void SbPropertyValues::setPropertyValues(const Sequence< PropertyValue >& rPrope ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { if ( !m_aPropVals.empty() ) throw PropertyExistException(); @@ -258,19 +258,19 @@ SbPropertySetInfo::~SbPropertySetInfo() -Sequence< Property > SbPropertySetInfo::getProperties(void) throw( RuntimeException ) +Sequence< Property > SbPropertySetInfo::getProperties(void) throw( RuntimeException, std::exception ) { return aImpl.getProperties(); } Property SbPropertySetInfo::getPropertyByName(const OUString& Name) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return aImpl.getPropertyByName( Name ); } sal_Bool SbPropertySetInfo::hasPropertyByName(const OUString& Name) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return aImpl.hasPropertyByName( Name ); } diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index a0ffd4cc3bfc..2620251f83a6 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -80,9 +80,9 @@ public: void startListening(); void stopListening(); - virtual void SAL_CALL queryClosing( const lang::EventObject& rSource, sal_Bool bGetsOwnership ) throw (util::CloseVetoException, uno::RuntimeException); - virtual void SAL_CALL notifyClosing( const lang::EventObject& rSource ) throw (uno::RuntimeException); - virtual void SAL_CALL disposing( const lang::EventObject& rSource ) throw (uno::RuntimeException); + virtual void SAL_CALL queryClosing( const lang::EventObject& rSource, sal_Bool bGetsOwnership ) throw (util::CloseVetoException, uno::RuntimeException, std::exception); + virtual void SAL_CALL notifyClosing( const lang::EventObject& rSource ) throw (uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing( const lang::EventObject& rSource ) throw (uno::RuntimeException, std::exception); private: StarBASIC& mrDocBasic; @@ -136,17 +136,17 @@ void DocBasicItem::stopListening() } } -void SAL_CALL DocBasicItem::queryClosing( const lang::EventObject& /*rSource*/, sal_Bool /*bGetsOwnership*/ ) throw (util::CloseVetoException, uno::RuntimeException) +void SAL_CALL DocBasicItem::queryClosing( const lang::EventObject& /*rSource*/, sal_Bool /*bGetsOwnership*/ ) throw (util::CloseVetoException, uno::RuntimeException, std::exception) { } -void SAL_CALL DocBasicItem::notifyClosing( const lang::EventObject& /*rEvent*/ ) throw (uno::RuntimeException) +void SAL_CALL DocBasicItem::notifyClosing( const lang::EventObject& /*rEvent*/ ) throw (uno::RuntimeException, std::exception) { stopListening(); mbDocClosed = true; } -void SAL_CALL DocBasicItem::disposing( const lang::EventObject& /*rEvent*/ ) throw (uno::RuntimeException) +void SAL_CALL DocBasicItem::disposing( const lang::EventObject& /*rEvent*/ ) throw (uno::RuntimeException, std::exception) { stopListening(); } diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index 2bc4c57a0ce5..5e21eecb5044 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -3907,11 +3907,11 @@ public: ~BasicAllListener_Impl(); // Methods of XAllListener - virtual void SAL_CALL firing(const AllEventObject& Event) throw ( RuntimeException ); - virtual Any SAL_CALL approveFiring(const AllEventObject& Event) throw ( RuntimeException ); + virtual void SAL_CALL firing(const AllEventObject& Event) throw ( RuntimeException, std::exception ); + virtual Any SAL_CALL approveFiring(const AllEventObject& Event) throw ( RuntimeException, std::exception ); // Methods of XEventListener - virtual void SAL_CALL disposing(const EventObject& Source) throw ( RuntimeException ); + virtual void SAL_CALL disposing(const EventObject& Source) throw ( RuntimeException, std::exception ); }; @@ -3979,12 +3979,12 @@ void BasicAllListener_Impl::firing_impl( const AllEventObject& Event, Any* pRet // Methods of Listener -void BasicAllListener_Impl::firing( const AllEventObject& Event ) throw ( RuntimeException ) +void BasicAllListener_Impl::firing( const AllEventObject& Event ) throw ( RuntimeException, std::exception ) { firing_impl( Event, NULL ); } -Any BasicAllListener_Impl::approveFiring( const AllEventObject& Event ) throw ( RuntimeException ) +Any BasicAllListener_Impl::approveFiring( const AllEventObject& Event ) throw ( RuntimeException, std::exception ) { Any aRetAny; firing_impl( Event, &aRetAny ); @@ -3993,7 +3993,7 @@ Any BasicAllListener_Impl::approveFiring( const AllEventObject& Event ) throw ( // Methods of XEventListener -void BasicAllListener_Impl ::disposing(const EventObject& ) throw ( RuntimeException ) +void BasicAllListener_Impl ::disposing(const EventObject& ) throw ( RuntimeException, std::exception ) { SolarMutexGuard guard; @@ -4013,14 +4013,14 @@ public: const Reference< XAllListener >& AllListener, const Any& Helper ); // XInvocation - virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection(void) throw( RuntimeException ); + virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection(void) throw( RuntimeException, std::exception ); virtual Any SAL_CALL invoke(const OUString& FunctionName, const Sequence< Any >& Params, Sequence< sal_Int16 >& OutParamIndex, Sequence< Any >& OutParam) - throw( IllegalArgumentException, CannotConvertException, InvocationTargetException, RuntimeException ); + throw( IllegalArgumentException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception ); virtual void SAL_CALL setValue(const OUString& PropertyName, const Any& Value) - throw( UnknownPropertyException, CannotConvertException, InvocationTargetException, RuntimeException ); - virtual Any SAL_CALL getValue(const OUString& PropertyName) throw( UnknownPropertyException, RuntimeException ); - virtual sal_Bool SAL_CALL hasMethod(const OUString& Name) throw( RuntimeException ); - virtual sal_Bool SAL_CALL hasProperty(const OUString& Name) throw( RuntimeException ); + throw( UnknownPropertyException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception ); + virtual Any SAL_CALL getValue(const OUString& PropertyName) throw( UnknownPropertyException, RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL hasMethod(const OUString& Name) throw( RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL hasProperty(const OUString& Name) throw( RuntimeException, std::exception ); private: Reference< XIdlReflection > m_xCoreReflection; @@ -4065,7 +4065,7 @@ InvocationToAllListenerMapper::InvocationToAllListenerMapper Reference< XIntrospectionAccess > SAL_CALL InvocationToAllListenerMapper::getIntrospection(void) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return Reference< XIntrospectionAccess >(); } @@ -4074,7 +4074,7 @@ Reference< XIntrospectionAccess > SAL_CALL InvocationToAllListenerMapper::getInt Any SAL_CALL InvocationToAllListenerMapper::invoke(const OUString& FunctionName, const Sequence< Any >& Params, Sequence< sal_Int16 >& OutParamIndex, Sequence< Any >& OutParam) throw( IllegalArgumentException, CannotConvertException, - InvocationTargetException, RuntimeException ) + InvocationTargetException, RuntimeException, std::exception ) { (void)OutParamIndex; (void)OutParam ; @@ -4127,7 +4127,7 @@ Any SAL_CALL InvocationToAllListenerMapper::invoke(const OUString& FunctionName, void SAL_CALL InvocationToAllListenerMapper::setValue(const OUString& PropertyName, const Any& Value) throw( UnknownPropertyException, CannotConvertException, - InvocationTargetException, RuntimeException ) + InvocationTargetException, RuntimeException, std::exception ) { (void)PropertyName; (void)Value; @@ -4135,7 +4135,7 @@ void SAL_CALL InvocationToAllListenerMapper::setValue(const OUString& PropertyNa Any SAL_CALL InvocationToAllListenerMapper::getValue(const OUString& PropertyName) - throw( UnknownPropertyException, RuntimeException ) + throw( UnknownPropertyException, RuntimeException, std::exception ) { (void)PropertyName; @@ -4144,7 +4144,7 @@ Any SAL_CALL InvocationToAllListenerMapper::getValue(const OUString& PropertyNam sal_Bool SAL_CALL InvocationToAllListenerMapper::hasMethod(const OUString& Name) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { Reference< XIdlMethod > xMethod = m_xListenerType->getMethod( Name ); return xMethod.is(); @@ -4152,7 +4152,7 @@ sal_Bool SAL_CALL InvocationToAllListenerMapper::hasMethod(const OUString& Name) sal_Bool SAL_CALL InvocationToAllListenerMapper::hasProperty(const OUString& Name) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { Reference< XIdlField > xField = m_xListenerType->getField( Name ); return xField.is(); @@ -4352,24 +4352,24 @@ public: {} // XInvocation - virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection() throw(); + virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection() throw(std::exception); virtual void SAL_CALL setValue( const OUString& rProperty, const Any& rValue ) - throw( UnknownPropertyException ); + throw( UnknownPropertyException, std::exception ); virtual Any SAL_CALL getValue( const OUString& rProperty ) - throw( UnknownPropertyException ); - virtual sal_Bool SAL_CALL hasMethod( const OUString& rName ) throw(); - virtual sal_Bool SAL_CALL hasProperty( const OUString& rProp ) throw(); + throw( UnknownPropertyException, std::exception ); + virtual sal_Bool SAL_CALL hasMethod( const OUString& rName ) throw(std::exception); + virtual sal_Bool SAL_CALL hasProperty( const OUString& rProp ) throw(std::exception); virtual Any SAL_CALL invoke( const OUString& rFunction, const Sequence< Any >& rParams, Sequence< sal_Int16 >& rOutParamIndex, Sequence< Any >& rOutParam ) - throw( CannotConvertException, InvocationTargetException ); + throw( CannotConvertException, InvocationTargetException, std::exception ); // XComponent - virtual void SAL_CALL dispose() throw(RuntimeException); - virtual void SAL_CALL addEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException); - virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& aListener ) throw (RuntimeException); + virtual void SAL_CALL dispose() throw(RuntimeException, std::exception); + virtual void SAL_CALL addEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException, std::exception); + virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& aListener ) throw (RuntimeException, std::exception); }; ModuleInvocationProxy::ModuleInvocationProxy( const OUString& aPrefix, SbxObjectRef xScopeObj ) @@ -4380,12 +4380,12 @@ ModuleInvocationProxy::ModuleInvocationProxy( const OUString& aPrefix, SbxObject m_bProxyIsClassModuleObject = xScopeObj.Is() ? xScopeObj->ISA(SbClassModuleObject) : false; } -Reference< XIntrospectionAccess > SAL_CALL ModuleInvocationProxy::getIntrospection() throw() +Reference< XIntrospectionAccess > SAL_CALL ModuleInvocationProxy::getIntrospection() throw(std::exception) { return Reference< XIntrospectionAccess >(); } -void SAL_CALL ModuleInvocationProxy::setValue( const OUString& rProperty, const Any& rValue ) throw( UnknownPropertyException ) +void SAL_CALL ModuleInvocationProxy::setValue( const OUString& rProperty, const Any& rValue ) throw( UnknownPropertyException, std::exception ) { if( !m_bProxyIsClassModuleObject ) throw UnknownPropertyException(); @@ -4423,7 +4423,7 @@ void SAL_CALL ModuleInvocationProxy::setValue( const OUString& rProperty, const } -Any SAL_CALL ModuleInvocationProxy::getValue( const OUString& rProperty ) throw( UnknownPropertyException ) +Any SAL_CALL ModuleInvocationProxy::getValue( const OUString& rProperty ) throw( UnknownPropertyException, std::exception ) { if( !m_bProxyIsClassModuleObject ) { @@ -4451,12 +4451,12 @@ Any SAL_CALL ModuleInvocationProxy::getValue( const OUString& rProperty ) throw( return aRet; } -sal_Bool SAL_CALL ModuleInvocationProxy::hasMethod( const OUString& ) throw() +sal_Bool SAL_CALL ModuleInvocationProxy::hasMethod( const OUString& ) throw(std::exception) { return sal_False; } -sal_Bool SAL_CALL ModuleInvocationProxy::hasProperty( const OUString& ) throw() +sal_Bool SAL_CALL ModuleInvocationProxy::hasProperty( const OUString& ) throw(std::exception) { return sal_False; } @@ -4465,7 +4465,7 @@ Any SAL_CALL ModuleInvocationProxy::invoke( const OUString& rFunction, const Sequence< Any >& rParams, Sequence< sal_Int16 >&, Sequence< Any >& ) - throw( CannotConvertException, InvocationTargetException ) + throw( CannotConvertException, InvocationTargetException, std::exception ) { SolarMutexGuard guard; @@ -4532,7 +4532,7 @@ Any SAL_CALL ModuleInvocationProxy::invoke( const OUString& rFunction, } void SAL_CALL ModuleInvocationProxy::dispose() - throw(RuntimeException) + throw(RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -4543,13 +4543,13 @@ void SAL_CALL ModuleInvocationProxy::dispose() } void SAL_CALL ModuleInvocationProxy::addEventListener( const Reference< XEventListener >& xListener ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { m_aListeners.addInterface( xListener ); } void SAL_CALL ModuleInvocationProxy::removeEventListener( const Reference< XEventListener >& xListener ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { m_aListeners.removeInterface( xListener ); } diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index 2768ef98b497..ce31d501c647 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -107,23 +107,23 @@ public: virtual void SAL_CALL acquire() throw(); virtual void SAL_CALL release() throw(); - virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (RuntimeException) + virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (RuntimeException, std::exception) { if( !m_xAggregateTypeProv.is() ) throw RuntimeException(); return m_xAggregateTypeProv->getImplementationId(); } - virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection( ) throw (RuntimeException); + virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection( ) throw (RuntimeException, std::exception); - virtual Any SAL_CALL invoke( const OUString& aFunctionName, const Sequence< Any >& aParams, Sequence< ::sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam ) throw (IllegalArgumentException, CannotConvertException, InvocationTargetException, RuntimeException); - virtual void SAL_CALL setValue( const OUString& aPropertyName, const Any& aValue ) throw (UnknownPropertyException, CannotConvertException, InvocationTargetException, RuntimeException); - virtual Any SAL_CALL getValue( const OUString& aPropertyName ) throw (UnknownPropertyException, RuntimeException); - virtual ::sal_Bool SAL_CALL hasMethod( const OUString& aName ) throw (RuntimeException); - virtual ::sal_Bool SAL_CALL hasProperty( const OUString& aName ) throw (RuntimeException); - virtual Any SAL_CALL queryInterface( const Type& aType ) throw ( RuntimeException ); + virtual Any SAL_CALL invoke( const OUString& aFunctionName, const Sequence< Any >& aParams, Sequence< ::sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam ) throw (IllegalArgumentException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception); + virtual void SAL_CALL setValue( const OUString& aPropertyName, const Any& aValue ) throw (UnknownPropertyException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception); + virtual Any SAL_CALL getValue( const OUString& aPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL hasMethod( const OUString& aName ) throw (RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL hasProperty( const OUString& aName ) throw (RuntimeException, std::exception); + virtual Any SAL_CALL queryInterface( const Type& aType ) throw ( RuntimeException, std::exception ); - virtual Sequence< Type > SAL_CALL getTypes() throw ( RuntimeException ); + virtual Sequence< Type > SAL_CALL getTypes() throw ( RuntimeException, std::exception ); }; DocObjectWrapper::DocObjectWrapper( SbModule* pVar ) : m_pMod( pVar ), mName( pVar->GetName() ) @@ -202,7 +202,7 @@ DocObjectWrapper::~DocObjectWrapper() } Sequence< Type > SAL_CALL DocObjectWrapper::getTypes() - throw ( RuntimeException ) + throw ( RuntimeException, std::exception ) { if ( m_Types.getLength() == 0 ) { @@ -229,13 +229,13 @@ Sequence< Type > SAL_CALL DocObjectWrapper::getTypes() } Reference< XIntrospectionAccess > SAL_CALL -DocObjectWrapper::getIntrospection( ) throw (RuntimeException) +DocObjectWrapper::getIntrospection( ) throw (RuntimeException, std::exception) { return NULL; } Any SAL_CALL -DocObjectWrapper::invoke( const OUString& aFunctionName, const Sequence< Any >& aParams, Sequence< ::sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam ) throw (IllegalArgumentException, CannotConvertException, InvocationTargetException, RuntimeException) +DocObjectWrapper::invoke( const OUString& aFunctionName, const Sequence< Any >& aParams, Sequence< ::sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam ) throw (IllegalArgumentException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception) { if ( m_xAggInv.is() && m_xAggInv->hasMethod( aFunctionName ) ) return m_xAggInv->invoke( aFunctionName, aParams, aOutParamIndex, aOutParam ); @@ -329,7 +329,7 @@ DocObjectWrapper::invoke( const OUString& aFunctionName, const Sequence< Any >& } void SAL_CALL -DocObjectWrapper::setValue( const OUString& aPropertyName, const Any& aValue ) throw (UnknownPropertyException, CannotConvertException, InvocationTargetException, RuntimeException) +DocObjectWrapper::setValue( const OUString& aPropertyName, const Any& aValue ) throw (UnknownPropertyException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception) { if ( m_xAggInv.is() && m_xAggInv->hasProperty( aPropertyName ) ) return m_xAggInv->setValue( aPropertyName, aValue ); @@ -341,7 +341,7 @@ DocObjectWrapper::setValue( const OUString& aPropertyName, const Any& aValue ) t } Any SAL_CALL -DocObjectWrapper::getValue( const OUString& aPropertyName ) throw (UnknownPropertyException, RuntimeException) +DocObjectWrapper::getValue( const OUString& aPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception) { if ( m_xAggInv.is() && m_xAggInv->hasProperty( aPropertyName ) ) return m_xAggInv->getValue( aPropertyName ); @@ -359,7 +359,7 @@ DocObjectWrapper::getValue( const OUString& aPropertyName ) throw (UnknownProper } ::sal_Bool SAL_CALL -DocObjectWrapper::hasMethod( const OUString& aName ) throw (RuntimeException) +DocObjectWrapper::hasMethod( const OUString& aName ) throw (RuntimeException, std::exception) { if ( m_xAggInv.is() && m_xAggInv->hasMethod( aName ) ) return sal_True; @@ -367,7 +367,7 @@ DocObjectWrapper::hasMethod( const OUString& aName ) throw (RuntimeException) } ::sal_Bool SAL_CALL -DocObjectWrapper::hasProperty( const OUString& aName ) throw (RuntimeException) +DocObjectWrapper::hasProperty( const OUString& aName ) throw (RuntimeException, std::exception) { sal_Bool bRes = sal_False; if ( m_xAggInv.is() && m_xAggInv->hasProperty( aName ) ) @@ -377,7 +377,7 @@ DocObjectWrapper::hasProperty( const OUString& aName ) throw (RuntimeException) } Any SAL_CALL DocObjectWrapper::queryInterface( const Type& aType ) - throw ( RuntimeException ) + throw ( RuntimeException, std::exception ) { Any aRet = DocObjectWrapper_BASE::queryInterface( aType ); if ( aRet.hasValue() ) @@ -2350,7 +2350,7 @@ public: mxModel.clear(); } - virtual void SAL_CALL windowOpened( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException) + virtual void SAL_CALL windowOpened( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) { if ( mpUserForm ) { @@ -2365,7 +2365,7 @@ public: } - virtual void SAL_CALL windowClosing( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException) + virtual void SAL_CALL windowClosing( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) { #ifdef IN_THE_FUTURE uno::Reference< awt::XDialog > xDialog( e.Source, uno::UNO_QUERY ); @@ -2397,21 +2397,21 @@ public: } - virtual void SAL_CALL windowClosed( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException) + virtual void SAL_CALL windowClosed( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) { mbOpened = false; mbShowing = false; } - virtual void SAL_CALL windowMinimized( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException) + virtual void SAL_CALL windowMinimized( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) { } - virtual void SAL_CALL windowNormalized( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException) + virtual void SAL_CALL windowNormalized( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) { } - virtual void SAL_CALL windowActivated( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException) + virtual void SAL_CALL windowActivated( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) { if ( mpUserForm ) { @@ -2424,13 +2424,13 @@ public: } } - virtual void SAL_CALL windowDeactivated( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException) + virtual void SAL_CALL windowDeactivated( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) { if ( mpUserForm ) mpUserForm->triggerDeactivateEvent(); } - virtual void SAL_CALL windowResized( const awt::WindowEvent& /*e*/ ) throw (uno::RuntimeException) + virtual void SAL_CALL windowResized( const awt::WindowEvent& /*e*/ ) throw (uno::RuntimeException, std::exception) { if ( mpUserForm ) { @@ -2439,21 +2439,21 @@ public: } } - virtual void SAL_CALL windowMoved( const awt::WindowEvent& /*e*/ ) throw (uno::RuntimeException) + virtual void SAL_CALL windowMoved( const awt::WindowEvent& /*e*/ ) throw (uno::RuntimeException, std::exception) { if ( mpUserForm ) mpUserForm->triggerLayoutEvent(); } - virtual void SAL_CALL windowShown( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException) + virtual void SAL_CALL windowShown( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) { } - virtual void SAL_CALL windowHidden( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException) + virtual void SAL_CALL windowHidden( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) { } - virtual void SAL_CALL notifyEvent( const document::EventObject& rEvent ) throw (uno::RuntimeException) + virtual void SAL_CALL notifyEvent( const document::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) { // early dosposing on document event "OnUnload", to be sure Basic still exists when calling VBA "UserForm_Terminate" if( rEvent.EventName == GlobalEventConfig::GetEventName( STR_EVENT_CLOSEDOC ) ) @@ -2465,7 +2465,7 @@ public: } } - virtual void SAL_CALL disposing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException) + virtual void SAL_CALL disposing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException, std::exception) { SAL_INFO("basic", "** Userform/Dialog disposing"); removeListener(); diff --git a/basic/source/inc/dlgcont.hxx b/basic/source/inc/dlgcont.hxx index a22fdb872e36..81354edfc29a 100644 --- a/basic/source/inc/dlgcont.hxx +++ b/basic/source/inc/dlgcont.hxx @@ -75,7 +75,7 @@ public: // Methods XStorageBasedLibraryContainer virtual void SAL_CALL storeLibrariesToStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& RootStorage ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // Resource handling ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourcePersistence > @@ -83,12 +83,12 @@ public: // Methods XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // XLibraryQueryExecutable virtual sal_Bool SAL_CALL HasExecutableCode(const OUString&) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // Service static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static(); static OUString getImplementationName_static(); @@ -144,7 +144,7 @@ public: // XStringResourceSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceResolver > - SAL_CALL getStringResource( ) throw (::com::sun::star::uno::RuntimeException); + SAL_CALL getStringResource( ) throw (::com::sun::star::uno::RuntimeException, std::exception); OUString getName( void ) { return m_aName; } diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx index a2066cf69aa6..38e83f0db2e8 100644 --- a/basic/source/inc/namecont.hxx +++ b/basic/source/inc/namecont.hxx @@ -98,53 +98,53 @@ public: // Methods XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasElements( ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); // Methods XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); // Methods XNameReplace virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // Methods XNameContainer virtual void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeByName( const OUString& Name ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // Methods XContainer virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // Methods XChangesNotifier virtual void SAL_CALL addChangesListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XChangesListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeChangesListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XChangesListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); }; @@ -386,145 +386,145 @@ public: // Methods XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasElements() - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); // Methods XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); // Members XStorageBasedLibraryContainer - virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > SAL_CALL getRootStorage() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setRootStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& _rootstorage ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL storeLibrariesToStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& RootStorage ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > SAL_CALL getRootStorage() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setRootStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& _rootstorage ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL storeLibrariesToStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& RootStorage ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); // Methods XModifiable (base of XPersistentLibraryContainer) - virtual ::sal_Bool SAL_CALL isModified( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setModified( ::sal_Bool bModified ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL isModified( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setModified( ::sal_Bool bModified ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); // Methods XPersistentLibraryContainer (base of XStorageBasedLibraryContainer) - virtual ::com::sun::star::uno::Any SAL_CALL getRootLocation() throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getContainerLocationName() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL storeLibraries( ) throw (::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getRootLocation() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getContainerLocationName() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL storeLibraries( ) throw (::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); //Methods XLibraryContainer3 virtual OUString SAL_CALL getOriginalLibraryLinkURL( const OUString& Name ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // Methods XLibraryContainer2 (base of XPersistentLibraryContainer) virtual sal_Bool SAL_CALL isLibraryLink( const OUString& Name ) throw (::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getLibraryLinkURL( const OUString& Name ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isLibraryReadOnly( const OUString& Name ) throw (::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setLibraryReadOnly( const OUString& Name, sal_Bool bReadOnly ) throw (::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL renameLibrary( const OUString& Name, const OUString& NewName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::container::ElementExistException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // Methods XLibraryContainer (base of XLibraryContainer2) virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > SAL_CALL createLibrary( const OUString& Name ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL createLibraryLink ( const OUString& Name, const OUString& StorageURL, sal_Bool ReadOnly ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeLibrary( const OUString& Name ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isLibraryLoaded( const OUString& Name ) throw(::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL loadLibrary( const OUString& Name ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // Methods XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // Methods XLibraryContainerPassword virtual sal_Bool SAL_CALL isLibraryPasswordProtected( const OUString& Name ) throw (::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isLibraryPasswordVerified( const OUString& Name ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL verifyLibraryPassword( const OUString& Name, const OUString& Password ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL changeLibraryPassword( const OUString& Name, const OUString& OldPassword, const OUString& NewPassword ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // Methods XContainer virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // Methods XLibraryContainerExport virtual void SAL_CALL exportLibrary( const OUString& Name, const OUString& URL, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) throw (::com::sun::star::uno::Exception, ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // Methods XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw (::com::sun::star::uno::RuntimeException) = 0; + throw (::com::sun::star::uno::RuntimeException, std::exception) = 0; virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (::com::sun::star::uno::RuntimeException) = 0; + throw (::com::sun::star::uno::RuntimeException, std::exception) = 0; // Methods XVBACompatibility - virtual ::sal_Bool SAL_CALL getVBACompatibilityMode() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setVBACompatibilityMode( ::sal_Bool _vbacompatmodeon ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getProjectName() throw (::com::sun::star::uno::RuntimeException) { return msProjectName; } - virtual void SAL_CALL setProjectName( const OUString& _projectname ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL getVBACompatibilityMode() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setVBACompatibilityMode( ::sal_Bool _vbacompatmodeon ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getProjectName() throw (::com::sun::star::uno::RuntimeException, std::exception) { return msProjectName; } + virtual void SAL_CALL setProjectName( const OUString& _projectname ) throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL getRunningVBAScripts() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addVBAScriptListener( const ::com::sun::star::uno::Reference< ::com::sun::star::script::vba::XVBAScriptListener >& Listener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeVBAScriptListener( const ::com::sun::star::uno::Reference< ::com::sun::star::script::vba::XVBAScriptListener >& Listener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL broadcastVBAScriptEvent( sal_Int32 nIdentifier, const OUString& rModuleName ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); }; @@ -634,65 +634,65 @@ public: ); // Methods XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType ) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL acquire() throw() { OComponentHelper::acquire(); } virtual void SAL_CALL release() throw() { OComponentHelper::release(); } // Methods XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasElements( ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); // Methods XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); // Methods XNameReplace virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // Methods XNameContainer virtual void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeByName( const OUString& Name ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // XTypeProvider ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); // Methods XContainer virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // Methods XChangesNotifier virtual void SAL_CALL addChangesListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XChangesListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeChangesListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XChangesListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); public: struct LibraryContainerAccess { friend class SfxLibraryContainer; private: LibraryContainerAccess() { } }; diff --git a/basic/source/inc/propacc.hxx b/basic/source/inc/propacc.hxx index 0253cb0a217a..23141c641254 100644 --- a/basic/source/inc/propacc.hxx +++ b/basic/source/inc/propacc.hxx @@ -51,7 +51,7 @@ public: // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo(void) throw( ::com::sun::star::uno::RuntimeException ); + getPropertySetInfo(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue) @@ -59,31 +59,31 @@ public: ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& ) - throw (); + throw (std::exception); virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& ) - throw (); + throw (std::exception); virtual void SAL_CALL addVetoableChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& ) - throw (); + throw (std::exception); virtual void SAL_CALL removeVetoableChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& ) - throw (); + throw (std::exception); // XPropertyAccess - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues(void) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValues(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& PropertyValues_) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues(void) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertyValues(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& PropertyValues_) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); }; @@ -121,11 +121,11 @@ public: // XPropertySetInfo virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties(void) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName(const OUString& Name) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL hasPropertyByName(const OUString& Name) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); }; diff --git a/basic/source/inc/scriptcont.hxx b/basic/source/inc/scriptcont.hxx index 6c2bc5b07538..02b2ba9bdd9a 100644 --- a/basic/source/inc/scriptcont.hxx +++ b/basic/source/inc/scriptcont.hxx @@ -99,28 +99,28 @@ public: // Methods XLibraryContainerPassword virtual sal_Bool SAL_CALL isLibraryPasswordProtected( const OUString& Name ) throw (::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isLibraryPasswordVerified( const OUString& Name ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL verifyLibraryPassword( const OUString& Name, const OUString& Password ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL changeLibraryPassword( const OUString& Name, const OUString& OldPassword, const OUString& NewPassword ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // XLibraryQueryExecutable virtual sal_Bool SAL_CALL HasExecutableCode(const OUString&) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // Methods XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // Service static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static(); @@ -175,10 +175,10 @@ public: DECLARE_XTYPEPROVIDER() // XVBAModuleInfo - virtual ::com::sun::star::script::ModuleInfo SAL_CALL getModuleInfo( const OUString& ModuleName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasModuleInfo( const OUString& ModuleName ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL insertModuleInfo( const OUString& ModuleName, const ::com::sun::star::script::ModuleInfo& ModuleInfo ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeModuleInfo( const OUString& ModuleName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::script::ModuleInfo SAL_CALL getModuleInfo( const OUString& ModuleName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasModuleInfo( const OUString& ModuleName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL insertModuleInfo( const OUString& ModuleName, const ::com::sun::star::script::ModuleInfo& ModuleInfo ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeModuleInfo( const OUString& ModuleName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); static bool containsValidModule( const ::com::sun::star::uno::Any& _rElement ); diff --git a/basic/source/runtime/comenumwrapper.cxx b/basic/source/runtime/comenumwrapper.cxx index a5372ffdfe1d..4ef346a205ac 100644 --- a/basic/source/runtime/comenumwrapper.cxx +++ b/basic/source/runtime/comenumwrapper.cxx @@ -22,7 +22,7 @@ using namespace ::com::sun::star; ::sal_Bool SAL_CALL ComEnumerationWrapper::hasMoreElements() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { sal_Bool bResult = sal_False; @@ -43,7 +43,7 @@ using namespace ::com::sun::star; uno::Any SAL_CALL ComEnumerationWrapper::nextElement() throw ( container::NoSuchElementException, lang::WrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { try { diff --git a/basic/source/runtime/comenumwrapper.hxx b/basic/source/runtime/comenumwrapper.hxx index a3b5c0c27a92..0f9992c2b36c 100644 --- a/basic/source/runtime/comenumwrapper.hxx +++ b/basic/source/runtime/comenumwrapper.hxx @@ -38,8 +38,8 @@ public: } // container::XEnumeration - virtual ::sal_Bool SAL_CALL hasMoreElements() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL nextElement() throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL hasMoreElements() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL nextElement() throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); }; #endif // INCLUDED_BASIC_SOURCE_RUNTIME_COMENUMWRAPPER_HXX diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx index 016c0ffdb5f3..532310e542a7 100644 --- a/basic/source/uno/dlgcont.cxx +++ b/basic/source/uno/dlgcont.cxx @@ -186,7 +186,7 @@ void SAL_CALL SfxDialogLibraryContainer::writeLibraryElement xInput->closeInput(); } -void SfxDialogLibraryContainer::storeLibrariesToStorage( const uno::Reference< embed::XStorage >& xStorage ) throw ( RuntimeException ) +void SfxDialogLibraryContainer::storeLibrariesToStorage( const uno::Reference< embed::XStorage >& xStorage ) throw ( RuntimeException, std::exception ) { LibraryContainerMethodGuard aGuard( *this ); mbOasis2OOoFormat = false; @@ -443,7 +443,7 @@ void SfxDialogLibraryContainer::onNewRootStorage() } sal_Bool SAL_CALL -SfxDialogLibraryContainer:: HasExecutableCode( const OUString& /*Library*/ ) throw (uno::RuntimeException) +SfxDialogLibraryContainer:: HasExecutableCode( const OUString& /*Library*/ ) throw (uno::RuntimeException, std::exception) { return sal_False; // dialog library has no executable code } @@ -455,12 +455,12 @@ void createRegistryInfo_SfxDialogLibraryContainer() static OAutoRegistration< SfxDialogLibraryContainer > aAutoRegistration; } -OUString SAL_CALL SfxDialogLibraryContainer::getImplementationName( ) throw (RuntimeException) +OUString SAL_CALL SfxDialogLibraryContainer::getImplementationName( ) throw (RuntimeException, std::exception) { return getImplementationName_static(); } -Sequence< OUString > SAL_CALL SfxDialogLibraryContainer::getSupportedServiceNames( ) throw (RuntimeException) +Sequence< OUString > SAL_CALL SfxDialogLibraryContainer::getSupportedServiceNames( ) throw (RuntimeException, std::exception) { return getSupportedServiceNames_static(); } @@ -585,7 +585,7 @@ void SfxDialogLibrary::storeResourcesToStorage( const ::com::sun::star::uno::Ref // XStringResourceSupplier Reference< resource::XStringResourceResolver > - SAL_CALL SfxDialogLibrary::getStringResource( ) throw (RuntimeException) + SAL_CALL SfxDialogLibrary::getStringResource( ) throw (RuntimeException, std::exception) { if( !m_xStringResourcePersistence.is() ) m_xStringResourcePersistence = m_pParent->implCreateStringResource( this ); diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx index 2c3295f90a77..7590e18b55ff 100644 --- a/basic/source/uno/namecont.cxx +++ b/basic/source/uno/namecont.cxx @@ -98,13 +98,13 @@ static bool GbMigrationSuppressErrors = false; // Methods XElementAccess Type NameContainer::getElementType() - throw(RuntimeException) + throw(RuntimeException, std::exception) { return mType; } sal_Bool NameContainer::hasElements() - throw(RuntimeException) + throw(RuntimeException, std::exception) { sal_Bool bRet = (mnElementCount > 0); return bRet; @@ -112,7 +112,7 @@ sal_Bool NameContainer::hasElements() // Methods XNameAccess Any NameContainer::getByName( const OUString& aName ) - throw(NoSuchElementException, WrappedTargetException, RuntimeException) + throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { NameContainerNameMap::iterator aIt = mHashMap.find( aName ); if( aIt == mHashMap.end() ) @@ -125,13 +125,13 @@ Any NameContainer::getByName( const OUString& aName ) } Sequence< OUString > NameContainer::getElementNames() - throw(RuntimeException) + throw(RuntimeException, std::exception) { return mNames; } sal_Bool NameContainer::hasByName( const OUString& aName ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { NameContainerNameMap::iterator aIt = mHashMap.find( aName ); sal_Bool bRet = ( aIt != mHashMap.end() ); @@ -141,7 +141,7 @@ sal_Bool NameContainer::hasByName( const OUString& aName ) // Methods XNameReplace void NameContainer::replaceByName( const OUString& aName, const Any& aElement ) - throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) + throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { Type aAnyType = aElement.getValueType(); if( mType != aAnyType ) @@ -188,7 +188,7 @@ void NameContainer::replaceByName( const OUString& aName, const Any& aElement ) // Methods XNameContainer void NameContainer::insertByName( const OUString& aName, const Any& aElement ) - throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException) + throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) { Type aAnyType = aElement.getValueType(); if( mType != aAnyType ) @@ -236,7 +236,7 @@ void NameContainer::insertByName( const OUString& aName, const Any& aElement ) } void NameContainer::removeByName( const OUString& aName ) - throw(NoSuchElementException, WrappedTargetException, RuntimeException) + throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { NameContainerNameMap::iterator aIt = mHashMap.find( aName ); if( aIt == mHashMap.end() ) @@ -290,7 +290,7 @@ void NameContainer::removeByName( const OUString& aName ) // Methods XContainer void SAL_CALL NameContainer::addContainerListener( const Reference< XContainerListener >& xListener ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if( !xListener.is() ) { @@ -301,7 +301,7 @@ void SAL_CALL NameContainer::addContainerListener( const Reference< XContainerLi } void SAL_CALL NameContainer::removeContainerListener( const Reference< XContainerListener >& xListener ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if( !xListener.is() ) { @@ -312,7 +312,7 @@ void SAL_CALL NameContainer::removeContainerListener( const Reference< XContaine // Methods XChangesNotifier void SAL_CALL NameContainer::addChangesListener( const Reference< XChangesListener >& xListener ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if( !xListener.is() ) { @@ -322,7 +322,7 @@ void SAL_CALL NameContainer::addChangesListener( const Reference< XChangesListen } void SAL_CALL NameContainer::removeChangesListener( const Reference< XChangesListener >& xListener ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if( !xListener.is() ) { @@ -441,14 +441,14 @@ BasicManager* SfxLibraryContainer::getBasicManager( void ) } // Methods XStorageBasedLibraryContainer -Reference< XStorage > SAL_CALL SfxLibraryContainer::getRootStorage() throw (RuntimeException) +Reference< XStorage > SAL_CALL SfxLibraryContainer::getRootStorage() throw (RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); return mxStorage; } void SAL_CALL SfxLibraryContainer::setRootStorage( const Reference< XStorage >& _rxRootStorage ) - throw (IllegalArgumentException, RuntimeException) + throw (IllegalArgumentException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); if ( !_rxRootStorage.is() ) @@ -460,7 +460,7 @@ void SAL_CALL SfxLibraryContainer::setRootStorage( const Reference< XStorage >& } void SAL_CALL SfxLibraryContainer::storeLibrariesToStorage( const Reference< XStorage >& _rxRootStorage ) - throw (IllegalArgumentException, WrappedTargetException, RuntimeException) + throw (IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); if ( !_rxRootStorage.is() ) @@ -481,7 +481,7 @@ void SAL_CALL SfxLibraryContainer::storeLibrariesToStorage( const Reference< XSt // Methods XModifiable sal_Bool SfxLibraryContainer::isModified() - throw (RuntimeException) + throw (RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); if ( maModifiable.isModified() ) @@ -518,41 +518,41 @@ sal_Bool SfxLibraryContainer::isModified() } void SAL_CALL SfxLibraryContainer::setModified( sal_Bool _bModified ) - throw (PropertyVetoException, RuntimeException) + throw (PropertyVetoException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); maModifiable.setModified( _bModified ); } void SAL_CALL SfxLibraryContainer::addModifyListener( const Reference< XModifyListener >& _rxListener ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); maModifiable.addModifyListener( _rxListener ); } void SAL_CALL SfxLibraryContainer::removeModifyListener( const Reference< XModifyListener >& _rxListener ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); maModifiable.removeModifyListener( _rxListener ); } // Methods XPersistentLibraryContainer -Any SAL_CALL SfxLibraryContainer::getRootLocation() throw (RuntimeException) +Any SAL_CALL SfxLibraryContainer::getRootLocation() throw (RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); return makeAny( getRootStorage() ); } -OUString SAL_CALL SfxLibraryContainer::getContainerLocationName() throw (RuntimeException) +OUString SAL_CALL SfxLibraryContainer::getContainerLocationName() throw (RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); return maLibrariesDir; } void SAL_CALL SfxLibraryContainer::storeLibraries( ) - throw (WrappedTargetException, RuntimeException) + throw (WrappedTargetException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); try @@ -2144,14 +2144,14 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto // Methods XElementAccess Type SAL_CALL SfxLibraryContainer::getElementType() - throw(RuntimeException) + throw(RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); return maNameContainer.getElementType(); } sal_Bool SfxLibraryContainer::hasElements() - throw(RuntimeException) + throw(RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); sal_Bool bRet = maNameContainer.hasElements(); @@ -2160,7 +2160,7 @@ sal_Bool SfxLibraryContainer::hasElements() // Methods XNameAccess Any SfxLibraryContainer::getByName( const OUString& aName ) - throw(NoSuchElementException, WrappedTargetException, RuntimeException) + throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); Any aRetAny = maNameContainer.getByName( aName ) ; @@ -2168,14 +2168,14 @@ Any SfxLibraryContainer::getByName( const OUString& aName ) } Sequence< OUString > SfxLibraryContainer::getElementNames() - throw(RuntimeException) + throw(RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); return maNameContainer.getElementNames(); } sal_Bool SfxLibraryContainer::hasByName( const OUString& aName ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); return maNameContainer.hasByName( aName ) ; @@ -2183,7 +2183,7 @@ sal_Bool SfxLibraryContainer::hasByName( const OUString& aName ) // Methods XLibraryContainer Reference< XNameContainer > SAL_CALL SfxLibraryContainer::createLibrary( const OUString& Name ) - throw(IllegalArgumentException, ElementExistException, RuntimeException) + throw(IllegalArgumentException, ElementExistException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); SfxLibrary* pNewLib = implCreateLibrary( Name ); @@ -2202,7 +2202,7 @@ Reference< XNameContainer > SAL_CALL SfxLibraryContainer::createLibrary( const O Reference< XNameAccess > SAL_CALL SfxLibraryContainer::createLibraryLink ( const OUString& Name, const OUString& StorageURL, sal_Bool ReadOnly ) - throw(IllegalArgumentException, ElementExistException, RuntimeException) + throw(IllegalArgumentException, ElementExistException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); // TODO: Check other reasons to force ReadOnly status @@ -2250,7 +2250,7 @@ Reference< XNameAccess > SAL_CALL SfxLibraryContainer::createLibraryLink } void SAL_CALL SfxLibraryContainer::removeLibrary( const OUString& Name ) - throw(NoSuchElementException, WrappedTargetException, RuntimeException) + throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); // Get and hold library before removing @@ -2321,7 +2321,7 @@ void SAL_CALL SfxLibraryContainer::removeLibrary( const OUString& Name ) } sal_Bool SAL_CALL SfxLibraryContainer::isLibraryLoaded( const OUString& Name ) - throw(NoSuchElementException, RuntimeException) + throw(NoSuchElementException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); SfxLibrary* pImplLib = getImplLib( Name ); @@ -2331,7 +2331,7 @@ sal_Bool SAL_CALL SfxLibraryContainer::isLibraryLoaded( const OUString& Name ) void SAL_CALL SfxLibraryContainer::loadLibrary( const OUString& Name ) - throw(NoSuchElementException, WrappedTargetException, RuntimeException) + throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); Any aLibAny = maNameContainer.getByName( Name ) ; @@ -2470,7 +2470,7 @@ void SAL_CALL SfxLibraryContainer::loadLibrary( const OUString& Name ) // Methods XLibraryContainer2 sal_Bool SAL_CALL SfxLibraryContainer::isLibraryLink( const OUString& Name ) - throw (NoSuchElementException, RuntimeException) + throw (NoSuchElementException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); SfxLibrary* pImplLib = getImplLib( Name ); @@ -2479,7 +2479,7 @@ sal_Bool SAL_CALL SfxLibraryContainer::isLibraryLink( const OUString& Name ) } OUString SAL_CALL SfxLibraryContainer::getLibraryLinkURL( const OUString& Name ) - throw (IllegalArgumentException, NoSuchElementException, RuntimeException) + throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); SfxLibrary* pImplLib = getImplLib( Name ); @@ -2493,7 +2493,7 @@ OUString SAL_CALL SfxLibraryContainer::getLibraryLinkURL( const OUString& Name ) } sal_Bool SAL_CALL SfxLibraryContainer::isLibraryReadOnly( const OUString& Name ) - throw (NoSuchElementException, RuntimeException) + throw (NoSuchElementException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); SfxLibrary* pImplLib = getImplLib( Name ); @@ -2502,7 +2502,7 @@ sal_Bool SAL_CALL SfxLibraryContainer::isLibraryReadOnly( const OUString& Name ) } void SAL_CALL SfxLibraryContainer::setLibraryReadOnly( const OUString& Name, sal_Bool bReadOnly ) - throw (NoSuchElementException, RuntimeException) + throw (NoSuchElementException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); SfxLibrary* pImplLib = getImplLib( Name ); @@ -2526,7 +2526,7 @@ void SAL_CALL SfxLibraryContainer::setLibraryReadOnly( const OUString& Name, sal } void SAL_CALL SfxLibraryContainer::renameLibrary( const OUString& Name, const OUString& NewName ) - throw (NoSuchElementException, ElementExistException, RuntimeException) + throw (NoSuchElementException, ElementExistException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); if( maNameContainer.hasByName( NewName ) ) @@ -2658,7 +2658,7 @@ void SAL_CALL SfxLibraryContainer::renameLibrary( const OUString& Name, const OU // Methods XInitialization void SAL_CALL SfxLibraryContainer::initialize( const Sequence< Any >& _rArguments ) - throw (Exception, RuntimeException) + throw (Exception, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); sal_Int32 nArgCount = _rArguments.getLength(); @@ -2739,28 +2739,28 @@ void SAL_CALL SfxLibraryContainer::disposing() // Methods XLibraryContainerPassword sal_Bool SAL_CALL SfxLibraryContainer::isLibraryPasswordProtected( const OUString& ) - throw (NoSuchElementException, RuntimeException) + throw (NoSuchElementException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); return sal_False; } sal_Bool SAL_CALL SfxLibraryContainer::isLibraryPasswordVerified( const OUString& ) - throw (IllegalArgumentException, NoSuchElementException, RuntimeException) + throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); throw IllegalArgumentException(); } sal_Bool SAL_CALL SfxLibraryContainer::verifyLibraryPassword( const OUString&, const OUString& ) - throw (IllegalArgumentException, NoSuchElementException, RuntimeException) + throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); throw IllegalArgumentException(); } void SAL_CALL SfxLibraryContainer::changeLibraryPassword(const OUString&, const OUString&, const OUString& ) - throw (IllegalArgumentException, NoSuchElementException, RuntimeException) + throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); throw IllegalArgumentException(); @@ -2768,7 +2768,7 @@ void SAL_CALL SfxLibraryContainer::changeLibraryPassword(const OUString&, const // Methods XContainer void SAL_CALL SfxLibraryContainer::addContainerListener( const Reference< XContainerListener >& xListener ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); maNameContainer.setEventSource( static_cast< XInterface* >( (OWeakObject*)this ) ); @@ -2776,7 +2776,7 @@ void SAL_CALL SfxLibraryContainer::addContainerListener( const Reference< XConta } void SAL_CALL SfxLibraryContainer::removeContainerListener( const Reference< XContainerListener >& xListener ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); maNameContainer.removeContainerListener( xListener ); @@ -2785,7 +2785,7 @@ void SAL_CALL SfxLibraryContainer::removeContainerListener( const Reference< XCo // Methods XLibraryContainerExport void SAL_CALL SfxLibraryContainer::exportLibrary( const OUString& Name, const OUString& URL, const Reference< XInteractionHandler >& Handler ) - throw ( uno::Exception, NoSuchElementException, RuntimeException) + throw ( uno::Exception, NoSuchElementException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); SfxLibrary* pImplLib = getImplLib( Name ); @@ -2860,7 +2860,7 @@ OUString SfxLibraryContainer::expand_url( const OUString& url ) //XLibraryContainer3 OUString SAL_CALL SfxLibraryContainer::getOriginalLibraryLinkURL( const OUString& Name ) - throw (IllegalArgumentException, NoSuchElementException, RuntimeException) + throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); SfxLibrary* pImplLib = getImplLib( Name ); @@ -2875,12 +2875,12 @@ OUString SAL_CALL SfxLibraryContainer::getOriginalLibraryLinkURL( const OUString // XVBACompatibility -sal_Bool SAL_CALL SfxLibraryContainer::getVBACompatibilityMode() throw (RuntimeException) +sal_Bool SAL_CALL SfxLibraryContainer::getVBACompatibilityMode() throw (RuntimeException, std::exception) { return mbVBACompat; } -void SAL_CALL SfxLibraryContainer::setVBACompatibilityMode( ::sal_Bool _vbacompatmodeon ) throw (RuntimeException) +void SAL_CALL SfxLibraryContainer::setVBACompatibilityMode( ::sal_Bool _vbacompatmodeon ) throw (RuntimeException, std::exception) { /* The member variable mbVBACompat must be set first, the following call to getBasicManager() may call getVBACompatibilityMode() which returns @@ -2917,7 +2917,7 @@ void SAL_CALL SfxLibraryContainer::setVBACompatibilityMode( ::sal_Bool _vbacompa } } -void SAL_CALL SfxLibraryContainer::setProjectName( const OUString& _projectname ) throw (RuntimeException) +void SAL_CALL SfxLibraryContainer::setProjectName( const OUString& _projectname ) throw (RuntimeException, std::exception) { msProjectName = _projectname; BasicManager* pBasMgr = getBasicManager(); @@ -2931,23 +2931,23 @@ void SAL_CALL SfxLibraryContainer::setProjectName( const OUString& _projectname } } -sal_Int32 SAL_CALL SfxLibraryContainer::getRunningVBAScripts() throw (RuntimeException) +sal_Int32 SAL_CALL SfxLibraryContainer::getRunningVBAScripts() throw (RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); return mnRunningVBAScripts; } -void SAL_CALL SfxLibraryContainer::addVBAScriptListener( const Reference< vba::XVBAScriptListener >& rxListener ) throw (RuntimeException) +void SAL_CALL SfxLibraryContainer::addVBAScriptListener( const Reference< vba::XVBAScriptListener >& rxListener ) throw (RuntimeException, std::exception) { maVBAScriptListeners.addTypedListener( rxListener ); } -void SAL_CALL SfxLibraryContainer::removeVBAScriptListener( const Reference< vba::XVBAScriptListener >& rxListener ) throw (RuntimeException) +void SAL_CALL SfxLibraryContainer::removeVBAScriptListener( const Reference< vba::XVBAScriptListener >& rxListener ) throw (RuntimeException, std::exception) { maVBAScriptListeners.removeTypedListener( rxListener ); } -void SAL_CALL SfxLibraryContainer::broadcastVBAScriptEvent( sal_Int32 nIdentifier, const OUString& rModuleName ) throw (RuntimeException) +void SAL_CALL SfxLibraryContainer::broadcastVBAScriptEvent( sal_Int32 nIdentifier, const OUString& rModuleName ) throw (RuntimeException, std::exception) { // own lock for accessing the number of running scripts enterMethod(); @@ -2969,7 +2969,7 @@ void SAL_CALL SfxLibraryContainer::broadcastVBAScriptEvent( sal_Int32 nIdentifie // Methods XServiceInfo sal_Bool SAL_CALL SfxLibraryContainer::supportsService( const OUString& _rServiceName ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return cppu::supportsService(this, _rServiceName); } @@ -3039,7 +3039,7 @@ void SfxLibrary::implSetModified( sal_Bool _bIsModified ) // Methods XInterface Any SAL_CALL SfxLibrary::queryInterface( const Type& rType ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { Any aRet; @@ -3060,13 +3060,13 @@ Any SAL_CALL SfxLibrary::queryInterface( const Type& rType ) // Methods XElementAccess Type SfxLibrary::getElementType() - throw(RuntimeException) + throw(RuntimeException, std::exception) { return maNameContainer.getElementType(); } sal_Bool SfxLibrary::hasElements() - throw(RuntimeException) + throw(RuntimeException, std::exception) { sal_Bool bRet = maNameContainer.hasElements(); return bRet; @@ -3074,7 +3074,7 @@ sal_Bool SfxLibrary::hasElements() // Methods XNameAccess Any SfxLibrary::getByName( const OUString& aName ) - throw(NoSuchElementException, WrappedTargetException, RuntimeException) + throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { impl_checkLoaded(); @@ -3083,13 +3083,13 @@ Any SfxLibrary::getByName( const OUString& aName ) } Sequence< OUString > SfxLibrary::getElementNames() - throw(RuntimeException) + throw(RuntimeException, std::exception) { return maNameContainer.getElementNames(); } sal_Bool SfxLibrary::hasByName( const OUString& aName ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { sal_Bool bRet = maNameContainer.hasByName( aName ); return bRet; @@ -3124,7 +3124,7 @@ void SfxLibrary::impl_checkLoaded() // Methods XNameReplace void SfxLibrary::replaceByName( const OUString& aName, const Any& aElement ) - throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) + throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { impl_checkReadOnly(); impl_checkLoaded(); @@ -3140,7 +3140,7 @@ void SfxLibrary::replaceByName( const OUString& aName, const Any& aElement ) // Methods XNameContainer void SfxLibrary::insertByName( const OUString& aName, const Any& aElement ) - throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException) + throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) { impl_checkReadOnly(); impl_checkLoaded(); @@ -3183,7 +3183,7 @@ void SfxLibrary::impl_removeWithoutChecks( const OUString& _rElementName ) } void SfxLibrary::removeByName( const OUString& Name ) - throw(NoSuchElementException, WrappedTargetException, RuntimeException) + throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { impl_checkReadOnly(); impl_checkLoaded(); @@ -3192,7 +3192,7 @@ void SfxLibrary::removeByName( const OUString& Name ) // XTypeProvider Sequence< Type > SfxLibrary::getTypes() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { static OTypeCollection * s_pTypes_NameContainer = 0; { @@ -3215,7 +3215,7 @@ Sequence< Type > SfxLibrary::getTypes() Sequence< sal_Int8 > SfxLibrary::getImplementationId() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { static OImplementationId * s_pId_NameContainer = 0; { @@ -3234,28 +3234,28 @@ Sequence< sal_Int8 > SfxLibrary::getImplementationId() // Methods XContainer void SAL_CALL SfxLibrary::addContainerListener( const Reference< XContainerListener >& xListener ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { maNameContainer.setEventSource( static_cast< XInterface* >( (OWeakObject*)this ) ); maNameContainer.addContainerListener( xListener ); } void SAL_CALL SfxLibrary::removeContainerListener( const Reference< XContainerListener >& xListener ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { maNameContainer.removeContainerListener( xListener ); } // Methods XChangesNotifier void SAL_CALL SfxLibrary::addChangesListener( const Reference< XChangesListener >& xListener ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { maNameContainer.setEventSource( static_cast< XInterface* >( (OWeakObject*)this ) ); maNameContainer.addChangesListener( xListener ); } void SAL_CALL SfxLibrary::removeChangesListener( const Reference< XChangesListener >& xListener ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { maNameContainer.removeChangesListener( xListener ); } diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx index 57b07e5e4d8a..6c39c0ce6768 100644 --- a/basic/source/uno/scriptcont.cxx +++ b/basic/source/uno/scriptcont.cxx @@ -381,7 +381,7 @@ void SAL_CALL SfxScriptLibraryContainer::importFromOldStorage( const OUString& a // Methods XLibraryContainerPassword sal_Bool SAL_CALL SfxScriptLibraryContainer::isLibraryPasswordProtected( const OUString& Name ) - throw (NoSuchElementException, RuntimeException) + throw (NoSuchElementException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); SfxLibrary* pImplLib = getImplLib( Name ); @@ -390,7 +390,7 @@ sal_Bool SAL_CALL SfxScriptLibraryContainer::isLibraryPasswordProtected( const O } sal_Bool SAL_CALL SfxScriptLibraryContainer::isLibraryPasswordVerified( const OUString& Name ) - throw (IllegalArgumentException, NoSuchElementException, RuntimeException) + throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); SfxLibrary* pImplLib = getImplLib( Name ); @@ -404,7 +404,7 @@ sal_Bool SAL_CALL SfxScriptLibraryContainer::isLibraryPasswordVerified( const OU sal_Bool SAL_CALL SfxScriptLibraryContainer::verifyLibraryPassword ( const OUString& Name, const OUString& Password ) - throw (IllegalArgumentException, NoSuchElementException, RuntimeException) + throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); SfxLibrary* pImplLib = getImplLib( Name ); @@ -447,7 +447,7 @@ sal_Bool SAL_CALL SfxScriptLibraryContainer::verifyLibraryPassword void SAL_CALL SfxScriptLibraryContainer::changeLibraryPassword( const OUString& Name, const OUString& OldPassword, const OUString& NewPassword ) - throw (IllegalArgumentException, NoSuchElementException, RuntimeException) + throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); SfxLibrary* pImplLib = getImplLib( Name ); @@ -1181,7 +1181,7 @@ void SfxScriptLibraryContainer::onNewRootStorage() } sal_Bool SAL_CALL SfxScriptLibraryContainer:: HasExecutableCode( const OUString& Library ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { BasicManager* pBasicMgr = getBasicManager(); OSL_ENSURE( pBasicMgr, "we need a basicmanager, really we do" ); @@ -1201,13 +1201,13 @@ void createRegistryInfo_SfxScriptLibraryContainer() } OUString SAL_CALL SfxScriptLibraryContainer::getImplementationName( ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return getImplementationName_static(); } Sequence< OUString > SAL_CALL SfxScriptLibraryContainer::getSupportedServiceNames( ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return getSupportedServiceNames_static(); } @@ -1307,7 +1307,7 @@ IMPLEMENT_FORWARD_XINTERFACE2( SfxScriptLibrary, SfxLibrary, SfxScriptLibrary_BA IMPLEMENT_FORWARD_XTYPEPROVIDER2( SfxScriptLibrary, SfxLibrary, SfxScriptLibrary_BASE ); script::ModuleInfo SAL_CALL SfxScriptLibrary::getModuleInfo( const OUString& ModuleName ) - throw (NoSuchElementException, WrappedTargetException, RuntimeException) + throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { if ( !hasModuleInfo( ModuleName ) ) { @@ -1317,7 +1317,7 @@ script::ModuleInfo SAL_CALL SfxScriptLibrary::getModuleInfo( const OUString& Mod } sal_Bool SAL_CALL SfxScriptLibrary::hasModuleInfo( const OUString& ModuleName ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { sal_Bool bRes = sal_False; ModuleInfoMap::iterator it = mModuleInfos.find( ModuleName ); @@ -1330,7 +1330,7 @@ sal_Bool SAL_CALL SfxScriptLibrary::hasModuleInfo( const OUString& ModuleName ) } void SAL_CALL SfxScriptLibrary::insertModuleInfo( const OUString& ModuleName, const script::ModuleInfo& ModuleInfo ) - throw (IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException) + throw (IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) { if ( hasModuleInfo( ModuleName ) ) { @@ -1340,7 +1340,7 @@ void SAL_CALL SfxScriptLibrary::insertModuleInfo( const OUString& ModuleName, co } void SAL_CALL SfxScriptLibrary::removeModuleInfo( const OUString& ModuleName ) - throw (NoSuchElementException, WrappedTargetException, RuntimeException) + throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { // #FIXME add NoSuchElementException to the spec if ( !hasModuleInfo( ModuleName ) ) |