diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-01-31 08:03:10 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-01-31 08:03:10 +0000 |
| commit | 5bab71befb9ade234120e854fc729e8ba4e33f12 (patch) | |
| tree | 88bb44a826b685d62b6aaea0681442d987031422 | |
| parent | 0bc728b4663431300e739b5688ad4c10aa700600 (diff) | |
INTEGRATION: CWS mav15 (1.15.38); FILE MERGED
2005/01/13 11:48:34 mav 1.15.38.1: #i40445# allow to call saveCompleted(false) for nonstored objects
| -rw-r--r-- | embeddedobj/source/msole/olepersist.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/embeddedobj/source/msole/olepersist.cxx b/embeddedobj/source/msole/olepersist.cxx index 332a6659580d..43f6511d1f50 100644 --- a/embeddedobj/source/msole/olepersist.cxx +++ b/embeddedobj/source/msole/olepersist.cxx @@ -2,9 +2,9 @@ * * $RCSfile: olepersist.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: kz $ $Date: 2005-01-18 15:10:54 $ + * last change: $Author: rt $ $Date: 2005-01-31 09:03:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1007,6 +1007,10 @@ void SAL_CALL OleEmbeddedObject::saveCompleted( sal_Bool bUseNew ) uno::Reference< uno::XInterface >( reinterpret_cast< ::cppu::OWeakObject* >(this) ) ); } + // it is allowed to call saveCompleted( false ) for nonstored objects + if ( !m_bWaitSaveCompleted && !bUseNew ) + return; + OSL_ENSURE( m_bWaitSaveCompleted, "Unexpected saveCompleted() call!\n" ); if ( !m_bWaitSaveCompleted ) throw io::IOException(); // TODO: illegal call |