summaryrefslogtreecommitdiff
path: root/svx/source/svdraw/svdoole2.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/svdraw/svdoole2.cxx')
-rw-r--r--svx/source/svdraw/svdoole2.cxx79
1 files changed, 24 insertions, 55 deletions
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index 3b924abb13c1..ee7a1dfb03bf 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -135,36 +135,36 @@ public:
private:
Rectangle impl_getScaledRect_nothrow() const;
// XStateChangeListener
- virtual void SAL_CALL changingState( const css::lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (css::embed::WrongStateException, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL stateChanged( const css::lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL changingState( const css::lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) override;
+ virtual void SAL_CALL stateChanged( const css::lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) override;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) override;
// document::XEventListener
- virtual void SAL_CALL notifyEvent( const document::EventObject& aEvent ) throw( uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL notifyEvent( const document::EventObject& aEvent ) override;
// XEmbeddedClient
- virtual void SAL_CALL saveObject() throw ( embed::ObjectSaveVetoException, uno::Exception, uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL visibilityChanged( sal_Bool bVisible ) throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL saveObject() override;
+ virtual void SAL_CALL visibilityChanged( sal_Bool bVisible ) override;
// XComponentSupplier
- virtual uno::Reference< util::XCloseable > SAL_CALL getComponent() throw ( uno::RuntimeException, std::exception ) override;
+ virtual uno::Reference< util::XCloseable > SAL_CALL getComponent() override;
// XInplaceClient
- virtual sal_Bool SAL_CALL canInplaceActivate() throw ( uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL activatingInplace() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL activatingUI() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL deactivatedInplace() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL deactivatedUI() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override;
- virtual uno::Reference< css::frame::XLayoutManager > SAL_CALL getLayoutManager() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override;
- virtual uno::Reference< frame::XDispatchProvider > SAL_CALL getInplaceDispatchProvider() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override;
- virtual awt::Rectangle SAL_CALL getPlacement() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override;
- virtual awt::Rectangle SAL_CALL getClipRectangle() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL translateAccelerators( const uno::Sequence< awt::KeyEvent >& aKeys ) throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL scrollObject( const awt::Size& aOffset ) throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL changedPlacement( const awt::Rectangle& aPosRect ) throw ( embed::WrongStateException, uno::Exception, uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL canInplaceActivate() override;
+ virtual void SAL_CALL activatingInplace() override;
+ virtual void SAL_CALL activatingUI() override;
+ virtual void SAL_CALL deactivatedInplace() override;
+ virtual void SAL_CALL deactivatedUI() override;
+ virtual uno::Reference< css::frame::XLayoutManager > SAL_CALL getLayoutManager() override;
+ virtual uno::Reference< frame::XDispatchProvider > SAL_CALL getInplaceDispatchProvider() override;
+ virtual awt::Rectangle SAL_CALL getPlacement() override;
+ virtual awt::Rectangle SAL_CALL getClipRectangle() override;
+ virtual void SAL_CALL translateAccelerators( const uno::Sequence< awt::KeyEvent >& aKeys ) override;
+ virtual void SAL_CALL scrollObject( const awt::Size& aOffset ) override;
+ virtual void SAL_CALL changedPlacement( const awt::Rectangle& aPosRect ) override;
// XWindowSupplier
- virtual uno::Reference< awt::XWindow > SAL_CALL getWindow() throw ( uno::RuntimeException, std::exception ) override;
+ virtual uno::Reference< awt::XWindow > SAL_CALL getWindow() override;
};
SdrLightEmbeddedClient_Impl::SdrLightEmbeddedClient_Impl( SdrOle2Obj* pObj )
@@ -180,7 +180,7 @@ Rectangle SdrLightEmbeddedClient_Impl::impl_getScaledRect_nothrow() const
return aLogicRect;
}
-void SAL_CALL SdrLightEmbeddedClient_Impl::changingState( const css::lang::EventObject& /*aEvent*/, ::sal_Int32 /*nOldState*/, ::sal_Int32 /*nNewState*/ ) throw (css::embed::WrongStateException, css::uno::RuntimeException, std::exception)
+void SAL_CALL SdrLightEmbeddedClient_Impl::changingState( const css::lang::EventObject& /*aEvent*/, ::sal_Int32 /*nOldState*/, ::sal_Int32 /*nNewState*/ )
{
}
@@ -194,7 +194,7 @@ void SdrLightEmbeddedClient_Impl::Release()
release();
}
-void SAL_CALL SdrLightEmbeddedClient_Impl::stateChanged( const css::lang::EventObject& /*aEvent*/, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SdrLightEmbeddedClient_Impl::stateChanged( const css::lang::EventObject& /*aEvent*/, ::sal_Int32 nOldState, ::sal_Int32 nNewState )
{
SolarMutexGuard aGuard;
@@ -209,14 +209,14 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::stateChanged( const css::lang::EventO
}
}
-void SAL_CALL SdrLightEmbeddedClient_Impl::disposing( const css::lang::EventObject& /*aEvent*/ ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SdrLightEmbeddedClient_Impl::disposing( const css::lang::EventObject& /*aEvent*/ )
{
SolarMutexGuard aGuard;
GetSdrGlobalData().GetOLEObjCache().RemoveObj(mpObj);
}
-void SAL_CALL SdrLightEmbeddedClient_Impl::notifyEvent( const document::EventObject& aEvent ) throw( uno::RuntimeException, std::exception )
+void SAL_CALL SdrLightEmbeddedClient_Impl::notifyEvent( const document::EventObject& aEvent )
{
// TODO/LATER: when writer uses this implementation the code could be shared with SfxInPlaceClient_Impl
@@ -282,9 +282,6 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::notifyEvent( const document::EventObj
}
void SAL_CALL SdrLightEmbeddedClient_Impl::saveObject()
- throw ( embed::ObjectSaveVetoException,
- uno::Exception,
- uno::RuntimeException, std::exception )
{
// TODO/LATER: when writer uses this implementation the code could be shared with SfxInPlaceClient_Impl
uno::Reference< embed::XCommonEmbedPersist > xPersist;
@@ -308,8 +305,6 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::saveObject()
}
void SAL_CALL SdrLightEmbeddedClient_Impl::visibilityChanged( sal_Bool /*bVisible*/ )
- throw ( embed::WrongStateException,
- uno::RuntimeException, std::exception )
{
// nothing to do currently
// TODO/LATER: when writer uses this implementation the code could be shared with SfxInPlaceClient_Impl
@@ -328,7 +323,6 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::visibilityChanged( sal_Bool /*bVisibl
}
uno::Reference< util::XCloseable > SAL_CALL SdrLightEmbeddedClient_Impl::getComponent()
- throw ( uno::RuntimeException, std::exception )
{
uno::Reference< util::XCloseable > xResult;
@@ -341,7 +335,6 @@ uno::Reference< util::XCloseable > SAL_CALL SdrLightEmbeddedClient_Impl::getComp
// XInplaceClient
sal_Bool SAL_CALL SdrLightEmbeddedClient_Impl::canInplaceActivate()
- throw ( uno::RuntimeException, std::exception )
{
bool bRet = false;
SolarMutexGuard aGuard;
@@ -357,14 +350,10 @@ sal_Bool SAL_CALL SdrLightEmbeddedClient_Impl::canInplaceActivate()
}
void SAL_CALL SdrLightEmbeddedClient_Impl::activatingInplace()
- throw ( embed::WrongStateException,
- uno::RuntimeException, std::exception )
{
}
void SAL_CALL SdrLightEmbeddedClient_Impl::activatingUI()
- throw ( embed::WrongStateException,
- uno::RuntimeException, std::exception )
{
SolarMutexGuard aGuard;
@@ -408,14 +397,10 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::activatingUI()
}
void SAL_CALL SdrLightEmbeddedClient_Impl::deactivatedInplace()
- throw ( embed::WrongStateException,
- uno::RuntimeException, std::exception )
{
}
void SAL_CALL SdrLightEmbeddedClient_Impl::deactivatedUI()
- throw ( embed::WrongStateException,
- uno::RuntimeException, std::exception )
{
SolarMutexGuard aGuard;
css::uno::Reference< css::frame::XLayoutManager > xLayoutManager(getLayoutManager());
@@ -428,8 +413,6 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::deactivatedUI()
}
uno::Reference< css::frame::XLayoutManager > SAL_CALL SdrLightEmbeddedClient_Impl::getLayoutManager()
- throw ( embed::WrongStateException,
- uno::RuntimeException, std::exception )
{
uno::Reference< css::frame::XLayoutManager > xMan;
SolarMutexGuard aGuard;
@@ -447,16 +430,12 @@ uno::Reference< css::frame::XLayoutManager > SAL_CALL SdrLightEmbeddedClient_Imp
}
uno::Reference< frame::XDispatchProvider > SAL_CALL SdrLightEmbeddedClient_Impl::getInplaceDispatchProvider()
- throw ( embed::WrongStateException,
- uno::RuntimeException, std::exception )
{
SolarMutexGuard aGuard;
return uno::Reference < frame::XDispatchProvider >( lcl_getFrame_throw(mpObj), uno::UNO_QUERY_THROW );
}
awt::Rectangle SAL_CALL SdrLightEmbeddedClient_Impl::getPlacement()
- throw ( embed::WrongStateException,
- uno::RuntimeException, std::exception )
{
SolarMutexGuard aGuard;
if ( !mpObj )
@@ -473,28 +452,19 @@ awt::Rectangle SAL_CALL SdrLightEmbeddedClient_Impl::getPlacement()
}
awt::Rectangle SAL_CALL SdrLightEmbeddedClient_Impl::getClipRectangle()
- throw ( embed::WrongStateException,
- uno::RuntimeException, std::exception )
{
return getPlacement();
}
void SAL_CALL SdrLightEmbeddedClient_Impl::translateAccelerators( const uno::Sequence< awt::KeyEvent >& /*aKeys*/ )
- throw ( embed::WrongStateException,
- uno::RuntimeException, std::exception )
{
}
void SAL_CALL SdrLightEmbeddedClient_Impl::scrollObject( const awt::Size& /*aOffset*/ )
- throw ( embed::WrongStateException,
- uno::RuntimeException, std::exception )
{
}
void SAL_CALL SdrLightEmbeddedClient_Impl::changedPlacement( const awt::Rectangle& aPosRect )
- throw ( embed::WrongStateException,
- uno::Exception,
- uno::RuntimeException, std::exception )
{
SolarMutexGuard aGuard;
if ( !mpObj )
@@ -551,7 +521,6 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::changedPlacement( const awt::Rectangl
// XWindowSupplier
uno::Reference< awt::XWindow > SAL_CALL SdrLightEmbeddedClient_Impl::getWindow()
- throw ( uno::RuntimeException, std::exception )
{
SolarMutexGuard aGuard;
uno::Reference< awt::XWindow > xCurrent = m_xWindow;