diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-07-12 11:19:21 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-07-12 11:19:21 +0000 |
| commit | a6cd27a1475562fa648d713f8ba5caae0c6586d5 (patch) | |
| tree | 338781da6395b5ef19499e992ddaf87883700b9e /embeddedobj/source/msole/olemisc.cxx | |
| parent | ac129807b06e022df461a55a1548a295ad4e065a (diff) | |
INTEGRATION: CWS mav18 (1.17.10); FILE MERGED
2005/07/01 10:26:45 mav 1.17.10.2: #i50978# no need to be dependent from persistence
2005/05/30 09:56:06 mav 1.17.10.1: #i49751# the view of an object in loaded state can not change
Diffstat (limited to 'embeddedobj/source/msole/olemisc.cxx')
| -rw-r--r-- | embeddedobj/source/msole/olemisc.cxx | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/embeddedobj/source/msole/olemisc.cxx b/embeddedobj/source/msole/olemisc.cxx index b29ddcb7cd..468dfed0d3 100644 --- a/embeddedobj/source/msole/olemisc.cxx +++ b/embeddedobj/source/msole/olemisc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: olemisc.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: obo $ $Date: 2005-03-15 11:39:15 $ + * last change: $Author: kz $ $Date: 2005-07-12 12:19:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -98,6 +98,7 @@ OleEmbeddedObject::OleEmbeddedObject( const uno::Reference< lang::XMultiServiceF , m_aClassName( aClassName ) , m_bWaitSaveCompleted( sal_False ) , m_bVisReplInStream( sal_True ) +, m_bStoreLoaded( sal_False ) , m_bStoreVisRepl( sal_True ) , m_bNewVisReplInStream( sal_True ) , m_bIsLink( sal_False ) @@ -126,6 +127,7 @@ OleEmbeddedObject::OleEmbeddedObject( const uno::Reference< lang::XMultiServiceF , m_xFactory( xFactory ) , m_bWaitSaveCompleted( sal_False ) , m_bVisReplInStream( sal_True ) +, m_bStoreLoaded( sal_False ) , m_bStoreVisRepl( sal_True ) , m_bNewVisReplInStream( sal_True ) , m_bIsLink( bLink ) @@ -153,6 +155,7 @@ OleEmbeddedObject::OleEmbeddedObject( const uno::Reference< lang::XMultiServiceF , m_xFactory( xFactory ) , m_bWaitSaveCompleted( sal_False ) , m_bVisReplInStream( sal_True ) +, m_bStoreLoaded( sal_False ) , m_bStoreVisRepl( sal_True ) , m_bNewVisReplInStream( sal_True ) , m_bIsLink( sal_False ) @@ -373,10 +376,10 @@ uno::Reference< util::XCloseable > SAL_CALL OleEmbeddedObject::getComponent() uno::Reference< uno::XInterface >( reinterpret_cast< ::cppu::OWeakObject* >(this) ) ); } - if ( m_bWaitSaveCompleted ) - throw embed::WrongStateException( - ::rtl::OUString::createFromAscii( "The object waits for saveCompleted() call!\n" ), - uno::Reference< uno::XInterface >( reinterpret_cast< ::cppu::OWeakObject* >(this) ) ); + // if ( m_bWaitSaveCompleted ) + // throw embed::WrongStateException( + // ::rtl::OUString::createFromAscii( "The object waits for saveCompleted() call!\n" ), + // uno::Reference< uno::XInterface >( reinterpret_cast< ::cppu::OWeakObject* >(this) ) ); if ( !m_pOleComponent ) { |