diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-04-28 15:44:09 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-04-28 15:44:09 +0000 |
| commit | 95acd8e60384321c3bec6022c0fa669c836a2b59 (patch) | |
| tree | d26d6c7a7975f86db351dd954d061ef30627da95 /bridges/test/testcomp.h | |
| parent | f4d24c9d32ee21cb5e0e9b413bb2dba4cd0010c2 (diff) | |
INTEGRATION: CWS ooo20030412 (1.2.60); FILE MERGED
2003/04/11 09:09:48 mh 1.2.60.1: join: from ooo11beta
Diffstat (limited to 'bridges/test/testcomp.h')
| -rw-r--r-- | bridges/test/testcomp.h | 55 |
1 files changed, 14 insertions, 41 deletions
diff --git a/bridges/test/testcomp.h b/bridges/test/testcomp.h index 57cceafe8..375e05374 100644 --- a/bridges/test/testcomp.h +++ b/bridges/test/testcomp.h @@ -2,9 +2,9 @@ * * $RCSfile: testcomp.h,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: rt $ $Date: 2003-04-23 16:32:48 $ + * last change: $Author: hr $ $Date: 2003-04-28 16:44:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -87,10 +87,9 @@ public: public: // XInterface - 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(); } + 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); @@ -115,10 +114,9 @@ public: public: // XInterface - 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(); } + 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 ) @@ -152,10 +150,9 @@ public: public: // XInterface - 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(); } + 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); @@ -164,28 +161,6 @@ public: }; -/* -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, @@ -199,13 +174,11 @@ public: ~OInstanceProvider(){ printf( "instance provider dies\n" );} public: // XInterface - 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(); } + 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, |