diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-12-19 13:03:38 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-12-19 13:03:38 +0000 |
| commit | 49feb5ada377afa7b7d73250a3a91df5c301081f (patch) | |
| tree | e546af4ca891ce20a2a39fbd632c8383fedf9795 | |
| parent | 635cb82d49e057ad39ba784d49156a2939e5a3ec (diff) | |
INTEGRATION: CWS fwk56 (1.19.8); FILE MERGED
2006/11/03 08:53:11 mav 1.19.8.2: #132511# fix cleanup
2006/10/27 10:51:28 mav 1.19.8.1: #129882# the exception should not be thrown here
| -rw-r--r-- | svtools/source/misc/embedhlp.cxx | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx index 9978b2bd35e0..e3ca460ecd2e 100644 --- a/svtools/source/misc/embedhlp.cxx +++ b/svtools/source/misc/embedhlp.cxx @@ -4,9 +4,9 @@ * * $RCSfile: embedhlp.cxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: obo $ $Date: 2006-10-13 11:27:58 $ + * last change: $Author: ihi $ $Date: 2006-12-19 14:03:38 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -379,6 +379,10 @@ void EmbeddedObjectRef::Clear() { // there's still someone who needs the object! } + catch ( uno::Exception& ) + { + OSL_ENSURE( sal_False, "Error on switching of the object to loaded state and closing!\n" ); + } } } @@ -392,6 +396,13 @@ void EmbeddedObjectRef::Clear() mxObj = 0; mpImp->bNeedUpdate = sal_False; } + + mpImp->pContainer = 0; + mpImp->pGraphic = 0; + mpImp->pHCGraphic = 0; + mpImp->nViewAspect = embed::Aspects::MSOLE_CONTENT; + mpImp->bIsLocked = FALSE; + mpImp->bNeedUpdate = sal_False; } void EmbeddedObjectRef::AssignToContainer( comphelper::EmbeddedObjectContainer* pContainer, const ::rtl::OUString& rPersistName ) |