diff options
Diffstat (limited to 'basctl/source/basicide')
-rw-r--r-- | basctl/source/basicide/basicrenderable.cxx | 6 | ||||
-rw-r--r-- | basctl/source/basicide/basicrenderable.hxx | 9 | ||||
-rw-r--r-- | basctl/source/basicide/baside2b.cxx | 4 | ||||
-rw-r--r-- | basctl/source/basicide/basidectrlr.cxx | 8 | ||||
-rw-r--r-- | basctl/source/basicide/basidesh.cxx | 8 | ||||
-rw-r--r-- | basctl/source/basicide/basobj2.cxx | 1 | ||||
-rw-r--r-- | basctl/source/basicide/basobj3.cxx | 1 | ||||
-rw-r--r-- | basctl/source/basicide/doceventnotifier.cxx | 8 | ||||
-rw-r--r-- | basctl/source/basicide/moduldl2.cxx | 10 | ||||
-rw-r--r-- | basctl/source/basicide/unomodel.cxx | 18 | ||||
-rw-r--r-- | basctl/source/basicide/unomodel.hxx | 29 |
11 files changed, 42 insertions, 60 deletions
diff --git a/basctl/source/basicide/basicrenderable.cxx b/basctl/source/basicide/basicrenderable.cxx index d1b7bced581d..3af2ee9ef9f9 100644 --- a/basctl/source/basicide/basicrenderable.cxx +++ b/basctl/source/basicide/basicrenderable.cxx @@ -86,7 +86,7 @@ VclPtr< Printer > Renderable::getPrinter() sal_Int32 SAL_CALL Renderable::getRendererCount ( const Any&, const Sequence<beans::PropertyValue >& i_xOptions - ) throw (lang::IllegalArgumentException, RuntimeException, std::exception) + ) { processProperties( i_xOptions ); @@ -118,7 +118,7 @@ sal_Int32 SAL_CALL Renderable::getRendererCount ( Sequence<beans::PropertyValue> SAL_CALL Renderable::getRenderer ( sal_Int32, const Any&, const Sequence<beans::PropertyValue>& i_xOptions - ) throw (lang::IllegalArgumentException, RuntimeException, std::exception) + ) { processProperties( i_xOptions ); @@ -146,7 +146,7 @@ Sequence<beans::PropertyValue> SAL_CALL Renderable::getRenderer ( void SAL_CALL Renderable::render ( sal_Int32 nRenderer, const Any&, const Sequence<beans::PropertyValue>& i_xOptions - ) throw (lang::IllegalArgumentException, RuntimeException, std::exception) + ) { processProperties( i_xOptions ); diff --git a/basctl/source/basicide/basicrenderable.hxx b/basctl/source/basicide/basicrenderable.hxx index c2bfce9fde94..412480609f0c 100644 --- a/basctl/source/basicide/basicrenderable.hxx +++ b/basctl/source/basicide/basicrenderable.hxx @@ -44,20 +44,17 @@ public: // XRenderable virtual sal_Int32 SAL_CALL getRendererCount ( const css::uno::Any& aSelection, - const css::uno::Sequence<css::beans::PropertyValue >& xOptions) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence<css::beans::PropertyValue >& xOptions) override; virtual css::uno::Sequence<css::beans::PropertyValue> SAL_CALL getRenderer ( sal_Int32 nRenderer, const css::uno::Any& rSelection, - const css::uno::Sequence<css::beans::PropertyValue>& rxOptions) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence<css::beans::PropertyValue>& rxOptions) override; virtual void SAL_CALL render ( sal_Int32 nRenderer, const css::uno::Any& rSelection, - const css::uno::Sequence<css::beans::PropertyValue>& rxOptions) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence<css::beans::PropertyValue>& rxOptions) override; }; diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index bd0b4cff2249..977d827f8230 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -183,14 +183,14 @@ public: private: virtual ~ChangesListener() override {} - virtual void SAL_CALL disposing(lang::EventObject const &) throw (RuntimeException, std::exception) override + virtual void SAL_CALL disposing(lang::EventObject const &) override { osl::MutexGuard g(editor_.mutex_); editor_.notifier_.clear(); } virtual void SAL_CALL propertiesChange( - Sequence< beans::PropertyChangeEvent > const &) throw (RuntimeException, std::exception) override + Sequence< beans::PropertyChangeEvent > const &) override { SolarMutexGuard g; editor_.ImplSetFont(); diff --git a/basctl/source/basicide/basidectrlr.cxx b/basctl/source/basicide/basidectrlr.cxx index 3dea60f64b22..7fa89a717dc6 100644 --- a/basctl/source/basicide/basidectrlr.cxx +++ b/basctl/source/basicide/basidectrlr.cxx @@ -56,7 +56,7 @@ Controller::~Controller() { } // XInterface -Any SAL_CALL Controller::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL Controller::queryInterface( const Type & rType ) { Any aReturn = SfxBaseController::queryInterface( rType ); if ( !aReturn.hasValue() ) @@ -76,7 +76,7 @@ void SAL_CALL Controller::release() throw() } // XTypeProvider ( ::SfxBaseController ) -Sequence< Type > SAL_CALL Controller::getTypes() throw(RuntimeException, std::exception) +Sequence< Type > SAL_CALL Controller::getTypes() { Sequence< Type > aTypes = ::comphelper::concatSequences( SfxBaseController::getTypes(), @@ -86,13 +86,13 @@ Sequence< Type > SAL_CALL Controller::getTypes() throw(RuntimeException, std::ex return aTypes; } -Sequence< sal_Int8 > SAL_CALL Controller::getImplementationId() throw(RuntimeException, std::exception) +Sequence< sal_Int8 > SAL_CALL Controller::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } // XPropertySet -Reference< beans::XPropertySetInfo > SAL_CALL Controller::getPropertySetInfo() throw(RuntimeException, std::exception) +Reference< beans::XPropertySetInfo > SAL_CALL Controller::getPropertySetInfo() { Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx index 8e7ddc17e9b4..09aa70fb0536 100644 --- a/basctl/source/basicide/basidesh.cxx +++ b/basctl/source/basicide/basidesh.cxx @@ -109,17 +109,17 @@ public: } // XEventListener - virtual void SAL_CALL disposing( const lang::EventObject& ) throw( uno::RuntimeException, std::exception ) override {} + virtual void SAL_CALL disposing( const lang::EventObject& ) override {} // XContainerListener - virtual void SAL_CALL elementInserted( const container::ContainerEvent& Event ) throw( uno::RuntimeException, std::exception ) override + virtual void SAL_CALL elementInserted( const container::ContainerEvent& Event ) override { OUString sModuleName; if( mpShell && ( Event.Accessor >>= sModuleName ) ) mpShell->FindBasWin( mpShell->m_aCurDocument, mpShell->m_aCurLibName, sModuleName, true ); } - virtual void SAL_CALL elementReplaced( const container::ContainerEvent& ) throw( css::uno::RuntimeException, std::exception ) override { } - virtual void SAL_CALL elementRemoved( const container::ContainerEvent& Event ) throw( css::uno::RuntimeException, std::exception ) override + virtual void SAL_CALL elementReplaced( const container::ContainerEvent& ) override { } + virtual void SAL_CALL elementRemoved( const container::ContainerEvent& Event ) override { OUString sModuleName; if( mpShell && ( Event.Accessor >>= sModuleName ) ) diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx index 0d8b7d23e71f..ae859336ee64 100644 --- a/basctl/source/basicide/basobj2.cxx +++ b/basctl/source/basicide/basobj2.cxx @@ -358,7 +358,6 @@ OUString ChooseMacro( const uno::Reference< frame::XModel >& rxLimitToDocument, } Sequence< OUString > GetMethodNames( const ScriptDocument& rDocument, const OUString& rLibName, const OUString& rModName ) - throw (NoSuchElementException, RuntimeException, std::exception) { Sequence< OUString > aSeqMethods; diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx index f3cdc49b6a70..d1bd544b5bc7 100644 --- a/basctl/source/basicide/basobj3.cxx +++ b/basctl/source/basicide/basobj3.cxx @@ -134,7 +134,6 @@ bool RenameDialog ( OUString const& rOldName, OUString const& rNewName ) - throw (ElementExistException, NoSuchElementException, RuntimeException, std::exception) { if ( !rDocument.hasDialog( rLibName, rOldName ) ) { diff --git a/basctl/source/basicide/doceventnotifier.cxx b/basctl/source/basicide/doceventnotifier.cxx index 3b4f345138d4..90e55e00ee18 100644 --- a/basctl/source/basicide/doceventnotifier.cxx +++ b/basctl/source/basicide/doceventnotifier.cxx @@ -73,10 +73,10 @@ namespace basctl virtual ~Impl () override; // XDocumentEventListener - virtual void SAL_CALL documentEventOccured( const DocumentEvent& Event ) throw (RuntimeException, std::exception) override; + virtual void SAL_CALL documentEventOccured( const DocumentEvent& Event ) override; // XEventListener - virtual void SAL_CALL disposing( const csslang::EventObject& Event ) throw (RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const csslang::EventObject& Event ) override; // ComponentHelper virtual void SAL_CALL disposing() override; @@ -115,7 +115,7 @@ namespace basctl } } - void SAL_CALL DocumentEventNotifier::Impl::documentEventOccured( const DocumentEvent& _rEvent ) throw (RuntimeException, std::exception) + void SAL_CALL DocumentEventNotifier::Impl::documentEventOccured( const DocumentEvent& _rEvent ) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -168,7 +168,7 @@ namespace basctl } } - void SAL_CALL DocumentEventNotifier::Impl::disposing( const csslang::EventObject& /*Event*/ ) throw (RuntimeException, std::exception) + void SAL_CALL DocumentEventNotifier::Impl::disposing( const csslang::EventObject& /*Event*/ ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx index 43c8dc012ecd..3e7842aea543 100644 --- a/basctl/source/basicide/moduldl2.cxx +++ b/basctl/source/basicide/moduldl2.cxx @@ -80,7 +80,7 @@ public: { } - virtual void SAL_CALL handle( const Reference< task::XInteractionRequest >& rRequest ) throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL handle( const Reference< task::XInteractionRequest >& rRequest ) override { if ( m_xHandler.is() ) { @@ -1154,20 +1154,16 @@ public: {} // Methods - virtual Reference< task::XInteractionHandler > SAL_CALL getInteractionHandler() - throw(RuntimeException, std::exception) override; - virtual Reference< XProgressHandler > SAL_CALL getProgressHandler() - throw(RuntimeException, std::exception) override; + virtual Reference< task::XInteractionHandler > SAL_CALL getInteractionHandler() override; + virtual Reference< XProgressHandler > SAL_CALL getProgressHandler() override; }; Reference< task::XInteractionHandler > OLibCommandEnvironment::getInteractionHandler() - throw(RuntimeException, std::exception) { return mxInteraction; } Reference< XProgressHandler > OLibCommandEnvironment::getProgressHandler() - throw(RuntimeException, std::exception) { Reference< XProgressHandler > xRet; return xRet; diff --git a/basctl/source/basicide/unomodel.cxx b/basctl/source/basicide/unomodel.cxx index 5cceb2a599c5..ca255657f8c8 100644 --- a/basctl/source/basicide/unomodel.cxx +++ b/basctl/source/basicide/unomodel.cxx @@ -43,7 +43,7 @@ SIDEModel::~SIDEModel() { } -uno::Any SAL_CALL SIDEModel::queryInterface( const uno::Type& rType ) throw(uno::RuntimeException, std::exception) +uno::Any SAL_CALL SIDEModel::queryInterface( const uno::Type& rType ) { uno::Any aRet = ::cppu::queryInterface ( rType, // OWeakObject interfaces @@ -67,7 +67,7 @@ void SAL_CALL SIDEModel::release() throw() OWeakObject::release(); } -uno::Sequence< uno::Type > SAL_CALL SIDEModel::getTypes( ) throw(uno::RuntimeException, std::exception) +uno::Sequence< uno::Type > SAL_CALL SIDEModel::getTypes( ) { uno::Sequence< uno::Type > aTypes = SfxBaseModel::getTypes(); sal_Int32 nLen = aTypes.getLength(); @@ -78,7 +78,7 @@ uno::Sequence< uno::Type > SAL_CALL SIDEModel::getTypes( ) throw(uno::RuntimeEx return aTypes; } -OUString SIDEModel::getImplementationName() throw( uno::RuntimeException, std::exception ) +OUString SIDEModel::getImplementationName() { return getImplementationName_Static(); } @@ -88,11 +88,11 @@ OUString SIDEModel::getImplementationName_Static() return OUString( "com.sun.star.comp.basic.BasicIDE" ); } -sal_Bool SIDEModel::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception ) +sal_Bool SIDEModel::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } -uno::Sequence< OUString > SIDEModel::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SIDEModel::getSupportedServiceNames() { return getSupportedServiceNames_Static(); } @@ -103,7 +103,7 @@ uno::Sequence< OUString > SIDEModel::getSupportedServiceNames_Static() } uno::Reference< uno::XInterface > SAL_CALL SIDEModel_createInstance( - const uno::Reference< lang::XMultiServiceFactory > & ) throw( uno::Exception ) + const uno::Reference< lang::XMultiServiceFactory > & ) { SolarMutexGuard aGuard; EnsureIde(); @@ -112,25 +112,23 @@ uno::Reference< uno::XInterface > SAL_CALL SIDEModel_createInstance( } // XStorable -void SAL_CALL SIDEModel::store() throw (io::IOException, uno::RuntimeException, std::exception) +void SAL_CALL SIDEModel::store() { notImplemented(); } void SAL_CALL SIDEModel::storeAsURL( const OUString&, const uno::Sequence< beans::PropertyValue >& ) - throw (io::IOException, uno::RuntimeException, std::exception) { notImplemented(); } void SAL_CALL SIDEModel::storeToURL( const OUString&, const uno::Sequence< beans::PropertyValue >& ) - throw (io::IOException, uno::RuntimeException, std::exception) { notImplemented(); } -void SIDEModel::notImplemented() throw ( io::IOException ) +void SIDEModel::notImplemented() { throw io::IOException("Can't store IDE model" ); } diff --git a/basctl/source/basicide/unomodel.hxx b/basctl/source/basicide/unomodel.hxx index baea50903f83..e4d92351347a 100644 --- a/basctl/source/basicide/unomodel.hxx +++ b/basctl/source/basicide/unomodel.hxx @@ -29,37 +29,31 @@ class SIDEModel : public SfxBaseModel, public com::sun::star::lang::XServiceInfo { /// @throws css::io::IOException - static void notImplemented() throw ( css::io::IOException ); + static void notImplemented(); public: explicit SIDEModel(SfxObjectShell *pObjSh = nullptr); virtual ~SIDEModel() override; //XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; virtual void SAL_CALL acquire( ) throw() override; virtual void SAL_CALL release( ) throw() override; //XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XStorable2 - virtual void SAL_CALL storeSelf( const css::uno::Sequence< css::beans::PropertyValue >& ) - throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception) override { notImplemented(); } + virtual void SAL_CALL storeSelf( const css::uno::Sequence< css::beans::PropertyValue >& ) override { notImplemented(); } // XStorable - virtual void SAL_CALL store() throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL store() override; virtual void SAL_CALL storeAsURL( const OUString& sURL, - const css::uno::Sequence< css::beans::PropertyValue >& seqArguments ) - throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& seqArguments ) override; virtual void SAL_CALL storeToURL( const OUString& sURL, - const css::uno::Sequence< css::beans::PropertyValue >& seqArguments ) - throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& seqArguments ) override; static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); static OUString getImplementationName_Static(); @@ -67,8 +61,7 @@ public: /// @throws com::sun::star::uno::Exception css::uno::Reference< css::uno::XInterface > SAL_CALL SIDEModel_createInstance( - const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) - throw( com::sun::star::uno::Exception ); + const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ); } // namespace basctl |