From 6bbd4e977b91c4f536a8b121f97dea0bb9d8c763 Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Mon, 10 May 2004 16:51:12 +0000 Subject: INTEGRATION: CWS fwkbugfix02 (1.7.10); FILE MERGED 2004/04/30 15:28:17 mav 1.7.10.6: #116056# interfaces review 2004/04/30 15:27:33 mav 1.7.10.5: #116056# interfaces review 2004/04/29 07:49:10 mav 1.7.10.4: #116056# interfaces review 2004/04/28 10:25:20 mav 1.7.10.3: #116056# use inheritance 2004/04/14 14:23:22 mav 1.7.10.2: #i22465# state change events 2004/04/07 16:34:48 mav 1.7.10.1: #116056# adopt to incompatible changes --- embeddedobj/source/commonembedding/miscobj.cxx | 70 ++++++++++++++++++-------- 1 file changed, 48 insertions(+), 22 deletions(-) (limited to 'embeddedobj/source/commonembedding') diff --git a/embeddedobj/source/commonembedding/miscobj.cxx b/embeddedobj/source/commonembedding/miscobj.cxx index 4c5cb3da3480..11b793a994a1 100644 --- a/embeddedobj/source/commonembedding/miscobj.cxx +++ b/embeddedobj/source/commonembedding/miscobj.cxx @@ -2,9 +2,9 @@ * * $RCSfile: miscobj.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: mav $ $Date: 2003-12-02 15:33:44 $ + * last change: $Author: hr $ $Date: 2004-05-10 17:51:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -97,7 +97,7 @@ OCommonEmbeddedObject::OCommonEmbeddedObject( const uno::Reference< lang::XMulti , m_bDisposed( sal_False ) , m_bClosed( sal_False ) , m_nObjectState( -1 ) -, m_nUpdateMode ( embed::EmbedUpdateModes::EMBED_ALWAYS_UPDATE ) +, m_nUpdateMode ( embed::EmbedUpdateModes::ALWAYS_UPDATE ) , m_xFactory( xFactory ) , m_aClassID( aClassID ) , m_aClassName( aClassName ) @@ -112,8 +112,8 @@ OCommonEmbeddedObject::OCommonEmbeddedObject( const uno::Reference< lang::XMulti //------------------------------------------------------ OCommonEmbeddedObject::OCommonEmbeddedObject( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory, - const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, + const uno::Reference< lang::XMultiServiceFactory >& xFactory, + const uno::Sequence< sal_Int8 >& aClassID, const ::rtl::OUString& aClassName, const ::rtl::OUString& aDocServiceName, const ::rtl::OUString& aLinkFilterName, @@ -123,8 +123,8 @@ OCommonEmbeddedObject::OCommonEmbeddedObject( , m_bReadOnly( sal_False ) , m_bDisposed( sal_False ) , m_bClosed( sal_False ) -, m_nObjectState( embed::EmbedStates::EMBED_LOADED ) -, m_nUpdateMode ( embed::EmbedUpdateModes::EMBED_ALWAYS_UPDATE ) +, m_nObjectState( embed::EmbedStates::LOADED ) +, m_nUpdateMode ( embed::EmbedUpdateModes::ALWAYS_UPDATE ) , m_xFactory( xFactory ) , m_aClassID( aClassID ) , m_aClassName( aClassName ) @@ -153,29 +153,29 @@ void OCommonEmbeddedObject::CommonInit_Impl() m_pDocHolder->acquire(); // accepted states - m_aAcceptedStates[0] = embed::EmbedStates::EMBED_LOADED; - m_aAcceptedStates[1] = embed::EmbedStates::EMBED_RUNNING; - m_aAcceptedStates[2] = embed::EmbedStates::EMBED_ACTIVE; + m_aAcceptedStates[0] = embed::EmbedStates::LOADED; + m_aAcceptedStates[1] = embed::EmbedStates::RUNNING; + m_aAcceptedStates[2] = embed::EmbedStates::ACTIVE; // intermediate states m_pIntermediateStatesSeqs[0][2].realloc( 1 ); - m_pIntermediateStatesSeqs[0][2][0] = embed::EmbedStates::EMBED_RUNNING; + m_pIntermediateStatesSeqs[0][2][0] = embed::EmbedStates::RUNNING; m_pIntermediateStatesSeqs[2][0].realloc( 1 ); - m_pIntermediateStatesSeqs[2][0][0] = embed::EmbedStates::EMBED_RUNNING; + m_pIntermediateStatesSeqs[2][0][0] = embed::EmbedStates::RUNNING; // verbs table m_aVerbTable[0].realloc( 2 ); m_aVerbTable[0][0] = embed::EmbedVerbs::MS_OLEVERB_PRIMARY; - m_aVerbTable[0][1] = embed::EmbedStates::EMBED_ACTIVE; + m_aVerbTable[0][1] = embed::EmbedStates::ACTIVE; m_aVerbTable[1].realloc( 2 ); m_aVerbTable[1][0] = embed::EmbedVerbs::MS_OLEVERB_SHOW; - m_aVerbTable[1][1] = embed::EmbedStates::EMBED_ACTIVE; + m_aVerbTable[1][1] = embed::EmbedStates::ACTIVE; m_aVerbTable[2].realloc( 2 ); m_aVerbTable[2][0] = embed::EmbedVerbs::MS_OLEVERB_OPEN; - m_aVerbTable[2][1] = embed::EmbedStates::EMBED_ACTIVE; + m_aVerbTable[2][1] = embed::EmbedStates::ACTIVE; } //------------------------------------------------------ @@ -223,7 +223,7 @@ void OCommonEmbeddedObject::PostEvent_Impl( const ::rtl::OUString& aEventName ) ::getCppuType((const uno::Reference< document::XEventListener >*)0) ); if( pIC ) { - document::EventObject aEvent( (embed::XEmbeddedObject*)this, aEventName ); + document::EventObject aEvent( static_cast< ::cppu::OWeakObject* >( this ), aEventName ); ::cppu::OInterfaceIteratorHelper aIt( *pIC ); while( aIt.hasMoreElements() ) { @@ -291,13 +291,13 @@ uno::Sequence< uno::Type > SAL_CALL OCommonEmbeddedObject::getTypes() static ::cppu::OTypeCollection aTypeCollection( ::getCppuType( (const uno::Reference< lang::XTypeProvider >*)NULL ), ::getCppuType( (const uno::Reference< embed::XEmbeddedObject >*)NULL ), - ::getCppuType( (const uno::Reference< embed::XVisualObject >*)NULL ), + // ::getCppuType( (const uno::Reference< embed::XVisualObject >*)NULL ), ::getCppuType( (const uno::Reference< embed::XEmbedPersist >*)NULL ), - ::getCppuType( (const uno::Reference< embed::XLinkageSupport >*)NULL ), - ::getCppuType( (const uno::Reference< embed::XClassifiedObject >*)NULL ), - ::getCppuType( (const uno::Reference< embed::XComponentSupplier >*)NULL ), - ::getCppuType( (const uno::Reference< util::XCloseable >*)NULL ), - ::getCppuType( (const uno::Reference< document::XEventBroadcaster >*)NULL ) ); + ::getCppuType( (const uno::Reference< embed::XLinkageSupport >*)NULL ) ); + // ::getCppuType( (const uno::Reference< embed::XClassifiedObject >*)NULL ), + // ::getCppuType( (const uno::Reference< embed::XComponentSupplier >*)NULL ), + // ::getCppuType( (const uno::Reference< util::XCloseable >*)NULL ), + // ::getCppuType( (const uno::Reference< document::XEventBroadcaster >*)NULL ) ); pTypeCollection = &aTypeCollection ; } @@ -382,6 +382,32 @@ uno::Reference< util::XCloseable > SAL_CALL OCommonEmbeddedObject::getComponent( return uno::Reference< util::XCloseable >( m_pDocHolder->GetDocument(), uno::UNO_QUERY ); } +//---------------------------------------------- +void SAL_CALL OCommonEmbeddedObject::addStateChangeListener( const uno::Reference< embed::XStateChangeListener >& xListener ) + throw ( uno::RuntimeException ) +{ + ::osl::MutexGuard aGuard( m_aMutex ); + if ( m_bDisposed ) + throw lang::DisposedException(); // TODO + + if ( !m_pInterfaceContainer ) + m_pInterfaceContainer = new ::cppu::OMultiTypeInterfaceContainerHelper( m_aMutex ); + + m_pInterfaceContainer->addInterface( ::getCppuType( (const uno::Reference< embed::XStateChangeListener >*)0 ), + xListener ); +} + +//---------------------------------------------- +void SAL_CALL OCommonEmbeddedObject::removeStateChangeListener( + const uno::Reference< embed::XStateChangeListener >& xListener ) + throw (uno::RuntimeException) +{ + ::osl::MutexGuard aGuard( m_aMutex ); + if ( m_pInterfaceContainer ) + m_pInterfaceContainer->removeInterface( ::getCppuType( (const uno::Reference< embed::XStateChangeListener >*)0 ), + xListener ); +} + //---------------------------------------------- void SAL_CALL OCommonEmbeddedObject::close( sal_Bool bDeliverOwnership ) throw ( util::CloseVetoException, -- cgit