From eaf3ab8ce4ab7729824e8e9fba8ef109b92421eb Mon Sep 17 00:00:00 2001 From: Martin Gallwey Date: Tue, 21 Nov 2000 11:07:58 +0000 Subject: [PATCH] Removed usage of the TOOLSLIB stuff for debugging and file timestamping --- package/inc/CRC32.hxx | 8 ++------ package/inc/Deflater.hxx | 8 ++++++-- package/inc/Inflater.hxx | 8 ++++---- package/inc/ZipEnumeration.hxx | 8 ++------ package/inc/ZipFile.hxx | 8 ++------ package/inc/ZipOutputStream.hxx | 29 ++++++++++------------------- package/inc/ZipPackage.hxx | 8 ++------ package/inc/ZipPackageFolder.hxx | 10 ++++------ 8 files changed, 32 insertions(+), 55 deletions(-) diff --git a/package/inc/CRC32.hxx b/package/inc/CRC32.hxx index 48b55248b07d..e91419e42f6f 100644 --- a/package/inc/CRC32.hxx +++ b/package/inc/CRC32.hxx @@ -2,9 +2,9 @@ * * $RCSfile: CRC32.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: mtg $ $Date: 2000-11-13 13:37:57 $ + * last change: $Author: mtg $ $Date: 2000-11-21 12:07:58 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,10 +73,6 @@ #include #endif -#ifndef _TOOLS_DEBUG_HXX -#include -#endif - class CRC32 : public cppu::WeakImplHelper1 { private: diff --git a/package/inc/Deflater.hxx b/package/inc/Deflater.hxx index 84bd07e87a93..3489e329c169 100644 --- a/package/inc/Deflater.hxx +++ b/package/inc/Deflater.hxx @@ -2,9 +2,9 @@ * * $RCSfile: Deflater.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mtg $ $Date: 2000-11-16 22:52:06 $ + * last change: $Author: mtg $ $Date: 2000-11-21 12:07:58 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,6 +73,10 @@ #include #endif +#ifndef _VOS_DIAGNOSE_H_ +#include +#endif + #ifndef _COM_SUN_STAR_PACKAGE_ZIPCONSTANTS_HPP_ #include #endif diff --git a/package/inc/Inflater.hxx b/package/inc/Inflater.hxx index e848cefc8c1b..0e6627861e17 100644 --- a/package/inc/Inflater.hxx +++ b/package/inc/Inflater.hxx @@ -2,9 +2,9 @@ * * $RCSfile: Inflater.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mtg $ $Date: 2000-11-16 22:52:06 $ + * last change: $Author: mtg $ $Date: 2000-11-21 12:07:58 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,8 +73,8 @@ #include #endif -#ifndef _TOOLS_DEBUG_HXX -#include +#ifndef _VOS_DIAGNOSE_H_ +#include #endif #ifndef _COM_SUN_STAR_PACKAGE_ZIPCONSTANTS_HPP_ diff --git a/package/inc/ZipEnumeration.hxx b/package/inc/ZipEnumeration.hxx index 3ee04e85774e..29616a482711 100644 --- a/package/inc/ZipEnumeration.hxx +++ b/package/inc/ZipEnumeration.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ZipEnumeration.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: mtg $ $Date: 2000-11-13 13:37:57 $ + * last change: $Author: mtg $ $Date: 2000-11-21 12:07:58 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,10 +61,6 @@ #ifndef _ZIP_ENUMERATION_HXX #define _ZIP_ENUMERATION_HXX -#ifndef _TOOLS_DEBUG_HXX -#include -#endif - #ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include // helper for implementations #endif diff --git a/package/inc/ZipFile.hxx b/package/inc/ZipFile.hxx index 5255a23f3ccd..a2b0dd6b4aae 100644 --- a/package/inc/ZipFile.hxx +++ b/package/inc/ZipFile.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ZipFile.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: mtg $ $Date: 2000-11-13 13:37:57 $ + * last change: $Author: mtg $ $Date: 2000-11-21 12:07:58 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,10 +61,6 @@ #ifndef _ZIP_FILE_HXX #define _ZIP_FILE_HXX -#ifndef _TOOLS_DEBUG_HXX -#include -#endif - #ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include // helper for implementations #endif diff --git a/package/inc/ZipOutputStream.hxx b/package/inc/ZipOutputStream.hxx index 049f073071c9..69940b8d100f 100644 --- a/package/inc/ZipOutputStream.hxx +++ b/package/inc/ZipOutputStream.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ZipOutputStream.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mtg $ $Date: 2000-11-16 11:55:51 $ + * last change: $Author: mtg $ $Date: 2000-11-21 12:07:58 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -81,10 +81,6 @@ #include "CRC32.hxx" #endif -#ifndef _TOOLS_TIME_HXX -#include -#endif - #ifndef _COM_SUN_STAR_PACKAGE_XZIPOUTPUTSTREAM_HPP_ #include #endif @@ -97,6 +93,12 @@ #include #endif +#ifndef _VOS_DIAGNOSE_H_ +#include +#endif + +#include +#include class ZipOutputStream : public cppu::WeakImplHelper1< com::sun::star::package::XZipOutputStream > { @@ -132,19 +134,8 @@ public: throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL close( ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); -#if 0 - ZipOutputStream (SvStream& aOStream); - void close(); - void closeEntry(); - void finish(); - void putNextEntry(ZipEntry &rEntry); - void setComment(::rtl::ByteSequence &nComment); - void setLevel(sal_Int16 nNewLevel); - void setMethod(sal_Int16 nNewMethod); - void write (::rtl::ByteSequence &rBuffer, sal_uInt16 nOff, sal_uInt16 nLen); - static const sal_Int16 STORED = ZipEntry::STORED; - static const sal_Int16 DEFLATED = ZipEntry::DEFLATED; -#endif + static sal_uInt32 tmDateToDosDate ( tm &rTime); + static void dosDateToTMDate ( tm &rTime, sal_uInt32 nDosDate); private: void doDeflate(); void writeEND(sal_uInt32 nOffset, sal_uInt32 nLength); diff --git a/package/inc/ZipPackage.hxx b/package/inc/ZipPackage.hxx index 10eeaa99ac0e..77d9aa222996 100644 --- a/package/inc/ZipPackage.hxx +++ b/package/inc/ZipPackage.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ZipPackage.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: mtg $ $Date: 2000-11-21 10:45:20 $ + * last change: $Author: mtg $ $Date: 2000-11-21 12:07:58 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,10 +61,6 @@ #ifndef _ZIP_PACKAGE_HXX #define _ZIP_PACKAGE_HXX -#ifndef _TOOLS_DEBUG_HXX -#include -#endif - #ifndef _CPPUHELPER_IMPLBASE4_HXX_ #include // helper for implementations #endif diff --git a/package/inc/ZipPackageFolder.hxx b/package/inc/ZipPackageFolder.hxx index 48f2cf4be721..34c8bfdd2cc9 100644 --- a/package/inc/ZipPackageFolder.hxx +++ b/package/inc/ZipPackageFolder.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ZipPackageFolder.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: mtg $ $Date: 2000-11-21 10:45:20 $ + * last change: $Author: mtg $ $Date: 2000-11-21 12:07:58 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,10 +61,6 @@ #ifndef _ZIP_PACKAGE_FOLDER_HXX #define _ZIP_PACKAGE_FOLDER_HXX -#ifndef _TOOLS_DEBUG_HXX -#include -#endif - #ifndef _COM_SUN_STAR_IO_XOUTPUTSTREAM_HPP_ #include #endif @@ -98,6 +94,8 @@ #endif #include +#include +#include struct eqFunc {