diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-01-31 07:45:49 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-01-31 07:45:49 +0000 |
| commit | bd0b2cc631ec6b8462487288fe38528e53cac7c1 (patch) | |
| tree | 6d3d9fe3113598cc72680b2259fad035c6ab6708 | |
| parent | 4a4f2d0639fb4a0bca7508b85cd3ea0e55e5db62 (diff) | |
INTEGRATION: CWS fwkbugfix05 (1.3.38); FILE MERGED
2004/12/18 15:03:07 mba 1.3.38.1: #i39159#: ThisComponent didn't work after OLE deactivation
| -rw-r--r-- | sfx2/source/view/ipclient.cxx | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx index c30848f2d102..3abdb2b6deb8 100644 --- a/sfx2/source/view/ipclient.cxx +++ b/sfx2/source/view/ipclient.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ipclient.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: kz $ $Date: 2005-01-18 15:20:05 $ + * last change: $Author: rt $ $Date: 2005-01-31 08:45:49 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -194,13 +194,11 @@ void SAL_CALL SfxInPlaceClient_Impl::changingState( const ::com::sun::star::lang void SAL_CALL SfxInPlaceClient_Impl::stateChanged( const ::com::sun::star::lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (::com::sun::star::uno::RuntimeException) { - /* - if ( nOldState != embed::EmbedStates::LOADED && nNewState == embed::EmbedStates::RUNNING ) + if ( m_pClient && nOldState != embed::EmbedStates::LOADED && nNewState == embed::EmbedStates::RUNNING ) { - m_pClient->SetObject(0); - delete m_pClient; + // deactivation of object + SfxObjectShell::SetWorkingDocument( m_pClient->GetViewShell()->GetObjectShell() ); } - */ } void SAL_CALL SfxInPlaceClient_Impl::notifyEvent( const document::EventObject& aEvent ) throw( uno::RuntimeException ) |