diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-01-18 14:10:36 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-01-18 14:10:36 +0000 |
| commit | d87aeac3b392db97e77e5c40ff29ff7c96cc58ae (patch) | |
| tree | 099d77d543773617d5b69cf4236b4fdbc6e984c4 /embeddedobj | |
| parent | 610ed19ddacd423c250d487772d05759d732bdfd (diff) | |
INTEGRATION: CWS mav14 (1.13.24); FILE MERGED
2004/12/09 13:21:22 mav 1.13.24.1: #i33996# workaround to view MSOLE objects for wich no server is available
Diffstat (limited to 'embeddedobj')
| -rw-r--r-- | embeddedobj/source/msole/olemisc.cxx | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/embeddedobj/source/msole/olemisc.cxx b/embeddedobj/source/msole/olemisc.cxx index 3793d8975d..6372a3b2d7 100644 --- a/embeddedobj/source/msole/olemisc.cxx +++ b/embeddedobj/source/msole/olemisc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: olemisc.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: kz $ $Date: 2004-10-04 19:55:17 $ + * last change: $Author: kz $ $Date: 2005-01-18 15:10:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -78,6 +78,8 @@ #include <oleembobj.hxx> #include <olecomponent.hxx> +#include "ownview.hxx" + using namespace ::com::sun::star; //------------------------------------------------------ @@ -98,6 +100,7 @@ OleEmbeddedObject::OleEmbeddedObject( const uno::Reference< lang::XMultiServiceF , m_bStoreVisRepl( sal_True ) , m_bNewVisReplInStream( sal_True ) , m_bIsLink( sal_False ) +, m_pOwnView( NULL ) { } @@ -117,6 +120,7 @@ OleEmbeddedObject::OleEmbeddedObject( const uno::Reference< lang::XMultiServiceF , m_bStoreVisRepl( sal_True ) , m_bNewVisReplInStream( sal_True ) , m_bIsLink( bLink ) +, m_pOwnView( NULL ) { } @@ -244,6 +248,13 @@ void OleEmbeddedObject::Dispose() m_pInterfaceContainer = NULL; } + if ( m_pOwnView ) + { + m_pOwnView->Close(); + m_pOwnView->release(); + m_pOwnView = NULL; + } + if ( m_pOleComponent ) try { GetRidOfComponent(); |