#112739# adopt for linux

3 files changed, 19 insertions, 22 deletions

diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx
index 22a990065bdc..1d685344640b 100644
--- a/embeddedobj/source/general/docholder.cxx
+++ b/embeddedobj/source/general/docholder.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: docholder.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: mav $ $Date: 2003-10-27 12:58:19 $
+ *  last change: $Author: mav $ $Date: 2003-10-28 16:32:48 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -519,6 +519,7 @@ sal_Bool DocumentHolder::GetExtent( awt::Size *pSize )
 }
 
 void SAL_CALL DocumentHolder::disposing( const com::sun::star::lang::EventObject& aSource )
+        throw (::com::sun::star::uno::RuntimeException)
 {
     if ( m_xDocument.is() && m_xDocument == aSource.Source )
         m_xDocument = uno::Reference< frame::XModel >();
@@ -529,13 +530,14 @@ void SAL_CALL DocumentHolder::disposing( const com::sun::star::lang::EventObject
 
 
 void SAL_CALL DocumentHolder::queryClosing( const lang::EventObject& aSource, sal_Bool bGetsOwnership )
-        throw( util::CloseVetoException )
+        throw (::com::sun::star::util::CloseVetoException, ::com::sun::star::uno::RuntimeException)
 {
     if ( m_xDocument.is() && m_xDocument == aSource.Source )
         throw util::CloseVetoException();
 }
 
 void SAL_CALL DocumentHolder::notifyClosing( const lang::EventObject& aSource )
+        throw (::com::sun::star::uno::RuntimeException)
 {
     uno::Reference< util::XCloseBroadcaster > xEventBroadcaster(
         aSource.Source, uno::UNO_QUERY );
@@ -550,13 +552,14 @@ void SAL_CALL DocumentHolder::notifyClosing( const lang::EventObject& aSource )
 }
 
 void SAL_CALL DocumentHolder::queryTermination( const lang::EventObject& aSource )
-        throw( frame::TerminationVetoException )
+        throw (::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException)
 {
     if ( m_xDocument.is() )
         throw frame::TerminationVetoException();
 }
 
 void SAL_CALL DocumentHolder::notifyTermination( const lang::EventObject& aSource )
+        throw (::com::sun::star::uno::RuntimeException)
 {
     OSL_ENSURE( !m_xDocument.is(), "Just a disaster..." );
 
diff --git a/embeddedobj/source/inc/closepreventer.hxx b/embeddedobj/source/inc/closepreventer.hxx
index b1278bffd6aa..bea8f4ad1a5f 100644
--- a/embeddedobj/source/inc/closepreventer.hxx
+++ b/embeddedobj/source/inc/closepreventer.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: closepreventer.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: mav $ $Date: 2003-10-27 13:00:38 $
+ *  last change: $Author: mav $ $Date: 2003-10-28 16:32:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -69,11 +69,9 @@
 
 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 );
+    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 notifyClosing( const com::sun::star::lang::EventObject& Source );
-
-    virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source );
+    virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException);
 };
 
diff --git a/embeddedobj/source/inc/docholder.hxx b/embeddedobj/source/inc/docholder.hxx
index c59f4659d2e0..3d419fd7b392 100644
--- a/embeddedobj/source/inc/docholder.hxx
+++ b/embeddedobj/source/inc/docholder.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: docholder.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: mav $ $Date: 2003-10-27 13:00:39 $
+ *  last change: $Author: mav $ $Date: 2003-10-28 16:32:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -149,19 +149,15 @@ public:
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetDocument() { return m_xDocument; }
 
 // XEventListener
-    virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& aSource );
+    virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException);
 
 // XCloseListener
-    virtual void SAL_CALL queryClosing( const com::sun::star::lang::EventObject& aSource, sal_Bool bGetsOwnership )
-        throw( ::com::sun::star::util::CloseVetoException );
-
-    virtual void SAL_CALL notifyClosing( const com::sun::star::lang::EventObject& aSource );
+    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);
 
 // XTerminateListener
-    virtual void SAL_CALL queryTermination( const com::sun::star::lang::EventObject& aSource )
-        throw( ::com::sun::star::frame::TerminationVetoException );
-
-    virtual void SAL_CALL notifyTermination( const com::sun::star::lang::EventObject& aSource );
+    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);
 
 // XModifyListener
     virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw ( ::com::sun::star::uno::RuntimeException );