diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-12-19 13:09:54 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-12-19 13:09:54 +0000 |
| commit | d2d620f4e92417afa924675387b64decb0a678d4 (patch) | |
| tree | 6f180ecd570315d4ddc40b28a96b4409fbef2725 /package | |
| parent | efb27e9634651581dd4108fc9f788ca718e42f2d (diff) | |
INTEGRATION: CWS fwk56 (1.28.12); FILE MERGED
2006/11/01 14:14:44 mav 1.28.12.2: #i54892# clear the list of deleted entries
2006/10/31 11:52:46 mav 1.28.12.1: #140583# catch unexpected exceptions
Diffstat (limited to 'package')
| -rw-r--r-- | package/source/xstor/xstorage.cxx | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx index 532208f022ed..ea580c4ffbb2 100644 --- a/package/source/xstor/xstorage.cxx +++ b/package/source/xstor/xstorage.cxx @@ -4,9 +4,9 @@ * * $RCSfile: xstorage.cxx,v $ * - * $Revision: 1.28 $ + * $Revision: 1.29 $ * - * last change: $Author: obo $ $Date: 2006-10-13 11:50:53 $ + * last change: $Author: ihi $ $Date: 2006-12-19 14:09:54 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -373,7 +373,7 @@ OStorage_Impl::~OStorage_Impl() try { m_pAntiImpl->InternalDispose( sal_False ); } - catch ( uno::RuntimeException& ) + catch ( uno::Exception& ) {} m_pAntiImpl = NULL; } @@ -401,6 +401,12 @@ OStorage_Impl::~OStorage_Impl() m_aChildrenList.clear(); + for ( SotElementList_Impl::iterator pDeletedIter = m_aDeletedList.begin(); + pDeletedIter != m_aDeletedList.end(); pDeletedIter++ ) + delete *pDeletedIter; + + m_aDeletedList.clear(); + if ( m_nStorageType == OFOPXML_STORAGE && m_pRelStorElement ) { delete m_pRelStorElement; |