summaryrefslogtreecommitdiff
path: root/embeddedobj/source/inc
diff options
context:
space:
mode:
Diffstat (limited to 'embeddedobj/source/inc')
-rw-r--r--embeddedobj/source/inc/closepreventer.hxx6
-rw-r--r--embeddedobj/source/inc/commonembobj.hxx90
-rw-r--r--embeddedobj/source/inc/docholder.hxx24
-rw-r--r--embeddedobj/source/inc/dummyobject.hxx70
-rw-r--r--embeddedobj/source/inc/intercept.hxx20
-rw-r--r--embeddedobj/source/inc/oleembobj.hxx86
-rw-r--r--embeddedobj/source/inc/specialobject.hxx14
-rw-r--r--embeddedobj/source/inc/xcreator.hxx16
8 files changed, 163 insertions, 163 deletions
diff --git a/embeddedobj/source/inc/closepreventer.hxx b/embeddedobj/source/inc/closepreventer.hxx
index 9310cdcd6c31..2c6b0535ab73 100644
--- a/embeddedobj/source/inc/closepreventer.hxx
+++ b/embeddedobj/source/inc/closepreventer.hxx
@@ -25,10 +25,10 @@
class OClosePreventer : public ::cppu::WeakImplHelper1 < ::com::sun::star::util::XCloseListener >
{
- virtual void SAL_CALL queryClosing( const ::com::sun::star::lang::EventObject& Source, sal_Bool GetsOwnership ) throw (::com::sun::star::util::CloseVetoException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL notifyClosing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL queryClosing( const ::com::sun::star::lang::EventObject& Source, sal_Bool GetsOwnership ) throw (::com::sun::star::util::CloseVetoException, ::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL notifyClosing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception);
};
#endif
diff --git a/embeddedobj/source/inc/commonembobj.hxx b/embeddedobj/source/inc/commonembobj.hxx
index fba8d218d928..719807d63c3a 100644
--- a/embeddedobj/source/inc/commonembobj.hxx
+++ b/embeddedobj/source/inc/commonembobj.hxx
@@ -250,7 +250,7 @@ public:
// XInterface
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType )
- throw( ::com::sun::star::uno::RuntimeException ) ;
+ throw( ::com::sun::star::uno::RuntimeException, std::exception ) ;
virtual void SAL_CALL acquire()
throw();
@@ -272,51 +272,51 @@ public:
throw ( ::com::sun::star::embed::UnreachableStateException,
::com::sun::star::embed::WrongStateException,
::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getReachableStates()
throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual sal_Int32 SAL_CALL getCurrentState()
throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual void SAL_CALL doVerb( sal_Int32 nVerbID )
throw ( ::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException,
::com::sun::star::embed::UnreachableStateException,
::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::embed::VerbDescriptor > SAL_CALL getSupportedVerbs()
throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual void SAL_CALL setClientSite(
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedClient >& xClient )
throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedClient > SAL_CALL getClientSite()
throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual void SAL_CALL update()
throw ( ::com::sun::star::embed::WrongStateException,
::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual void SAL_CALL setUpdateMode( sal_Int32 nMode )
throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual sal_Int64 SAL_CALL getStatus( sal_Int64 nAspect )
throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual void SAL_CALL setContainerName( const OUString& sName )
- throw ( ::com::sun::star::uno::RuntimeException );
+ throw ( ::com::sun::star::uno::RuntimeException, std::exception );
// XVisualObject
@@ -325,23 +325,23 @@ public:
throw ( ::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException,
::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual ::com::sun::star::awt::Size SAL_CALL getVisualAreaSize( sal_Int64 nAspect )
throw ( ::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException,
::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual ::com::sun::star::embed::VisualRepresentation SAL_CALL getPreferredVisualRepresentation( ::sal_Int64 nAspect )
throw ( ::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException,
::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual sal_Int32 SAL_CALL getMapUnit( sal_Int64 nAspect )
throw ( ::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException);
+ ::com::sun::star::uno::RuntimeException, std::exception);
// XEmbedPersist
@@ -355,14 +355,14 @@ public:
::com::sun::star::embed::WrongStateException,
::com::sun::star::io::IOException,
::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual void SAL_CALL storeToEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs )
throw ( ::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException,
::com::sun::star::io::IOException,
::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual void SAL_CALL storeAsEntry(
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage,
@@ -373,20 +373,20 @@ public:
::com::sun::star::embed::WrongStateException,
::com::sun::star::io::IOException,
::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual void SAL_CALL saveCompleted( sal_Bool bUseNew )
throw ( ::com::sun::star::embed::WrongStateException,
::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual sal_Bool SAL_CALL hasEntry()
throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual OUString SAL_CALL getEntryName()
throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
// XLinkageSupport
@@ -396,16 +396,16 @@ public:
::com::sun::star::embed::WrongStateException,
::com::sun::star::io::IOException,
::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual sal_Bool SAL_CALL isLink()
throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::RuntimeException);
+ ::com::sun::star::uno::RuntimeException, std::exception);
virtual OUString SAL_CALL getLinkURL()
throw ( ::com::sun::star::embed::WrongStateException,
::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException);
+ ::com::sun::star::uno::RuntimeException, std::exception);
// XCommonEmbedPersist
@@ -414,11 +414,11 @@ public:
throw ( ::com::sun::star::embed::WrongStateException,
::com::sun::star::io::IOException,
::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual sal_Bool SAL_CALL isReadonly()
throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual void SAL_CALL reload(
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments,
@@ -427,7 +427,7 @@ public:
::com::sun::star::embed::WrongStateException,
::com::sun::star::io::IOException,
::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
// XInplaceObject
@@ -436,71 +436,71 @@ public:
const ::com::sun::star::awt::Rectangle& aClipRect )
throw ( ::com::sun::star::embed::WrongStateException,
::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual void SAL_CALL enableModeless( sal_Bool bEnable )
throw ( ::com::sun::star::embed::WrongStateException,
::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual void SAL_CALL translateAccelerators(
const ::com::sun::star::uno::Sequence< ::com::sun::star::awt::KeyEvent >& aKeys )
throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
// XClassifiedObject
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getClassID()
- throw ( ::com::sun::star::uno::RuntimeException );
+ throw ( ::com::sun::star::uno::RuntimeException, std::exception );
virtual OUString SAL_CALL getClassName()
- throw ( ::com::sun::star::uno::RuntimeException );
+ throw ( ::com::sun::star::uno::RuntimeException, std::exception );
virtual void SAL_CALL setClassInfo(
const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName )
throw ( ::com::sun::star::lang::NoSupportException,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
// XComponentSupplier
virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseable > SAL_CALL getComponent()
- throw ( ::com::sun::star::uno::RuntimeException );
+ throw ( ::com::sun::star::uno::RuntimeException, std::exception );
// XStateChangeBroadcaster
- virtual void SAL_CALL addStateChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStateChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removeStateChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStateChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addStateChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStateChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL removeStateChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStateChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception);
// XCloseable
virtual void SAL_CALL close( sal_Bool DeliverOwnership )
throw ( ::com::sun::star::util::CloseVetoException,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual void SAL_CALL addCloseListener(
const ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseListener >& Listener )
- throw ( ::com::sun::star::uno::RuntimeException );
+ throw ( ::com::sun::star::uno::RuntimeException, std::exception );
virtual void SAL_CALL removeCloseListener(
const ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseListener >& Listener )
- throw ( ::com::sun::star::uno::RuntimeException );
+ throw ( ::com::sun::star::uno::RuntimeException, std::exception );
// XEventBroadcaster
virtual void SAL_CALL addEventListener(
const ::com::sun::star::uno::Reference< ::com::sun::star::document::XEventListener >& Listener )
- throw ( ::com::sun::star::uno::RuntimeException );
+ throw ( ::com::sun::star::uno::RuntimeException, std::exception );
virtual void SAL_CALL removeEventListener(
const ::com::sun::star::uno::Reference< ::com::sun::star::document::XEventListener >& Listener )
- throw ( ::com::sun::star::uno::RuntimeException );
+ throw ( ::com::sun::star::uno::RuntimeException, std::exception );
// XChild
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception);
// XDefaultSizeTransmitter
//#i103460# charts do not necessaryly have an own size within ODF files, in this case they need to use the size settings from the surrounding frame, which is made available with this method
- virtual void SAL_CALL setDefaultSize( const ::com::sun::star::awt::Size& rSize_100TH_MM ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setDefaultSize( const ::com::sun::star::awt::Size& rSize_100TH_MM ) throw (::com::sun::star::uno::RuntimeException, std::exception);
};
#endif
diff --git a/embeddedobj/source/inc/docholder.hxx b/embeddedobj/source/inc/docholder.hxx
index 709c5e4add90..b026eef3862c 100644
--- a/embeddedobj/source/inc/docholder.hxx
+++ b/embeddedobj/source/inc/docholder.hxx
@@ -172,30 +172,30 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseable > GetComponent() { return m_xComponent; }
// XEventListener
- virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception);
// XCloseListener
- virtual void SAL_CALL queryClosing( const ::com::sun::star::lang::EventObject& Source, sal_Bool GetsOwnership ) throw (::com::sun::star::util::CloseVetoException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL notifyClosing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL queryClosing( const ::com::sun::star::lang::EventObject& Source, sal_Bool GetsOwnership ) throw (::com::sun::star::util::CloseVetoException, ::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL notifyClosing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception);
// XTerminateListener
- virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception);
// XModifyListener
- virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw ( ::com::sun::star::uno::RuntimeException );
+ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw ( ::com::sun::star::uno::RuntimeException, std::exception );
// XEventListener
- virtual void SAL_CALL notifyEvent( const ::com::sun::star::document::EventObject& Event ) throw ( ::com::sun::star::uno::RuntimeException );
+ virtual void SAL_CALL notifyEvent( const ::com::sun::star::document::EventObject& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception );
// XBorderResizeListener
- virtual void SAL_CALL borderWidthsChanged( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& aObject, const ::com::sun::star::frame::BorderWidths& aNewSize ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL borderWidthsChanged( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& aObject, const ::com::sun::star::frame::BorderWidths& aNewSize ) throw (::com::sun::star::uno::RuntimeException, std::exception);
// XHatchWindowController
- virtual void SAL_CALL requestPositioning( const ::com::sun::star::awt::Rectangle& aRect ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::awt::Rectangle SAL_CALL calcAdjustedRectangle( const ::com::sun::star::awt::Rectangle& aRect ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL activated( ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL deactivated( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL requestPositioning( const ::com::sun::star::awt::Rectangle& aRect ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::awt::Rectangle SAL_CALL calcAdjustedRectangle( const ::com::sun::star::awt::Rectangle& aRect ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL activated( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL deactivated( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
};
#endif
diff --git a/embeddedobj/source/inc/dummyobject.hxx b/embeddedobj/source/inc/dummyobject.hxx
index 7574a80890c5..372bcc27047b 100644
--- a/embeddedobj/source/inc/dummyobject.hxx
+++ b/embeddedobj/source/inc/dummyobject.hxx
@@ -90,51 +90,51 @@ public:
throw ( ::com::sun::star::embed::UnreachableStateException,
::com::sun::star::embed::WrongStateException,
::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getReachableStates()
throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual sal_Int32 SAL_CALL getCurrentState()
throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual void SAL_CALL doVerb( sal_Int32 nVerbID )
throw ( ::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException,
::com::sun::star::embed::UnreachableStateException,
::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::embed::VerbDescriptor > SAL_CALL getSupportedVerbs()
throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual void SAL_CALL setClientSite(
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedClient >& xClient )
throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedClient > SAL_CALL getClientSite()
throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual void SAL_CALL update()
throw ( ::com::sun::star::embed::WrongStateException,
::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual void SAL_CALL setUpdateMode( sal_Int32 nMode )
throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual sal_Int64 SAL_CALL getStatus( sal_Int64 nAspect )
throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual void SAL_CALL setContainerName( const OUString& sName )
- throw ( ::com::sun::star::uno::RuntimeException );
+ throw ( ::com::sun::star::uno::RuntimeException, std::exception );
// XVisualObject
@@ -143,23 +143,23 @@ public:
throw ( ::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException,
::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual ::com::sun::star::awt::Size SAL_CALL getVisualAreaSize( sal_Int64 nAspect )
throw ( ::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException,
::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual ::com::sun::star::embed::VisualRepresentation SAL_CALL getPreferredVisualRepresentation( ::sal_Int64 nAspect )
throw ( ::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException,
::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual sal_Int32 SAL_CALL getMapUnit( sal_Int64 nAspect )
throw ( ::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException);
+ ::com::sun::star::uno::RuntimeException, std::exception);
// XEmbedPersist
@@ -173,14 +173,14 @@ public:
::com::sun::star::embed::WrongStateException,
::com::sun::star::io::IOException,
::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual void SAL_CALL storeToEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs )
throw ( ::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException,
::com::sun::star::io::IOException,
::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual void SAL_CALL storeAsEntry(
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage,
@@ -191,20 +191,20 @@ public:
::com::sun::star::embed::WrongStateException,
::com::sun::star::io::IOException,
::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual void SAL_CALL saveCompleted( sal_Bool bUseNew )
throw ( ::com::sun::star::embed::WrongStateException,
::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual sal_Bool SAL_CALL hasEntry()
throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual OUString SAL_CALL getEntryName()
throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
// XCommonEmbedPersist
@@ -213,11 +213,11 @@ public:
throw ( ::com::sun::star::embed::WrongStateException,
::com::sun::star::io::IOException,
::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual sal_Bool SAL_CALL isReadonly()
throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual void SAL_CALL reload(
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments,
@@ -226,54 +226,54 @@ public:
::com::sun::star::embed::WrongStateException,
::com::sun::star::io::IOException,
::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
// XClassifiedObject
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getClassID()
- throw ( ::com::sun::star::uno::RuntimeException );
+ throw ( ::com::sun::star::uno::RuntimeException, std::exception );
virtual OUString SAL_CALL getClassName()
- throw ( ::com::sun::star::uno::RuntimeException );
+ throw ( ::com::sun::star::uno::RuntimeException, std::exception );
virtual void SAL_CALL setClassInfo(
const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName )
throw ( ::com::sun::star::lang::NoSupportException,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
// XComponentSupplier
virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseable > SAL_CALL getComponent()
- throw ( ::com::sun::star::uno::RuntimeException );
+ throw ( ::com::sun::star::uno::RuntimeException, std::exception );
// XStateChangeBroadcaster
- virtual void SAL_CALL addStateChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStateChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removeStateChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStateChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addStateChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStateChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL removeStateChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStateChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception);
// XCloseable
virtual void SAL_CALL close( sal_Bool DeliverOwnership )
throw ( ::com::sun::star::util::CloseVetoException,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual void SAL_CALL addCloseListener(
const ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseListener >& Listener )
- throw ( ::com::sun::star::uno::RuntimeException );
+ throw ( ::com::sun::star::uno::RuntimeException, std::exception );
virtual void SAL_CALL removeCloseListener(
const ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseListener >& Listener )
- throw ( ::com::sun::star::uno::RuntimeException );
+ throw ( ::com::sun::star::uno::RuntimeException, std::exception );
// XEventBroadcaster
virtual void SAL_CALL addEventListener(
const ::com::sun::star::uno::Reference< ::com::sun::star::document::XEventListener >& Listener )
- throw ( ::com::sun::star::uno::RuntimeException );
+ throw ( ::com::sun::star::uno::RuntimeException, std::exception );
virtual void SAL_CALL removeEventListener(
const ::com::sun::star::uno::Reference< ::com::sun::star::document::XEventListener >& Listener )
- throw ( ::com::sun::star::uno::RuntimeException );
+ throw ( ::com::sun::star::uno::RuntimeException, std::exception );
};
diff --git a/embeddedobj/source/inc/intercept.hxx b/embeddedobj/source/inc/intercept.hxx
index 3821a105084a..e3cb9acdf8e4 100644
--- a/embeddedobj/source/inc/intercept.hxx
+++ b/embeddedobj/source/inc/intercept.hxx
@@ -59,7 +59,7 @@ public:
const ::com::sun::star::util::URL& URL,
const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue >& Arguments )
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException, std::exception);
virtual void SAL_CALL
addStatusListener(
@@ -67,7 +67,7 @@ public:
::com::sun::star::frame::XStatusListener >& Control,
const ::com::sun::star::util::URL& URL )
throw (
- ::com::sun::star::uno::RuntimeException
+ ::com::sun::star::uno::RuntimeException, std::exception
);
virtual void SAL_CALL
@@ -76,14 +76,14 @@ public:
::com::sun::star::frame::XStatusListener >& Control,
const ::com::sun::star::util::URL& URL )
throw (
- ::com::sun::star::uno::RuntimeException
+ ::com::sun::star::uno::RuntimeException, std::exception
);
//XInterceptorInfo
virtual ::com::sun::star::uno::Sequence< OUString >
SAL_CALL getInterceptedURLs( )
throw (
- ::com::sun::star::uno::RuntimeException
+ ::com::sun::star::uno::RuntimeException, std::exception
);
//XDispatchProvider ( inherited by XDispatchProviderInterceptor )
@@ -94,7 +94,7 @@ public:
const OUString& TargetFrameName,
sal_Int32 SearchFlags )
throw (
- ::com::sun::star::uno::RuntimeException
+ ::com::sun::star::uno::RuntimeException, std::exception
);
virtual ::com::sun::star::uno::Sequence<
@@ -104,7 +104,7 @@ public:
const ::com::sun::star::uno::Sequence<
::com::sun::star::frame::DispatchDescriptor >& Requests )
throw (
- ::com::sun::star::uno::RuntimeException
+ ::com::sun::star::uno::RuntimeException, std::exception
);
@@ -113,7 +113,7 @@ public:
::com::sun::star::frame::XDispatchProvider > SAL_CALL
getSlaveDispatchProvider( )
throw (
- ::com::sun::star::uno::RuntimeException
+ ::com::sun::star::uno::RuntimeException, std::exception
);
virtual void SAL_CALL
@@ -121,14 +121,14 @@ public:
const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XDispatchProvider >& NewDispatchProvider )
throw (
- ::com::sun::star::uno::RuntimeException
+ ::com::sun::star::uno::RuntimeException, std::exception
);
virtual ::com::sun::star::uno::Reference<
::com::sun::star::frame::XDispatchProvider > SAL_CALL
getMasterDispatchProvider( )
throw (
- ::com::sun::star::uno::RuntimeException
+ ::com::sun::star::uno::RuntimeException, std::exception
);
virtual void SAL_CALL
@@ -136,7 +136,7 @@ public:
const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XDispatchProvider >& NewSupplier )
throw (
- ::com::sun::star::uno::RuntimeException
+ ::com::sun::star::uno::RuntimeException, std::exception
);
diff --git a/embeddedobj/source/inc/oleembobj.hxx b/embeddedobj/source/inc/oleembobj.hxx
index a3b1dd101473..12c306f8fad5 100644
--- a/embeddedobj/source/inc/oleembobj.hxx
+++ b/embeddedobj/source/inc/oleembobj.hxx
@@ -311,51 +311,51 @@ public:
throw ( ::com::sun::star::embed::UnreachableStateException,
::com::sun::star::embed::WrongStateException,
::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getReachableStates()
throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual sal_Int32 SAL_CALL getCurrentState()
throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual void SAL_CALL doVerb( sal_Int32 nVerbID )
throw ( ::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException,
::com::sun::star::embed::UnreachableStateException,
::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::embed::VerbDescriptor > SAL_CALL getSupportedVerbs()
throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual void SAL_CALL setClientSite(
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedClient >& xClient )
throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedClient > SAL_CALL getClientSite()
throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual void SAL_CALL update()
throw ( ::com::sun::star::embed::WrongStateException,
::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual void SAL_CALL setUpdateMode( sal_Int32 nMode )
throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual sal_Int64 SAL_CALL getStatus( sal_Int64 nAspect )
throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual void SAL_CALL setContainerName( const OUString& sName )
- throw ( ::com::sun::star::uno::RuntimeException );
+ throw ( ::com::sun::star::uno::RuntimeException, std::exception );
// XVisualObject
@@ -364,23 +364,23 @@ public:
throw ( ::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException,
::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual ::com::sun::star::awt::Size SAL_CALL getVisualAreaSize( sal_Int64 nAspect )
throw ( ::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException,
::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual ::com::sun::star::embed::VisualRepresentation SAL_CALL getPreferredVisualRepresentation( ::sal_Int64 nAspect )
throw ( ::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException,
::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual sal_Int32 SAL_CALL getMapUnit( sal_Int64 nAspect )
throw ( ::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException);
+ ::com::sun::star::uno::RuntimeException, std::exception);
// XEmbedPersist
@@ -395,14 +395,14 @@ public:
::com::sun::star::embed::WrongStateException,
::com::sun::star::io::IOException,
::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual void SAL_CALL storeToEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs )
throw ( ::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException,
::com::sun::star::io::IOException,
::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual void SAL_CALL storeAsEntry(
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage,
@@ -413,20 +413,20 @@ public:
::com::sun::star::embed::WrongStateException,
::com::sun::star::io::IOException,
::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual void SAL_CALL saveCompleted( sal_Bool bUseNew )
throw ( ::com::sun::star::embed::WrongStateException,
::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual sal_Bool SAL_CALL hasEntry()
throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual OUString SAL_CALL getEntryName()
throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
// XLinkageSupport
@@ -436,27 +436,27 @@ public:
::com::sun::star::embed::WrongStateException,
::com::sun::star::io::IOException,
::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual sal_Bool SAL_CALL isLink()
throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::RuntimeException);
+ ::com::sun::star::uno::RuntimeException, std::exception);
virtual OUString SAL_CALL getLinkURL()
throw ( ::com::sun::star::embed::WrongStateException,
::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException);
+ ::com::sun::star::uno::RuntimeException, std::exception);
// XCommonEmbedPersist
virtual void SAL_CALL storeOwn()
throw ( ::com::sun::star::embed::WrongStateException,
::com::sun::star::io::IOException,
::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual sal_Bool SAL_CALL isReadonly()
throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual void SAL_CALL reload(
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments,
@@ -465,53 +465,53 @@ public:
::com::sun::star::embed::WrongStateException,
::com::sun::star::io::IOException,
::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
// XClassifiedObject
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getClassID()
- throw ( ::com::sun::star::uno::RuntimeException );
+ throw ( ::com::sun::star::uno::RuntimeException, std::exception );
virtual OUString SAL_CALL getClassName()
- throw ( ::com::sun::star::uno::RuntimeException );
+ throw ( ::com::sun::star::uno::RuntimeException, std::exception );
virtual void SAL_CALL setClassInfo(
const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName )
throw ( ::com::sun::star::lang::NoSupportException,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
// XStateChangeBroadcaster
- virtual void SAL_CALL addStateChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStateChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removeStateChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStateChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addStateChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStateChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL removeStateChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStateChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception);
// XComponentSupplier
virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseable > SAL_CALL getComponent()
- throw ( ::com::sun::star::uno::RuntimeException );
+ throw ( ::com::sun::star::uno::RuntimeException, std::exception );
// XCloseable
virtual void SAL_CALL close( sal_Bool DeliverOwnership )
throw ( ::com::sun::star::util::CloseVetoException,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual void SAL_CALL addCloseListener(
const ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseListener >& Listener )
- throw ( ::com::sun::star::uno::RuntimeException );
+ throw ( ::com::sun::star::uno::RuntimeException, std::exception );
virtual void SAL_CALL removeCloseListener(
const ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseListener >& Listener )
- throw ( ::com::sun::star::uno::RuntimeException );
+ throw ( ::com::sun::star::uno::RuntimeException, std::exception );
// XEventBroadcaster
virtual void SAL_CALL addEventListener(
const ::com::sun::star::uno::Reference< ::com::sun::star::document::XEventListener >& Listener )
- throw ( ::com::sun::star::uno::RuntimeException );
+ throw ( ::com::sun::star::uno::RuntimeException, std::exception );
virtual void SAL_CALL removeEventListener(
const ::com::sun::star::uno::Reference< ::com::sun::star::document::XEventListener >& Listener )
- throw ( ::com::sun::star::uno::RuntimeException );
+ throw ( ::com::sun::star::uno::RuntimeException, std::exception );
// XInplaceObject ( only for wrapping scenario here )
@@ -519,21 +519,21 @@ public:
const ::com::sun::star::awt::Rectangle& aClipRect )
throw ( ::com::sun::star::embed::WrongStateException,
::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual void SAL_CALL enableModeless( sal_Bool bEnable )
throw ( ::com::sun::star::embed::WrongStateException,
::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual void SAL_CALL translateAccelerators(
const ::com::sun::star::uno::Sequence< ::com::sun::star::awt::KeyEvent >& aKeys )
throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
// XChild ( only for wrapping scenario here )
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception);
};
diff --git a/embeddedobj/source/inc/specialobject.hxx b/embeddedobj/source/inc/specialobject.hxx
index e0612dfe4b32..89a230c35d45 100644
--- a/embeddedobj/source/inc/specialobject.hxx
+++ b/embeddedobj/source/inc/specialobject.hxx
@@ -35,7 +35,7 @@ public:
// XInterface
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType )
- throw( ::com::sun::star::uno::RuntimeException ) ;
+ throw( ::com::sun::star::uno::RuntimeException, std::exception ) ;
// XTypeProvider
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes()
@@ -46,36 +46,36 @@ public:
throw ( ::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException,
::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual void SAL_CALL setVisualAreaSize( sal_Int64 nAspect, const ::com::sun::star::awt::Size& aSize )
throw ( ::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException,
::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual ::com::sun::star::awt::Size SAL_CALL getVisualAreaSize( sal_Int64 nAspect )
throw ( ::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException,
::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual sal_Int32 SAL_CALL getMapUnit( sal_Int64 nAspect )
throw ( ::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException);
+ ::com::sun::star::uno::RuntimeException, std::exception);
virtual void SAL_CALL changeState( sal_Int32 nNewState )
throw ( ::com::sun::star::embed::UnreachableStateException,
::com::sun::star::embed::WrongStateException,
::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
virtual void SAL_CALL doVerb( sal_Int32 nVerbID )
throw ( ::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException,
::com::sun::star::embed::UnreachableStateException,
::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
};
#endif
diff --git a/embeddedobj/source/inc/xcreator.hxx b/embeddedobj/source/inc/xcreator.hxx
index a282c41fcd5d..3a120a2bf31b 100644
--- a/embeddedobj/source/inc/xcreator.hxx
+++ b/embeddedobj/source/inc/xcreator.hxx
@@ -52,23 +52,23 @@ public:
// XEmbedObjectCreator
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitNew( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitFromEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMedDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitFromMediaDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitNew( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitFromEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMedDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitFromMediaDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception);
// XEmbedObjectFactory
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceUserInit( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const OUString& sClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, sal_Int32 nEntryConnectionMode, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aObjectArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceUserInit( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const OUString& sClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, sal_Int32 nEntryConnectionMode, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aObjectArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception);
// XLinkCreator
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceLink( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceLink( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception);
// XLinkFactory
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceLinkUserInit( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aClassID, const OUString& sClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntryName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aObjectArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception);
};