1 files changed, 40 insertions, 125 deletions
diff --git a/embeddedobj/source/inc/dummyobject.hxx b/embeddedobj/source/inc/dummyobject.hxx
index afec254ff13f..30505a2b0244 100644
--- a/embeddedobj/source/inc/dummyobject.hxx
+++ b/embeddedobj/source/inc/dummyobject.hxx
@@ -91,80 +91,39 @@ public:
 
 // XEmbeddedObject
 
-    virtual void SAL_CALL changeState( sal_Int32 nNewState )
-        throw ( css::embed::UnreachableStateException,
-                css::embed::WrongStateException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
-
-    virtual css::uno::Sequence< sal_Int32 > SAL_CALL getReachableStates()
-        throw ( css::embed::WrongStateException,
-                css::uno::RuntimeException, std::exception ) override;
-
-    virtual sal_Int32 SAL_CALL getCurrentState()
-        throw ( css::embed::WrongStateException,
-                css::uno::RuntimeException, std::exception ) override;
-
-    virtual void SAL_CALL doVerb( sal_Int32 nVerbID )
-        throw ( css::lang::IllegalArgumentException,
-                css::embed::WrongStateException,
-                css::embed::UnreachableStateException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
-
-    virtual css::uno::Sequence< css::embed::VerbDescriptor > SAL_CALL getSupportedVerbs()
-        throw ( css::embed::WrongStateException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL changeState( sal_Int32 nNewState ) override;
+
+    virtual css::uno::Sequence< sal_Int32 > SAL_CALL getReachableStates() override;
+
+    virtual sal_Int32 SAL_CALL getCurrentState() override;
+
+    virtual void SAL_CALL doVerb( sal_Int32 nVerbID ) override;
+
+    virtual css::uno::Sequence< css::embed::VerbDescriptor > SAL_CALL getSupportedVerbs() override;
 
     virtual void SAL_CALL setClientSite(
-                const css::uno::Reference< css::embed::XEmbeddedClient >& xClient )
-        throw ( css::embed::WrongStateException,
-                css::uno::RuntimeException, std::exception ) override;
+                const css::uno::Reference< css::embed::XEmbeddedClient >& xClient ) override;
 
-    virtual css::uno::Reference< css::embed::XEmbeddedClient > SAL_CALL getClientSite()
-        throw ( css::embed::WrongStateException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::embed::XEmbeddedClient > SAL_CALL getClientSite() override;
 
-    virtual void SAL_CALL update()
-        throw ( css::embed::WrongStateException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL update() override;
 
-    virtual void SAL_CALL setUpdateMode( sal_Int32 nMode )
-        throw ( css::embed::WrongStateException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL setUpdateMode( sal_Int32 nMode ) override;
 
-    virtual sal_Int64 SAL_CALL getStatus( sal_Int64 nAspect )
-        throw ( css::embed::WrongStateException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int64 SAL_CALL getStatus( sal_Int64 nAspect ) override;
 
-    virtual void SAL_CALL setContainerName( const OUString& sName )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL setContainerName( const OUString& sName ) override;
 
 
 // XVisualObject
 
-    virtual void SAL_CALL setVisualAreaSize( sal_Int64 nAspect, const css::awt::Size& aSize )
-        throw ( css::lang::IllegalArgumentException,
-                css::embed::WrongStateException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL setVisualAreaSize( sal_Int64 nAspect, const css::awt::Size& aSize ) override;
 
-    virtual css::awt::Size SAL_CALL getVisualAreaSize( sal_Int64 nAspect )
-        throw ( css::lang::IllegalArgumentException,
-                css::embed::WrongStateException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual css::awt::Size SAL_CALL getVisualAreaSize( sal_Int64 nAspect ) override;
 
-    virtual css::embed::VisualRepresentation SAL_CALL getPreferredVisualRepresentation( ::sal_Int64 nAspect )
-        throw ( css::lang::IllegalArgumentException,
-                css::embed::WrongStateException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual css::embed::VisualRepresentation SAL_CALL getPreferredVisualRepresentation( ::sal_Int64 nAspect ) override;
 
-    virtual sal_Int32 SAL_CALL getMapUnit( sal_Int64 nAspect )
-        throw ( css::uno::Exception,
-                css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getMapUnit( sal_Int64 nAspect ) override;
 
 // XEmbedPersist
 
@@ -173,112 +132,68 @@ public:
                     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::embed::WrongStateException,
-                css::io::IOException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
-
-    virtual void SAL_CALL storeToEntry( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& lArguments, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs )
-        throw ( css::lang::IllegalArgumentException,
-                css::embed::WrongStateException,
-                css::io::IOException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
+                    const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) override;
+
+    virtual void SAL_CALL storeToEntry( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& lArguments, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) override;
 
     virtual void SAL_CALL storeAsEntry(
                 const css::uno::Reference< css::embed::XStorage >& xStorage,
                 const OUString& sEntName,
                 const css::uno::Sequence< css::beans::PropertyValue >& lArguments,
-                const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs )
-        throw ( css::lang::IllegalArgumentException,
-                css::embed::WrongStateException,
-                css::io::IOException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
+                const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) override;
 
-    virtual void SAL_CALL saveCompleted( sal_Bool bUseNew )
-        throw ( css::embed::WrongStateException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL saveCompleted( sal_Bool bUseNew ) override;
 
-    virtual sal_Bool SAL_CALL hasEntry()
-        throw ( css::embed::WrongStateException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL hasEntry() override;
 
-    virtual OUString SAL_CALL getEntryName()
-        throw ( css::embed::WrongStateException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getEntryName() override;
 
 
 // XCommonEmbedPersist
 
-    virtual void SAL_CALL storeOwn()
-        throw ( css::embed::WrongStateException,
-                css::io::IOException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL storeOwn() override;
 
-    virtual sal_Bool SAL_CALL isReadonly()
-        throw ( css::embed::WrongStateException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL isReadonly() override;
 
     virtual void SAL_CALL reload(
                 const css::uno::Sequence< css::beans::PropertyValue >& lArguments,
-                const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs )
-        throw ( css::lang::IllegalArgumentException,
-                css::embed::WrongStateException,
-                css::io::IOException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
+                const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) override;
 
 
 // XClassifiedObject
 
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getClassID()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getClassID() override;
 
-    virtual OUString SAL_CALL getClassName()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getClassName() override;
 
     virtual void SAL_CALL setClassInfo(
-                const css::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName )
-        throw ( css::lang::NoSupportException,
-                css::uno::RuntimeException, std::exception ) override;
+                const css::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName ) override;
 
 
 // XComponentSupplier
 
-    virtual css::uno::Reference< css::util::XCloseable > SAL_CALL getComponent()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::util::XCloseable > SAL_CALL getComponent() override;
 
 // XStateChangeBroadcaster
-    virtual void SAL_CALL addStateChangeListener( const css::uno::Reference< css::embed::XStateChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeStateChangeListener( const css::uno::Reference< css::embed::XStateChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addStateChangeListener( const css::uno::Reference< css::embed::XStateChangeListener >& xListener ) override;
+    virtual void SAL_CALL removeStateChangeListener( const css::uno::Reference< css::embed::XStateChangeListener >& xListener ) override;
 
 // XCloseable
 
-    virtual void SAL_CALL close( sal_Bool DeliverOwnership )
-        throw ( css::util::CloseVetoException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL close( sal_Bool DeliverOwnership ) override;
 
     virtual void SAL_CALL addCloseListener(
-                const css::uno::Reference< css::util::XCloseListener >& Listener )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+                const css::uno::Reference< css::util::XCloseListener >& Listener ) override;
 
     virtual void SAL_CALL removeCloseListener(
-                const css::uno::Reference< css::util::XCloseListener >& Listener )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+                const css::uno::Reference< css::util::XCloseListener >& Listener ) override;
 
 // XEventBroadcaster
     virtual void SAL_CALL addEventListener(
-                const css::uno::Reference< css::document::XEventListener >& Listener )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+                const css::uno::Reference< css::document::XEventListener >& Listener ) override;
 
     virtual void SAL_CALL removeEventListener(
-                const css::uno::Reference< css::document::XEventListener >& Listener )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+                const css::uno::Reference< css::document::XEventListener >& Listener ) override;
 
 };