diff options
author | Martin Blapp <mbr@FreeBSD.org> | 2003-03-27 10:07:05 +0000 |
---|---|---|
committer | Martin Blapp <mbr@FreeBSD.org> | 2003-03-27 10:07:05 +0000 |
commit | e1020f36063a366c3653b2d99ff9c21c048aa048 (patch) | |
tree | df9a21ee30d96e414ca0fdba5893eee13d7e8959 /editors | |
parent | cb8732083ac540e323516e47d20e69d353267f87 (diff) | |
download | ports-e1020f36063a366c3653b2d99ff9c21c048aa048.tar.gz ports-e1020f36063a366c3653b2d99ff9c21c048aa048.zip |
Notes
Diffstat (limited to 'editors')
34 files changed, 0 insertions, 3587 deletions
diff --git a/editors/openoffice-1.1-devel/files/patch-bridges+test+testcomp.cxx b/editors/openoffice-1.1-devel/files/patch-bridges+test+testcomp.cxx deleted file mode 100644 index 2eb011510945..000000000000 --- a/editors/openoffice-1.1-devel/files/patch-bridges+test+testcomp.cxx +++ /dev/null @@ -1,113 +0,0 @@ ---- ../bridges/test/testcomp.cxx.orig Wed Mar 12 17:40:53 2003 -+++ ../bridges/test/testcomp.cxx Wed Mar 12 17:42:54 2003 -@@ -2,9 +2,9 @@ - * - * $RCSfile: testcomp.cxx,v $ - * -- * $Revision: 1.2 $ -+ * $Revision: 1.2.54.1 $ - * -- * last change: $Author: jl $ $Date: 2001/03/14 09:25:39 $ -+ * last change: $Author: mh $ $Date: 2003/03/12 09:23:15 $ - * - * The Contents of this file are made available subject to the terms of - * either of the following licenses -@@ -125,7 +125,7 @@ - } - } - --Any OInstanceProvider::queryInterface( const Type & aType ) -+Any OInstanceProvider::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType , - SAL_STATIC_CAST( XInstanceProvider * , this ) ); -@@ -192,9 +192,9 @@ - } - return aRet; - } -- virtual void SAL_CALL acquire() throw(::com::sun::star::uno::RuntimeException) -+ virtual void SAL_CALL acquire() throw() - { osl_incrementInterlockedCount( &_nRef ); } -- virtual void SAL_CALL release() throw(::com::sun::star::uno::RuntimeException) -+ virtual void SAL_CALL release() throw() - { if (! osl_decrementInterlockedCount( &_nRef )) delete this; } - - // XServiceInfo -@@ -325,7 +325,7 @@ - * - *****************/ - --Any OCallMe::queryInterface( const Type & aType ) -+Any OCallMe::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST( XCallMe * , this ) ); -@@ -421,7 +421,7 @@ - * OInterfaceTest - * - *******************/ --Any OInterfaceTest::queryInterface( const Type & aType ) -+Any OInterfaceTest::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST( XInterfaceTest * , this ) ); -@@ -473,7 +473,7 @@ - } - - --Any OTestFactory::queryInterface( const Type & aType ) -+Any OTestFactory::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST( XTestFactory * , this ) ); -@@ -500,42 +500,6 @@ - - - --/******************************************************** -- * -- ********************************************************/ --/*Any OConnectCallback::queryInterface( const Type & aType ) --{ -- Any a = ::cppu::queryInterface( aType, -- SAL_STATIC_CAST( XConnectCallback * , this ) ); -- if( a.hasValue() ) -- { -- return a; -- } -- return OWeakObject::queryInterface( aType ); --} -- -- --void SAL_CALL OConnectCallback::attemptConnect( -- const Reference< XConnectionServerSide >& connection ) -- throw(SecurityException, ::com::sun::star::uno::RuntimeException) --{ -- // TODO -- // user verification -- if( L"bad guy" == connection->getUser() && -- L"secret" == connection->getPassword() ) -- { -- Reference< XInterface > rInterface( -- ( XInterface * ) (::cppu::OWeakObject *) new OTestFactory() ); -- connection->provideRemoteObject( rInterface ); -- } -- else -- { -- throw SecurityException(); -- } --} -- --*/ -- - - // class OInstanceProvider : - // public ::cppu::OWeakObject, -@@ -551,7 +515,6 @@ - // void SAL_CALL release() { OWeakObject::release(); } - - // public: --// // XConnectCallback - // virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - // getInstance( const ::rtl::OUString& sObjectName ) - // throw( ::com::sun::star::container::NoSuchElementException, diff --git a/editors/openoffice-1.1-devel/files/patch-bridges+test+testcomp.h b/editors/openoffice-1.1-devel/files/patch-bridges+test+testcomp.h deleted file mode 100644 index c1f0c320b201..000000000000 --- a/editors/openoffice-1.1-devel/files/patch-bridges+test+testcomp.h +++ /dev/null @@ -1,98 +0,0 @@ ---- ../bridges/test/testcomp.h.orig Wed Mar 12 10:06:16 2003 -+++ ../bridges/test/testcomp.h Wed Mar 12 10:05:54 2003 -@@ -2,9 +2,9 @@ - * - * $RCSfile: testcomp.h,v $ - * -- * $Revision: 1.2 $ -+ * $Revision: 1.4 $ - * -- * last change: $Author: jbu $ $Date: 2001/03/16 09:42:20 $ -+ * last change: $Author: jbu $ $Date: 2002/04/18 10:09:22 $ - * - * The Contents of this file are made available subject to the terms of - * either of the following licenses -@@ -87,9 +87,9 @@ - - public: - // XInterface -- Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType) throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire() throw() { OWeakObject::acquire(); } -+ void SAL_CALL release() throw() { OWeakObject::release(); } - - public: - virtual void SAL_CALL setIn( const ::com::sun::star::uno::Reference< ::test::XCallMe >& callback ) throw(::com::sun::star::uno::RuntimeException); -@@ -114,9 +114,9 @@ - - public: - // XInterface -- Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType) throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire()throw() { OWeakObject::acquire(); } -+ void SAL_CALL release()throw() { OWeakObject::release(); } - public: - // XCallMe - virtual void SAL_CALL call( const ::rtl::OUString& s, sal_Int32 nToDo ) -@@ -150,9 +150,9 @@ - - public: - // XInterface -- Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType ); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType ) throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire()throw() { OWeakObject::acquire(); } -+ void SAL_CALL release() throw() { OWeakObject::release(); } - public: - virtual ::com::sun::star::uno::Reference< ::test::XCallMe > SAL_CALL createCallMe( ) - throw(::com::sun::star::uno::RuntimeException); -@@ -161,28 +161,6 @@ - - }; - --/* --class OConnectCallback : -- public ::cppu::OWeakObject, -- public XConnectCallback --{ --public: -- OConnectCallback( ){} -- ~OConnectCallback(){ printf( "callback dies\n" );} --public: -- // XInterface -- Any SAL_CALL queryInterface( const Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -- --public: -- // XConnectCallback -- virtual void SAL_CALL attemptConnect( -- const Reference< XConnectionServerSide >& connection ) -- throw(SecurityException, RuntimeException); --}; -- --*/ - - class OInstanceProvider : - public ::cppu::OWeakObject, -@@ -196,12 +174,11 @@ - ~OInstanceProvider(){ printf( "instance provider dies\n" );} - public: - // XInterface -- Any SAL_CALL queryInterface( const Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const Type & aType)throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire()throw() { OWeakObject::acquire(); } -+ void SAL_CALL release() throw() { OWeakObject::release(); } - - public: -- // XConnectCallback - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - getInstance( const ::rtl::OUString& sObjectName ) - throw( ::com::sun::star::container::NoSuchElementException, diff --git a/editors/openoffice-1.1/files/patch-bridges+test+testcomp.cxx b/editors/openoffice-1.1/files/patch-bridges+test+testcomp.cxx deleted file mode 100644 index 2eb011510945..000000000000 --- a/editors/openoffice-1.1/files/patch-bridges+test+testcomp.cxx +++ /dev/null @@ -1,113 +0,0 @@ ---- ../bridges/test/testcomp.cxx.orig Wed Mar 12 17:40:53 2003 -+++ ../bridges/test/testcomp.cxx Wed Mar 12 17:42:54 2003 -@@ -2,9 +2,9 @@ - * - * $RCSfile: testcomp.cxx,v $ - * -- * $Revision: 1.2 $ -+ * $Revision: 1.2.54.1 $ - * -- * last change: $Author: jl $ $Date: 2001/03/14 09:25:39 $ -+ * last change: $Author: mh $ $Date: 2003/03/12 09:23:15 $ - * - * The Contents of this file are made available subject to the terms of - * either of the following licenses -@@ -125,7 +125,7 @@ - } - } - --Any OInstanceProvider::queryInterface( const Type & aType ) -+Any OInstanceProvider::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType , - SAL_STATIC_CAST( XInstanceProvider * , this ) ); -@@ -192,9 +192,9 @@ - } - return aRet; - } -- virtual void SAL_CALL acquire() throw(::com::sun::star::uno::RuntimeException) -+ virtual void SAL_CALL acquire() throw() - { osl_incrementInterlockedCount( &_nRef ); } -- virtual void SAL_CALL release() throw(::com::sun::star::uno::RuntimeException) -+ virtual void SAL_CALL release() throw() - { if (! osl_decrementInterlockedCount( &_nRef )) delete this; } - - // XServiceInfo -@@ -325,7 +325,7 @@ - * - *****************/ - --Any OCallMe::queryInterface( const Type & aType ) -+Any OCallMe::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST( XCallMe * , this ) ); -@@ -421,7 +421,7 @@ - * OInterfaceTest - * - *******************/ --Any OInterfaceTest::queryInterface( const Type & aType ) -+Any OInterfaceTest::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST( XInterfaceTest * , this ) ); -@@ -473,7 +473,7 @@ - } - - --Any OTestFactory::queryInterface( const Type & aType ) -+Any OTestFactory::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST( XTestFactory * , this ) ); -@@ -500,42 +500,6 @@ - - - --/******************************************************** -- * -- ********************************************************/ --/*Any OConnectCallback::queryInterface( const Type & aType ) --{ -- Any a = ::cppu::queryInterface( aType, -- SAL_STATIC_CAST( XConnectCallback * , this ) ); -- if( a.hasValue() ) -- { -- return a; -- } -- return OWeakObject::queryInterface( aType ); --} -- -- --void SAL_CALL OConnectCallback::attemptConnect( -- const Reference< XConnectionServerSide >& connection ) -- throw(SecurityException, ::com::sun::star::uno::RuntimeException) --{ -- // TODO -- // user verification -- if( L"bad guy" == connection->getUser() && -- L"secret" == connection->getPassword() ) -- { -- Reference< XInterface > rInterface( -- ( XInterface * ) (::cppu::OWeakObject *) new OTestFactory() ); -- connection->provideRemoteObject( rInterface ); -- } -- else -- { -- throw SecurityException(); -- } --} -- --*/ -- - - // class OInstanceProvider : - // public ::cppu::OWeakObject, -@@ -551,7 +515,6 @@ - // void SAL_CALL release() { OWeakObject::release(); } - - // public: --// // XConnectCallback - // virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - // getInstance( const ::rtl::OUString& sObjectName ) - // throw( ::com::sun::star::container::NoSuchElementException, diff --git a/editors/openoffice-1.1/files/patch-bridges+test+testcomp.h b/editors/openoffice-1.1/files/patch-bridges+test+testcomp.h deleted file mode 100644 index c1f0c320b201..000000000000 --- a/editors/openoffice-1.1/files/patch-bridges+test+testcomp.h +++ /dev/null @@ -1,98 +0,0 @@ ---- ../bridges/test/testcomp.h.orig Wed Mar 12 10:06:16 2003 -+++ ../bridges/test/testcomp.h Wed Mar 12 10:05:54 2003 -@@ -2,9 +2,9 @@ - * - * $RCSfile: testcomp.h,v $ - * -- * $Revision: 1.2 $ -+ * $Revision: 1.4 $ - * -- * last change: $Author: jbu $ $Date: 2001/03/16 09:42:20 $ -+ * last change: $Author: jbu $ $Date: 2002/04/18 10:09:22 $ - * - * The Contents of this file are made available subject to the terms of - * either of the following licenses -@@ -87,9 +87,9 @@ - - public: - // XInterface -- Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType) throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire() throw() { OWeakObject::acquire(); } -+ void SAL_CALL release() throw() { OWeakObject::release(); } - - public: - virtual void SAL_CALL setIn( const ::com::sun::star::uno::Reference< ::test::XCallMe >& callback ) throw(::com::sun::star::uno::RuntimeException); -@@ -114,9 +114,9 @@ - - public: - // XInterface -- Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType) throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire()throw() { OWeakObject::acquire(); } -+ void SAL_CALL release()throw() { OWeakObject::release(); } - public: - // XCallMe - virtual void SAL_CALL call( const ::rtl::OUString& s, sal_Int32 nToDo ) -@@ -150,9 +150,9 @@ - - public: - // XInterface -- Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType ); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType ) throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire()throw() { OWeakObject::acquire(); } -+ void SAL_CALL release() throw() { OWeakObject::release(); } - public: - virtual ::com::sun::star::uno::Reference< ::test::XCallMe > SAL_CALL createCallMe( ) - throw(::com::sun::star::uno::RuntimeException); -@@ -161,28 +161,6 @@ - - }; - --/* --class OConnectCallback : -- public ::cppu::OWeakObject, -- public XConnectCallback --{ --public: -- OConnectCallback( ){} -- ~OConnectCallback(){ printf( "callback dies\n" );} --public: -- // XInterface -- Any SAL_CALL queryInterface( const Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -- --public: -- // XConnectCallback -- virtual void SAL_CALL attemptConnect( -- const Reference< XConnectionServerSide >& connection ) -- throw(SecurityException, RuntimeException); --}; -- --*/ - - class OInstanceProvider : - public ::cppu::OWeakObject, -@@ -196,12 +174,11 @@ - ~OInstanceProvider(){ printf( "instance provider dies\n" );} - public: - // XInterface -- Any SAL_CALL queryInterface( const Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const Type & aType)throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire()throw() { OWeakObject::acquire(); } -+ void SAL_CALL release() throw() { OWeakObject::release(); } - - public: -- // XConnectCallback - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - getInstance( const ::rtl::OUString& sObjectName ) - throw( ::com::sun::star::container::NoSuchElementException, diff --git a/editors/openoffice-2.0-devel/files/patch-bridges+test+testcomp.cxx b/editors/openoffice-2.0-devel/files/patch-bridges+test+testcomp.cxx deleted file mode 100644 index 2eb011510945..000000000000 --- a/editors/openoffice-2.0-devel/files/patch-bridges+test+testcomp.cxx +++ /dev/null @@ -1,113 +0,0 @@ ---- ../bridges/test/testcomp.cxx.orig Wed Mar 12 17:40:53 2003 -+++ ../bridges/test/testcomp.cxx Wed Mar 12 17:42:54 2003 -@@ -2,9 +2,9 @@ - * - * $RCSfile: testcomp.cxx,v $ - * -- * $Revision: 1.2 $ -+ * $Revision: 1.2.54.1 $ - * -- * last change: $Author: jl $ $Date: 2001/03/14 09:25:39 $ -+ * last change: $Author: mh $ $Date: 2003/03/12 09:23:15 $ - * - * The Contents of this file are made available subject to the terms of - * either of the following licenses -@@ -125,7 +125,7 @@ - } - } - --Any OInstanceProvider::queryInterface( const Type & aType ) -+Any OInstanceProvider::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType , - SAL_STATIC_CAST( XInstanceProvider * , this ) ); -@@ -192,9 +192,9 @@ - } - return aRet; - } -- virtual void SAL_CALL acquire() throw(::com::sun::star::uno::RuntimeException) -+ virtual void SAL_CALL acquire() throw() - { osl_incrementInterlockedCount( &_nRef ); } -- virtual void SAL_CALL release() throw(::com::sun::star::uno::RuntimeException) -+ virtual void SAL_CALL release() throw() - { if (! osl_decrementInterlockedCount( &_nRef )) delete this; } - - // XServiceInfo -@@ -325,7 +325,7 @@ - * - *****************/ - --Any OCallMe::queryInterface( const Type & aType ) -+Any OCallMe::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST( XCallMe * , this ) ); -@@ -421,7 +421,7 @@ - * OInterfaceTest - * - *******************/ --Any OInterfaceTest::queryInterface( const Type & aType ) -+Any OInterfaceTest::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST( XInterfaceTest * , this ) ); -@@ -473,7 +473,7 @@ - } - - --Any OTestFactory::queryInterface( const Type & aType ) -+Any OTestFactory::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST( XTestFactory * , this ) ); -@@ -500,42 +500,6 @@ - - - --/******************************************************** -- * -- ********************************************************/ --/*Any OConnectCallback::queryInterface( const Type & aType ) --{ -- Any a = ::cppu::queryInterface( aType, -- SAL_STATIC_CAST( XConnectCallback * , this ) ); -- if( a.hasValue() ) -- { -- return a; -- } -- return OWeakObject::queryInterface( aType ); --} -- -- --void SAL_CALL OConnectCallback::attemptConnect( -- const Reference< XConnectionServerSide >& connection ) -- throw(SecurityException, ::com::sun::star::uno::RuntimeException) --{ -- // TODO -- // user verification -- if( L"bad guy" == connection->getUser() && -- L"secret" == connection->getPassword() ) -- { -- Reference< XInterface > rInterface( -- ( XInterface * ) (::cppu::OWeakObject *) new OTestFactory() ); -- connection->provideRemoteObject( rInterface ); -- } -- else -- { -- throw SecurityException(); -- } --} -- --*/ -- - - // class OInstanceProvider : - // public ::cppu::OWeakObject, -@@ -551,7 +515,6 @@ - // void SAL_CALL release() { OWeakObject::release(); } - - // public: --// // XConnectCallback - // virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - // getInstance( const ::rtl::OUString& sObjectName ) - // throw( ::com::sun::star::container::NoSuchElementException, diff --git a/editors/openoffice-2.0-devel/files/patch-bridges+test+testcomp.h b/editors/openoffice-2.0-devel/files/patch-bridges+test+testcomp.h deleted file mode 100644 index c1f0c320b201..000000000000 --- a/editors/openoffice-2.0-devel/files/patch-bridges+test+testcomp.h +++ /dev/null @@ -1,98 +0,0 @@ ---- ../bridges/test/testcomp.h.orig Wed Mar 12 10:06:16 2003 -+++ ../bridges/test/testcomp.h Wed Mar 12 10:05:54 2003 -@@ -2,9 +2,9 @@ - * - * $RCSfile: testcomp.h,v $ - * -- * $Revision: 1.2 $ -+ * $Revision: 1.4 $ - * -- * last change: $Author: jbu $ $Date: 2001/03/16 09:42:20 $ -+ * last change: $Author: jbu $ $Date: 2002/04/18 10:09:22 $ - * - * The Contents of this file are made available subject to the terms of - * either of the following licenses -@@ -87,9 +87,9 @@ - - public: - // XInterface -- Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType) throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire() throw() { OWeakObject::acquire(); } -+ void SAL_CALL release() throw() { OWeakObject::release(); } - - public: - virtual void SAL_CALL setIn( const ::com::sun::star::uno::Reference< ::test::XCallMe >& callback ) throw(::com::sun::star::uno::RuntimeException); -@@ -114,9 +114,9 @@ - - public: - // XInterface -- Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType) throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire()throw() { OWeakObject::acquire(); } -+ void SAL_CALL release()throw() { OWeakObject::release(); } - public: - // XCallMe - virtual void SAL_CALL call( const ::rtl::OUString& s, sal_Int32 nToDo ) -@@ -150,9 +150,9 @@ - - public: - // XInterface -- Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType ); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType ) throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire()throw() { OWeakObject::acquire(); } -+ void SAL_CALL release() throw() { OWeakObject::release(); } - public: - virtual ::com::sun::star::uno::Reference< ::test::XCallMe > SAL_CALL createCallMe( ) - throw(::com::sun::star::uno::RuntimeException); -@@ -161,28 +161,6 @@ - - }; - --/* --class OConnectCallback : -- public ::cppu::OWeakObject, -- public XConnectCallback --{ --public: -- OConnectCallback( ){} -- ~OConnectCallback(){ printf( "callback dies\n" );} --public: -- // XInterface -- Any SAL_CALL queryInterface( const Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -- --public: -- // XConnectCallback -- virtual void SAL_CALL attemptConnect( -- const Reference< XConnectionServerSide >& connection ) -- throw(SecurityException, RuntimeException); --}; -- --*/ - - class OInstanceProvider : - public ::cppu::OWeakObject, -@@ -196,12 +174,11 @@ - ~OInstanceProvider(){ printf( "instance provider dies\n" );} - public: - // XInterface -- Any SAL_CALL queryInterface( const Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const Type & aType)throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire()throw() { OWeakObject::acquire(); } -+ void SAL_CALL release() throw() { OWeakObject::release(); } - - public: -- // XConnectCallback - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - getInstance( const ::rtl::OUString& sObjectName ) - throw( ::com::sun::star::container::NoSuchElementException, diff --git a/editors/openoffice-3-devel/files/patch-bridges+test+testcomp.cxx b/editors/openoffice-3-devel/files/patch-bridges+test+testcomp.cxx deleted file mode 100644 index 2eb011510945..000000000000 --- a/editors/openoffice-3-devel/files/patch-bridges+test+testcomp.cxx +++ /dev/null @@ -1,113 +0,0 @@ ---- ../bridges/test/testcomp.cxx.orig Wed Mar 12 17:40:53 2003 -+++ ../bridges/test/testcomp.cxx Wed Mar 12 17:42:54 2003 -@@ -2,9 +2,9 @@ - * - * $RCSfile: testcomp.cxx,v $ - * -- * $Revision: 1.2 $ -+ * $Revision: 1.2.54.1 $ - * -- * last change: $Author: jl $ $Date: 2001/03/14 09:25:39 $ -+ * last change: $Author: mh $ $Date: 2003/03/12 09:23:15 $ - * - * The Contents of this file are made available subject to the terms of - * either of the following licenses -@@ -125,7 +125,7 @@ - } - } - --Any OInstanceProvider::queryInterface( const Type & aType ) -+Any OInstanceProvider::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType , - SAL_STATIC_CAST( XInstanceProvider * , this ) ); -@@ -192,9 +192,9 @@ - } - return aRet; - } -- virtual void SAL_CALL acquire() throw(::com::sun::star::uno::RuntimeException) -+ virtual void SAL_CALL acquire() throw() - { osl_incrementInterlockedCount( &_nRef ); } -- virtual void SAL_CALL release() throw(::com::sun::star::uno::RuntimeException) -+ virtual void SAL_CALL release() throw() - { if (! osl_decrementInterlockedCount( &_nRef )) delete this; } - - // XServiceInfo -@@ -325,7 +325,7 @@ - * - *****************/ - --Any OCallMe::queryInterface( const Type & aType ) -+Any OCallMe::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST( XCallMe * , this ) ); -@@ -421,7 +421,7 @@ - * OInterfaceTest - * - *******************/ --Any OInterfaceTest::queryInterface( const Type & aType ) -+Any OInterfaceTest::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST( XInterfaceTest * , this ) ); -@@ -473,7 +473,7 @@ - } - - --Any OTestFactory::queryInterface( const Type & aType ) -+Any OTestFactory::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST( XTestFactory * , this ) ); -@@ -500,42 +500,6 @@ - - - --/******************************************************** -- * -- ********************************************************/ --/*Any OConnectCallback::queryInterface( const Type & aType ) --{ -- Any a = ::cppu::queryInterface( aType, -- SAL_STATIC_CAST( XConnectCallback * , this ) ); -- if( a.hasValue() ) -- { -- return a; -- } -- return OWeakObject::queryInterface( aType ); --} -- -- --void SAL_CALL OConnectCallback::attemptConnect( -- const Reference< XConnectionServerSide >& connection ) -- throw(SecurityException, ::com::sun::star::uno::RuntimeException) --{ -- // TODO -- // user verification -- if( L"bad guy" == connection->getUser() && -- L"secret" == connection->getPassword() ) -- { -- Reference< XInterface > rInterface( -- ( XInterface * ) (::cppu::OWeakObject *) new OTestFactory() ); -- connection->provideRemoteObject( rInterface ); -- } -- else -- { -- throw SecurityException(); -- } --} -- --*/ -- - - // class OInstanceProvider : - // public ::cppu::OWeakObject, -@@ -551,7 +515,6 @@ - // void SAL_CALL release() { OWeakObject::release(); } - - // public: --// // XConnectCallback - // virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - // getInstance( const ::rtl::OUString& sObjectName ) - // throw( ::com::sun::star::container::NoSuchElementException, diff --git a/editors/openoffice-3-devel/files/patch-bridges+test+testcomp.h b/editors/openoffice-3-devel/files/patch-bridges+test+testcomp.h deleted file mode 100644 index c1f0c320b201..000000000000 --- a/editors/openoffice-3-devel/files/patch-bridges+test+testcomp.h +++ /dev/null @@ -1,98 +0,0 @@ ---- ../bridges/test/testcomp.h.orig Wed Mar 12 10:06:16 2003 -+++ ../bridges/test/testcomp.h Wed Mar 12 10:05:54 2003 -@@ -2,9 +2,9 @@ - * - * $RCSfile: testcomp.h,v $ - * -- * $Revision: 1.2 $ -+ * $Revision: 1.4 $ - * -- * last change: $Author: jbu $ $Date: 2001/03/16 09:42:20 $ -+ * last change: $Author: jbu $ $Date: 2002/04/18 10:09:22 $ - * - * The Contents of this file are made available subject to the terms of - * either of the following licenses -@@ -87,9 +87,9 @@ - - public: - // XInterface -- Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType) throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire() throw() { OWeakObject::acquire(); } -+ void SAL_CALL release() throw() { OWeakObject::release(); } - - public: - virtual void SAL_CALL setIn( const ::com::sun::star::uno::Reference< ::test::XCallMe >& callback ) throw(::com::sun::star::uno::RuntimeException); -@@ -114,9 +114,9 @@ - - public: - // XInterface -- Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType) throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire()throw() { OWeakObject::acquire(); } -+ void SAL_CALL release()throw() { OWeakObject::release(); } - public: - // XCallMe - virtual void SAL_CALL call( const ::rtl::OUString& s, sal_Int32 nToDo ) -@@ -150,9 +150,9 @@ - - public: - // XInterface -- Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType ); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType ) throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire()throw() { OWeakObject::acquire(); } -+ void SAL_CALL release() throw() { OWeakObject::release(); } - public: - virtual ::com::sun::star::uno::Reference< ::test::XCallMe > SAL_CALL createCallMe( ) - throw(::com::sun::star::uno::RuntimeException); -@@ -161,28 +161,6 @@ - - }; - --/* --class OConnectCallback : -- public ::cppu::OWeakObject, -- public XConnectCallback --{ --public: -- OConnectCallback( ){} -- ~OConnectCallback(){ printf( "callback dies\n" );} --public: -- // XInterface -- Any SAL_CALL queryInterface( const Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -- --public: -- // XConnectCallback -- virtual void SAL_CALL attemptConnect( -- const Reference< XConnectionServerSide >& connection ) -- throw(SecurityException, RuntimeException); --}; -- --*/ - - class OInstanceProvider : - public ::cppu::OWeakObject, -@@ -196,12 +174,11 @@ - ~OInstanceProvider(){ printf( "instance provider dies\n" );} - public: - // XInterface -- Any SAL_CALL queryInterface( const Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const Type & aType)throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire()throw() { OWeakObject::acquire(); } -+ void SAL_CALL release() throw() { OWeakObject::release(); } - - public: -- // XConnectCallback - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - getInstance( const ::rtl::OUString& sObjectName ) - throw( ::com::sun::star::container::NoSuchElementException, diff --git a/editors/openoffice-3/files/patch-bridges+test+testcomp.cxx b/editors/openoffice-3/files/patch-bridges+test+testcomp.cxx deleted file mode 100644 index 2eb011510945..000000000000 --- a/editors/openoffice-3/files/patch-bridges+test+testcomp.cxx +++ /dev/null @@ -1,113 +0,0 @@ ---- ../bridges/test/testcomp.cxx.orig Wed Mar 12 17:40:53 2003 -+++ ../bridges/test/testcomp.cxx Wed Mar 12 17:42:54 2003 -@@ -2,9 +2,9 @@ - * - * $RCSfile: testcomp.cxx,v $ - * -- * $Revision: 1.2 $ -+ * $Revision: 1.2.54.1 $ - * -- * last change: $Author: jl $ $Date: 2001/03/14 09:25:39 $ -+ * last change: $Author: mh $ $Date: 2003/03/12 09:23:15 $ - * - * The Contents of this file are made available subject to the terms of - * either of the following licenses -@@ -125,7 +125,7 @@ - } - } - --Any OInstanceProvider::queryInterface( const Type & aType ) -+Any OInstanceProvider::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType , - SAL_STATIC_CAST( XInstanceProvider * , this ) ); -@@ -192,9 +192,9 @@ - } - return aRet; - } -- virtual void SAL_CALL acquire() throw(::com::sun::star::uno::RuntimeException) -+ virtual void SAL_CALL acquire() throw() - { osl_incrementInterlockedCount( &_nRef ); } -- virtual void SAL_CALL release() throw(::com::sun::star::uno::RuntimeException) -+ virtual void SAL_CALL release() throw() - { if (! osl_decrementInterlockedCount( &_nRef )) delete this; } - - // XServiceInfo -@@ -325,7 +325,7 @@ - * - *****************/ - --Any OCallMe::queryInterface( const Type & aType ) -+Any OCallMe::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST( XCallMe * , this ) ); -@@ -421,7 +421,7 @@ - * OInterfaceTest - * - *******************/ --Any OInterfaceTest::queryInterface( const Type & aType ) -+Any OInterfaceTest::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST( XInterfaceTest * , this ) ); -@@ -473,7 +473,7 @@ - } - - --Any OTestFactory::queryInterface( const Type & aType ) -+Any OTestFactory::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST( XTestFactory * , this ) ); -@@ -500,42 +500,6 @@ - - - --/******************************************************** -- * -- ********************************************************/ --/*Any OConnectCallback::queryInterface( const Type & aType ) --{ -- Any a = ::cppu::queryInterface( aType, -- SAL_STATIC_CAST( XConnectCallback * , this ) ); -- if( a.hasValue() ) -- { -- return a; -- } -- return OWeakObject::queryInterface( aType ); --} -- -- --void SAL_CALL OConnectCallback::attemptConnect( -- const Reference< XConnectionServerSide >& connection ) -- throw(SecurityException, ::com::sun::star::uno::RuntimeException) --{ -- // TODO -- // user verification -- if( L"bad guy" == connection->getUser() && -- L"secret" == connection->getPassword() ) -- { -- Reference< XInterface > rInterface( -- ( XInterface * ) (::cppu::OWeakObject *) new OTestFactory() ); -- connection->provideRemoteObject( rInterface ); -- } -- else -- { -- throw SecurityException(); -- } --} -- --*/ -- - - // class OInstanceProvider : - // public ::cppu::OWeakObject, -@@ -551,7 +515,6 @@ - // void SAL_CALL release() { OWeakObject::release(); } - - // public: --// // XConnectCallback - // virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - // getInstance( const ::rtl::OUString& sObjectName ) - // throw( ::com::sun::star::container::NoSuchElementException, diff --git a/editors/openoffice-3/files/patch-bridges+test+testcomp.h b/editors/openoffice-3/files/patch-bridges+test+testcomp.h deleted file mode 100644 index c1f0c320b201..000000000000 --- a/editors/openoffice-3/files/patch-bridges+test+testcomp.h +++ /dev/null @@ -1,98 +0,0 @@ ---- ../bridges/test/testcomp.h.orig Wed Mar 12 10:06:16 2003 -+++ ../bridges/test/testcomp.h Wed Mar 12 10:05:54 2003 -@@ -2,9 +2,9 @@ - * - * $RCSfile: testcomp.h,v $ - * -- * $Revision: 1.2 $ -+ * $Revision: 1.4 $ - * -- * last change: $Author: jbu $ $Date: 2001/03/16 09:42:20 $ -+ * last change: $Author: jbu $ $Date: 2002/04/18 10:09:22 $ - * - * The Contents of this file are made available subject to the terms of - * either of the following licenses -@@ -87,9 +87,9 @@ - - public: - // XInterface -- Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType) throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire() throw() { OWeakObject::acquire(); } -+ void SAL_CALL release() throw() { OWeakObject::release(); } - - public: - virtual void SAL_CALL setIn( const ::com::sun::star::uno::Reference< ::test::XCallMe >& callback ) throw(::com::sun::star::uno::RuntimeException); -@@ -114,9 +114,9 @@ - - public: - // XInterface -- Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType) throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire()throw() { OWeakObject::acquire(); } -+ void SAL_CALL release()throw() { OWeakObject::release(); } - public: - // XCallMe - virtual void SAL_CALL call( const ::rtl::OUString& s, sal_Int32 nToDo ) -@@ -150,9 +150,9 @@ - - public: - // XInterface -- Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType ); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType ) throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire()throw() { OWeakObject::acquire(); } -+ void SAL_CALL release() throw() { OWeakObject::release(); } - public: - virtual ::com::sun::star::uno::Reference< ::test::XCallMe > SAL_CALL createCallMe( ) - throw(::com::sun::star::uno::RuntimeException); -@@ -161,28 +161,6 @@ - - }; - --/* --class OConnectCallback : -- public ::cppu::OWeakObject, -- public XConnectCallback --{ --public: -- OConnectCallback( ){} -- ~OConnectCallback(){ printf( "callback dies\n" );} --public: -- // XInterface -- Any SAL_CALL queryInterface( const Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -- --public: -- // XConnectCallback -- virtual void SAL_CALL attemptConnect( -- const Reference< XConnectionServerSide >& connection ) -- throw(SecurityException, RuntimeException); --}; -- --*/ - - class OInstanceProvider : - public ::cppu::OWeakObject, -@@ -196,12 +174,11 @@ - ~OInstanceProvider(){ printf( "instance provider dies\n" );} - public: - // XInterface -- Any SAL_CALL queryInterface( const Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const Type & aType)throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire()throw() { OWeakObject::acquire(); } -+ void SAL_CALL release() throw() { OWeakObject::release(); } - - public: -- // XConnectCallback - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - getInstance( const ::rtl::OUString& sObjectName ) - throw( ::com::sun::star::container::NoSuchElementException, diff --git a/editors/openoffice-devel/files/patch-bridges+test+testcomp.cxx b/editors/openoffice-devel/files/patch-bridges+test+testcomp.cxx deleted file mode 100644 index 2eb011510945..000000000000 --- a/editors/openoffice-devel/files/patch-bridges+test+testcomp.cxx +++ /dev/null @@ -1,113 +0,0 @@ ---- ../bridges/test/testcomp.cxx.orig Wed Mar 12 17:40:53 2003 -+++ ../bridges/test/testcomp.cxx Wed Mar 12 17:42:54 2003 -@@ -2,9 +2,9 @@ - * - * $RCSfile: testcomp.cxx,v $ - * -- * $Revision: 1.2 $ -+ * $Revision: 1.2.54.1 $ - * -- * last change: $Author: jl $ $Date: 2001/03/14 09:25:39 $ -+ * last change: $Author: mh $ $Date: 2003/03/12 09:23:15 $ - * - * The Contents of this file are made available subject to the terms of - * either of the following licenses -@@ -125,7 +125,7 @@ - } - } - --Any OInstanceProvider::queryInterface( const Type & aType ) -+Any OInstanceProvider::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType , - SAL_STATIC_CAST( XInstanceProvider * , this ) ); -@@ -192,9 +192,9 @@ - } - return aRet; - } -- virtual void SAL_CALL acquire() throw(::com::sun::star::uno::RuntimeException) -+ virtual void SAL_CALL acquire() throw() - { osl_incrementInterlockedCount( &_nRef ); } -- virtual void SAL_CALL release() throw(::com::sun::star::uno::RuntimeException) -+ virtual void SAL_CALL release() throw() - { if (! osl_decrementInterlockedCount( &_nRef )) delete this; } - - // XServiceInfo -@@ -325,7 +325,7 @@ - * - *****************/ - --Any OCallMe::queryInterface( const Type & aType ) -+Any OCallMe::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST( XCallMe * , this ) ); -@@ -421,7 +421,7 @@ - * OInterfaceTest - * - *******************/ --Any OInterfaceTest::queryInterface( const Type & aType ) -+Any OInterfaceTest::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST( XInterfaceTest * , this ) ); -@@ -473,7 +473,7 @@ - } - - --Any OTestFactory::queryInterface( const Type & aType ) -+Any OTestFactory::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST( XTestFactory * , this ) ); -@@ -500,42 +500,6 @@ - - - --/******************************************************** -- * -- ********************************************************/ --/*Any OConnectCallback::queryInterface( const Type & aType ) --{ -- Any a = ::cppu::queryInterface( aType, -- SAL_STATIC_CAST( XConnectCallback * , this ) ); -- if( a.hasValue() ) -- { -- return a; -- } -- return OWeakObject::queryInterface( aType ); --} -- -- --void SAL_CALL OConnectCallback::attemptConnect( -- const Reference< XConnectionServerSide >& connection ) -- throw(SecurityException, ::com::sun::star::uno::RuntimeException) --{ -- // TODO -- // user verification -- if( L"bad guy" == connection->getUser() && -- L"secret" == connection->getPassword() ) -- { -- Reference< XInterface > rInterface( -- ( XInterface * ) (::cppu::OWeakObject *) new OTestFactory() ); -- connection->provideRemoteObject( rInterface ); -- } -- else -- { -- throw SecurityException(); -- } --} -- --*/ -- - - // class OInstanceProvider : - // public ::cppu::OWeakObject, -@@ -551,7 +515,6 @@ - // void SAL_CALL release() { OWeakObject::release(); } - - // public: --// // XConnectCallback - // virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - // getInstance( const ::rtl::OUString& sObjectName ) - // throw( ::com::sun::star::container::NoSuchElementException, diff --git a/editors/openoffice-devel/files/patch-bridges+test+testcomp.h b/editors/openoffice-devel/files/patch-bridges+test+testcomp.h deleted file mode 100644 index c1f0c320b201..000000000000 --- a/editors/openoffice-devel/files/patch-bridges+test+testcomp.h +++ /dev/null @@ -1,98 +0,0 @@ ---- ../bridges/test/testcomp.h.orig Wed Mar 12 10:06:16 2003 -+++ ../bridges/test/testcomp.h Wed Mar 12 10:05:54 2003 -@@ -2,9 +2,9 @@ - * - * $RCSfile: testcomp.h,v $ - * -- * $Revision: 1.2 $ -+ * $Revision: 1.4 $ - * -- * last change: $Author: jbu $ $Date: 2001/03/16 09:42:20 $ -+ * last change: $Author: jbu $ $Date: 2002/04/18 10:09:22 $ - * - * The Contents of this file are made available subject to the terms of - * either of the following licenses -@@ -87,9 +87,9 @@ - - public: - // XInterface -- Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType) throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire() throw() { OWeakObject::acquire(); } -+ void SAL_CALL release() throw() { OWeakObject::release(); } - - public: - virtual void SAL_CALL setIn( const ::com::sun::star::uno::Reference< ::test::XCallMe >& callback ) throw(::com::sun::star::uno::RuntimeException); -@@ -114,9 +114,9 @@ - - public: - // XInterface -- Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType) throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire()throw() { OWeakObject::acquire(); } -+ void SAL_CALL release()throw() { OWeakObject::release(); } - public: - // XCallMe - virtual void SAL_CALL call( const ::rtl::OUString& s, sal_Int32 nToDo ) -@@ -150,9 +150,9 @@ - - public: - // XInterface -- Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType ); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType ) throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire()throw() { OWeakObject::acquire(); } -+ void SAL_CALL release() throw() { OWeakObject::release(); } - public: - virtual ::com::sun::star::uno::Reference< ::test::XCallMe > SAL_CALL createCallMe( ) - throw(::com::sun::star::uno::RuntimeException); -@@ -161,28 +161,6 @@ - - }; - --/* --class OConnectCallback : -- public ::cppu::OWeakObject, -- public XConnectCallback --{ --public: -- OConnectCallback( ){} -- ~OConnectCallback(){ printf( "callback dies\n" );} --public: -- // XInterface -- Any SAL_CALL queryInterface( const Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -- --public: -- // XConnectCallback -- virtual void SAL_CALL attemptConnect( -- const Reference< XConnectionServerSide >& connection ) -- throw(SecurityException, RuntimeException); --}; -- --*/ - - class OInstanceProvider : - public ::cppu::OWeakObject, -@@ -196,12 +174,11 @@ - ~OInstanceProvider(){ printf( "instance provider dies\n" );} - public: - // XInterface -- Any SAL_CALL queryInterface( const Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const Type & aType)throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire()throw() { OWeakObject::acquire(); } -+ void SAL_CALL release() throw() { OWeakObject::release(); } - - public: -- // XConnectCallback - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - getInstance( const ::rtl::OUString& sObjectName ) - throw( ::com::sun::star::container::NoSuchElementException, diff --git a/editors/openoffice.org-1.1-devel/files/patch-bridges+test+testcomp.cxx b/editors/openoffice.org-1.1-devel/files/patch-bridges+test+testcomp.cxx deleted file mode 100644 index 2eb011510945..000000000000 --- a/editors/openoffice.org-1.1-devel/files/patch-bridges+test+testcomp.cxx +++ /dev/null @@ -1,113 +0,0 @@ ---- ../bridges/test/testcomp.cxx.orig Wed Mar 12 17:40:53 2003 -+++ ../bridges/test/testcomp.cxx Wed Mar 12 17:42:54 2003 -@@ -2,9 +2,9 @@ - * - * $RCSfile: testcomp.cxx,v $ - * -- * $Revision: 1.2 $ -+ * $Revision: 1.2.54.1 $ - * -- * last change: $Author: jl $ $Date: 2001/03/14 09:25:39 $ -+ * last change: $Author: mh $ $Date: 2003/03/12 09:23:15 $ - * - * The Contents of this file are made available subject to the terms of - * either of the following licenses -@@ -125,7 +125,7 @@ - } - } - --Any OInstanceProvider::queryInterface( const Type & aType ) -+Any OInstanceProvider::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType , - SAL_STATIC_CAST( XInstanceProvider * , this ) ); -@@ -192,9 +192,9 @@ - } - return aRet; - } -- virtual void SAL_CALL acquire() throw(::com::sun::star::uno::RuntimeException) -+ virtual void SAL_CALL acquire() throw() - { osl_incrementInterlockedCount( &_nRef ); } -- virtual void SAL_CALL release() throw(::com::sun::star::uno::RuntimeException) -+ virtual void SAL_CALL release() throw() - { if (! osl_decrementInterlockedCount( &_nRef )) delete this; } - - // XServiceInfo -@@ -325,7 +325,7 @@ - * - *****************/ - --Any OCallMe::queryInterface( const Type & aType ) -+Any OCallMe::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST( XCallMe * , this ) ); -@@ -421,7 +421,7 @@ - * OInterfaceTest - * - *******************/ --Any OInterfaceTest::queryInterface( const Type & aType ) -+Any OInterfaceTest::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST( XInterfaceTest * , this ) ); -@@ -473,7 +473,7 @@ - } - - --Any OTestFactory::queryInterface( const Type & aType ) -+Any OTestFactory::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST( XTestFactory * , this ) ); -@@ -500,42 +500,6 @@ - - - --/******************************************************** -- * -- ********************************************************/ --/*Any OConnectCallback::queryInterface( const Type & aType ) --{ -- Any a = ::cppu::queryInterface( aType, -- SAL_STATIC_CAST( XConnectCallback * , this ) ); -- if( a.hasValue() ) -- { -- return a; -- } -- return OWeakObject::queryInterface( aType ); --} -- -- --void SAL_CALL OConnectCallback::attemptConnect( -- const Reference< XConnectionServerSide >& connection ) -- throw(SecurityException, ::com::sun::star::uno::RuntimeException) --{ -- // TODO -- // user verification -- if( L"bad guy" == connection->getUser() && -- L"secret" == connection->getPassword() ) -- { -- Reference< XInterface > rInterface( -- ( XInterface * ) (::cppu::OWeakObject *) new OTestFactory() ); -- connection->provideRemoteObject( rInterface ); -- } -- else -- { -- throw SecurityException(); -- } --} -- --*/ -- - - // class OInstanceProvider : - // public ::cppu::OWeakObject, -@@ -551,7 +515,6 @@ - // void SAL_CALL release() { OWeakObject::release(); } - - // public: --// // XConnectCallback - // virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - // getInstance( const ::rtl::OUString& sObjectName ) - // throw( ::com::sun::star::container::NoSuchElementException, diff --git a/editors/openoffice.org-1.1-devel/files/patch-bridges+test+testcomp.h b/editors/openoffice.org-1.1-devel/files/patch-bridges+test+testcomp.h deleted file mode 100644 index c1f0c320b201..000000000000 --- a/editors/openoffice.org-1.1-devel/files/patch-bridges+test+testcomp.h +++ /dev/null @@ -1,98 +0,0 @@ ---- ../bridges/test/testcomp.h.orig Wed Mar 12 10:06:16 2003 -+++ ../bridges/test/testcomp.h Wed Mar 12 10:05:54 2003 -@@ -2,9 +2,9 @@ - * - * $RCSfile: testcomp.h,v $ - * -- * $Revision: 1.2 $ -+ * $Revision: 1.4 $ - * -- * last change: $Author: jbu $ $Date: 2001/03/16 09:42:20 $ -+ * last change: $Author: jbu $ $Date: 2002/04/18 10:09:22 $ - * - * The Contents of this file are made available subject to the terms of - * either of the following licenses -@@ -87,9 +87,9 @@ - - public: - // XInterface -- Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType) throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire() throw() { OWeakObject::acquire(); } -+ void SAL_CALL release() throw() { OWeakObject::release(); } - - public: - virtual void SAL_CALL setIn( const ::com::sun::star::uno::Reference< ::test::XCallMe >& callback ) throw(::com::sun::star::uno::RuntimeException); -@@ -114,9 +114,9 @@ - - public: - // XInterface -- Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType) throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire()throw() { OWeakObject::acquire(); } -+ void SAL_CALL release()throw() { OWeakObject::release(); } - public: - // XCallMe - virtual void SAL_CALL call( const ::rtl::OUString& s, sal_Int32 nToDo ) -@@ -150,9 +150,9 @@ - - public: - // XInterface -- Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType ); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType ) throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire()throw() { OWeakObject::acquire(); } -+ void SAL_CALL release() throw() { OWeakObject::release(); } - public: - virtual ::com::sun::star::uno::Reference< ::test::XCallMe > SAL_CALL createCallMe( ) - throw(::com::sun::star::uno::RuntimeException); -@@ -161,28 +161,6 @@ - - }; - --/* --class OConnectCallback : -- public ::cppu::OWeakObject, -- public XConnectCallback --{ --public: -- OConnectCallback( ){} -- ~OConnectCallback(){ printf( "callback dies\n" );} --public: -- // XInterface -- Any SAL_CALL queryInterface( const Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -- --public: -- // XConnectCallback -- virtual void SAL_CALL attemptConnect( -- const Reference< XConnectionServerSide >& connection ) -- throw(SecurityException, RuntimeException); --}; -- --*/ - - class OInstanceProvider : - public ::cppu::OWeakObject, -@@ -196,12 +174,11 @@ - ~OInstanceProvider(){ printf( "instance provider dies\n" );} - public: - // XInterface -- Any SAL_CALL queryInterface( const Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const Type & aType)throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire()throw() { OWeakObject::acquire(); } -+ void SAL_CALL release() throw() { OWeakObject::release(); } - - public: -- // XConnectCallback - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - getInstance( const ::rtl::OUString& sObjectName ) - throw( ::com::sun::star::container::NoSuchElementException, diff --git a/editors/openoffice.org-1.1/files/patch-bridges+test+testcomp.cxx b/editors/openoffice.org-1.1/files/patch-bridges+test+testcomp.cxx deleted file mode 100644 index 2eb011510945..000000000000 --- a/editors/openoffice.org-1.1/files/patch-bridges+test+testcomp.cxx +++ /dev/null @@ -1,113 +0,0 @@ ---- ../bridges/test/testcomp.cxx.orig Wed Mar 12 17:40:53 2003 -+++ ../bridges/test/testcomp.cxx Wed Mar 12 17:42:54 2003 -@@ -2,9 +2,9 @@ - * - * $RCSfile: testcomp.cxx,v $ - * -- * $Revision: 1.2 $ -+ * $Revision: 1.2.54.1 $ - * -- * last change: $Author: jl $ $Date: 2001/03/14 09:25:39 $ -+ * last change: $Author: mh $ $Date: 2003/03/12 09:23:15 $ - * - * The Contents of this file are made available subject to the terms of - * either of the following licenses -@@ -125,7 +125,7 @@ - } - } - --Any OInstanceProvider::queryInterface( const Type & aType ) -+Any OInstanceProvider::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType , - SAL_STATIC_CAST( XInstanceProvider * , this ) ); -@@ -192,9 +192,9 @@ - } - return aRet; - } -- virtual void SAL_CALL acquire() throw(::com::sun::star::uno::RuntimeException) -+ virtual void SAL_CALL acquire() throw() - { osl_incrementInterlockedCount( &_nRef ); } -- virtual void SAL_CALL release() throw(::com::sun::star::uno::RuntimeException) -+ virtual void SAL_CALL release() throw() - { if (! osl_decrementInterlockedCount( &_nRef )) delete this; } - - // XServiceInfo -@@ -325,7 +325,7 @@ - * - *****************/ - --Any OCallMe::queryInterface( const Type & aType ) -+Any OCallMe::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST( XCallMe * , this ) ); -@@ -421,7 +421,7 @@ - * OInterfaceTest - * - *******************/ --Any OInterfaceTest::queryInterface( const Type & aType ) -+Any OInterfaceTest::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST( XInterfaceTest * , this ) ); -@@ -473,7 +473,7 @@ - } - - --Any OTestFactory::queryInterface( const Type & aType ) -+Any OTestFactory::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST( XTestFactory * , this ) ); -@@ -500,42 +500,6 @@ - - - --/******************************************************** -- * -- ********************************************************/ --/*Any OConnectCallback::queryInterface( const Type & aType ) --{ -- Any a = ::cppu::queryInterface( aType, -- SAL_STATIC_CAST( XConnectCallback * , this ) ); -- if( a.hasValue() ) -- { -- return a; -- } -- return OWeakObject::queryInterface( aType ); --} -- -- --void SAL_CALL OConnectCallback::attemptConnect( -- const Reference< XConnectionServerSide >& connection ) -- throw(SecurityException, ::com::sun::star::uno::RuntimeException) --{ -- // TODO -- // user verification -- if( L"bad guy" == connection->getUser() && -- L"secret" == connection->getPassword() ) -- { -- Reference< XInterface > rInterface( -- ( XInterface * ) (::cppu::OWeakObject *) new OTestFactory() ); -- connection->provideRemoteObject( rInterface ); -- } -- else -- { -- throw SecurityException(); -- } --} -- --*/ -- - - // class OInstanceProvider : - // public ::cppu::OWeakObject, -@@ -551,7 +515,6 @@ - // void SAL_CALL release() { OWeakObject::release(); } - - // public: --// // XConnectCallback - // virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - // getInstance( const ::rtl::OUString& sObjectName ) - // throw( ::com::sun::star::container::NoSuchElementException, diff --git a/editors/openoffice.org-1.1/files/patch-bridges+test+testcomp.h b/editors/openoffice.org-1.1/files/patch-bridges+test+testcomp.h deleted file mode 100644 index c1f0c320b201..000000000000 --- a/editors/openoffice.org-1.1/files/patch-bridges+test+testcomp.h +++ /dev/null @@ -1,98 +0,0 @@ ---- ../bridges/test/testcomp.h.orig Wed Mar 12 10:06:16 2003 -+++ ../bridges/test/testcomp.h Wed Mar 12 10:05:54 2003 -@@ -2,9 +2,9 @@ - * - * $RCSfile: testcomp.h,v $ - * -- * $Revision: 1.2 $ -+ * $Revision: 1.4 $ - * -- * last change: $Author: jbu $ $Date: 2001/03/16 09:42:20 $ -+ * last change: $Author: jbu $ $Date: 2002/04/18 10:09:22 $ - * - * The Contents of this file are made available subject to the terms of - * either of the following licenses -@@ -87,9 +87,9 @@ - - public: - // XInterface -- Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType) throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire() throw() { OWeakObject::acquire(); } -+ void SAL_CALL release() throw() { OWeakObject::release(); } - - public: - virtual void SAL_CALL setIn( const ::com::sun::star::uno::Reference< ::test::XCallMe >& callback ) throw(::com::sun::star::uno::RuntimeException); -@@ -114,9 +114,9 @@ - - public: - // XInterface -- Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType) throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire()throw() { OWeakObject::acquire(); } -+ void SAL_CALL release()throw() { OWeakObject::release(); } - public: - // XCallMe - virtual void SAL_CALL call( const ::rtl::OUString& s, sal_Int32 nToDo ) -@@ -150,9 +150,9 @@ - - public: - // XInterface -- Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType ); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType ) throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire()throw() { OWeakObject::acquire(); } -+ void SAL_CALL release() throw() { OWeakObject::release(); } - public: - virtual ::com::sun::star::uno::Reference< ::test::XCallMe > SAL_CALL createCallMe( ) - throw(::com::sun::star::uno::RuntimeException); -@@ -161,28 +161,6 @@ - - }; - --/* --class OConnectCallback : -- public ::cppu::OWeakObject, -- public XConnectCallback --{ --public: -- OConnectCallback( ){} -- ~OConnectCallback(){ printf( "callback dies\n" );} --public: -- // XInterface -- Any SAL_CALL queryInterface( const Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -- --public: -- // XConnectCallback -- virtual void SAL_CALL attemptConnect( -- const Reference< XConnectionServerSide >& connection ) -- throw(SecurityException, RuntimeException); --}; -- --*/ - - class OInstanceProvider : - public ::cppu::OWeakObject, -@@ -196,12 +174,11 @@ - ~OInstanceProvider(){ printf( "instance provider dies\n" );} - public: - // XInterface -- Any SAL_CALL queryInterface( const Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const Type & aType)throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire()throw() { OWeakObject::acquire(); } -+ void SAL_CALL release() throw() { OWeakObject::release(); } - - public: -- // XConnectCallback - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - getInstance( const ::rtl::OUString& sObjectName ) - throw( ::com::sun::star::container::NoSuchElementException, diff --git a/editors/openoffice.org-2-RC/files/patch-bridges+test+testcomp.cxx b/editors/openoffice.org-2-RC/files/patch-bridges+test+testcomp.cxx deleted file mode 100644 index 2eb011510945..000000000000 --- a/editors/openoffice.org-2-RC/files/patch-bridges+test+testcomp.cxx +++ /dev/null @@ -1,113 +0,0 @@ ---- ../bridges/test/testcomp.cxx.orig Wed Mar 12 17:40:53 2003 -+++ ../bridges/test/testcomp.cxx Wed Mar 12 17:42:54 2003 -@@ -2,9 +2,9 @@ - * - * $RCSfile: testcomp.cxx,v $ - * -- * $Revision: 1.2 $ -+ * $Revision: 1.2.54.1 $ - * -- * last change: $Author: jl $ $Date: 2001/03/14 09:25:39 $ -+ * last change: $Author: mh $ $Date: 2003/03/12 09:23:15 $ - * - * The Contents of this file are made available subject to the terms of - * either of the following licenses -@@ -125,7 +125,7 @@ - } - } - --Any OInstanceProvider::queryInterface( const Type & aType ) -+Any OInstanceProvider::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType , - SAL_STATIC_CAST( XInstanceProvider * , this ) ); -@@ -192,9 +192,9 @@ - } - return aRet; - } -- virtual void SAL_CALL acquire() throw(::com::sun::star::uno::RuntimeException) -+ virtual void SAL_CALL acquire() throw() - { osl_incrementInterlockedCount( &_nRef ); } -- virtual void SAL_CALL release() throw(::com::sun::star::uno::RuntimeException) -+ virtual void SAL_CALL release() throw() - { if (! osl_decrementInterlockedCount( &_nRef )) delete this; } - - // XServiceInfo -@@ -325,7 +325,7 @@ - * - *****************/ - --Any OCallMe::queryInterface( const Type & aType ) -+Any OCallMe::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST( XCallMe * , this ) ); -@@ -421,7 +421,7 @@ - * OInterfaceTest - * - *******************/ --Any OInterfaceTest::queryInterface( const Type & aType ) -+Any OInterfaceTest::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST( XInterfaceTest * , this ) ); -@@ -473,7 +473,7 @@ - } - - --Any OTestFactory::queryInterface( const Type & aType ) -+Any OTestFactory::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST( XTestFactory * , this ) ); -@@ -500,42 +500,6 @@ - - - --/******************************************************** -- * -- ********************************************************/ --/*Any OConnectCallback::queryInterface( const Type & aType ) --{ -- Any a = ::cppu::queryInterface( aType, -- SAL_STATIC_CAST( XConnectCallback * , this ) ); -- if( a.hasValue() ) -- { -- return a; -- } -- return OWeakObject::queryInterface( aType ); --} -- -- --void SAL_CALL OConnectCallback::attemptConnect( -- const Reference< XConnectionServerSide >& connection ) -- throw(SecurityException, ::com::sun::star::uno::RuntimeException) --{ -- // TODO -- // user verification -- if( L"bad guy" == connection->getUser() && -- L"secret" == connection->getPassword() ) -- { -- Reference< XInterface > rInterface( -- ( XInterface * ) (::cppu::OWeakObject *) new OTestFactory() ); -- connection->provideRemoteObject( rInterface ); -- } -- else -- { -- throw SecurityException(); -- } --} -- --*/ -- - - // class OInstanceProvider : - // public ::cppu::OWeakObject, -@@ -551,7 +515,6 @@ - // void SAL_CALL release() { OWeakObject::release(); } - - // public: --// // XConnectCallback - // virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - // getInstance( const ::rtl::OUString& sObjectName ) - // throw( ::com::sun::star::container::NoSuchElementException, diff --git a/editors/openoffice.org-2-RC/files/patch-bridges+test+testcomp.h b/editors/openoffice.org-2-RC/files/patch-bridges+test+testcomp.h deleted file mode 100644 index c1f0c320b201..000000000000 --- a/editors/openoffice.org-2-RC/files/patch-bridges+test+testcomp.h +++ /dev/null @@ -1,98 +0,0 @@ ---- ../bridges/test/testcomp.h.orig Wed Mar 12 10:06:16 2003 -+++ ../bridges/test/testcomp.h Wed Mar 12 10:05:54 2003 -@@ -2,9 +2,9 @@ - * - * $RCSfile: testcomp.h,v $ - * -- * $Revision: 1.2 $ -+ * $Revision: 1.4 $ - * -- * last change: $Author: jbu $ $Date: 2001/03/16 09:42:20 $ -+ * last change: $Author: jbu $ $Date: 2002/04/18 10:09:22 $ - * - * The Contents of this file are made available subject to the terms of - * either of the following licenses -@@ -87,9 +87,9 @@ - - public: - // XInterface -- Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType) throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire() throw() { OWeakObject::acquire(); } -+ void SAL_CALL release() throw() { OWeakObject::release(); } - - public: - virtual void SAL_CALL setIn( const ::com::sun::star::uno::Reference< ::test::XCallMe >& callback ) throw(::com::sun::star::uno::RuntimeException); -@@ -114,9 +114,9 @@ - - public: - // XInterface -- Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType) throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire()throw() { OWeakObject::acquire(); } -+ void SAL_CALL release()throw() { OWeakObject::release(); } - public: - // XCallMe - virtual void SAL_CALL call( const ::rtl::OUString& s, sal_Int32 nToDo ) -@@ -150,9 +150,9 @@ - - public: - // XInterface -- Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType ); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType ) throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire()throw() { OWeakObject::acquire(); } -+ void SAL_CALL release() throw() { OWeakObject::release(); } - public: - virtual ::com::sun::star::uno::Reference< ::test::XCallMe > SAL_CALL createCallMe( ) - throw(::com::sun::star::uno::RuntimeException); -@@ -161,28 +161,6 @@ - - }; - --/* --class OConnectCallback : -- public ::cppu::OWeakObject, -- public XConnectCallback --{ --public: -- OConnectCallback( ){} -- ~OConnectCallback(){ printf( "callback dies\n" );} --public: -- // XInterface -- Any SAL_CALL queryInterface( const Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -- --public: -- // XConnectCallback -- virtual void SAL_CALL attemptConnect( -- const Reference< XConnectionServerSide >& connection ) -- throw(SecurityException, RuntimeException); --}; -- --*/ - - class OInstanceProvider : - public ::cppu::OWeakObject, -@@ -196,12 +174,11 @@ - ~OInstanceProvider(){ printf( "instance provider dies\n" );} - public: - // XInterface -- Any SAL_CALL queryInterface( const Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const Type & aType)throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire()throw() { OWeakObject::acquire(); } -+ void SAL_CALL release() throw() { OWeakObject::release(); } - - public: -- // XConnectCallback - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - getInstance( const ::rtl::OUString& sObjectName ) - throw( ::com::sun::star::container::NoSuchElementException, diff --git a/editors/openoffice.org-2-devel/files/patch-bridges+test+testcomp.cxx b/editors/openoffice.org-2-devel/files/patch-bridges+test+testcomp.cxx deleted file mode 100644 index 2eb011510945..000000000000 --- a/editors/openoffice.org-2-devel/files/patch-bridges+test+testcomp.cxx +++ /dev/null @@ -1,113 +0,0 @@ ---- ../bridges/test/testcomp.cxx.orig Wed Mar 12 17:40:53 2003 -+++ ../bridges/test/testcomp.cxx Wed Mar 12 17:42:54 2003 -@@ -2,9 +2,9 @@ - * - * $RCSfile: testcomp.cxx,v $ - * -- * $Revision: 1.2 $ -+ * $Revision: 1.2.54.1 $ - * -- * last change: $Author: jl $ $Date: 2001/03/14 09:25:39 $ -+ * last change: $Author: mh $ $Date: 2003/03/12 09:23:15 $ - * - * The Contents of this file are made available subject to the terms of - * either of the following licenses -@@ -125,7 +125,7 @@ - } - } - --Any OInstanceProvider::queryInterface( const Type & aType ) -+Any OInstanceProvider::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType , - SAL_STATIC_CAST( XInstanceProvider * , this ) ); -@@ -192,9 +192,9 @@ - } - return aRet; - } -- virtual void SAL_CALL acquire() throw(::com::sun::star::uno::RuntimeException) -+ virtual void SAL_CALL acquire() throw() - { osl_incrementInterlockedCount( &_nRef ); } -- virtual void SAL_CALL release() throw(::com::sun::star::uno::RuntimeException) -+ virtual void SAL_CALL release() throw() - { if (! osl_decrementInterlockedCount( &_nRef )) delete this; } - - // XServiceInfo -@@ -325,7 +325,7 @@ - * - *****************/ - --Any OCallMe::queryInterface( const Type & aType ) -+Any OCallMe::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST( XCallMe * , this ) ); -@@ -421,7 +421,7 @@ - * OInterfaceTest - * - *******************/ --Any OInterfaceTest::queryInterface( const Type & aType ) -+Any OInterfaceTest::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST( XInterfaceTest * , this ) ); -@@ -473,7 +473,7 @@ - } - - --Any OTestFactory::queryInterface( const Type & aType ) -+Any OTestFactory::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST( XTestFactory * , this ) ); -@@ -500,42 +500,6 @@ - - - --/******************************************************** -- * -- ********************************************************/ --/*Any OConnectCallback::queryInterface( const Type & aType ) --{ -- Any a = ::cppu::queryInterface( aType, -- SAL_STATIC_CAST( XConnectCallback * , this ) ); -- if( a.hasValue() ) -- { -- return a; -- } -- return OWeakObject::queryInterface( aType ); --} -- -- --void SAL_CALL OConnectCallback::attemptConnect( -- const Reference< XConnectionServerSide >& connection ) -- throw(SecurityException, ::com::sun::star::uno::RuntimeException) --{ -- // TODO -- // user verification -- if( L"bad guy" == connection->getUser() && -- L"secret" == connection->getPassword() ) -- { -- Reference< XInterface > rInterface( -- ( XInterface * ) (::cppu::OWeakObject *) new OTestFactory() ); -- connection->provideRemoteObject( rInterface ); -- } -- else -- { -- throw SecurityException(); -- } --} -- --*/ -- - - // class OInstanceProvider : - // public ::cppu::OWeakObject, -@@ -551,7 +515,6 @@ - // void SAL_CALL release() { OWeakObject::release(); } - - // public: --// // XConnectCallback - // virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - // getInstance( const ::rtl::OUString& sObjectName ) - // throw( ::com::sun::star::container::NoSuchElementException, diff --git a/editors/openoffice.org-2-devel/files/patch-bridges+test+testcomp.h b/editors/openoffice.org-2-devel/files/patch-bridges+test+testcomp.h deleted file mode 100644 index c1f0c320b201..000000000000 --- a/editors/openoffice.org-2-devel/files/patch-bridges+test+testcomp.h +++ /dev/null @@ -1,98 +0,0 @@ ---- ../bridges/test/testcomp.h.orig Wed Mar 12 10:06:16 2003 -+++ ../bridges/test/testcomp.h Wed Mar 12 10:05:54 2003 -@@ -2,9 +2,9 @@ - * - * $RCSfile: testcomp.h,v $ - * -- * $Revision: 1.2 $ -+ * $Revision: 1.4 $ - * -- * last change: $Author: jbu $ $Date: 2001/03/16 09:42:20 $ -+ * last change: $Author: jbu $ $Date: 2002/04/18 10:09:22 $ - * - * The Contents of this file are made available subject to the terms of - * either of the following licenses -@@ -87,9 +87,9 @@ - - public: - // XInterface -- Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType) throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire() throw() { OWeakObject::acquire(); } -+ void SAL_CALL release() throw() { OWeakObject::release(); } - - public: - virtual void SAL_CALL setIn( const ::com::sun::star::uno::Reference< ::test::XCallMe >& callback ) throw(::com::sun::star::uno::RuntimeException); -@@ -114,9 +114,9 @@ - - public: - // XInterface -- Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType) throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire()throw() { OWeakObject::acquire(); } -+ void SAL_CALL release()throw() { OWeakObject::release(); } - public: - // XCallMe - virtual void SAL_CALL call( const ::rtl::OUString& s, sal_Int32 nToDo ) -@@ -150,9 +150,9 @@ - - public: - // XInterface -- Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType ); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType ) throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire()throw() { OWeakObject::acquire(); } -+ void SAL_CALL release() throw() { OWeakObject::release(); } - public: - virtual ::com::sun::star::uno::Reference< ::test::XCallMe > SAL_CALL createCallMe( ) - throw(::com::sun::star::uno::RuntimeException); -@@ -161,28 +161,6 @@ - - }; - --/* --class OConnectCallback : -- public ::cppu::OWeakObject, -- public XConnectCallback --{ --public: -- OConnectCallback( ){} -- ~OConnectCallback(){ printf( "callback dies\n" );} --public: -- // XInterface -- Any SAL_CALL queryInterface( const Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -- --public: -- // XConnectCallback -- virtual void SAL_CALL attemptConnect( -- const Reference< XConnectionServerSide >& connection ) -- throw(SecurityException, RuntimeException); --}; -- --*/ - - class OInstanceProvider : - public ::cppu::OWeakObject, -@@ -196,12 +174,11 @@ - ~OInstanceProvider(){ printf( "instance provider dies\n" );} - public: - // XInterface -- Any SAL_CALL queryInterface( const Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const Type & aType)throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire()throw() { OWeakObject::acquire(); } -+ void SAL_CALL release() throw() { OWeakObject::release(); } - - public: -- // XConnectCallback - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - getInstance( const ::rtl::OUString& sObjectName ) - throw( ::com::sun::star::container::NoSuchElementException, diff --git a/editors/openoffice.org-2.0-devel/files/patch-bridges+test+testcomp.cxx b/editors/openoffice.org-2.0-devel/files/patch-bridges+test+testcomp.cxx deleted file mode 100644 index 2eb011510945..000000000000 --- a/editors/openoffice.org-2.0-devel/files/patch-bridges+test+testcomp.cxx +++ /dev/null @@ -1,113 +0,0 @@ ---- ../bridges/test/testcomp.cxx.orig Wed Mar 12 17:40:53 2003 -+++ ../bridges/test/testcomp.cxx Wed Mar 12 17:42:54 2003 -@@ -2,9 +2,9 @@ - * - * $RCSfile: testcomp.cxx,v $ - * -- * $Revision: 1.2 $ -+ * $Revision: 1.2.54.1 $ - * -- * last change: $Author: jl $ $Date: 2001/03/14 09:25:39 $ -+ * last change: $Author: mh $ $Date: 2003/03/12 09:23:15 $ - * - * The Contents of this file are made available subject to the terms of - * either of the following licenses -@@ -125,7 +125,7 @@ - } - } - --Any OInstanceProvider::queryInterface( const Type & aType ) -+Any OInstanceProvider::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType , - SAL_STATIC_CAST( XInstanceProvider * , this ) ); -@@ -192,9 +192,9 @@ - } - return aRet; - } -- virtual void SAL_CALL acquire() throw(::com::sun::star::uno::RuntimeException) -+ virtual void SAL_CALL acquire() throw() - { osl_incrementInterlockedCount( &_nRef ); } -- virtual void SAL_CALL release() throw(::com::sun::star::uno::RuntimeException) -+ virtual void SAL_CALL release() throw() - { if (! osl_decrementInterlockedCount( &_nRef )) delete this; } - - // XServiceInfo -@@ -325,7 +325,7 @@ - * - *****************/ - --Any OCallMe::queryInterface( const Type & aType ) -+Any OCallMe::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST( XCallMe * , this ) ); -@@ -421,7 +421,7 @@ - * OInterfaceTest - * - *******************/ --Any OInterfaceTest::queryInterface( const Type & aType ) -+Any OInterfaceTest::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST( XInterfaceTest * , this ) ); -@@ -473,7 +473,7 @@ - } - - --Any OTestFactory::queryInterface( const Type & aType ) -+Any OTestFactory::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST( XTestFactory * , this ) ); -@@ -500,42 +500,6 @@ - - - --/******************************************************** -- * -- ********************************************************/ --/*Any OConnectCallback::queryInterface( const Type & aType ) --{ -- Any a = ::cppu::queryInterface( aType, -- SAL_STATIC_CAST( XConnectCallback * , this ) ); -- if( a.hasValue() ) -- { -- return a; -- } -- return OWeakObject::queryInterface( aType ); --} -- -- --void SAL_CALL OConnectCallback::attemptConnect( -- const Reference< XConnectionServerSide >& connection ) -- throw(SecurityException, ::com::sun::star::uno::RuntimeException) --{ -- // TODO -- // user verification -- if( L"bad guy" == connection->getUser() && -- L"secret" == connection->getPassword() ) -- { -- Reference< XInterface > rInterface( -- ( XInterface * ) (::cppu::OWeakObject *) new OTestFactory() ); -- connection->provideRemoteObject( rInterface ); -- } -- else -- { -- throw SecurityException(); -- } --} -- --*/ -- - - // class OInstanceProvider : - // public ::cppu::OWeakObject, -@@ -551,7 +515,6 @@ - // void SAL_CALL release() { OWeakObject::release(); } - - // public: --// // XConnectCallback - // virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - // getInstance( const ::rtl::OUString& sObjectName ) - // throw( ::com::sun::star::container::NoSuchElementException, diff --git a/editors/openoffice.org-2.0-devel/files/patch-bridges+test+testcomp.h b/editors/openoffice.org-2.0-devel/files/patch-bridges+test+testcomp.h deleted file mode 100644 index c1f0c320b201..000000000000 --- a/editors/openoffice.org-2.0-devel/files/patch-bridges+test+testcomp.h +++ /dev/null @@ -1,98 +0,0 @@ ---- ../bridges/test/testcomp.h.orig Wed Mar 12 10:06:16 2003 -+++ ../bridges/test/testcomp.h Wed Mar 12 10:05:54 2003 -@@ -2,9 +2,9 @@ - * - * $RCSfile: testcomp.h,v $ - * -- * $Revision: 1.2 $ -+ * $Revision: 1.4 $ - * -- * last change: $Author: jbu $ $Date: 2001/03/16 09:42:20 $ -+ * last change: $Author: jbu $ $Date: 2002/04/18 10:09:22 $ - * - * The Contents of this file are made available subject to the terms of - * either of the following licenses -@@ -87,9 +87,9 @@ - - public: - // XInterface -- Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType) throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire() throw() { OWeakObject::acquire(); } -+ void SAL_CALL release() throw() { OWeakObject::release(); } - - public: - virtual void SAL_CALL setIn( const ::com::sun::star::uno::Reference< ::test::XCallMe >& callback ) throw(::com::sun::star::uno::RuntimeException); -@@ -114,9 +114,9 @@ - - public: - // XInterface -- Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType) throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire()throw() { OWeakObject::acquire(); } -+ void SAL_CALL release()throw() { OWeakObject::release(); } - public: - // XCallMe - virtual void SAL_CALL call( const ::rtl::OUString& s, sal_Int32 nToDo ) -@@ -150,9 +150,9 @@ - - public: - // XInterface -- Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType ); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType ) throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire()throw() { OWeakObject::acquire(); } -+ void SAL_CALL release() throw() { OWeakObject::release(); } - public: - virtual ::com::sun::star::uno::Reference< ::test::XCallMe > SAL_CALL createCallMe( ) - throw(::com::sun::star::uno::RuntimeException); -@@ -161,28 +161,6 @@ - - }; - --/* --class OConnectCallback : -- public ::cppu::OWeakObject, -- public XConnectCallback --{ --public: -- OConnectCallback( ){} -- ~OConnectCallback(){ printf( "callback dies\n" );} --public: -- // XInterface -- Any SAL_CALL queryInterface( const Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -- --public: -- // XConnectCallback -- virtual void SAL_CALL attemptConnect( -- const Reference< XConnectionServerSide >& connection ) -- throw(SecurityException, RuntimeException); --}; -- --*/ - - class OInstanceProvider : - public ::cppu::OWeakObject, -@@ -196,12 +174,11 @@ - ~OInstanceProvider(){ printf( "instance provider dies\n" );} - public: - // XInterface -- Any SAL_CALL queryInterface( const Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const Type & aType)throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire()throw() { OWeakObject::acquire(); } -+ void SAL_CALL release() throw() { OWeakObject::release(); } - - public: -- // XConnectCallback - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - getInstance( const ::rtl::OUString& sObjectName ) - throw( ::com::sun::star::container::NoSuchElementException, diff --git a/editors/openoffice.org-2.0/files/patch-bridges+test+testcomp.cxx b/editors/openoffice.org-2.0/files/patch-bridges+test+testcomp.cxx deleted file mode 100644 index 2eb011510945..000000000000 --- a/editors/openoffice.org-2.0/files/patch-bridges+test+testcomp.cxx +++ /dev/null @@ -1,113 +0,0 @@ ---- ../bridges/test/testcomp.cxx.orig Wed Mar 12 17:40:53 2003 -+++ ../bridges/test/testcomp.cxx Wed Mar 12 17:42:54 2003 -@@ -2,9 +2,9 @@ - * - * $RCSfile: testcomp.cxx,v $ - * -- * $Revision: 1.2 $ -+ * $Revision: 1.2.54.1 $ - * -- * last change: $Author: jl $ $Date: 2001/03/14 09:25:39 $ -+ * last change: $Author: mh $ $Date: 2003/03/12 09:23:15 $ - * - * The Contents of this file are made available subject to the terms of - * either of the following licenses -@@ -125,7 +125,7 @@ - } - } - --Any OInstanceProvider::queryInterface( const Type & aType ) -+Any OInstanceProvider::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType , - SAL_STATIC_CAST( XInstanceProvider * , this ) ); -@@ -192,9 +192,9 @@ - } - return aRet; - } -- virtual void SAL_CALL acquire() throw(::com::sun::star::uno::RuntimeException) -+ virtual void SAL_CALL acquire() throw() - { osl_incrementInterlockedCount( &_nRef ); } -- virtual void SAL_CALL release() throw(::com::sun::star::uno::RuntimeException) -+ virtual void SAL_CALL release() throw() - { if (! osl_decrementInterlockedCount( &_nRef )) delete this; } - - // XServiceInfo -@@ -325,7 +325,7 @@ - * - *****************/ - --Any OCallMe::queryInterface( const Type & aType ) -+Any OCallMe::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST( XCallMe * , this ) ); -@@ -421,7 +421,7 @@ - * OInterfaceTest - * - *******************/ --Any OInterfaceTest::queryInterface( const Type & aType ) -+Any OInterfaceTest::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST( XInterfaceTest * , this ) ); -@@ -473,7 +473,7 @@ - } - - --Any OTestFactory::queryInterface( const Type & aType ) -+Any OTestFactory::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST( XTestFactory * , this ) ); -@@ -500,42 +500,6 @@ - - - --/******************************************************** -- * -- ********************************************************/ --/*Any OConnectCallback::queryInterface( const Type & aType ) --{ -- Any a = ::cppu::queryInterface( aType, -- SAL_STATIC_CAST( XConnectCallback * , this ) ); -- if( a.hasValue() ) -- { -- return a; -- } -- return OWeakObject::queryInterface( aType ); --} -- -- --void SAL_CALL OConnectCallback::attemptConnect( -- const Reference< XConnectionServerSide >& connection ) -- throw(SecurityException, ::com::sun::star::uno::RuntimeException) --{ -- // TODO -- // user verification -- if( L"bad guy" == connection->getUser() && -- L"secret" == connection->getPassword() ) -- { -- Reference< XInterface > rInterface( -- ( XInterface * ) (::cppu::OWeakObject *) new OTestFactory() ); -- connection->provideRemoteObject( rInterface ); -- } -- else -- { -- throw SecurityException(); -- } --} -- --*/ -- - - // class OInstanceProvider : - // public ::cppu::OWeakObject, -@@ -551,7 +515,6 @@ - // void SAL_CALL release() { OWeakObject::release(); } - - // public: --// // XConnectCallback - // virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - // getInstance( const ::rtl::OUString& sObjectName ) - // throw( ::com::sun::star::container::NoSuchElementException, diff --git a/editors/openoffice.org-2.0/files/patch-bridges+test+testcomp.h b/editors/openoffice.org-2.0/files/patch-bridges+test+testcomp.h deleted file mode 100644 index c1f0c320b201..000000000000 --- a/editors/openoffice.org-2.0/files/patch-bridges+test+testcomp.h +++ /dev/null @@ -1,98 +0,0 @@ ---- ../bridges/test/testcomp.h.orig Wed Mar 12 10:06:16 2003 -+++ ../bridges/test/testcomp.h Wed Mar 12 10:05:54 2003 -@@ -2,9 +2,9 @@ - * - * $RCSfile: testcomp.h,v $ - * -- * $Revision: 1.2 $ -+ * $Revision: 1.4 $ - * -- * last change: $Author: jbu $ $Date: 2001/03/16 09:42:20 $ -+ * last change: $Author: jbu $ $Date: 2002/04/18 10:09:22 $ - * - * The Contents of this file are made available subject to the terms of - * either of the following licenses -@@ -87,9 +87,9 @@ - - public: - // XInterface -- Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType) throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire() throw() { OWeakObject::acquire(); } -+ void SAL_CALL release() throw() { OWeakObject::release(); } - - public: - virtual void SAL_CALL setIn( const ::com::sun::star::uno::Reference< ::test::XCallMe >& callback ) throw(::com::sun::star::uno::RuntimeException); -@@ -114,9 +114,9 @@ - - public: - // XInterface -- Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType) throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire()throw() { OWeakObject::acquire(); } -+ void SAL_CALL release()throw() { OWeakObject::release(); } - public: - // XCallMe - virtual void SAL_CALL call( const ::rtl::OUString& s, sal_Int32 nToDo ) -@@ -150,9 +150,9 @@ - - public: - // XInterface -- Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType ); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType ) throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire()throw() { OWeakObject::acquire(); } -+ void SAL_CALL release() throw() { OWeakObject::release(); } - public: - virtual ::com::sun::star::uno::Reference< ::test::XCallMe > SAL_CALL createCallMe( ) - throw(::com::sun::star::uno::RuntimeException); -@@ -161,28 +161,6 @@ - - }; - --/* --class OConnectCallback : -- public ::cppu::OWeakObject, -- public XConnectCallback --{ --public: -- OConnectCallback( ){} -- ~OConnectCallback(){ printf( "callback dies\n" );} --public: -- // XInterface -- Any SAL_CALL queryInterface( const Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -- --public: -- // XConnectCallback -- virtual void SAL_CALL attemptConnect( -- const Reference< XConnectionServerSide >& connection ) -- throw(SecurityException, RuntimeException); --}; -- --*/ - - class OInstanceProvider : - public ::cppu::OWeakObject, -@@ -196,12 +174,11 @@ - ~OInstanceProvider(){ printf( "instance provider dies\n" );} - public: - // XInterface -- Any SAL_CALL queryInterface( const Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const Type & aType)throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire()throw() { OWeakObject::acquire(); } -+ void SAL_CALL release() throw() { OWeakObject::release(); } - - public: -- // XConnectCallback - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - getInstance( const ::rtl::OUString& sObjectName ) - throw( ::com::sun::star::container::NoSuchElementException, diff --git a/editors/openoffice.org-2/files/patch-bridges+test+testcomp.cxx b/editors/openoffice.org-2/files/patch-bridges+test+testcomp.cxx deleted file mode 100644 index 2eb011510945..000000000000 --- a/editors/openoffice.org-2/files/patch-bridges+test+testcomp.cxx +++ /dev/null @@ -1,113 +0,0 @@ ---- ../bridges/test/testcomp.cxx.orig Wed Mar 12 17:40:53 2003 -+++ ../bridges/test/testcomp.cxx Wed Mar 12 17:42:54 2003 -@@ -2,9 +2,9 @@ - * - * $RCSfile: testcomp.cxx,v $ - * -- * $Revision: 1.2 $ -+ * $Revision: 1.2.54.1 $ - * -- * last change: $Author: jl $ $Date: 2001/03/14 09:25:39 $ -+ * last change: $Author: mh $ $Date: 2003/03/12 09:23:15 $ - * - * The Contents of this file are made available subject to the terms of - * either of the following licenses -@@ -125,7 +125,7 @@ - } - } - --Any OInstanceProvider::queryInterface( const Type & aType ) -+Any OInstanceProvider::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType , - SAL_STATIC_CAST( XInstanceProvider * , this ) ); -@@ -192,9 +192,9 @@ - } - return aRet; - } -- virtual void SAL_CALL acquire() throw(::com::sun::star::uno::RuntimeException) -+ virtual void SAL_CALL acquire() throw() - { osl_incrementInterlockedCount( &_nRef ); } -- virtual void SAL_CALL release() throw(::com::sun::star::uno::RuntimeException) -+ virtual void SAL_CALL release() throw() - { if (! osl_decrementInterlockedCount( &_nRef )) delete this; } - - // XServiceInfo -@@ -325,7 +325,7 @@ - * - *****************/ - --Any OCallMe::queryInterface( const Type & aType ) -+Any OCallMe::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST( XCallMe * , this ) ); -@@ -421,7 +421,7 @@ - * OInterfaceTest - * - *******************/ --Any OInterfaceTest::queryInterface( const Type & aType ) -+Any OInterfaceTest::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST( XInterfaceTest * , this ) ); -@@ -473,7 +473,7 @@ - } - - --Any OTestFactory::queryInterface( const Type & aType ) -+Any OTestFactory::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST( XTestFactory * , this ) ); -@@ -500,42 +500,6 @@ - - - --/******************************************************** -- * -- ********************************************************/ --/*Any OConnectCallback::queryInterface( const Type & aType ) --{ -- Any a = ::cppu::queryInterface( aType, -- SAL_STATIC_CAST( XConnectCallback * , this ) ); -- if( a.hasValue() ) -- { -- return a; -- } -- return OWeakObject::queryInterface( aType ); --} -- -- --void SAL_CALL OConnectCallback::attemptConnect( -- const Reference< XConnectionServerSide >& connection ) -- throw(SecurityException, ::com::sun::star::uno::RuntimeException) --{ -- // TODO -- // user verification -- if( L"bad guy" == connection->getUser() && -- L"secret" == connection->getPassword() ) -- { -- Reference< XInterface > rInterface( -- ( XInterface * ) (::cppu::OWeakObject *) new OTestFactory() ); -- connection->provideRemoteObject( rInterface ); -- } -- else -- { -- throw SecurityException(); -- } --} -- --*/ -- - - // class OInstanceProvider : - // public ::cppu::OWeakObject, -@@ -551,7 +515,6 @@ - // void SAL_CALL release() { OWeakObject::release(); } - - // public: --// // XConnectCallback - // virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - // getInstance( const ::rtl::OUString& sObjectName ) - // throw( ::com::sun::star::container::NoSuchElementException, diff --git a/editors/openoffice.org-2/files/patch-bridges+test+testcomp.h b/editors/openoffice.org-2/files/patch-bridges+test+testcomp.h deleted file mode 100644 index c1f0c320b201..000000000000 --- a/editors/openoffice.org-2/files/patch-bridges+test+testcomp.h +++ /dev/null @@ -1,98 +0,0 @@ ---- ../bridges/test/testcomp.h.orig Wed Mar 12 10:06:16 2003 -+++ ../bridges/test/testcomp.h Wed Mar 12 10:05:54 2003 -@@ -2,9 +2,9 @@ - * - * $RCSfile: testcomp.h,v $ - * -- * $Revision: 1.2 $ -+ * $Revision: 1.4 $ - * -- * last change: $Author: jbu $ $Date: 2001/03/16 09:42:20 $ -+ * last change: $Author: jbu $ $Date: 2002/04/18 10:09:22 $ - * - * The Contents of this file are made available subject to the terms of - * either of the following licenses -@@ -87,9 +87,9 @@ - - public: - // XInterface -- Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType) throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire() throw() { OWeakObject::acquire(); } -+ void SAL_CALL release() throw() { OWeakObject::release(); } - - public: - virtual void SAL_CALL setIn( const ::com::sun::star::uno::Reference< ::test::XCallMe >& callback ) throw(::com::sun::star::uno::RuntimeException); -@@ -114,9 +114,9 @@ - - public: - // XInterface -- Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType) throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire()throw() { OWeakObject::acquire(); } -+ void SAL_CALL release()throw() { OWeakObject::release(); } - public: - // XCallMe - virtual void SAL_CALL call( const ::rtl::OUString& s, sal_Int32 nToDo ) -@@ -150,9 +150,9 @@ - - public: - // XInterface -- Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType ); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType ) throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire()throw() { OWeakObject::acquire(); } -+ void SAL_CALL release() throw() { OWeakObject::release(); } - public: - virtual ::com::sun::star::uno::Reference< ::test::XCallMe > SAL_CALL createCallMe( ) - throw(::com::sun::star::uno::RuntimeException); -@@ -161,28 +161,6 @@ - - }; - --/* --class OConnectCallback : -- public ::cppu::OWeakObject, -- public XConnectCallback --{ --public: -- OConnectCallback( ){} -- ~OConnectCallback(){ printf( "callback dies\n" );} --public: -- // XInterface -- Any SAL_CALL queryInterface( const Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -- --public: -- // XConnectCallback -- virtual void SAL_CALL attemptConnect( -- const Reference< XConnectionServerSide >& connection ) -- throw(SecurityException, RuntimeException); --}; -- --*/ - - class OInstanceProvider : - public ::cppu::OWeakObject, -@@ -196,12 +174,11 @@ - ~OInstanceProvider(){ printf( "instance provider dies\n" );} - public: - // XInterface -- Any SAL_CALL queryInterface( const Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const Type & aType)throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire()throw() { OWeakObject::acquire(); } -+ void SAL_CALL release() throw() { OWeakObject::release(); } - - public: -- // XConnectCallback - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - getInstance( const ::rtl::OUString& sObjectName ) - throw( ::com::sun::star::container::NoSuchElementException, diff --git a/editors/openoffice.org-3-RC/files/patch-bridges+test+testcomp.cxx b/editors/openoffice.org-3-RC/files/patch-bridges+test+testcomp.cxx deleted file mode 100644 index 2eb011510945..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-bridges+test+testcomp.cxx +++ /dev/null @@ -1,113 +0,0 @@ ---- ../bridges/test/testcomp.cxx.orig Wed Mar 12 17:40:53 2003 -+++ ../bridges/test/testcomp.cxx Wed Mar 12 17:42:54 2003 -@@ -2,9 +2,9 @@ - * - * $RCSfile: testcomp.cxx,v $ - * -- * $Revision: 1.2 $ -+ * $Revision: 1.2.54.1 $ - * -- * last change: $Author: jl $ $Date: 2001/03/14 09:25:39 $ -+ * last change: $Author: mh $ $Date: 2003/03/12 09:23:15 $ - * - * The Contents of this file are made available subject to the terms of - * either of the following licenses -@@ -125,7 +125,7 @@ - } - } - --Any OInstanceProvider::queryInterface( const Type & aType ) -+Any OInstanceProvider::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType , - SAL_STATIC_CAST( XInstanceProvider * , this ) ); -@@ -192,9 +192,9 @@ - } - return aRet; - } -- virtual void SAL_CALL acquire() throw(::com::sun::star::uno::RuntimeException) -+ virtual void SAL_CALL acquire() throw() - { osl_incrementInterlockedCount( &_nRef ); } -- virtual void SAL_CALL release() throw(::com::sun::star::uno::RuntimeException) -+ virtual void SAL_CALL release() throw() - { if (! osl_decrementInterlockedCount( &_nRef )) delete this; } - - // XServiceInfo -@@ -325,7 +325,7 @@ - * - *****************/ - --Any OCallMe::queryInterface( const Type & aType ) -+Any OCallMe::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST( XCallMe * , this ) ); -@@ -421,7 +421,7 @@ - * OInterfaceTest - * - *******************/ --Any OInterfaceTest::queryInterface( const Type & aType ) -+Any OInterfaceTest::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST( XInterfaceTest * , this ) ); -@@ -473,7 +473,7 @@ - } - - --Any OTestFactory::queryInterface( const Type & aType ) -+Any OTestFactory::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST( XTestFactory * , this ) ); -@@ -500,42 +500,6 @@ - - - --/******************************************************** -- * -- ********************************************************/ --/*Any OConnectCallback::queryInterface( const Type & aType ) --{ -- Any a = ::cppu::queryInterface( aType, -- SAL_STATIC_CAST( XConnectCallback * , this ) ); -- if( a.hasValue() ) -- { -- return a; -- } -- return OWeakObject::queryInterface( aType ); --} -- -- --void SAL_CALL OConnectCallback::attemptConnect( -- const Reference< XConnectionServerSide >& connection ) -- throw(SecurityException, ::com::sun::star::uno::RuntimeException) --{ -- // TODO -- // user verification -- if( L"bad guy" == connection->getUser() && -- L"secret" == connection->getPassword() ) -- { -- Reference< XInterface > rInterface( -- ( XInterface * ) (::cppu::OWeakObject *) new OTestFactory() ); -- connection->provideRemoteObject( rInterface ); -- } -- else -- { -- throw SecurityException(); -- } --} -- --*/ -- - - // class OInstanceProvider : - // public ::cppu::OWeakObject, -@@ -551,7 +515,6 @@ - // void SAL_CALL release() { OWeakObject::release(); } - - // public: --// // XConnectCallback - // virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - // getInstance( const ::rtl::OUString& sObjectName ) - // throw( ::com::sun::star::container::NoSuchElementException, diff --git a/editors/openoffice.org-3-RC/files/patch-bridges+test+testcomp.h b/editors/openoffice.org-3-RC/files/patch-bridges+test+testcomp.h deleted file mode 100644 index c1f0c320b201..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-bridges+test+testcomp.h +++ /dev/null @@ -1,98 +0,0 @@ ---- ../bridges/test/testcomp.h.orig Wed Mar 12 10:06:16 2003 -+++ ../bridges/test/testcomp.h Wed Mar 12 10:05:54 2003 -@@ -2,9 +2,9 @@ - * - * $RCSfile: testcomp.h,v $ - * -- * $Revision: 1.2 $ -+ * $Revision: 1.4 $ - * -- * last change: $Author: jbu $ $Date: 2001/03/16 09:42:20 $ -+ * last change: $Author: jbu $ $Date: 2002/04/18 10:09:22 $ - * - * The Contents of this file are made available subject to the terms of - * either of the following licenses -@@ -87,9 +87,9 @@ - - public: - // XInterface -- Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType) throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire() throw() { OWeakObject::acquire(); } -+ void SAL_CALL release() throw() { OWeakObject::release(); } - - public: - virtual void SAL_CALL setIn( const ::com::sun::star::uno::Reference< ::test::XCallMe >& callback ) throw(::com::sun::star::uno::RuntimeException); -@@ -114,9 +114,9 @@ - - public: - // XInterface -- Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType) throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire()throw() { OWeakObject::acquire(); } -+ void SAL_CALL release()throw() { OWeakObject::release(); } - public: - // XCallMe - virtual void SAL_CALL call( const ::rtl::OUString& s, sal_Int32 nToDo ) -@@ -150,9 +150,9 @@ - - public: - // XInterface -- Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType ); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType ) throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire()throw() { OWeakObject::acquire(); } -+ void SAL_CALL release() throw() { OWeakObject::release(); } - public: - virtual ::com::sun::star::uno::Reference< ::test::XCallMe > SAL_CALL createCallMe( ) - throw(::com::sun::star::uno::RuntimeException); -@@ -161,28 +161,6 @@ - - }; - --/* --class OConnectCallback : -- public ::cppu::OWeakObject, -- public XConnectCallback --{ --public: -- OConnectCallback( ){} -- ~OConnectCallback(){ printf( "callback dies\n" );} --public: -- // XInterface -- Any SAL_CALL queryInterface( const Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -- --public: -- // XConnectCallback -- virtual void SAL_CALL attemptConnect( -- const Reference< XConnectionServerSide >& connection ) -- throw(SecurityException, RuntimeException); --}; -- --*/ - - class OInstanceProvider : - public ::cppu::OWeakObject, -@@ -196,12 +174,11 @@ - ~OInstanceProvider(){ printf( "instance provider dies\n" );} - public: - // XInterface -- Any SAL_CALL queryInterface( const Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const Type & aType)throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire()throw() { OWeakObject::acquire(); } -+ void SAL_CALL release() throw() { OWeakObject::release(); } - - public: -- // XConnectCallback - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - getInstance( const ::rtl::OUString& sObjectName ) - throw( ::com::sun::star::container::NoSuchElementException, diff --git a/editors/openoffice.org-3-devel/files/patch-bridges+test+testcomp.cxx b/editors/openoffice.org-3-devel/files/patch-bridges+test+testcomp.cxx deleted file mode 100644 index 2eb011510945..000000000000 --- a/editors/openoffice.org-3-devel/files/patch-bridges+test+testcomp.cxx +++ /dev/null @@ -1,113 +0,0 @@ ---- ../bridges/test/testcomp.cxx.orig Wed Mar 12 17:40:53 2003 -+++ ../bridges/test/testcomp.cxx Wed Mar 12 17:42:54 2003 -@@ -2,9 +2,9 @@ - * - * $RCSfile: testcomp.cxx,v $ - * -- * $Revision: 1.2 $ -+ * $Revision: 1.2.54.1 $ - * -- * last change: $Author: jl $ $Date: 2001/03/14 09:25:39 $ -+ * last change: $Author: mh $ $Date: 2003/03/12 09:23:15 $ - * - * The Contents of this file are made available subject to the terms of - * either of the following licenses -@@ -125,7 +125,7 @@ - } - } - --Any OInstanceProvider::queryInterface( const Type & aType ) -+Any OInstanceProvider::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType , - SAL_STATIC_CAST( XInstanceProvider * , this ) ); -@@ -192,9 +192,9 @@ - } - return aRet; - } -- virtual void SAL_CALL acquire() throw(::com::sun::star::uno::RuntimeException) -+ virtual void SAL_CALL acquire() throw() - { osl_incrementInterlockedCount( &_nRef ); } -- virtual void SAL_CALL release() throw(::com::sun::star::uno::RuntimeException) -+ virtual void SAL_CALL release() throw() - { if (! osl_decrementInterlockedCount( &_nRef )) delete this; } - - // XServiceInfo -@@ -325,7 +325,7 @@ - * - *****************/ - --Any OCallMe::queryInterface( const Type & aType ) -+Any OCallMe::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST( XCallMe * , this ) ); -@@ -421,7 +421,7 @@ - * OInterfaceTest - * - *******************/ --Any OInterfaceTest::queryInterface( const Type & aType ) -+Any OInterfaceTest::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST( XInterfaceTest * , this ) ); -@@ -473,7 +473,7 @@ - } - - --Any OTestFactory::queryInterface( const Type & aType ) -+Any OTestFactory::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST( XTestFactory * , this ) ); -@@ -500,42 +500,6 @@ - - - --/******************************************************** -- * -- ********************************************************/ --/*Any OConnectCallback::queryInterface( const Type & aType ) --{ -- Any a = ::cppu::queryInterface( aType, -- SAL_STATIC_CAST( XConnectCallback * , this ) ); -- if( a.hasValue() ) -- { -- return a; -- } -- return OWeakObject::queryInterface( aType ); --} -- -- --void SAL_CALL OConnectCallback::attemptConnect( -- const Reference< XConnectionServerSide >& connection ) -- throw(SecurityException, ::com::sun::star::uno::RuntimeException) --{ -- // TODO -- // user verification -- if( L"bad guy" == connection->getUser() && -- L"secret" == connection->getPassword() ) -- { -- Reference< XInterface > rInterface( -- ( XInterface * ) (::cppu::OWeakObject *) new OTestFactory() ); -- connection->provideRemoteObject( rInterface ); -- } -- else -- { -- throw SecurityException(); -- } --} -- --*/ -- - - // class OInstanceProvider : - // public ::cppu::OWeakObject, -@@ -551,7 +515,6 @@ - // void SAL_CALL release() { OWeakObject::release(); } - - // public: --// // XConnectCallback - // virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - // getInstance( const ::rtl::OUString& sObjectName ) - // throw( ::com::sun::star::container::NoSuchElementException, diff --git a/editors/openoffice.org-3-devel/files/patch-bridges+test+testcomp.h b/editors/openoffice.org-3-devel/files/patch-bridges+test+testcomp.h deleted file mode 100644 index c1f0c320b201..000000000000 --- a/editors/openoffice.org-3-devel/files/patch-bridges+test+testcomp.h +++ /dev/null @@ -1,98 +0,0 @@ ---- ../bridges/test/testcomp.h.orig Wed Mar 12 10:06:16 2003 -+++ ../bridges/test/testcomp.h Wed Mar 12 10:05:54 2003 -@@ -2,9 +2,9 @@ - * - * $RCSfile: testcomp.h,v $ - * -- * $Revision: 1.2 $ -+ * $Revision: 1.4 $ - * -- * last change: $Author: jbu $ $Date: 2001/03/16 09:42:20 $ -+ * last change: $Author: jbu $ $Date: 2002/04/18 10:09:22 $ - * - * The Contents of this file are made available subject to the terms of - * either of the following licenses -@@ -87,9 +87,9 @@ - - public: - // XInterface -- Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType) throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire() throw() { OWeakObject::acquire(); } -+ void SAL_CALL release() throw() { OWeakObject::release(); } - - public: - virtual void SAL_CALL setIn( const ::com::sun::star::uno::Reference< ::test::XCallMe >& callback ) throw(::com::sun::star::uno::RuntimeException); -@@ -114,9 +114,9 @@ - - public: - // XInterface -- Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType) throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire()throw() { OWeakObject::acquire(); } -+ void SAL_CALL release()throw() { OWeakObject::release(); } - public: - // XCallMe - virtual void SAL_CALL call( const ::rtl::OUString& s, sal_Int32 nToDo ) -@@ -150,9 +150,9 @@ - - public: - // XInterface -- Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType ); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType ) throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire()throw() { OWeakObject::acquire(); } -+ void SAL_CALL release() throw() { OWeakObject::release(); } - public: - virtual ::com::sun::star::uno::Reference< ::test::XCallMe > SAL_CALL createCallMe( ) - throw(::com::sun::star::uno::RuntimeException); -@@ -161,28 +161,6 @@ - - }; - --/* --class OConnectCallback : -- public ::cppu::OWeakObject, -- public XConnectCallback --{ --public: -- OConnectCallback( ){} -- ~OConnectCallback(){ printf( "callback dies\n" );} --public: -- // XInterface -- Any SAL_CALL queryInterface( const Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -- --public: -- // XConnectCallback -- virtual void SAL_CALL attemptConnect( -- const Reference< XConnectionServerSide >& connection ) -- throw(SecurityException, RuntimeException); --}; -- --*/ - - class OInstanceProvider : - public ::cppu::OWeakObject, -@@ -196,12 +174,11 @@ - ~OInstanceProvider(){ printf( "instance provider dies\n" );} - public: - // XInterface -- Any SAL_CALL queryInterface( const Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const Type & aType)throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire()throw() { OWeakObject::acquire(); } -+ void SAL_CALL release() throw() { OWeakObject::release(); } - - public: -- // XConnectCallback - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - getInstance( const ::rtl::OUString& sObjectName ) - throw( ::com::sun::star::container::NoSuchElementException, diff --git a/editors/openoffice.org-3/files/patch-bridges+test+testcomp.cxx b/editors/openoffice.org-3/files/patch-bridges+test+testcomp.cxx deleted file mode 100644 index 2eb011510945..000000000000 --- a/editors/openoffice.org-3/files/patch-bridges+test+testcomp.cxx +++ /dev/null @@ -1,113 +0,0 @@ ---- ../bridges/test/testcomp.cxx.orig Wed Mar 12 17:40:53 2003 -+++ ../bridges/test/testcomp.cxx Wed Mar 12 17:42:54 2003 -@@ -2,9 +2,9 @@ - * - * $RCSfile: testcomp.cxx,v $ - * -- * $Revision: 1.2 $ -+ * $Revision: 1.2.54.1 $ - * -- * last change: $Author: jl $ $Date: 2001/03/14 09:25:39 $ -+ * last change: $Author: mh $ $Date: 2003/03/12 09:23:15 $ - * - * The Contents of this file are made available subject to the terms of - * either of the following licenses -@@ -125,7 +125,7 @@ - } - } - --Any OInstanceProvider::queryInterface( const Type & aType ) -+Any OInstanceProvider::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType , - SAL_STATIC_CAST( XInstanceProvider * , this ) ); -@@ -192,9 +192,9 @@ - } - return aRet; - } -- virtual void SAL_CALL acquire() throw(::com::sun::star::uno::RuntimeException) -+ virtual void SAL_CALL acquire() throw() - { osl_incrementInterlockedCount( &_nRef ); } -- virtual void SAL_CALL release() throw(::com::sun::star::uno::RuntimeException) -+ virtual void SAL_CALL release() throw() - { if (! osl_decrementInterlockedCount( &_nRef )) delete this; } - - // XServiceInfo -@@ -325,7 +325,7 @@ - * - *****************/ - --Any OCallMe::queryInterface( const Type & aType ) -+Any OCallMe::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST( XCallMe * , this ) ); -@@ -421,7 +421,7 @@ - * OInterfaceTest - * - *******************/ --Any OInterfaceTest::queryInterface( const Type & aType ) -+Any OInterfaceTest::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST( XInterfaceTest * , this ) ); -@@ -473,7 +473,7 @@ - } - - --Any OTestFactory::queryInterface( const Type & aType ) -+Any OTestFactory::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST( XTestFactory * , this ) ); -@@ -500,42 +500,6 @@ - - - --/******************************************************** -- * -- ********************************************************/ --/*Any OConnectCallback::queryInterface( const Type & aType ) --{ -- Any a = ::cppu::queryInterface( aType, -- SAL_STATIC_CAST( XConnectCallback * , this ) ); -- if( a.hasValue() ) -- { -- return a; -- } -- return OWeakObject::queryInterface( aType ); --} -- -- --void SAL_CALL OConnectCallback::attemptConnect( -- const Reference< XConnectionServerSide >& connection ) -- throw(SecurityException, ::com::sun::star::uno::RuntimeException) --{ -- // TODO -- // user verification -- if( L"bad guy" == connection->getUser() && -- L"secret" == connection->getPassword() ) -- { -- Reference< XInterface > rInterface( -- ( XInterface * ) (::cppu::OWeakObject *) new OTestFactory() ); -- connection->provideRemoteObject( rInterface ); -- } -- else -- { -- throw SecurityException(); -- } --} -- --*/ -- - - // class OInstanceProvider : - // public ::cppu::OWeakObject, -@@ -551,7 +515,6 @@ - // void SAL_CALL release() { OWeakObject::release(); } - - // public: --// // XConnectCallback - // virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - // getInstance( const ::rtl::OUString& sObjectName ) - // throw( ::com::sun::star::container::NoSuchElementException, diff --git a/editors/openoffice.org-3/files/patch-bridges+test+testcomp.h b/editors/openoffice.org-3/files/patch-bridges+test+testcomp.h deleted file mode 100644 index c1f0c320b201..000000000000 --- a/editors/openoffice.org-3/files/patch-bridges+test+testcomp.h +++ /dev/null @@ -1,98 +0,0 @@ ---- ../bridges/test/testcomp.h.orig Wed Mar 12 10:06:16 2003 -+++ ../bridges/test/testcomp.h Wed Mar 12 10:05:54 2003 -@@ -2,9 +2,9 @@ - * - * $RCSfile: testcomp.h,v $ - * -- * $Revision: 1.2 $ -+ * $Revision: 1.4 $ - * -- * last change: $Author: jbu $ $Date: 2001/03/16 09:42:20 $ -+ * last change: $Author: jbu $ $Date: 2002/04/18 10:09:22 $ - * - * The Contents of this file are made available subject to the terms of - * either of the following licenses -@@ -87,9 +87,9 @@ - - public: - // XInterface -- Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType) throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire() throw() { OWeakObject::acquire(); } -+ void SAL_CALL release() throw() { OWeakObject::release(); } - - public: - virtual void SAL_CALL setIn( const ::com::sun::star::uno::Reference< ::test::XCallMe >& callback ) throw(::com::sun::star::uno::RuntimeException); -@@ -114,9 +114,9 @@ - - public: - // XInterface -- Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType) throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire()throw() { OWeakObject::acquire(); } -+ void SAL_CALL release()throw() { OWeakObject::release(); } - public: - // XCallMe - virtual void SAL_CALL call( const ::rtl::OUString& s, sal_Int32 nToDo ) -@@ -150,9 +150,9 @@ - - public: - // XInterface -- Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType ); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType ) throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire()throw() { OWeakObject::acquire(); } -+ void SAL_CALL release() throw() { OWeakObject::release(); } - public: - virtual ::com::sun::star::uno::Reference< ::test::XCallMe > SAL_CALL createCallMe( ) - throw(::com::sun::star::uno::RuntimeException); -@@ -161,28 +161,6 @@ - - }; - --/* --class OConnectCallback : -- public ::cppu::OWeakObject, -- public XConnectCallback --{ --public: -- OConnectCallback( ){} -- ~OConnectCallback(){ printf( "callback dies\n" );} --public: -- // XInterface -- Any SAL_CALL queryInterface( const Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -- --public: -- // XConnectCallback -- virtual void SAL_CALL attemptConnect( -- const Reference< XConnectionServerSide >& connection ) -- throw(SecurityException, RuntimeException); --}; -- --*/ - - class OInstanceProvider : - public ::cppu::OWeakObject, -@@ -196,12 +174,11 @@ - ~OInstanceProvider(){ printf( "instance provider dies\n" );} - public: - // XInterface -- Any SAL_CALL queryInterface( const Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const Type & aType)throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire()throw() { OWeakObject::acquire(); } -+ void SAL_CALL release() throw() { OWeakObject::release(); } - - public: -- // XConnectCallback - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - getInstance( const ::rtl::OUString& sObjectName ) - throw( ::com::sun::star::container::NoSuchElementException, diff --git a/editors/openoffice.org-vcltesttool/files/patch-bridges+test+testcomp.cxx b/editors/openoffice.org-vcltesttool/files/patch-bridges+test+testcomp.cxx deleted file mode 100644 index 2eb011510945..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-bridges+test+testcomp.cxx +++ /dev/null @@ -1,113 +0,0 @@ ---- ../bridges/test/testcomp.cxx.orig Wed Mar 12 17:40:53 2003 -+++ ../bridges/test/testcomp.cxx Wed Mar 12 17:42:54 2003 -@@ -2,9 +2,9 @@ - * - * $RCSfile: testcomp.cxx,v $ - * -- * $Revision: 1.2 $ -+ * $Revision: 1.2.54.1 $ - * -- * last change: $Author: jl $ $Date: 2001/03/14 09:25:39 $ -+ * last change: $Author: mh $ $Date: 2003/03/12 09:23:15 $ - * - * The Contents of this file are made available subject to the terms of - * either of the following licenses -@@ -125,7 +125,7 @@ - } - } - --Any OInstanceProvider::queryInterface( const Type & aType ) -+Any OInstanceProvider::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType , - SAL_STATIC_CAST( XInstanceProvider * , this ) ); -@@ -192,9 +192,9 @@ - } - return aRet; - } -- virtual void SAL_CALL acquire() throw(::com::sun::star::uno::RuntimeException) -+ virtual void SAL_CALL acquire() throw() - { osl_incrementInterlockedCount( &_nRef ); } -- virtual void SAL_CALL release() throw(::com::sun::star::uno::RuntimeException) -+ virtual void SAL_CALL release() throw() - { if (! osl_decrementInterlockedCount( &_nRef )) delete this; } - - // XServiceInfo -@@ -325,7 +325,7 @@ - * - *****************/ - --Any OCallMe::queryInterface( const Type & aType ) -+Any OCallMe::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST( XCallMe * , this ) ); -@@ -421,7 +421,7 @@ - * OInterfaceTest - * - *******************/ --Any OInterfaceTest::queryInterface( const Type & aType ) -+Any OInterfaceTest::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST( XInterfaceTest * , this ) ); -@@ -473,7 +473,7 @@ - } - - --Any OTestFactory::queryInterface( const Type & aType ) -+Any OTestFactory::queryInterface( const Type & aType ) throw ( RuntimeException ) - { - Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST( XTestFactory * , this ) ); -@@ -500,42 +500,6 @@ - - - --/******************************************************** -- * -- ********************************************************/ --/*Any OConnectCallback::queryInterface( const Type & aType ) --{ -- Any a = ::cppu::queryInterface( aType, -- SAL_STATIC_CAST( XConnectCallback * , this ) ); -- if( a.hasValue() ) -- { -- return a; -- } -- return OWeakObject::queryInterface( aType ); --} -- -- --void SAL_CALL OConnectCallback::attemptConnect( -- const Reference< XConnectionServerSide >& connection ) -- throw(SecurityException, ::com::sun::star::uno::RuntimeException) --{ -- // TODO -- // user verification -- if( L"bad guy" == connection->getUser() && -- L"secret" == connection->getPassword() ) -- { -- Reference< XInterface > rInterface( -- ( XInterface * ) (::cppu::OWeakObject *) new OTestFactory() ); -- connection->provideRemoteObject( rInterface ); -- } -- else -- { -- throw SecurityException(); -- } --} -- --*/ -- - - // class OInstanceProvider : - // public ::cppu::OWeakObject, -@@ -551,7 +515,6 @@ - // void SAL_CALL release() { OWeakObject::release(); } - - // public: --// // XConnectCallback - // virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - // getInstance( const ::rtl::OUString& sObjectName ) - // throw( ::com::sun::star::container::NoSuchElementException, diff --git a/editors/openoffice.org-vcltesttool/files/patch-bridges+test+testcomp.h b/editors/openoffice.org-vcltesttool/files/patch-bridges+test+testcomp.h deleted file mode 100644 index c1f0c320b201..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-bridges+test+testcomp.h +++ /dev/null @@ -1,98 +0,0 @@ ---- ../bridges/test/testcomp.h.orig Wed Mar 12 10:06:16 2003 -+++ ../bridges/test/testcomp.h Wed Mar 12 10:05:54 2003 -@@ -2,9 +2,9 @@ - * - * $RCSfile: testcomp.h,v $ - * -- * $Revision: 1.2 $ -+ * $Revision: 1.4 $ - * -- * last change: $Author: jbu $ $Date: 2001/03/16 09:42:20 $ -+ * last change: $Author: jbu $ $Date: 2002/04/18 10:09:22 $ - * - * The Contents of this file are made available subject to the terms of - * either of the following licenses -@@ -87,9 +87,9 @@ - - public: - // XInterface -- Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType) throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire() throw() { OWeakObject::acquire(); } -+ void SAL_CALL release() throw() { OWeakObject::release(); } - - public: - virtual void SAL_CALL setIn( const ::com::sun::star::uno::Reference< ::test::XCallMe >& callback ) throw(::com::sun::star::uno::RuntimeException); -@@ -114,9 +114,9 @@ - - public: - // XInterface -- Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType) throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire()throw() { OWeakObject::acquire(); } -+ void SAL_CALL release()throw() { OWeakObject::release(); } - public: - // XCallMe - virtual void SAL_CALL call( const ::rtl::OUString& s, sal_Int32 nToDo ) -@@ -150,9 +150,9 @@ - - public: - // XInterface -- Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType ); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType ) throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire()throw() { OWeakObject::acquire(); } -+ void SAL_CALL release() throw() { OWeakObject::release(); } - public: - virtual ::com::sun::star::uno::Reference< ::test::XCallMe > SAL_CALL createCallMe( ) - throw(::com::sun::star::uno::RuntimeException); -@@ -161,28 +161,6 @@ - - }; - --/* --class OConnectCallback : -- public ::cppu::OWeakObject, -- public XConnectCallback --{ --public: -- OConnectCallback( ){} -- ~OConnectCallback(){ printf( "callback dies\n" );} --public: -- // XInterface -- Any SAL_CALL queryInterface( const Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -- --public: -- // XConnectCallback -- virtual void SAL_CALL attemptConnect( -- const Reference< XConnectionServerSide >& connection ) -- throw(SecurityException, RuntimeException); --}; -- --*/ - - class OInstanceProvider : - public ::cppu::OWeakObject, -@@ -196,12 +174,11 @@ - ~OInstanceProvider(){ printf( "instance provider dies\n" );} - public: - // XInterface -- Any SAL_CALL queryInterface( const Type & aType); -- void SAL_CALL acquire() { OWeakObject::acquire(); } -- void SAL_CALL release() { OWeakObject::release(); } -+ Any SAL_CALL queryInterface( const Type & aType)throw ( ::com::sun::star::uno::RuntimeException ); -+ void SAL_CALL acquire()throw() { OWeakObject::acquire(); } -+ void SAL_CALL release() throw() { OWeakObject::release(); } - - public: -- // XConnectCallback - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - getInstance( const ::rtl::OUString& sObjectName ) - throw( ::com::sun::star::container::NoSuchElementException, |