diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-07-31 18:14:17 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-07-31 18:14:17 +0000 |
| commit | 94d92f16ad5b0da5fc7444dea89f758686cbbb37 (patch) | |
| tree | 3dfdc6f08b939cfb8c356e7a144351f824ce5c2c /oox/source | |
| parent | b5d6d29a0e33ddf7b6a5fba5e6c68ea0e7f12684 (diff) | |
INTEGRATION: CWS dr65 (1.3.24); FILE MERGED
2008/07/23 20:34:56 dr 1.3.24.1: #i92010# check storage
Diffstat (limited to 'oox/source')
| -rw-r--r-- | oox/source/helper/zipstorage.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/oox/source/helper/zipstorage.cxx b/oox/source/helper/zipstorage.cxx index c60c837e9aed..ddc3ee9f5e7c 100644 --- a/oox/source/helper/zipstorage.cxx +++ b/oox/source/helper/zipstorage.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: zipstorage.cxx,v $ - * $Revision: 1.3 $ + * $Revision: 1.4 $ * * This file is part of OpenOffice.org. * @@ -64,7 +64,6 @@ ZipStorage::ZipStorage( } catch( Exception& ) { - OSL_ENSURE( false, "ZipStorage::ZipStorage - cannot open input storage" ); } } @@ -119,7 +118,7 @@ StorageRef ZipStorage::implOpenSubStorage( const OUString& rElementName, bool bC (void)bCreate; // prevent compiler warning Reference< XStorage > xSubXStorage; - try + if( mxStorage.is() ) try { // XStorage::isStorageElement may throw various exceptions... if( mxStorage->isStorageElement( rElementName ) ) |