summaryrefslogtreecommitdiff
path: root/package/source/zippackage/ZipPackageStream.cxx
diff options
context:
space:
mode:
authorMartin Gallwey <mtg@openoffice.org>2000-12-04 10:30:09 +0000
committerMartin Gallwey <mtg@openoffice.org>2000-12-04 10:30:09 +0000
commit2056f50eadd8c850f32e5b7c7fa6fc770db16264 (patch)
treeb95b8a2228f84a22c2d69c8650d86494678357e6 /package/source/zippackage/ZipPackageStream.cxx
parent8c42ca8d118b0be4ece362f5f06f0c2629e81c75 (diff)
#80556# improved exception handling
Diffstat (limited to 'package/source/zippackage/ZipPackageStream.cxx')
-rw-r--r--package/source/zippackage/ZipPackageStream.cxx20
1 files changed, 15 insertions, 5 deletions
diff --git a/package/source/zippackage/ZipPackageStream.cxx b/package/source/zippackage/ZipPackageStream.cxx
index eb8475520f4b..4a425771fbad 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ZipPackageStream.cxx,v $
*
- * $Revision: 1.9 $
+ * $Revision: 1.10 $
*
- * last change: $Author: mtg $ $Date: 2000-11-29 03:21:56 $
+ * last change: $Author: mtg $ $Date: 2000-12-04 11:30:09 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -143,7 +143,17 @@ uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getInputStream( )
throw(uno::RuntimeException)
{
if (bPackageMember)
- return pZipFile->getInputStream(aEntry);
+ {
+ try
+ {
+ return pZipFile->getInputStream(aEntry);
+ }
+ catch (package::ZipException &rException)
+ {
+ VOS_DEBUG_ONLY(rException.Message);
+ return uno::Reference < io::XInputStream > ();
+ }
+ }
else
return xStream;
}
@@ -217,7 +227,7 @@ sal_Int64 SAL_CALL ZipPackageStream::getSomething( const uno::Sequence< sal_Int8
throw(uno::RuntimeException)
{
if (aIdentifier.getLength() == 16 && 0 == rtl_compareMemory(getUnoTunnelImplementationId().getConstArray(), aIdentifier.getConstArray(), 16 ) )
- return reinterpret_cast<sal_Int64>(this);
+ return reinterpret_cast < sal_Int64 > ( this );
- throw uno::RuntimeException();
+ return 0;
}