diff options
Diffstat (limited to 'svx/source/sdr')
-rw-r--r-- | svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx | 40 | ||||
-rw-r--r-- | svx/source/sdr/primitive2d/primitivefactory2d.cxx | 17 |
2 files changed, 27 insertions, 30 deletions
diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx index a0488a38970d..2a13a40b0181 100644 --- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx @@ -621,24 +621,24 @@ namespace sdr { namespace contact { virtual ~ViewObjectContactOfUnoControl_Impl() override; // XEventListener - virtual void SAL_CALL disposing( const EventObject& Source ) throw(RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const EventObject& Source ) override; // XWindowListener - virtual void SAL_CALL windowResized( const WindowEvent& e ) throw(RuntimeException, std::exception) override; - virtual void SAL_CALL windowMoved( const WindowEvent& e ) throw(RuntimeException, std::exception) override; - virtual void SAL_CALL windowShown( const EventObject& e ) throw(RuntimeException, std::exception) override; - virtual void SAL_CALL windowHidden( const EventObject& e ) throw(RuntimeException, std::exception) override; + virtual void SAL_CALL windowResized( const WindowEvent& e ) override; + virtual void SAL_CALL windowMoved( const WindowEvent& e ) override; + virtual void SAL_CALL windowShown( const EventObject& e ) override; + virtual void SAL_CALL windowHidden( const EventObject& e ) override; // XPropertyChangeListener - virtual void SAL_CALL propertyChange( const PropertyChangeEvent& evt ) throw(RuntimeException, std::exception) override; + virtual void SAL_CALL propertyChange( const PropertyChangeEvent& evt ) override; // XModeChangeListener - virtual void SAL_CALL modeChanged( const ModeChangeEvent& _rSource ) throw (RuntimeException, std::exception) override; + virtual void SAL_CALL modeChanged( const ModeChangeEvent& _rSource ) override; // XContainerListener - virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) override; + virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) override; + virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) override; private: /** retrieves the SdrPageView which our associated SdrPageViewWindow belongs to @@ -1299,7 +1299,7 @@ namespace sdr { namespace contact { } - void SAL_CALL ViewObjectContactOfUnoControl_Impl::disposing( const EventObject& Source ) throw(RuntimeException, std::exception) + void SAL_CALL ViewObjectContactOfUnoControl_Impl::disposing( const EventObject& Source ) { SolarMutexGuard aSolarGuard; // some code below - in particular our disposal - might trigger actions which require the @@ -1325,33 +1325,33 @@ namespace sdr { namespace contact { } - void SAL_CALL ViewObjectContactOfUnoControl_Impl::windowResized( const WindowEvent& /*e*/ ) throw(RuntimeException, std::exception) + void SAL_CALL ViewObjectContactOfUnoControl_Impl::windowResized( const WindowEvent& /*e*/ ) { // not interested in } - void SAL_CALL ViewObjectContactOfUnoControl_Impl::windowMoved( const WindowEvent& /*e*/ ) throw(RuntimeException, std::exception) + void SAL_CALL ViewObjectContactOfUnoControl_Impl::windowMoved( const WindowEvent& /*e*/ ) { // not interested in } - void SAL_CALL ViewObjectContactOfUnoControl_Impl::windowShown( const EventObject& /*e*/ ) throw(RuntimeException, std::exception) + void SAL_CALL ViewObjectContactOfUnoControl_Impl::windowShown( const EventObject& /*e*/ ) { SolarMutexGuard aSolarGuard; m_bControlIsVisible = true; } - void SAL_CALL ViewObjectContactOfUnoControl_Impl::windowHidden( const EventObject& /*e*/ ) throw(RuntimeException, std::exception) + void SAL_CALL ViewObjectContactOfUnoControl_Impl::windowHidden( const EventObject& /*e*/ ) { SolarMutexGuard aSolarGuard; m_bControlIsVisible = false; } - void SAL_CALL ViewObjectContactOfUnoControl_Impl::propertyChange( const PropertyChangeEvent& /*_rEvent*/ ) throw(RuntimeException, std::exception) + void SAL_CALL ViewObjectContactOfUnoControl_Impl::propertyChange( const PropertyChangeEvent& /*_rEvent*/ ) { SolarMutexGuard aSolarGuard; // (re)painting might require VCL operations, which need the SolarMutex @@ -1372,7 +1372,7 @@ namespace sdr { namespace contact { } - void SAL_CALL ViewObjectContactOfUnoControl_Impl::modeChanged( const ModeChangeEvent& _rSource ) throw (RuntimeException, std::exception) + void SAL_CALL ViewObjectContactOfUnoControl_Impl::modeChanged( const ModeChangeEvent& _rSource ) { SolarMutexGuard aSolarGuard; @@ -1394,13 +1394,13 @@ namespace sdr { namespace contact { } - void SAL_CALL ViewObjectContactOfUnoControl_Impl::elementInserted( const ContainerEvent& /*_Event*/ ) throw (RuntimeException, std::exception) + void SAL_CALL ViewObjectContactOfUnoControl_Impl::elementInserted( const ContainerEvent& /*_Event*/ ) { // not interested in } - void SAL_CALL ViewObjectContactOfUnoControl_Impl::elementRemoved( const ContainerEvent& Event ) throw (RuntimeException, std::exception) + void SAL_CALL ViewObjectContactOfUnoControl_Impl::elementRemoved( const ContainerEvent& Event ) { SolarMutexGuard aSolarGuard; // some code below - in particular our disposal - might trigger actions which require the @@ -1415,7 +1415,7 @@ namespace sdr { namespace contact { } - void SAL_CALL ViewObjectContactOfUnoControl_Impl::elementReplaced( const ContainerEvent& Event ) throw (RuntimeException, std::exception) + void SAL_CALL ViewObjectContactOfUnoControl_Impl::elementReplaced( const ContainerEvent& Event ) { SolarMutexGuard aSolarGuard; DBG_ASSERT( Event.Source == m_xContainer, "ViewObjectContactOfUnoControl_Impl::elementReplaced: where did this come from?" ); diff --git a/svx/source/sdr/primitive2d/primitivefactory2d.cxx b/svx/source/sdr/primitive2d/primitivefactory2d.cxx index 77970a87b8b4..caa7c7754410 100644 --- a/svx/source/sdr/primitive2d/primitivefactory2d.cxx +++ b/svx/source/sdr/primitive2d/primitivefactory2d.cxx @@ -45,19 +45,16 @@ public: PrimitiveFactory2D(): PrimitiveFactory2DImplBase(m_aMutex) {} // Methods from XPrimitiveFactory2D - virtual css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > SAL_CALL createPrimitivesFromXShape( const css::uno::Reference< css::drawing::XShape >& xShape, const css::uno::Sequence< css::beans::PropertyValue >& aParms ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > SAL_CALL createPrimitivesFromXDrawPage( const css::uno::Reference< css::drawing::XDrawPage >& xDrawPage, const css::uno::Sequence< css::beans::PropertyValue >& aParms ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > SAL_CALL createPrimitivesFromXShape( const css::uno::Reference< css::drawing::XShape >& xShape, const css::uno::Sequence< css::beans::PropertyValue >& aParms ) override; + virtual css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > SAL_CALL createPrimitivesFromXDrawPage( const css::uno::Reference< css::drawing::XDrawPage >& xDrawPage, const css::uno::Sequence< css::beans::PropertyValue >& aParms ) override; - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + OUString SAL_CALL getImplementationName() override { return OUString("com.sun.star.comp.graphic.PrimitiveFactory2D"); } - sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) override + sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override { return cppu::supportsService(this, ServiceName); } - css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override + css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override { return css::uno::Sequence<OUString>{ "com.sun.star.graphic.PrimitiveFactory2D"}; @@ -66,7 +63,7 @@ public: css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > SAL_CALL PrimitiveFactory2D::createPrimitivesFromXShape( const uno::Reference< drawing::XShape >& xShape, - const uno::Sequence< beans::PropertyValue >& /*aParms*/ ) throw (uno::RuntimeException, std::exception) + const uno::Sequence< beans::PropertyValue >& /*aParms*/ ) { css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > aRetval; @@ -86,7 +83,7 @@ css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > SAL_CALL css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > SAL_CALL PrimitiveFactory2D::createPrimitivesFromXDrawPage( const uno::Reference< drawing::XDrawPage >& xDrawPage, - const uno::Sequence< beans::PropertyValue >& /*aParms*/ ) throw (uno::RuntimeException, std::exception) + const uno::Sequence< beans::PropertyValue >& /*aParms*/ ) { css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > aRetval; |