diff options
author | Martin Gallwey <mtg@openoffice.org> | 2000-12-04 10:30:09 +0000 |
---|---|---|
committer | Martin Gallwey <mtg@openoffice.org> | 2000-12-04 10:30:09 +0000 |
commit | 2056f50eadd8c850f32e5b7c7fa6fc770db16264 (patch) | |
tree | b95b8a2228f84a22c2d69c8650d86494678357e6 /package/inc | |
parent | 8c42ca8d118b0be4ece362f5f06f0c2629e81c75 (diff) |
#80556# improved exception handling
Diffstat (limited to 'package/inc')
-rw-r--r-- | package/inc/ZipFile.hxx | 19 | ||||
-rw-r--r-- | package/inc/ZipOutputStream.hxx | 16 | ||||
-rw-r--r-- | package/inc/ZipPackageFolder.hxx | 7 |
3 files changed, 26 insertions, 16 deletions
diff --git a/package/inc/ZipFile.hxx b/package/inc/ZipFile.hxx index 9b5554038257..0d3e6c1da808 100644 --- a/package/inc/ZipFile.hxx +++ b/package/inc/ZipFile.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ZipFile.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: mtg $ $Date: 2000-11-29 03:18:48 $ + * last change: $Author: mtg $ $Date: 2000-12-04 11:30:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -116,7 +116,10 @@ private: ByteGrabber aGrabber; com::sun::star::uno::Reference < com::sun::star::io::XInputStream > xStream; public: - ZipFile( com::sun::star::uno::Reference < com::sun::star::io::XInputStream > &xInput); + ZipFile( com::sun::star::uno::Reference < com::sun::star::io::XInputStream > &xInput) + throw(::com::sun::star::io::IOException, com::sun::star::package::ZipException, com::sun::star::uno::RuntimeException); + ZipFile( com::sun::star::uno::Reference < com::sun::star::io::XInputStream > &xInput, sal_Bool bInitialise) + throw(::com::sun::star::io::IOException, com::sun::star::package::ZipException, com::sun::star::uno::RuntimeException); void updateFromManList(std::vector < ManifestEntry * > &rManList); virtual ~ZipFile(); @@ -148,10 +151,12 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL entries( ) throw(::com::sun::star::uno::RuntimeException); private: - sal_Bool readLOC(const com::sun::star::package::ZipEntry &rEntry); - ZipEntryImpl* getNthEntry(sal_Int32 nIndex); - sal_Int32 readCEN(); - sal_Int32 findEND(); + sal_Bool readLOC(const com::sun::star::package::ZipEntry &rEntry) + throw(::com::sun::star::io::IOException, com::sun::star::package::ZipException, com::sun::star::uno::RuntimeException); + sal_Int32 readCEN() + throw(::com::sun::star::io::IOException, com::sun::star::package::ZipException, com::sun::star::uno::RuntimeException); + sal_Int32 findEND() + throw(::com::sun::star::io::IOException, com::sun::star::package::ZipException, com::sun::star::uno::RuntimeException); }; #if 0 diff --git a/package/inc/ZipOutputStream.hxx b/package/inc/ZipOutputStream.hxx index fb0ebf09f6db..d643c3a2da56 100644 --- a/package/inc/ZipOutputStream.hxx +++ b/package/inc/ZipOutputStream.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ZipOutputStream.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: mtg $ $Date: 2000-11-28 11:02:31 $ + * last change: $Author: mtg $ $Date: 2000-12-04 11:30:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -138,10 +138,14 @@ public: static void dosDateToTMDate ( tm &rTime, sal_uInt32 nDosDate); private: void doDeflate(); - void writeEND(sal_uInt32 nOffset, sal_uInt32 nLength); - void writeCEN( const com::sun::star::package::ZipEntry &rEntry ); - void writeEXT( const com::sun::star::package::ZipEntry &rEntry ); - void writeLOC( const com::sun::star::package::ZipEntry &rEntry ); + void writeEND(sal_uInt32 nOffset, sal_uInt32 nLength) + throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + void writeCEN( const com::sun::star::package::ZipEntry &rEntry ) + throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + void writeEXT( const com::sun::star::package::ZipEntry &rEntry ) + throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + void writeLOC( const com::sun::star::package::ZipEntry &rEntry ) + throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); }; diff --git a/package/inc/ZipPackageFolder.hxx b/package/inc/ZipPackageFolder.hxx index 89c508ac52a5..934b7b5080ef 100644 --- a/package/inc/ZipPackageFolder.hxx +++ b/package/inc/ZipPackageFolder.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ZipPackageFolder.hxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: mtg $ $Date: 2000-11-29 05:19:34 $ + * last change: $Author: mtg $ $Date: 2000-12-04 11:30:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -161,7 +161,8 @@ private: void setEntry(com::sun::star::package::ZipEntry &rDest, com::sun::star::package::ZipEntry &rSrc); public: ZipPackageFolder ( void ) ; - void saveContents(rtl::OUString &rPath, std::vector < ManifestEntry * > &rManList, ZipOutputStream & rZipOut); + void saveContents(rtl::OUString &rPath, std::vector < ManifestEntry * > &rManList, ZipOutputStream & rZipOut) + throw(::com::sun::star::uno::RuntimeException); void updateReferences( ZipFile * pNewZipFile); inline sal_Bool isFolder( void ) {return sal_True;} inline sal_Bool isStream( void ) {return sal_False;} |