From 19e677a2e8a4d6abc85773c5a7072e5216307a46 Mon Sep 17 00:00:00 2001 From: Martin Gallwey Date: Fri, 16 Mar 2001 16:11:42 +0000 Subject: comply with MI's required change for package->packages, as package is a reserved word in Java --- package/inc/CRC32.hxx | 8 +-- package/inc/Deflater.hxx | 10 ++-- package/inc/Inflater.hxx | 10 ++-- package/inc/ZipEnumeration.hxx | 10 ++-- package/inc/ZipFile.hxx | 32 ++++++------ package/inc/ZipOutputStream.hxx | 20 ++++---- package/inc/ZipPackage.hxx | 8 +-- package/inc/ZipPackageFolder.hxx | 8 +-- package/source/zipapi/Deflater.cxx | 6 +-- package/source/zipapi/EntryInputStream.cxx | 6 +-- package/source/zipapi/ZipEnumeration.cxx | 6 +-- package/source/zipapi/ZipFile.cxx | 68 +++++++++++++------------- package/source/zipapi/ZipOutputStream.cxx | 18 +++---- package/source/zipapi/makefile.mk | 22 ++++----- package/source/zippackage/ZipPackage.cxx | 18 +++---- package/source/zippackage/ZipPackageEntry.cxx | 6 +-- package/source/zippackage/ZipPackageFolder.cxx | 10 ++-- package/source/zippackage/ZipPackageStream.cxx | 12 ++--- 18 files changed, 139 insertions(+), 139 deletions(-) diff --git a/package/inc/CRC32.hxx b/package/inc/CRC32.hxx index 019c7438692a..c397df383123 100644 --- a/package/inc/CRC32.hxx +++ b/package/inc/CRC32.hxx @@ -2,9 +2,9 @@ * * $RCSfile: CRC32.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: mtg $ $Date: 2000-12-19 21:55:35 $ + * last change: $Author: mtg $ $Date: 2001-03-16 17:11:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,10 +70,10 @@ #endif #ifndef _COM_SUN_STAR_PACKAGE_XCHECKSUM_HPP_ -#include +#include #endif -class CRC32 : public cppu::WeakImplHelper1 +class CRC32 : public cppu::WeakImplHelper1 { private: sal_uInt32 nCRC; diff --git a/package/inc/Deflater.hxx b/package/inc/Deflater.hxx index 1b6796cd942d..c715ed5e614f 100644 --- a/package/inc/Deflater.hxx +++ b/package/inc/Deflater.hxx @@ -2,9 +2,9 @@ * * $RCSfile: Deflater.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: mtg $ $Date: 2000-12-19 21:55:35 $ + * last change: $Author: mtg $ $Date: 2001-03-16 17:11:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -62,7 +62,7 @@ #define _DEFLATER_HXX_ #ifndef _COM_SUN_STAR_PACKAGE_XDEFLATER_HDL_ -#include +#include #endif #ifndef _CPPUHELPER_IMPLBASE1_HXX_ @@ -78,10 +78,10 @@ #endif #ifndef _COM_SUN_STAR_PACKAGE_ZIPCONSTANTS_HPP_ -#include +#include #endif -class Deflater : public cppu::WeakImplHelper1 < com::sun::star::package::XDeflater> +class Deflater : public cppu::WeakImplHelper1 < com::sun::star::packages::XDeflater> { private: com::sun::star::uno::Sequence< sal_Int8 > sInBuffer; diff --git a/package/inc/Inflater.hxx b/package/inc/Inflater.hxx index 81f2b15b4aaa..1eaa8fb1117c 100644 --- a/package/inc/Inflater.hxx +++ b/package/inc/Inflater.hxx @@ -2,9 +2,9 @@ * * $RCSfile: Inflater.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: mtg $ $Date: 2001-03-07 19:24:14 $ + * last change: $Author: mtg $ $Date: 2001-03-16 17:11:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -66,7 +66,7 @@ #endif #ifndef _COM_SUN_STAR_PACKAGE_XINFLATER_HDL_ -#include +#include #endif #ifndef _CPPUHELPER_IMPLBASE1_HXX_ @@ -78,11 +78,11 @@ #endif #ifndef _COM_SUN_STAR_PACKAGE_ZIPCONSTANTS_HPP_ -#include +#include #endif -class Inflater : public cppu::WeakImplHelper1 < com::sun::star::package::XInflater> +class Inflater : public cppu::WeakImplHelper1 < com::sun::star::packages::XInflater> { private: sal_Bool bFinish; diff --git a/package/inc/ZipEnumeration.hxx b/package/inc/ZipEnumeration.hxx index 4acdc17f2be6..785d85470538 100644 --- a/package/inc/ZipEnumeration.hxx +++ b/package/inc/ZipEnumeration.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ZipEnumeration.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: mtg $ $Date: 2000-12-19 21:55:35 $ + * last change: $Author: mtg $ $Date: 2001-03-16 17:11:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -90,7 +90,7 @@ struct entryHashFunc } }; #include -typedef std::hash_map < rtl::OUString, com::sun::star::package::ZipEntry, entryHashFunc, entryEqFunc > EntryHash; +typedef std::hash_map < rtl::OUString, com::sun::star::packages::ZipEntry, entryHashFunc, entryEqFunc > EntryHash; #ifndef _ZIP_FILE_HXX_ #include "ZipFile.hxx" @@ -108,11 +108,11 @@ public: virtual com::sun::star::uno::Any SAL_CALL nextElement() throw (::com::sun::star::uno::RuntimeException); virtual ~ZipEnumeration(void); ZipEnumeration( EntryHash &rNewEntryHash); - //ZipEnumeration( com::sun::star::uno::Reference < com::sun::star::uno::Sequence< com::sun::star::package::ZipEntry > >&xList); + //ZipEnumeration( com::sun::star::uno::Reference < com::sun::star::uno::Sequence< com::sun::star::packages::ZipEntry > >&xList); /* ZipEnumeration(const com::sun::star::uno::Sequence< com::sun::star::uno::Reference< - com::sun::star::package::ZipEntry> > & seqEntries); + com::sun::star::packages::ZipEntry> > & seqEntries); // XInterface virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType ) throw( ::com::sun::star::uno::RuntimeException ); diff --git a/package/inc/ZipFile.hxx b/package/inc/ZipFile.hxx index 4a6af67d9021..06e24929368a 100644 --- a/package/inc/ZipFile.hxx +++ b/package/inc/ZipFile.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ZipFile.hxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: mtg $ $Date: 2001-03-07 19:24:14 $ + * last change: $Author: mtg $ $Date: 2001-03-16 17:11:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -66,7 +66,7 @@ #endif #ifndef _COM_SUN_STAR_PACKAGE_XZIPFILE_HPP_ -#include +#include #endif #ifndef _ENTRY_INPUT_STREAM_HXX @@ -96,7 +96,7 @@ #endif #ifndef _COM_SUN_STAR_PACKAGE_ZIPCONSTANTS_HPP_ -#include +#include #endif /* @@ -107,7 +107,7 @@ #define ZIP_MAXENTRIES (0x10000 - 2) class ZipFile : public cppu::WeakImplHelper1< - com::sun::star::package::XZipFile> + com::sun::star::packages::XZipFile> { private: ::rtl::OUString sName; /* zip file name */ @@ -118,14 +118,14 @@ private: com::sun::star::uno::Reference < com::sun::star::io::XInputStream > xStream; public: 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); + throw(::com::sun::star::io::IOException, com::sun::star::packages::ZipException, com::sun::star::uno::RuntimeException); void updateFromManList(std::vector < ManifestEntry * > &rManList); void setInputStream ( com::sun::star::uno::Reference < com::sun::star::io::XInputStream > xNewStream ); - sal_uInt32 SAL_CALL getHeader(const ::com::sun::star::package::ZipEntry& rEntry) - throw(::com::sun::star::io::IOException, ::com::sun::star::package::ZipException, ::com::sun::star::uno::RuntimeException); + sal_uInt32 SAL_CALL getHeader(const ::com::sun::star::packages::ZipEntry& rEntry) + throw(::com::sun::star::io::IOException, ::com::sun::star::packages::ZipException, ::com::sun::star::uno::RuntimeException); virtual ~ZipFile(); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getRawStream( const ::com::sun::star::package::ZipEntry& rEntry ) - throw(::com::sun::star::io::IOException, ::com::sun::star::package::ZipException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getRawStream( const ::com::sun::star::packages::ZipEntry& rEntry ) + throw(::com::sun::star::io::IOException, ::com::sun::star::packages::ZipException, ::com::sun::star::uno::RuntimeException); // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) @@ -133,8 +133,8 @@ public: virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException); // XZipFile - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getInputStream( const ::com::sun::star::package::ZipEntry& rEntry ) - throw(::com::sun::star::io::IOException, ::com::sun::star::package::ZipException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getInputStream( const ::com::sun::star::packages::ZipEntry& rEntry ) + throw(::com::sun::star::io::IOException, ::com::sun::star::packages::ZipException, ::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getSize( ) @@ -155,12 +155,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) - throw(::com::sun::star::io::IOException, com::sun::star::package::ZipException, com::sun::star::uno::RuntimeException); + sal_Bool readLOC(const com::sun::star::packages::ZipEntry &rEntry) + throw(::com::sun::star::io::IOException, com::sun::star::packages::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); + throw(::com::sun::star::io::IOException, com::sun::star::packages::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); + throw(::com::sun::star::io::IOException, com::sun::star::packages::ZipException, com::sun::star::uno::RuntimeException); }; #if 0 diff --git a/package/inc/ZipOutputStream.hxx b/package/inc/ZipOutputStream.hxx index d65ca78b0273..1461f661ad93 100644 --- a/package/inc/ZipOutputStream.hxx +++ b/package/inc/ZipOutputStream.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ZipOutputStream.hxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: mtg $ $Date: 2001-03-07 16:09:44 $ + * last change: $Author: mtg $ $Date: 2001-03-16 17:11:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -82,7 +82,7 @@ #endif #ifndef _COM_SUN_STAR_PACKAGE_XZIPOUTPUTSTREAM_HPP_ -#include +#include #endif #ifndef _CPPUHELPER_IMPLBASE1_HXX_ @@ -98,7 +98,7 @@ #endif -class ZipOutputStream : public cppu::WeakImplHelper1< com::sun::star::package::XZipOutputStream > +class ZipOutputStream : public cppu::WeakImplHelper1< com::sun::star::packages::XZipOutputStream > { private: com::sun::star::uno::Reference < com::sun::star::io::XOutputStream > xStream; @@ -107,11 +107,11 @@ private: ::rtl::OUString sComment; sal_Int16 nMethod; sal_Int16 nLevel; - com::sun::star::package::ZipEntry *pCurrentEntry; + com::sun::star::packages::ZipEntry *pCurrentEntry; CRC32 aCRC; sal_Bool bFinished; ByteChucker aChucker; - ::std::vector < ::com::sun::star::package::ZipEntry* > aZipList; + ::std::vector < ::com::sun::star::packages::ZipEntry* > aZipList; public: ZipOutputStream( com::sun::star::uno::Reference < com::sun::star::io::XOutputStream > &xOStream, sal_Int32 nNewBufferSize); @@ -129,7 +129,7 @@ public: throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setLevel( sal_Int32 nNewLevel ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL putNextEntry( const ::com::sun::star::package::ZipEntry& rEntry ) + virtual void SAL_CALL putNextEntry( const ::com::sun::star::packages::ZipEntry& rEntry ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL closeEntry( ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); @@ -148,11 +148,11 @@ private: void doDeflate(); 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 ) + void writeCEN( const com::sun::star::packages::ZipEntry &rEntry ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - void writeEXT( const com::sun::star::package::ZipEntry &rEntry ) + void writeEXT( const com::sun::star::packages::ZipEntry &rEntry ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - void writeLOC( const com::sun::star::package::ZipEntry &rEntry ) + void writeLOC( const com::sun::star::packages::ZipEntry &rEntry ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); }; diff --git a/package/inc/ZipPackage.hxx b/package/inc/ZipPackage.hxx index 1124a6079b24..8ce3e2a34e23 100644 --- a/package/inc/ZipPackage.hxx +++ b/package/inc/ZipPackage.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ZipPackage.hxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: mtg $ $Date: 2000-12-19 21:55:35 $ + * last change: $Author: mtg $ $Date: 2001-03-16 17:11:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -150,12 +150,12 @@ private: ZipFile *pZipFile; ::ucb::Content *pContent; sal_Bool bContained; - ::com::sun::star::uno::Reference < com::sun::star::package::XZipFile > xZipFile; + ::com::sun::star::uno::Reference < com::sun::star::packages::XZipFile > xZipFile; ::com::sun::star::uno::Reference < com::sun::star::container::XNameContainer > xRootFolder; ::com::sun::star::uno::Reference < com::sun::star::io::XInputStream > xContentStream; ::com::sun::star::uno::Reference < com::sun::star::io::XSeekable > xContentSeek; const ::com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory > xFactory; - sal_Bool isZipFile(com::sun::star::package::ZipEntry &rEntry); + sal_Bool isZipFile(com::sun::star::packages::ZipEntry &rEntry); void getZipFileContents(); void destroyFolderTree( ::com::sun::star::uno::Reference < ::com::sun::star::lang::XUnoTunnel > xFolder ); NameHash aRecent; diff --git a/package/inc/ZipPackageFolder.hxx b/package/inc/ZipPackageFolder.hxx index fc5e163cf0d7..a7c7e5ff4763 100644 --- a/package/inc/ZipPackageFolder.hxx +++ b/package/inc/ZipPackageFolder.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ZipPackageFolder.hxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: mtg $ $Date: 2001-03-07 16:09:44 $ + * last change: $Author: mtg $ $Date: 2001-03-16 17:11:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -78,7 +78,7 @@ #endif #ifndef _COM_SUN_STAR_PACKAGE_ZIPENTRY_HPP_ -#include +#include #endif #ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ @@ -176,7 +176,7 @@ public: ZipPackageFolder ( void ); virtual ~ZipPackageFolder( void ); - static void copyZipEntry( com::sun::star::package::ZipEntry &rDest, const com::sun::star::package::ZipEntry &rSource); + static void copyZipEntry( com::sun::star::packages::ZipEntry &rDest, const com::sun::star::packages::ZipEntry &rSource); // Recursive functions void saveContents(rtl::OUString &rPath, std::vector < ManifestEntry * > &rManList, ZipOutputStream & rZipOut) throw(::com::sun::star::uno::RuntimeException); diff --git a/package/source/zipapi/Deflater.cxx b/package/source/zipapi/Deflater.cxx index 1be58518f2ec..ed0ad4d8fe9a 100644 --- a/package/source/zipapi/Deflater.cxx +++ b/package/source/zipapi/Deflater.cxx @@ -2,9 +2,9 @@ * * $RCSfile: Deflater.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: mtg $ $Date: 2000-12-19 21:55:39 $ + * last change: $Author: mtg $ $Date: 2001-03-16 17:11:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,7 +65,7 @@ #include #include -using namespace com::sun::star::package::ZipConstants; +using namespace com::sun::star::packages::ZipConstants; using namespace com::sun::star; /** Provides general purpose compression using the ZLIB compression diff --git a/package/source/zipapi/EntryInputStream.cxx b/package/source/zipapi/EntryInputStream.cxx index d1d067bac1ec..7c1fae574b11 100644 --- a/package/source/zipapi/EntryInputStream.cxx +++ b/package/source/zipapi/EntryInputStream.cxx @@ -2,9 +2,9 @@ * * $RCSfile: EntryInputStream.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: mtg $ $Date: 2001-03-08 16:34:27 $ + * last change: $Author: mtg $ $Date: 2001-03-16 17:11:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -63,7 +63,7 @@ #endif #ifndef _COM_SUN_STAR_PACKAGE_ZIPCONSTANTS_HPP_ -#include +#include #endif using namespace rtl; diff --git a/package/source/zipapi/ZipEnumeration.cxx b/package/source/zipapi/ZipEnumeration.cxx index 4d648cb20b37..7d0b3a804413 100644 --- a/package/source/zipapi/ZipEnumeration.cxx +++ b/package/source/zipapi/ZipEnumeration.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ZipEnumeration.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: mtg $ $Date: 2000-12-19 21:55:39 $ + * last change: $Author: mtg $ $Date: 2001-03-16 17:11:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -63,7 +63,7 @@ #endif #ifndef _COM_SUN_STAR_PACKAGE_ZIPCONSTANTS_HPP_ -#include +#include #endif #include diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx index ea5c682c923f..d06c291452c3 100644 --- a/package/source/zipapi/ZipFile.cxx +++ b/package/source/zipapi/ZipFile.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ZipFile.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: mtg $ $Date: 2001-03-07 19:24:15 $ + * last change: $Author: mtg $ $Date: 2001-03-16 17:11:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,12 +65,12 @@ using namespace rtl; using namespace com::sun::star; -using namespace com::sun::star::package::ZipConstants; +using namespace com::sun::star::packages::ZipConstants; /** This class is used to read entries from a zip file */ ZipFile::ZipFile( uno::Reference < io::XInputStream > &xInput, sal_Bool bInitialise) - throw(io::IOException, package::ZipException, uno::RuntimeException) + throw(io::IOException, packages::ZipException, uno::RuntimeException) : xStream(xInput) , aGrabber(xInput) , aInflater (sal_True) @@ -93,7 +93,7 @@ void ZipFile::updateFromManList(std::vector < ManifestEntry * > &rManList) // I'm not sure how evil this is in this case... for (;i < nSize ; i++) { - package::ZipEntry * pEntry = &rManList[i]->aEntry; + packages::ZipEntry * pEntry = &rManList[i]->aEntry; aEntries[pEntry->sName] = *pEntry; } } @@ -130,7 +130,7 @@ sal_Int32 SAL_CALL ZipFile::getSize( ) uno::Type SAL_CALL ZipFile::getElementType( ) throw(uno::RuntimeException) { - return ::getCppuType((package::ZipEntry *) 0); + return ::getCppuType((packages::ZipEntry *) 0); } sal_Bool SAL_CALL ZipFile::hasElements( ) @@ -166,8 +166,8 @@ sal_Bool SAL_CALL ZipFile::hasByName( const ::rtl::OUString& aName ) return aEntries.count(aName); } -uno::Reference< io::XInputStream > SAL_CALL ZipFile::getInputStream( const package::ZipEntry& rEntry ) - throw(io::IOException, package::ZipException, uno::RuntimeException) +uno::Reference< io::XInputStream > SAL_CALL ZipFile::getInputStream( const packages::ZipEntry& rEntry ) + throw(io::IOException, packages::ZipException, uno::RuntimeException) { sal_Int64 nEnd = rEntry.nCompressedSize == 0 ? rEntry.nSize : rEntry.nCompressedSize; if (rEntry.nOffset <= 0) @@ -179,8 +179,8 @@ uno::Reference< io::XInputStream > SAL_CALL ZipFile::getInputStream( const packa return xStreamRef; } -sal_uInt32 SAL_CALL ZipFile::getHeader(const package::ZipEntry& rEntry) - throw(io::IOException, package::ZipException, uno::RuntimeException) +sal_uInt32 SAL_CALL ZipFile::getHeader(const packages::ZipEntry& rEntry) + throw(io::IOException, packages::ZipException, uno::RuntimeException) { uno::Sequence < sal_Int8 > aSequence (4); @@ -189,7 +189,7 @@ sal_uInt32 SAL_CALL ZipFile::getHeader(const package::ZipEntry& rEntry) if (rEntry.nOffset <= 0) readLOC(rEntry); } - catch (package::ZipException&) + catch (packages::ZipException&) { VOS_ENSURE(0, "Zip file bug!"); return 0; @@ -224,8 +224,8 @@ sal_uInt32 SAL_CALL ZipFile::getHeader(const package::ZipEntry& rEntry) | static_cast < sal_uInt8> (aSequence[3]& 0xFF) << 24)); } -uno::Reference< io::XInputStream > SAL_CALL ZipFile::getRawStream( const package::ZipEntry& rEntry ) - throw(io::IOException, package::ZipException, uno::RuntimeException) +uno::Reference< io::XInputStream > SAL_CALL ZipFile::getRawStream( const packages::ZipEntry& rEntry ) + throw(io::IOException, packages::ZipException, uno::RuntimeException) { sal_Int64 nSize = rEntry.nMethod == DEFLATED ? rEntry.nCompressedSize : rEntry.nSize; @@ -237,8 +237,8 @@ uno::Reference< io::XInputStream > SAL_CALL ZipFile::getRawStream( const package return xStreamRef; } -sal_Bool ZipFile::readLOC(const package::ZipEntry &rEntry) - throw(io::IOException, package::ZipException, uno::RuntimeException) +sal_Bool ZipFile::readLOC(const packages::ZipEntry &rEntry) + throw(io::IOException, packages::ZipException, uno::RuntimeException) { sal_uInt32 nTestSig, nTime, nCRC, nSize, nCompressedSize; sal_uInt16 nVersion, nFlag, nHow, nNameLen, nExtraLen; @@ -248,7 +248,7 @@ sal_Bool ZipFile::readLOC(const package::ZipEntry &rEntry) aGrabber >> nTestSig; if (nTestSig != LOCSIG) - throw package::ZipException( OUString( RTL_CONSTASCII_USTRINGPARAM ( "Invalid LOC header (bad signature") ), uno::Reference < uno::XInterface > () ); + throw packages::ZipException( OUString( RTL_CONSTASCII_USTRINGPARAM ( "Invalid LOC header (bad signature") ), uno::Reference < uno::XInterface > () ); aGrabber >> nVersion; aGrabber >> nFlag; aGrabber >> nHow; @@ -258,13 +258,13 @@ sal_Bool ZipFile::readLOC(const package::ZipEntry &rEntry) aGrabber >> nSize; aGrabber >> nNameLen; aGrabber >> nExtraLen; - package::ZipEntry *pNonConstEntry = const_cast < package::ZipEntry* > (&rEntry); + packages::ZipEntry *pNonConstEntry = const_cast < packages::ZipEntry* > (&rEntry); pNonConstEntry->nOffset = static_cast < sal_Int32 > (aGrabber.getPosition()) + nNameLen + nExtraLen; return sal_True; } sal_Int32 ZipFile::findEND( ) - throw(io::IOException, package::ZipException, uno::RuntimeException) + throw(io::IOException, packages::ZipException, uno::RuntimeException) { sal_Int32 nLength=0, nPos=0; uno::Sequence < sal_Int8 > aByteSeq; @@ -272,7 +272,7 @@ sal_Int32 ZipFile::findEND( ) if (nLength == 0) return -1; - //throw (package::ZipException( OUString::createFromAscii("Trying to find Zip END signature in a zero length file!"), uno::Reference < uno::XInterface> () )); + //throw (packages::ZipException( OUString::createFromAscii("Trying to find Zip END signature in a zero length file!"), uno::Reference < uno::XInterface> () )); aGrabber.seek( nLength ); @@ -309,11 +309,11 @@ sal_Int32 ZipFile::findEND( ) } } } - throw package::ZipException( OUString( RTL_CONSTASCII_USTRINGPARAM ( "Zip END signature not found!") ), uno::Reference < uno::XInterface> () ); + throw packages::ZipException( OUString( RTL_CONSTASCII_USTRINGPARAM ( "Zip END signature not found!") ), uno::Reference < uno::XInterface> () ); } sal_Int32 ZipFile::readCEN() - throw(io::IOException, package::ZipException, uno::RuntimeException) + throw(io::IOException, packages::ZipException, uno::RuntimeException) { sal_Int32 nEndPos, nLocPos; sal_Int16 nCount, nTotal; @@ -328,23 +328,23 @@ sal_Int32 ZipFile::readCEN() aGrabber >> nCenOff; if (nTotal<0 || nTotal * CENHDR > nCenLen) - throw package::ZipException(OUString( RTL_CONSTASCII_USTRINGPARAM ( "invalid END header (bad entry count)") ), uno::Reference < uno::XInterface > ()); + throw packages::ZipException(OUString( RTL_CONSTASCII_USTRINGPARAM ( "invalid END header (bad entry count)") ), uno::Reference < uno::XInterface > ()); if (nTotal > ZIP_MAXENTRIES) - throw package::ZipException(OUString( RTL_CONSTASCII_USTRINGPARAM ( "too many entries in ZIP File") ), uno::Reference < uno::XInterface > ()); + throw packages::ZipException(OUString( RTL_CONSTASCII_USTRINGPARAM ( "too many entries in ZIP File") ), uno::Reference < uno::XInterface > ()); if (nCenLen < 0 || nCenLen > nEndPos) - throw package::ZipException(OUString( RTL_CONSTASCII_USTRINGPARAM ( "Invalid END header (bad central directory size)") ), uno::Reference < uno::XInterface > ()); + throw packages::ZipException(OUString( RTL_CONSTASCII_USTRINGPARAM ( "Invalid END header (bad central directory size)") ), uno::Reference < uno::XInterface > ()); nCenPos = nEndPos - nCenLen; if (nCenOff < 0 || nCenOff > nCenPos) - throw package::ZipException(OUString( RTL_CONSTASCII_USTRINGPARAM ( "Invalid END header (bad central directory size)") ), uno::Reference < uno::XInterface > ()); + throw packages::ZipException(OUString( RTL_CONSTASCII_USTRINGPARAM ( "Invalid END header (bad central directory size)") ), uno::Reference < uno::XInterface > ()); nLocPos = nCenPos - nCenOff; aGrabber.seek(nCenPos); - package::ZipEntry *pEntry = new package::ZipEntry; + packages::ZipEntry *pEntry = new packages::ZipEntry; for (nCount = 0 ; nCount < nTotal; nCount++) { sal_Int32 nTestSig, nCRC, nCompressedSize, nTime, nSize, nExtAttr, nOffset; @@ -352,21 +352,21 @@ sal_Int32 ZipFile::readCEN() sal_Int16 nDisk, nIntAttr; if (aGrabber.getPosition() - nCenPos + CENHDR > nCenLen) - throw package::ZipException(OUString( RTL_CONSTASCII_USTRINGPARAM ( "Invalid CEN header (bad header size check 1)") ), uno::Reference < uno::XInterface > ()); + throw packages::ZipException(OUString( RTL_CONSTASCII_USTRINGPARAM ( "Invalid CEN header (bad header size check 1)") ), uno::Reference < uno::XInterface > ()); aGrabber >> nTestSig; if (nTestSig != CENSIG) - throw package::ZipException(OUString( RTL_CONSTASCII_USTRINGPARAM ( "Invalid CEN header (bad signature)") ), uno::Reference < uno::XInterface > ()); + throw packages::ZipException(OUString( RTL_CONSTASCII_USTRINGPARAM ( "Invalid CEN header (bad signature)") ), uno::Reference < uno::XInterface > ()); aGrabber >> nVerMade; aGrabber >> nVersion; if ((nVersion & 1) == 1) - throw package::ZipException(OUString( RTL_CONSTASCII_USTRINGPARAM ( "Invalid CEN header (encrypted entry)") ), uno::Reference < uno::XInterface > ()); + throw packages::ZipException(OUString( RTL_CONSTASCII_USTRINGPARAM ( "Invalid CEN header (encrypted entry)") ), uno::Reference < uno::XInterface > ()); aGrabber >> nFlag; aGrabber >> nHow; if (nHow != STORED && nHow != DEFLATED) - throw package::ZipException(OUString( RTL_CONSTASCII_USTRINGPARAM ( "Invalid CEN header (bad compression method)") ), uno::Reference < uno::XInterface > ()); + throw packages::ZipException(OUString( RTL_CONSTASCII_USTRINGPARAM ( "Invalid CEN header (bad compression method)") ), uno::Reference < uno::XInterface > ()); aGrabber >> nTime; aGrabber >> nCRC; @@ -381,13 +381,13 @@ sal_Int32 ZipFile::readCEN() aGrabber >> nOffset; if (aGrabber.getPosition() - nCenPos + nNameLen + nExtraLen + nCommentLen > nCenLen) - throw package::ZipException(OUString( RTL_CONSTASCII_USTRINGPARAM ( "Invalid CEN header (bad header size check 2)") ), uno::Reference < uno::XInterface > ()); + throw packages::ZipException(OUString( RTL_CONSTASCII_USTRINGPARAM ( "Invalid CEN header (bad header size check 2)") ), uno::Reference < uno::XInterface > ()); if (nNameLen > ZIP_MAXNAMELEN) - throw package::ZipException(OUString( RTL_CONSTASCII_USTRINGPARAM ( "name length exceeds 512 bytes" ) ), uno::Reference < uno::XInterface > ()); + throw packages::ZipException(OUString( RTL_CONSTASCII_USTRINGPARAM ( "name length exceeds 512 bytes" ) ), uno::Reference < uno::XInterface > ()); if (nExtraLen > ZIP_MAXEXTRA) - throw package::ZipException(OUString( RTL_CONSTASCII_USTRINGPARAM ( "extra header info exceeds 256 bytes") ), uno::Reference < uno::XInterface > ()); + throw packages::ZipException(OUString( RTL_CONSTASCII_USTRINGPARAM ( "extra header info exceeds 256 bytes") ), uno::Reference < uno::XInterface > ()); pEntry->nTime = nTime; pEntry->nCrc = nCRC; @@ -419,7 +419,7 @@ sal_Int32 ZipFile::readCEN() delete pEntry; if (nCount != nTotal) - throw package::ZipException(OUString( RTL_CONSTASCII_USTRINGPARAM ( "Count != Total") ), uno::Reference < uno::XInterface > ()); + throw packages::ZipException(OUString( RTL_CONSTASCII_USTRINGPARAM ( "Count != Total") ), uno::Reference < uno::XInterface > ()); return nCenPos; } diff --git a/package/source/zipapi/ZipOutputStream.cxx b/package/source/zipapi/ZipOutputStream.cxx index da407b8f19a8..ed64ef3a0854 100644 --- a/package/source/zipapi/ZipOutputStream.cxx +++ b/package/source/zipapi/ZipOutputStream.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ZipOutputStream.cxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: mtg $ $Date: 2001-03-07 16:09:44 $ + * last change: $Author: mtg $ $Date: 2001-03-16 17:11:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -67,7 +67,7 @@ using namespace rtl; using namespace com::sun::star; -using namespace com::sun::star::package::ZipConstants; +using namespace com::sun::star::packages::ZipConstants; /** This class is used to write Zip files */ @@ -101,10 +101,10 @@ void SAL_CALL ZipOutputStream::setLevel( sal_Int32 nNewLevel ) { aDeflater.setLevel( nNewLevel); } -void SAL_CALL ZipOutputStream::putNextEntry( const package::ZipEntry& rEntry ) +void SAL_CALL ZipOutputStream::putNextEntry( const packages::ZipEntry& rEntry ) throw(io::IOException, uno::RuntimeException) { - package::ZipEntry *pNonConstEntry = const_cast < package::ZipEntry* >(&rEntry); + packages::ZipEntry *pNonConstEntry = const_cast < packages::ZipEntry* >(&rEntry); if (pCurrentEntry != NULL) closeEntry(); if (pNonConstEntry->nTime == -1) @@ -135,7 +135,7 @@ void SAL_CALL ZipOutputStream::close( ) void SAL_CALL ZipOutputStream::closeEntry( ) throw(io::IOException, uno::RuntimeException) { - package::ZipEntry *pEntry = pCurrentEntry; + packages::ZipEntry *pEntry = pCurrentEntry; if (pEntry) { switch (pEntry->nMethod) @@ -314,7 +314,7 @@ void ZipOutputStream::writeEND(sal_uInt32 nOffset, sal_uInt32 nLength) if (nCommentLength) aChucker.writeBytes(aSequence); } -void ZipOutputStream::writeCEN( const package::ZipEntry &rEntry ) +void ZipOutputStream::writeCEN( const packages::ZipEntry &rEntry ) throw(io::IOException, uno::RuntimeException) { sal_Int16 nNameLength = static_cast < sal_Int16 > ( rEntry.sName.getLength() ) , @@ -381,7 +381,7 @@ void ZipOutputStream::writeCEN( const package::ZipEntry &rEntry ) aChucker.writeBytes( aSequence ); } } -void ZipOutputStream::writeEXT( const package::ZipEntry &rEntry ) +void ZipOutputStream::writeEXT( const packages::ZipEntry &rEntry ) throw(io::IOException, uno::RuntimeException) { aChucker << EXTSIG; @@ -390,7 +390,7 @@ void ZipOutputStream::writeEXT( const package::ZipEntry &rEntry ) aChucker << rEntry.nSize; } -void ZipOutputStream::writeLOC( const package::ZipEntry &rEntry ) +void ZipOutputStream::writeLOC( const packages::ZipEntry &rEntry ) throw(io::IOException, uno::RuntimeException) { sal_Int16 nNameLength = static_cast < sal_Int16 > (rEntry.sName.getLength()); diff --git a/package/source/zipapi/makefile.mk b/package/source/zipapi/makefile.mk index d1041a61e203..304fc5ef9e38 100644 --- a/package/source/zipapi/makefile.mk +++ b/package/source/zipapi/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.6 $ # -# last change: $Author: mtg $ $Date: 2000-12-20 11:24:25 $ +# last change: $Author: mtg $ $Date: 2001-03-16 17:11:42 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -97,15 +97,15 @@ UNOUCRDEP= $(SOLARBINDIR)$/applicat.rdb UNOUCRRDB= $(SOLARBINDIR)$/applicat.rdb UNOTYPES=\ - com.sun.star.package.XChecksum \ - com.sun.star.package.XInflater \ - com.sun.star.package.XDeflater \ - com.sun.star.package.XZipFile \ - com.sun.star.package.XZipInputStream \ - com.sun.star.package.XZipOutputStream \ - com.sun.star.package.ZipConstants \ - com.sun.star.package.ZipEntry \ - com.sun.star.package.ZipException \ + com.sun.star.packages.XChecksum \ + com.sun.star.packages.XInflater \ + com.sun.star.packages.XDeflater \ + com.sun.star.packages.XZipFile \ + com.sun.star.packages.XZipInputStream \ + com.sun.star.packages.XZipOutputStream \ + com.sun.star.packages.ZipConstants \ + com.sun.star.packages.ZipEntry \ + com.sun.star.packages.ZipException \ com.sun.star.io.XSeekable \ com.sun.star.io.XOutputStream \ com.sun.star.lang.XInitialization \ diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx index 739574c2dc6c..96235ac476a2 100644 --- a/package/source/zippackage/ZipPackage.cxx +++ b/package/source/zippackage/ZipPackage.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ZipPackage.cxx,v $ * - * $Revision: 1.31 $ + * $Revision: 1.32 $ * - * last change: $Author: mtg $ $Date: 2001-03-08 12:22:40 $ + * last change: $Author: mtg $ $Date: 2001-03-16 17:11:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -68,9 +68,9 @@ using namespace com::sun::star::registry; using namespace com::sun::star::util; using namespace com::sun::star::uno; using namespace com::sun::star::container; -using namespace com::sun::star::package; +using namespace com::sun::star::packages; using namespace com::sun::star::lang; -using namespace com::sun::star::package::ZipConstants; +using namespace com::sun::star::packages::ZipConstants; ZipPackage::ZipPackage (Reference < XInputStream > &xNewInput, const Reference < XMultiServiceFactory > &xNewFactory) @@ -675,7 +675,7 @@ Sequence< ElementChange > SAL_CALL ZipPackage::getPendingChanges( ) return Sequence < ElementChange > ( NULL, 0 ); } -sal_Bool ZipPackage::isZipFile(com::sun::star::package::ZipEntry &rEntry) +sal_Bool ZipPackage::isZipFile(ZipEntry &rEntry) { if (rEntry.nMethod == STORED) { @@ -704,7 +704,7 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( Sequence< OUString > ZipPackage_getSupportedServiceNames() { Sequence< OUString > seqNames(1); - seqNames.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.package.Package" ) ); + seqNames.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.packages.comp.ZipPackage" ) ); return seqNames; } @@ -752,13 +752,13 @@ extern "C" void * SAL_CALL component_getFactory( { void * pRet = 0; // which implementation is demanded? - if (pServiceManager && !rtl_str_compare( pImplName, "com.sun.star.package.Package" )) + if (pServiceManager && !rtl_str_compare( pImplName, "com.sun.star.packages.comp.ZipPackage" )) { - OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.package.Package") ); + OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.packages.comp.ZipPackage") ); Reference< XSingleServiceFactory > xFactory( cppu::createSingleFactory( // helper function from cppuhelper lib reinterpret_cast< XMultiServiceFactory * >( pServiceManager ), - OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.package.Package") ), + OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.packages.comp.ZipPackage") ), ZipPackage_create, ZipPackage_getSupportedServiceNames() ) ); if (xFactory.is()) diff --git a/package/source/zippackage/ZipPackageEntry.cxx b/package/source/zippackage/ZipPackageEntry.cxx index ab2bafab7018..1a289ed47348 100644 --- a/package/source/zippackage/ZipPackageEntry.cxx +++ b/package/source/zippackage/ZipPackageEntry.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ZipPackageEntry.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: mtg $ $Date: 2001-02-07 10:51:26 $ + * last change: $Author: mtg $ $Date: 2001-03-16 17:11:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -63,7 +63,7 @@ #endif using namespace com::sun::star; -using namespace com::sun::star::package::ZipConstants; +using namespace com::sun::star::packages::ZipConstants; using namespace rtl; ZipPackageEntry::ZipPackageEntry (void) diff --git a/package/source/zippackage/ZipPackageFolder.cxx b/package/source/zippackage/ZipPackageFolder.cxx index 16f730caaeba..eca8e343dc6a 100644 --- a/package/source/zippackage/ZipPackageFolder.cxx +++ b/package/source/zippackage/ZipPackageFolder.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ZipPackageFolder.cxx,v $ * - * $Revision: 1.33 $ + * $Revision: 1.34 $ * - * last change: $Author: mtg $ $Date: 2001-03-08 12:22:54 $ + * last change: $Author: mtg $ $Date: 2001-03-16 17:11:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -62,7 +62,7 @@ #include "ZipPackageFolder.hxx" #endif -using namespace com::sun::star::package::ZipConstants; +using namespace com::sun::star::packages::ZipConstants; using namespace com::sun::star; using namespace cppu; using namespace rtl; @@ -84,7 +84,7 @@ ZipPackageFolder::ZipPackageFolder (void) ZipPackageFolder::~ZipPackageFolder( void ) { } -void ZipPackageFolder::copyZipEntry( com::sun::star::package::ZipEntry &rDest, const com::sun::star::package::ZipEntry &rSource) +void ZipPackageFolder::copyZipEntry( com::sun::star::packages::ZipEntry &rDest, const com::sun::star::packages::ZipEntry &rSource) { rDest.nVersion = rSource.nVersion; rDest.nFlag = rSource.nFlag; @@ -413,7 +413,7 @@ void ZipPackageFolder::saveContents(rtl::OUString &rPath, std::vector < Manifest } rZipOut.rawCloseEntry(); } - catch (package::ZipException&) + catch (packages::ZipException&) { } } diff --git a/package/source/zippackage/ZipPackageStream.cxx b/package/source/zippackage/ZipPackageStream.cxx index 70feba7850ea..2b589caee361 100644 --- a/package/source/zippackage/ZipPackageStream.cxx +++ b/package/source/zippackage/ZipPackageStream.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ZipPackageStream.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: mtg $ $Date: 2001-01-10 11:36:01 $ + * last change: $Author: mtg $ $Date: 2001-03-16 17:11:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -83,7 +83,7 @@ ZipPackageStream::~ZipPackageStream( void ) { } -void ZipPackageStream::setZipEntry( const package::ZipEntry &rInEntry) +void ZipPackageStream::setZipEntry( const packages::ZipEntry &rInEntry) { aEntry.nVersion = rInEntry.nVersion; aEntry.nFlag = rInEntry.nFlag; @@ -135,7 +135,7 @@ void SAL_CALL ZipPackageStream::setInputStream( const uno::Reference< io::XInput aEntry.nTime = -1; } -uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getRawStream( com::sun::star::package::ZipEntry &rEntry ) +uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getRawStream( com::sun::star::packages::ZipEntry &rEntry ) throw(uno::RuntimeException) { if (bPackageMember) @@ -144,7 +144,7 @@ uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getRawStream( com: { return pZipFile->getRawStream(rEntry); } - catch (package::ZipException &)//rException) + catch (packages::ZipException &)//rException) { VOS_ENSURE( 0, "ZipException thrown");//rException.Message); return uno::Reference < io::XInputStream > (); @@ -163,7 +163,7 @@ uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getInputStream( ) { return pZipFile->getInputStream(aEntry); } - catch (package::ZipException &)//rException) + catch (packages::ZipException &)//rException) { VOS_ENSURE( 0,"ZipException thrown");//rException.Message); return uno::Reference < io::XInputStream > (); -- cgit