summaryrefslogtreecommitdiff
path: root/embeddedobj/source/msole
diff options
context:
space:
mode:
Diffstat (limited to 'embeddedobj/source/msole')
-rw-r--r--embeddedobj/source/msole/closepreventer.cxx3
-rw-r--r--embeddedobj/source/msole/graphconvert.cxx2
-rw-r--r--embeddedobj/source/msole/mtnotification.hxx3
-rw-r--r--embeddedobj/source/msole/olecomponent.cxx22
-rw-r--r--embeddedobj/source/msole/olecomponent.hxx29
-rw-r--r--embeddedobj/source/msole/oleembed.cxx27
-rw-r--r--embeddedobj/source/msole/olemisc.cxx25
-rw-r--r--embeddedobj/source/msole/olepersist.cxx52
-rw-r--r--embeddedobj/source/msole/olepersist.hxx3
-rw-r--r--embeddedobj/source/msole/olevisual.cxx15
-rw-r--r--embeddedobj/source/msole/ownview.cxx9
-rw-r--r--embeddedobj/source/msole/ownview.hxx8
-rw-r--r--embeddedobj/source/msole/xdialogcreator.cxx11
-rw-r--r--embeddedobj/source/msole/xdialogcreator.hxx10
-rw-r--r--embeddedobj/source/msole/xolefactory.cxx24
-rw-r--r--embeddedobj/source/msole/xolefactory.hxx16
16 files changed, 42 insertions, 217 deletions
diff --git a/embeddedobj/source/msole/closepreventer.cxx b/embeddedobj/source/msole/closepreventer.cxx
index 4ffeb4d4d444..69cf44b0d6f1 100644
--- a/embeddedobj/source/msole/closepreventer.cxx
+++ b/embeddedobj/source/msole/closepreventer.cxx
@@ -22,20 +22,17 @@
#include <osl/diagnose.h>
void SAL_CALL OClosePreventer::queryClosing( const css::lang::EventObject&, sal_Bool )
- throw (css::util::CloseVetoException, css::uno::RuntimeException, std::exception)
{
throw css::util::CloseVetoException();
}
void SAL_CALL OClosePreventer::notifyClosing( const css::lang::EventObject& )
- throw (css::uno::RuntimeException, std::exception)
{
// just a disaster
OSL_FAIL( "The object can not be prevented from closing!\n" );
}
void SAL_CALL OClosePreventer::disposing( const css::lang::EventObject& )
- throw (css::uno::RuntimeException, std::exception)
{
// just a disaster
OSL_FAIL( "The object can not be prevented from closing!\n" );
diff --git a/embeddedobj/source/msole/graphconvert.cxx b/embeddedobj/source/msole/graphconvert.cxx
index e7d4848c4823..f27d7481fba3 100644
--- a/embeddedobj/source/msole/graphconvert.cxx
+++ b/embeddedobj/source/msole/graphconvert.cxx
@@ -102,7 +102,7 @@ MainThreadNotificationRequest::MainThreadNotificationRequest( const ::rtl::Refer
, m_nAspect( nAspect )
{}
-void SAL_CALL MainThreadNotificationRequest::notify (const uno::Any& ) throw (uno::RuntimeException)
+void SAL_CALL MainThreadNotificationRequest::notify (const uno::Any& )
{
if ( m_pObject )
{
diff --git a/embeddedobj/source/msole/mtnotification.hxx b/embeddedobj/source/msole/mtnotification.hxx
index 99f4feb7295e..f8746ad36329 100644
--- a/embeddedobj/source/msole/mtnotification.hxx
+++ b/embeddedobj/source/msole/mtnotification.hxx
@@ -41,8 +41,7 @@ class MainThreadNotificationRequest : public cppu::WeakImplHelper< css::awt::XC
sal_uInt32 m_nAspect;
public:
- virtual void SAL_CALL notify (const css::uno::Any& rUserData)
- throw (css::uno::RuntimeException) override;
+ virtual void SAL_CALL notify (const css::uno::Any& rUserData) override;
MainThreadNotificationRequest( const ::rtl::Reference< OleEmbeddedObject >& xObj, sal_uInt16 nNotificationType, sal_uInt32 nAspect = 0 );
~MainThreadNotificationRequest() override;
};
diff --git a/embeddedobj/source/msole/olecomponent.cxx b/embeddedobj/source/msole/olecomponent.cxx
index 2f06f0496cdd..140ad3dc073b 100644
--- a/embeddedobj/source/msole/olecomponent.cxx
+++ b/embeddedobj/source/msole/olecomponent.cxx
@@ -1409,8 +1409,6 @@ void OleComponent::OnClose_Impl()
// XCloseable
void SAL_CALL OleComponent::close( sal_Bool bDeliverOwnership )
- throw ( util::CloseVetoException,
- uno::RuntimeException )
{
::osl::MutexGuard aGuard( m_aMutex );
if ( m_bDisposed )
@@ -1463,7 +1461,6 @@ void SAL_CALL OleComponent::close( sal_Bool bDeliverOwnership )
void SAL_CALL OleComponent::addCloseListener( const uno::Reference< util::XCloseListener >& xListener )
- throw ( uno::RuntimeException )
{
::osl::MutexGuard aGuard( m_aMutex );
if ( m_bDisposed )
@@ -1477,7 +1474,6 @@ void SAL_CALL OleComponent::addCloseListener( const uno::Reference< util::XClose
void SAL_CALL OleComponent::removeCloseListener( const uno::Reference< util::XCloseListener >& xListener )
- throw ( uno::RuntimeException )
{
::osl::MutexGuard aGuard( m_aMutex );
if ( m_bDisposed )
@@ -1491,9 +1487,6 @@ void SAL_CALL OleComponent::removeCloseListener( const uno::Reference< util::XCl
// XTransferable
uno::Any SAL_CALL OleComponent::getTransferData( const datatransfer::DataFlavor& aFlavor )
- throw ( datatransfer::UnsupportedFlavorException,
- io::IOException,
- uno::RuntimeException )
{
::osl::MutexGuard aGuard( m_aMutex );
if ( m_bDisposed )
@@ -1594,7 +1587,6 @@ uno::Any SAL_CALL OleComponent::getTransferData( const datatransfer::DataFlavor&
uno::Sequence< datatransfer::DataFlavor > SAL_CALL OleComponent::getTransferDataFlavors()
- throw ( uno::RuntimeException )
{
::osl::MutexGuard aGuard( m_aMutex );
if ( m_bDisposed )
@@ -1610,7 +1602,6 @@ uno::Sequence< datatransfer::DataFlavor > SAL_CALL OleComponent::getTransferData
sal_Bool SAL_CALL OleComponent::isDataFlavorSupported( const datatransfer::DataFlavor& aFlavor )
- throw ( uno::RuntimeException )
{
::osl::MutexGuard aGuard( m_aMutex );
if ( m_bDisposed )
@@ -1631,7 +1622,7 @@ sal_Bool SAL_CALL OleComponent::isDataFlavorSupported( const datatransfer::DataF
return false;
}
-void SAL_CALL OleComponent::dispose() throw (css::uno::RuntimeException)
+void SAL_CALL OleComponent::dispose()
{
try
{
@@ -1643,7 +1634,6 @@ void SAL_CALL OleComponent::dispose() throw (css::uno::RuntimeException)
}
void SAL_CALL OleComponent::addEventListener( const uno::Reference< lang::XEventListener >& xListener )
- throw ( uno::RuntimeException )
{
::osl::MutexGuard aGuard( m_aMutex );
if ( m_bDisposed )
@@ -1657,7 +1647,6 @@ void SAL_CALL OleComponent::addEventListener( const uno::Reference< lang::XEvent
void SAL_CALL OleComponent::removeEventListener( const uno::Reference< lang::XEventListener >& xListener )
- throw ( uno::RuntimeException )
{
::osl::MutexGuard aGuard( m_aMutex );
if ( m_bDisposed )
@@ -1668,7 +1657,7 @@ void SAL_CALL OleComponent::removeEventListener( const uno::Reference< lang::XEv
xListener );
}
-sal_Int64 SAL_CALL OleComponent::getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException)
+sal_Int64 SAL_CALL OleComponent::getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier )
{
try
{
@@ -1701,13 +1690,12 @@ sal_Int64 SAL_CALL OleComponent::getSomething( const css::uno::Sequence< sal_Int
return 0;
}
-sal_Bool SAL_CALL OleComponent::isModified() throw (css::uno::RuntimeException)
+sal_Bool SAL_CALL OleComponent::isModified()
{
return m_bModified;
}
void SAL_CALL OleComponent::setModified( sal_Bool bModified )
- throw (css::beans::PropertyVetoException, css::uno::RuntimeException)
{
m_bModified = bModified;
@@ -1734,7 +1722,7 @@ void SAL_CALL OleComponent::setModified( sal_Bool bModified )
}
}
-void SAL_CALL OleComponent::addModifyListener( const css::uno::Reference < css::util::XModifyListener >& xListener ) throw(css::uno::RuntimeException)
+void SAL_CALL OleComponent::addModifyListener( const css::uno::Reference < css::util::XModifyListener >& xListener )
{
::osl::MutexGuard aGuard( m_aMutex );
if ( m_bDisposed )
@@ -1746,7 +1734,7 @@ void SAL_CALL OleComponent::addModifyListener( const css::uno::Reference < css::
m_pInterfaceContainer->addInterface( cppu::UnoType<util::XModifyListener>::get(), xListener );
}
-void SAL_CALL OleComponent::removeModifyListener( const css::uno::Reference < css::util::XModifyListener >& xListener) throw(css::uno::RuntimeException)
+void SAL_CALL OleComponent::removeModifyListener( const css::uno::Reference < css::util::XModifyListener >& xListener)
{
::osl::MutexGuard aGuard( m_aMutex );
if ( m_bDisposed )
diff --git a/embeddedobj/source/msole/olecomponent.hxx b/embeddedobj/source/msole/olecomponent.hxx
index a8a2ea81c240..6665895c28e2 100644
--- a/embeddedobj/source/msole/olecomponent.hxx
+++ b/embeddedobj/source/msole/olecomponent.hxx
@@ -143,29 +143,28 @@ public:
void OnClose_Impl();
// XCloseable
- virtual void SAL_CALL close( sal_Bool DeliverOwnership ) throw (css::util::CloseVetoException, css::uno::RuntimeException) override;
- virtual void SAL_CALL addCloseListener( const css::uno::Reference< css::util::XCloseListener >& Listener ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL removeCloseListener( const css::uno::Reference< css::util::XCloseListener >& Listener ) throw (css::uno::RuntimeException) override;
+ virtual void SAL_CALL close( sal_Bool DeliverOwnership ) override;
+ virtual void SAL_CALL addCloseListener( const css::uno::Reference< css::util::XCloseListener >& Listener ) override;
+ virtual void SAL_CALL removeCloseListener( const css::uno::Reference< css::util::XCloseListener >& Listener ) override;
// XTransferable
- virtual css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor ) throw (css::datatransfer::UnsupportedFlavorException, css::io::IOException, css::uno::RuntimeException) override;
- virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) throw (css::uno::RuntimeException) override;
- virtual sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor ) throw (css::uno::RuntimeException) override;
+ virtual css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor ) override;
+ virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) override;
+ virtual sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor ) override;
// XComponent
- virtual void SAL_CALL dispose() throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL addEventListener(const css::uno::Reference < css::lang::XEventListener >& aListener) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL removeEventListener(const css::uno::Reference < css::lang::XEventListener >& aListener) throw (css::uno::RuntimeException) override;
+ virtual void SAL_CALL dispose() override;
+ virtual void SAL_CALL addEventListener(const css::uno::Reference < css::lang::XEventListener >& aListener) override;
+ virtual void SAL_CALL removeEventListener(const css::uno::Reference < css::lang::XEventListener >& aListener) override;
// XUnoTunnel
- virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException) override;
+ virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
// XModifiable
- virtual sal_Bool SAL_CALL isModified() throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL setModified( sal_Bool bModified )
- throw (css::beans::PropertyVetoException, css::uno::RuntimeException) override;
- virtual void SAL_CALL addModifyListener( const css::uno::Reference < css::util::XModifyListener >& xListener ) throw(css::uno::RuntimeException) override;
- virtual void SAL_CALL removeModifyListener( const css::uno::Reference < css::util::XModifyListener >& xListener) throw(css::uno::RuntimeException) override;
+ virtual sal_Bool SAL_CALL isModified() override;
+ virtual void SAL_CALL setModified( sal_Bool bModified ) override;
+ virtual void SAL_CALL addModifyListener( const css::uno::Reference < css::util::XModifyListener >& xListener ) override;
+ virtual void SAL_CALL removeModifyListener( const css::uno::Reference < css::util::XModifyListener >& xListener) override;
};
#endif
diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx
index a28786f05f9b..bb6bc4cea537 100644
--- a/embeddedobj/source/msole/oleembed.cxx
+++ b/embeddedobj/source/msole/oleembed.cxx
@@ -438,10 +438,6 @@ bool OleEmbeddedObject::TryToConvertToOOo()
void SAL_CALL OleEmbeddedObject::changeState( sal_Int32 nNewState )
- throw ( embed::UnreachableStateException,
- embed::WrongStateException,
- uno::Exception,
- uno::RuntimeException, std::exception )
{
// begin wrapping related part ====================
uno::Reference< embed::XEmbeddedObject > xWrappedObject = m_xWrappedObject;
@@ -596,8 +592,6 @@ void SAL_CALL OleEmbeddedObject::changeState( sal_Int32 nNewState )
uno::Sequence< sal_Int32 > SAL_CALL OleEmbeddedObject::getReachableStates()
- throw ( embed::WrongStateException,
- uno::RuntimeException, std::exception )
{
// begin wrapping related part ====================
uno::Reference< embed::XEmbeddedObject > xWrappedObject = m_xWrappedObject;
@@ -638,8 +632,6 @@ uno::Sequence< sal_Int32 > SAL_CALL OleEmbeddedObject::getReachableStates()
sal_Int32 SAL_CALL OleEmbeddedObject::getCurrentState()
- throw ( embed::WrongStateException,
- uno::RuntimeException, std::exception )
{
// begin wrapping related part ====================
uno::Reference< embed::XEmbeddedObject > xWrappedObject = m_xWrappedObject;
@@ -805,11 +797,6 @@ namespace
void SAL_CALL OleEmbeddedObject::doVerb( sal_Int32 nVerbID )
- throw ( lang::IllegalArgumentException,
- embed::WrongStateException,
- embed::UnreachableStateException,
- uno::Exception,
- uno::RuntimeException, std::exception )
{
// begin wrapping related part ====================
uno::Reference< embed::XEmbeddedObject > xWrappedObject = m_xWrappedObject;
@@ -941,8 +928,6 @@ void SAL_CALL OleEmbeddedObject::doVerb( sal_Int32 nVerbID )
uno::Sequence< embed::VerbDescriptor > SAL_CALL OleEmbeddedObject::getSupportedVerbs()
- throw ( embed::WrongStateException,
- uno::RuntimeException, std::exception )
{
// begin wrapping related part ====================
uno::Reference< embed::XEmbeddedObject > xWrappedObject = m_xWrappedObject;
@@ -982,8 +967,6 @@ uno::Sequence< embed::VerbDescriptor > SAL_CALL OleEmbeddedObject::getSupportedV
void SAL_CALL OleEmbeddedObject::setClientSite(
const uno::Reference< embed::XEmbeddedClient >& xClient )
- throw ( embed::WrongStateException,
- uno::RuntimeException, std::exception )
{
// begin wrapping related part ====================
uno::Reference< embed::XEmbeddedObject > xWrappedObject = m_xWrappedObject;
@@ -1012,8 +995,6 @@ void SAL_CALL OleEmbeddedObject::setClientSite(
uno::Reference< embed::XEmbeddedClient > SAL_CALL OleEmbeddedObject::getClientSite()
- throw ( embed::WrongStateException,
- uno::RuntimeException, std::exception )
{
// begin wrapping related part ====================
uno::Reference< embed::XEmbeddedObject > xWrappedObject = m_xWrappedObject;
@@ -1037,9 +1018,6 @@ uno::Reference< embed::XEmbeddedClient > SAL_CALL OleEmbeddedObject::getClientSi
void SAL_CALL OleEmbeddedObject::update()
- throw ( embed::WrongStateException,
- uno::Exception,
- uno::RuntimeException, std::exception )
{
// begin wrapping related part ====================
uno::Reference< embed::XEmbeddedObject > xWrappedObject = m_xWrappedObject;
@@ -1072,8 +1050,6 @@ void SAL_CALL OleEmbeddedObject::update()
void SAL_CALL OleEmbeddedObject::setUpdateMode( sal_Int32 nMode )
- throw ( embed::WrongStateException,
- uno::RuntimeException, std::exception )
{
// begin wrapping related part ====================
uno::Reference< embed::XEmbeddedObject > xWrappedObject = m_xWrappedObject;
@@ -1103,8 +1079,6 @@ void SAL_CALL OleEmbeddedObject::setUpdateMode( sal_Int32 nMode )
sal_Int64 SAL_CALL OleEmbeddedObject::getStatus( sal_Int64
nAspect
)
- throw ( embed::WrongStateException,
- uno::RuntimeException, std::exception )
{
// begin wrapping related part ====================
uno::Reference< embed::XEmbeddedObject > xWrappedObject = m_xWrappedObject;
@@ -1144,7 +1118,6 @@ sal_Int64 SAL_CALL OleEmbeddedObject::getStatus( sal_Int64
void SAL_CALL OleEmbeddedObject::setContainerName( const OUString& sName )
- throw ( uno::RuntimeException, std::exception )
{
// begin wrapping related part ====================
uno::Reference< embed::XEmbeddedObject > xWrappedObject = m_xWrappedObject;
diff --git a/embeddedobj/source/msole/olemisc.cxx b/embeddedobj/source/msole/olemisc.cxx
index a6d9a1a0b6e1..a5121aac9971 100644
--- a/embeddedobj/source/msole/olemisc.cxx
+++ b/embeddedobj/source/msole/olemisc.cxx
@@ -299,7 +299,6 @@ void OleEmbeddedObject::Dispose()
uno::Sequence< sal_Int8 > SAL_CALL OleEmbeddedObject::getClassID()
- throw ( uno::RuntimeException, std::exception )
{
// begin wrapping related part ====================
uno::Reference< embed::XEmbeddedObject > xWrappedObject = m_xWrappedObject;
@@ -319,7 +318,6 @@ uno::Sequence< sal_Int8 > SAL_CALL OleEmbeddedObject::getClassID()
OUString SAL_CALL OleEmbeddedObject::getClassName()
- throw ( uno::RuntimeException, std::exception )
{
// begin wrapping related part ====================
uno::Reference< embed::XEmbeddedObject > xWrappedObject = m_xWrappedObject;
@@ -340,8 +338,6 @@ OUString SAL_CALL OleEmbeddedObject::getClassName()
void SAL_CALL OleEmbeddedObject::setClassInfo(
const uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName )
- throw ( lang::NoSupportException,
- uno::RuntimeException, std::exception )
{
// begin wrapping related part ====================
uno::Reference< embed::XEmbeddedObject > xWrappedObject = m_xWrappedObject;
@@ -359,7 +355,6 @@ void SAL_CALL OleEmbeddedObject::setClassInfo(
uno::Reference< util::XCloseable > SAL_CALL OleEmbeddedObject::getComponent()
- throw ( uno::RuntimeException, std::exception )
{
// begin wrapping related part ====================
uno::Reference< embed::XEmbeddedObject > xWrappedObject = m_xWrappedObject;
@@ -396,7 +391,6 @@ uno::Reference< util::XCloseable > SAL_CALL OleEmbeddedObject::getComponent()
void SAL_CALL OleEmbeddedObject::addStateChangeListener( const uno::Reference< embed::XStateChangeListener >& xListener )
- throw ( uno::RuntimeException, std::exception )
{
// begin wrapping related part ====================
uno::Reference< embed::XStateChangeBroadcaster > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY );
@@ -422,7 +416,6 @@ void SAL_CALL OleEmbeddedObject::addStateChangeListener( const uno::Reference< e
void SAL_CALL OleEmbeddedObject::removeStateChangeListener(
const uno::Reference< embed::XStateChangeListener >& xListener )
- throw (uno::RuntimeException, std::exception)
{
// begin wrapping related part ====================
uno::Reference< embed::XStateChangeBroadcaster > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY );
@@ -442,8 +435,6 @@ void SAL_CALL OleEmbeddedObject::removeStateChangeListener(
void SAL_CALL OleEmbeddedObject::close( sal_Bool bDeliverOwnership )
- throw ( util::CloseVetoException,
- uno::RuntimeException, std::exception )
{
// begin wrapping related part ====================
uno::Reference< embed::XEmbeddedObject > xWrappedObject = m_xWrappedObject;
@@ -506,7 +497,6 @@ void SAL_CALL OleEmbeddedObject::close( sal_Bool bDeliverOwnership )
void SAL_CALL OleEmbeddedObject::addCloseListener( const uno::Reference< util::XCloseListener >& xListener )
- throw ( uno::RuntimeException, std::exception )
{
// begin wrapping related part ====================
uno::Reference< embed::XEmbeddedObject > xWrappedObject = m_xWrappedObject;
@@ -530,7 +520,6 @@ void SAL_CALL OleEmbeddedObject::addCloseListener( const uno::Reference< util::X
void SAL_CALL OleEmbeddedObject::removeCloseListener( const uno::Reference< util::XCloseListener >& xListener )
- throw (uno::RuntimeException, std::exception)
{
// begin wrapping related part ====================
uno::Reference< embed::XEmbeddedObject > xWrappedObject = m_xWrappedObject;
@@ -553,7 +542,6 @@ void SAL_CALL OleEmbeddedObject::removeCloseListener( const uno::Reference< util
void SAL_CALL OleEmbeddedObject::addEventListener( const uno::Reference< document::XEventListener >& xListener )
- throw ( uno::RuntimeException, std::exception )
{
// begin wrapping related part ====================
uno::Reference< embed::XEmbeddedObject > xWrappedObject = m_xWrappedObject;
@@ -578,7 +566,6 @@ void SAL_CALL OleEmbeddedObject::addEventListener( const uno::Reference< documen
void SAL_CALL OleEmbeddedObject::removeEventListener(
const uno::Reference< document::XEventListener >& xListener )
- throw ( uno::RuntimeException, std::exception )
{
// begin wrapping related part ====================
uno::Reference< embed::XEmbeddedObject > xWrappedObject = m_xWrappedObject;
@@ -603,9 +590,6 @@ void SAL_CALL OleEmbeddedObject::removeEventListener(
void SAL_CALL OleEmbeddedObject::setObjectRectangles( const awt::Rectangle& aPosRect,
const awt::Rectangle& aClipRect )
- throw ( embed::WrongStateException,
- uno::Exception,
- uno::RuntimeException, std::exception )
{
// begin wrapping related part ====================
uno::Reference< embed::XInplaceObject > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY );
@@ -622,9 +606,6 @@ void SAL_CALL OleEmbeddedObject::setObjectRectangles( const awt::Rectangle& aPos
void SAL_CALL OleEmbeddedObject::enableModeless( sal_Bool bEnable )
- throw ( embed::WrongStateException,
- uno::Exception,
- uno::RuntimeException, std::exception )
{
// begin wrapping related part ====================
uno::Reference< embed::XInplaceObject > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY );
@@ -642,8 +623,6 @@ void SAL_CALL OleEmbeddedObject::enableModeless( sal_Bool bEnable )
void SAL_CALL OleEmbeddedObject::translateAccelerators(
const uno::Sequence< awt::KeyEvent >& aKeys )
- throw ( embed::WrongStateException,
- uno::RuntimeException, std::exception )
{
// begin wrapping related part ====================
uno::Reference< embed::XInplaceObject > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY );
@@ -659,7 +638,7 @@ void SAL_CALL OleEmbeddedObject::translateAccelerators(
// XChild
-css::uno::Reference< css::uno::XInterface > SAL_CALL OleEmbeddedObject::getParent() throw (css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::uno::XInterface > SAL_CALL OleEmbeddedObject::getParent()
{
// begin wrapping related part ====================
uno::Reference< container::XChild > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY );
@@ -674,7 +653,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL OleEmbeddedObject::getParen
}
-void SAL_CALL OleEmbeddedObject::setParent( const css::uno::Reference< css::uno::XInterface >& xParent ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception)
+void SAL_CALL OleEmbeddedObject::setParent( const css::uno::Reference< css::uno::XInterface >& xParent )
{
// begin wrapping related part ====================
uno::Reference< container::XChild > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY );
diff --git a/embeddedobj/source/msole/olepersist.cxx b/embeddedobj/source/msole/olepersist.cxx
index d9bf6d92a647..036dd496157f 100644
--- a/embeddedobj/source/msole/olepersist.cxx
+++ b/embeddedobj/source/msole/olepersist.cxx
@@ -106,8 +106,6 @@ OUString GetNewTempFileURL_Impl( const uno::Reference< lang::XMultiServiceFactor
OUString GetNewFilledTempFile_Impl( const uno::Reference< io::XInputStream >& xInStream,
const uno::Reference< lang::XMultiServiceFactory >& xFactory )
- throw ( io::IOException,
- uno::RuntimeException )
{
OSL_ENSURE( xInStream.is() && xFactory.is(), "Wrong parameters are provided!\n" );
@@ -158,7 +156,6 @@ OUString GetNewFilledTempFile_Impl( const uno::Reference< io::XInputStream >& xI
/// @throws io::IOException
/// @throws uno::RuntimeException
OUString GetNewFilledTempFile_Impl( const uno::Reference< embed::XOptimizedStorage >& xParentStorage, const OUString& aEntryName, const uno::Reference< lang::XMultiServiceFactory >& xFactory )
- throw( io::IOException, uno::RuntimeException )
{
OUString aResult;
@@ -266,7 +263,6 @@ void VerbExecutionController::UnlockNotification()
uno::Reference< io::XStream > OleEmbeddedObject::GetNewFilledTempStream_Impl( const uno::Reference< io::XInputStream >& xInStream )
- throw( io::IOException, uno::RuntimeException )
{
SAL_WARN_IF( !xInStream.is(), "embeddedobj.ole", "Wrong parameter is provided!" );
@@ -288,7 +284,6 @@ uno::Reference< io::XStream > OleEmbeddedObject::GetNewFilledTempStream_Impl( co
uno::Reference< io::XStream > OleEmbeddedObject::TryToGetAcceptableFormat_Impl( const uno::Reference< io::XStream >& xStream )
- throw ( uno::Exception )
{
// TODO/LATER: Actually this should be done by a centralized component ( may be a graphical filter )
if ( !m_xFactory.is() )
@@ -371,7 +366,6 @@ uno::Reference< io::XStream > OleEmbeddedObject::TryToGetAcceptableFormat_Impl(
void OleEmbeddedObject::InsertVisualCache_Impl( const uno::Reference< io::XStream >& xTargetStream,
const uno::Reference< io::XStream >& xCachedVisualRepresentation )
- throw ( uno::Exception )
{
OSL_ENSURE( xTargetStream.is() && xCachedVisualRepresentation.is(), "Invalid arguments!\n" );
@@ -522,7 +516,6 @@ void OleEmbeddedObject::InsertVisualCache_Impl( const uno::Reference< io::XStrea
void OleEmbeddedObject::RemoveVisualCache_Impl( const uno::Reference< io::XStream >& xTargetStream )
- throw ( uno::Exception )
{
OSL_ENSURE( xTargetStream.is(), "Invalid argument!\n" );
if ( !xTargetStream.is() )
@@ -1030,7 +1023,6 @@ uno::Reference< io::XOutputStream > OleEmbeddedObject::GetStreamForSaving()
void OleEmbeddedObject::StoreObjectToStream( uno::Reference< io::XOutputStream > const & xOutStream )
- throw ( uno::Exception )
{
// this method should be used only on windows
if ( m_pOleComponent )
@@ -1073,7 +1065,6 @@ void OleEmbeddedObject::StoreToLocation_Impl(
const OUString& sEntName,
const uno::Sequence< beans::PropertyValue >& lObjArgs,
bool bSaveAs )
- throw ( uno::Exception )
{
// TODO: use lObjArgs
// TODO: exchange StoreVisualReplacement by SO file format version?
@@ -1286,11 +1277,6 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry(
sal_Int32 nEntryConnectionMode,
const uno::Sequence< beans::PropertyValue >& lArguments,
const uno::Sequence< beans::PropertyValue >& lObjArgs )
- throw ( lang::IllegalArgumentException,
- embed::WrongStateException,
- io::IOException,
- uno::Exception,
- uno::RuntimeException, std::exception )
{
// begin wrapping related part ====================
uno::Reference< embed::XEmbedPersist > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY );
@@ -1492,11 +1478,6 @@ void SAL_CALL OleEmbeddedObject::storeToEntry( const uno::Reference< embed::XSto
const OUString& sEntName,
const uno::Sequence< beans::PropertyValue >& lArguments,
const uno::Sequence< beans::PropertyValue >& lObjArgs )
- throw ( lang::IllegalArgumentException,
- embed::WrongStateException,
- io::IOException,
- uno::Exception,
- uno::RuntimeException, std::exception )
{
// begin wrapping related part ====================
uno::Reference< embed::XEmbedPersist > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY );
@@ -1524,11 +1505,6 @@ void SAL_CALL OleEmbeddedObject::storeAsEntry( const uno::Reference< embed::XSto
const OUString& sEntName,
const uno::Sequence< beans::PropertyValue >& lArguments,
const uno::Sequence< beans::PropertyValue >& lObjArgs )
- throw ( lang::IllegalArgumentException,
- embed::WrongStateException,
- io::IOException,
- uno::Exception,
- uno::RuntimeException, std::exception )
{
// begin wrapping related part ====================
uno::Reference< embed::XEmbedPersist > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY );
@@ -1553,9 +1529,6 @@ void SAL_CALL OleEmbeddedObject::storeAsEntry( const uno::Reference< embed::XSto
void SAL_CALL OleEmbeddedObject::saveCompleted( sal_Bool bUseNew )
- throw ( embed::WrongStateException,
- uno::Exception,
- uno::RuntimeException, std::exception )
{
// begin wrapping related part ====================
uno::Reference< embed::XEmbedPersist > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY );
@@ -1652,8 +1625,6 @@ void SAL_CALL OleEmbeddedObject::saveCompleted( sal_Bool bUseNew )
sal_Bool SAL_CALL OleEmbeddedObject::hasEntry()
- throw ( embed::WrongStateException,
- uno::RuntimeException, std::exception )
{
// begin wrapping related part ====================
uno::Reference< embed::XEmbedPersist > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY );
@@ -1681,8 +1652,6 @@ sal_Bool SAL_CALL OleEmbeddedObject::hasEntry()
OUString SAL_CALL OleEmbeddedObject::getEntryName()
- throw ( embed::WrongStateException,
- uno::RuntimeException, std::exception )
{
// begin wrapping related part ====================
uno::Reference< embed::XEmbedPersist > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY );
@@ -1714,10 +1683,6 @@ OUString SAL_CALL OleEmbeddedObject::getEntryName()
void SAL_CALL OleEmbeddedObject::storeOwn()
- throw ( embed::WrongStateException,
- io::IOException,
- uno::Exception,
- uno::RuntimeException, std::exception )
{
// begin wrapping related part ====================
uno::Reference< embed::XEmbedPersist > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY );
@@ -1832,8 +1797,6 @@ void SAL_CALL OleEmbeddedObject::storeOwn()
sal_Bool SAL_CALL OleEmbeddedObject::isReadonly()
- throw ( embed::WrongStateException,
- uno::RuntimeException, std::exception )
{
// begin wrapping related part ====================
uno::Reference< embed::XEmbedPersist > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY );
@@ -1867,11 +1830,6 @@ sal_Bool SAL_CALL OleEmbeddedObject::isReadonly()
void SAL_CALL OleEmbeddedObject::reload(
const uno::Sequence< beans::PropertyValue >& lArguments,
const uno::Sequence< beans::PropertyValue >& lObjArgs )
- throw ( lang::IllegalArgumentException,
- embed::WrongStateException,
- io::IOException,
- uno::Exception,
- uno::RuntimeException, std::exception )
{
// begin wrapping related part ====================
uno::Reference< embed::XEmbedPersist > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY );
@@ -1910,11 +1868,6 @@ void SAL_CALL OleEmbeddedObject::reload(
void SAL_CALL OleEmbeddedObject::breakLink( const uno::Reference< embed::XStorage >& xStorage,
const OUString& sEntName )
- throw ( lang::IllegalArgumentException,
- embed::WrongStateException,
- io::IOException,
- uno::Exception,
- uno::RuntimeException, std::exception )
{
// begin wrapping related part ====================
uno::Reference< embed::XLinkageSupport > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY );
@@ -2029,8 +1982,6 @@ void SAL_CALL OleEmbeddedObject::breakLink( const uno::Reference< embed::XStorag
sal_Bool SAL_CALL OleEmbeddedObject::isLink()
- throw ( embed::WrongStateException,
- uno::RuntimeException, std::exception )
{
// begin wrapping related part ====================
uno::Reference< embed::XLinkageSupport > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY );
@@ -2050,9 +2001,6 @@ sal_Bool SAL_CALL OleEmbeddedObject::isLink()
OUString SAL_CALL OleEmbeddedObject::getLinkURL()
- throw ( embed::WrongStateException,
- uno::Exception,
- uno::RuntimeException, std::exception )
{
// begin wrapping related part ====================
uno::Reference< embed::XLinkageSupport > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY );
diff --git a/embeddedobj/source/msole/olepersist.hxx b/embeddedobj/source/msole/olepersist.hxx
index 51adb40d2843..d0edd1d8b23b 100644
--- a/embeddedobj/source/msole/olepersist.hxx
+++ b/embeddedobj/source/msole/olepersist.hxx
@@ -38,8 +38,7 @@ OUString GetNewTempFileURL_Impl( const css::uno::Reference< css::lang::XMultiSer
/// @throws css::uno::RuntimeException
OUString GetNewFilledTempFile_Impl(
css::uno::Reference<css::io::XInputStream > const & xInStream,
- css::uno::Reference<css::lang::XMultiServiceFactory> const & xFactory)
- throw (css::io::IOException, css::uno::RuntimeException);
+ css::uno::Reference<css::lang::XMultiServiceFactory> const & xFactory);
bool KillFile_Impl( const OUString& aURL, const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory );
diff --git a/embeddedobj/source/msole/olevisual.cxx b/embeddedobj/source/msole/olevisual.cxx
index 094c4bed034f..6b197b547d35 100644
--- a/embeddedobj/source/msole/olevisual.cxx
+++ b/embeddedobj/source/msole/olevisual.cxx
@@ -39,7 +39,6 @@ using namespace ::comphelper;
embed::VisualRepresentation OleEmbeddedObject::GetVisualRepresentationInNativeFormat_Impl(
const uno::Reference< io::XStream >& xCachedVisRepr )
- throw ( uno::Exception )
{
embed::VisualRepresentation aVisualRepr;
@@ -78,10 +77,6 @@ embed::VisualRepresentation OleEmbeddedObject::GetVisualRepresentationInNativeFo
}
void SAL_CALL OleEmbeddedObject::setVisualAreaSize( sal_Int64 nAspect, const awt::Size& aSize )
- throw ( lang::IllegalArgumentException,
- embed::WrongStateException,
- uno::Exception,
- uno::RuntimeException, std::exception )
{
// begin wrapping related part ====================
uno::Reference< embed::XEmbeddedObject > xWrappedObject = m_xWrappedObject;
@@ -156,10 +151,6 @@ void SAL_CALL OleEmbeddedObject::setVisualAreaSize( sal_Int64 nAspect, const awt
}
awt::Size SAL_CALL OleEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect )
- throw ( lang::IllegalArgumentException,
- embed::WrongStateException,
- uno::Exception,
- uno::RuntimeException, std::exception )
{
// begin wrapping related part ====================
uno::Reference< embed::XEmbeddedObject > xWrappedObject = m_xWrappedObject;
@@ -321,10 +312,6 @@ awt::Size SAL_CALL OleEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect )
}
embed::VisualRepresentation SAL_CALL OleEmbeddedObject::getPreferredVisualRepresentation( sal_Int64 nAspect )
- throw ( lang::IllegalArgumentException,
- embed::WrongStateException,
- uno::Exception,
- uno::RuntimeException, std::exception )
{
// begin wrapping related part ====================
uno::Reference< embed::XEmbeddedObject > xWrappedObject = m_xWrappedObject;
@@ -416,8 +403,6 @@ embed::VisualRepresentation SAL_CALL OleEmbeddedObject::getPreferredVisualRepres
}
sal_Int32 SAL_CALL OleEmbeddedObject::getMapUnit( sal_Int64 nAspect )
- throw ( uno::Exception,
- uno::RuntimeException, std::exception)
{
// begin wrapping related part ====================
uno::Reference< embed::XEmbeddedObject > xWrappedObject = m_xWrappedObject;
diff --git a/embeddedobj/source/msole/ownview.cxx b/embeddedobj/source/msole/ownview.cxx
index 5bd54df9155e..0ea4da053d50 100644
--- a/embeddedobj/source/msole/ownview.cxx
+++ b/embeddedobj/source/msole/ownview.cxx
@@ -54,13 +54,11 @@ class DummyHandler_Impl : public ::cppu::WeakImplHelper< task::XInteractionHandl
public:
DummyHandler_Impl() {}
- virtual void SAL_CALL handle( const uno::Reference< task::XInteractionRequest >& xRequest )
- throw( uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL handle( const uno::Reference< task::XInteractionRequest >& xRequest ) override;
};
void SAL_CALL DummyHandler_Impl::handle( const uno::Reference< task::XInteractionRequest >& )
- throw( uno::RuntimeException, std::exception )
{
return;
}
@@ -567,7 +565,6 @@ void OwnView_Impl::Close()
void SAL_CALL OwnView_Impl::notifyEvent( const document::EventObject& aEvent )
- throw ( uno::RuntimeException, std::exception )
{
uno::Reference< frame::XModel > xModel;
@@ -604,14 +601,11 @@ void SAL_CALL OwnView_Impl::notifyEvent( const document::EventObject& aEvent )
void SAL_CALL OwnView_Impl::queryClosing( const lang::EventObject&, sal_Bool )
- throw ( util::CloseVetoException,
- uno::RuntimeException, std::exception )
{
}
void SAL_CALL OwnView_Impl::notifyClosing( const lang::EventObject& Source )
- throw ( uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
if ( Source.Source == m_xModel )
@@ -620,7 +614,6 @@ void SAL_CALL OwnView_Impl::notifyClosing( const lang::EventObject& Source )
void SAL_CALL OwnView_Impl::disposing( const lang::EventObject& Source )
- throw (uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( m_aMutex );
if ( Source.Source == m_xModel )
diff --git a/embeddedobj/source/msole/ownview.hxx b/embeddedobj/source/msole/ownview.hxx
index 8878583bf5c7..4b437fea8d51 100644
--- a/embeddedobj/source/msole/ownview.hxx
+++ b/embeddedobj/source/msole/ownview.hxx
@@ -70,12 +70,12 @@ public:
void Close();
- virtual void SAL_CALL notifyEvent( const css::document::EventObject& Event ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL notifyEvent( const css::document::EventObject& Event ) override;
- virtual void SAL_CALL queryClosing( const css::lang::EventObject& Source, sal_Bool GetsOwnership ) throw (css::util::CloseVetoException, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL notifyClosing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL queryClosing( const css::lang::EventObject& Source, sal_Bool GetsOwnership ) override;
+ virtual void SAL_CALL notifyClosing( const css::lang::EventObject& Source ) override;
- virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
};
#endif
diff --git a/embeddedobj/source/msole/xdialogcreator.cxx b/embeddedobj/source/msole/xdialogcreator.cxx
index 2b46d2f1099a..e7cc0216e938 100644
--- a/embeddedobj/source/msole/xdialogcreator.cxx
+++ b/embeddedobj/source/msole/xdialogcreator.cxx
@@ -130,10 +130,6 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceByDia
const uno::Reference< embed::XStorage >& xStorage,
const OUString& sEntName,
const uno::Sequence< beans::PropertyValue >& aInObjArgs )
- throw ( lang::IllegalArgumentException,
- io::IOException,
- uno::Exception,
- uno::RuntimeException )
{
embed::InsertedObjectInfo aObjectInfo;
uno::Sequence< beans::PropertyValue > aObjArgs( aInObjArgs );
@@ -282,10 +278,6 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceInitF
const uno::Reference< embed::XStorage >& xStorage,
const OUString& sEntryName,
const uno::Sequence< beans::PropertyValue >& aObjectArgs )
- throw ( lang::IllegalArgumentException,
- io::IOException,
- uno::Exception,
- uno::RuntimeException )
{
embed::InsertedObjectInfo aObjectInfo;
@@ -331,21 +323,18 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceInitF
OUString SAL_CALL MSOLEDialogObjectCreator::getImplementationName()
- throw ( uno::RuntimeException )
{
return impl_staticGetImplementationName();
}
sal_Bool SAL_CALL MSOLEDialogObjectCreator::supportsService( const OUString& ServiceName )
- throw ( uno::RuntimeException )
{
return cppu::supportsService(this, ServiceName);
}
uno::Sequence< OUString > SAL_CALL MSOLEDialogObjectCreator::getSupportedServiceNames()
- throw ( uno::RuntimeException )
{
return impl_staticGetSupportedServiceNames();
}
diff --git a/embeddedobj/source/msole/xdialogcreator.hxx b/embeddedobj/source/msole/xdialogcreator.hxx
index 714afeb1ddf1..5aec4daa17e7 100644
--- a/embeddedobj/source/msole/xdialogcreator.hxx
+++ b/embeddedobj/source/msole/xdialogcreator.hxx
@@ -52,15 +52,15 @@ public:
// XInsertObjectDialog
- virtual css::embed::InsertedObjectInfo SAL_CALL createInstanceByDialog( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException) override;
+ virtual css::embed::InsertedObjectInfo SAL_CALL createInstanceByDialog( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) override;
// XEmbedObjectClipboardCreator
- virtual css::embed::InsertedObjectInfo SAL_CALL createInstanceInitFromClipboard( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntryName, const css::uno::Sequence< css::beans::PropertyValue >& aObjectArgs ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException) override;
+ virtual css::embed::InsertedObjectInfo SAL_CALL createInstanceInitFromClipboard( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntryName, const css::uno::Sequence< css::beans::PropertyValue >& aObjectArgs ) override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException) 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;
};
diff --git a/embeddedobj/source/msole/xolefactory.cxx b/embeddedobj/source/msole/xolefactory.cxx
index 0653adde576c..81b0d04c8481 100644
--- a/embeddedobj/source/msole/xolefactory.cxx
+++ b/embeddedobj/source/msole/xolefactory.cxx
@@ -61,11 +61,6 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta
const OUString& sEntName,
const uno::Sequence< beans::PropertyValue >& aMedDescr,
const uno::Sequence< beans::PropertyValue >& lObjArgs )
- throw ( lang::IllegalArgumentException,
- container::NoSuchElementException,
- io::IOException,
- uno::Exception,
- uno::RuntimeException, std::exception)
{
if ( !xStorage.is() )
throw lang::IllegalArgumentException( "No parent storage is provided!",
@@ -132,10 +127,6 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta
const OUString& sEntName,
const uno::Sequence< beans::PropertyValue >& aMediaDescr,
const uno::Sequence< beans::PropertyValue >& lObjArgs )
- throw ( lang::IllegalArgumentException,
- io::IOException,
- uno::Exception,
- uno::RuntimeException, std::exception)
{
if ( !xStorage.is() )
throw lang::IllegalArgumentException( "No parent storage is provided!",
@@ -172,10 +163,6 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta
const uno::Reference< embed::XStorage >& xStorage,
const OUString& sEntName,
const uno::Sequence< beans::PropertyValue >& lObjArgs )
- throw ( lang::IllegalArgumentException,
- io::IOException,
- uno::Exception,
- uno::RuntimeException, std::exception)
{
if ( !xStorage.is() )
throw lang::IllegalArgumentException( "No parent storage is provided!",
@@ -211,10 +198,6 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta
const OUString& sEntName,
const uno::Sequence< beans::PropertyValue >& aMediaDescr,
const uno::Sequence< beans::PropertyValue >& lObjArgs )
- throw ( lang::IllegalArgumentException,
- io::IOException,
- uno::Exception,
- uno::RuntimeException, std::exception )
{
if ( !xStorage.is() )
throw lang::IllegalArgumentException( "No parent storage is provided!",
@@ -253,10 +236,6 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta
sal_Int32 /*nEntryConnectionMode*/,
const uno::Sequence< beans::PropertyValue >& /*lArguments*/,
const uno::Sequence< beans::PropertyValue >& lObjArgs )
- throw ( lang::IllegalArgumentException,
- io::IOException,
- uno::Exception,
- uno::RuntimeException, std::exception )
{
// the initialization is completely controlled by user
if ( !xStorage.is() )
@@ -291,20 +270,17 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta
OUString SAL_CALL OleEmbeddedObjectFactory::getImplementationName()
- throw ( uno::RuntimeException, std::exception )
{
return impl_staticGetImplementationName();
}
sal_Bool SAL_CALL OleEmbeddedObjectFactory::supportsService( const OUString& ServiceName )
- throw ( uno::RuntimeException, std::exception )
{
return cppu::supportsService(this, ServiceName);
}
uno::Sequence< OUString > SAL_CALL OleEmbeddedObjectFactory::getSupportedServiceNames()
- throw ( uno::RuntimeException, std::exception )
{
return impl_staticGetSupportedServiceNames();
}
diff --git a/embeddedobj/source/msole/xolefactory.hxx b/embeddedobj/source/msole/xolefactory.hxx
index cbc22773b32a..afe8165ffe64 100644
--- a/embeddedobj/source/msole/xolefactory.hxx
+++ b/embeddedobj/source/msole/xolefactory.hxx
@@ -52,20 +52,20 @@ public:
// XEmbedObjectCreator
- virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceInitNew( const css::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName, const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceInitFromEntry( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& aMedDescr, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceInitFromMediaDescriptor( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescr, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceInitNew( const css::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName, const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) override;
+ virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceInitFromEntry( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& aMedDescr, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) override;
+ virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceInitFromMediaDescriptor( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescr, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) override;
// XEmbedObjectFactory
- virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceUserInit( const css::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName, const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, sal_Int32 nEntryConnectionMode, const css::uno::Sequence< css::beans::PropertyValue >& lArguments, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceUserInit( const css::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName, const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, sal_Int32 nEntryConnectionMode, const css::uno::Sequence< css::beans::PropertyValue >& lArguments, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) override;
// XLinkCreator
- virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceLink( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescr, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceLink( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescr, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) 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;
};
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-30 13:22:57 +0000