more removed include guards using fixguard.py

13 files changed, 0 insertions, 40 deletions

diff --git a/package/inc/ZipFile.hxx b/package/inc/ZipFile.hxx
index be8158c0ba4e..a50d9e202df2 100644
--- a/package/inc/ZipFile.hxx
+++ b/package/inc/ZipFile.hxx
@@ -33,9 +33,7 @@
 #include <com/sun/star/packages/WrongPasswordException.hpp>
 #include <ByteGrabber.hxx>
 #include <HashMaps.hxx>
-#ifndef _INFLATER_HXX
 #include <Inflater.hxx>
-#endif
 
 #include <mutexholder.hxx>
 
diff --git a/package/inc/ZipOutputStream.hxx b/package/inc/ZipOutputStream.hxx
index 345fe332b8cc..552f7449393c 100644
--- a/package/inc/ZipOutputStream.hxx
+++ b/package/inc/ZipOutputStream.hxx
@@ -28,14 +28,10 @@
 #define _ZIP_OUTPUT_STREAM_HXX
 
 #include <ByteChucker.hxx>
-#ifndef _DEFLATER_HXX
 #include <Deflater.hxx>
-#endif
 #include <CRC32.hxx>
 #include <rtl/cipher.h>
-#ifndef RTL_DIGEST_H_
 #include <rtl/digest.h>
-#endif
 
 #include <vector>
 
diff --git a/package/inc/ZipPackage.hxx b/package/inc/ZipPackage.hxx
index e3b8d44be183..296bdedcc8dc 100644
--- a/package/inc/ZipPackage.hxx
+++ b/package/inc/ZipPackage.hxx
@@ -35,9 +35,7 @@
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#ifndef _COM_SUN_STAR_LANG_XPSERVICEINFO_HPP_
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#endif
 #include <HashMaps.hxx>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <osl/file.h>
diff --git a/package/inc/ZipPackageBuffer.hxx b/package/inc/ZipPackageBuffer.hxx
index 54876d97bde1..b56abba07ba3 100644
--- a/package/inc/ZipPackageBuffer.hxx
+++ b/package/inc/ZipPackageBuffer.hxx
@@ -30,9 +30,7 @@
 #include <com/sun/star/io/XOutputStream.hpp>
 #include <com/sun/star/io/XSeekable.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
-#ifndef _CPPUHELPER_IMPLBASE3_HXX
 #include <cppuhelper/implbase3.hxx>
-#endif
 
 class ZipPackage;
 
diff --git a/package/source/manifest/ManifestImport.hxx b/package/source/manifest/ManifestImport.hxx
index f83c8b6c49df..d1348f3265d6 100644
--- a/package/source/manifest/ManifestImport.hxx
+++ b/package/source/manifest/ManifestImport.hxx
@@ -29,9 +29,7 @@
 #define _MANIFEST_IMPORT_HXX
 
 #include <cppuhelper/implbase1.hxx> // helper for implementations
-#ifndef _COM_SUN_STAR_XML_SAX_XDUCUMENTHANDLER_HPP_
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#endif
 #include <vector>
 
 #include <HashMaps.hxx>
diff --git a/package/source/manifest/ManifestReader.hxx b/package/source/manifest/ManifestReader.hxx
index 92c99587f212..56ccbc4bf577 100644
--- a/package/source/manifest/ManifestReader.hxx
+++ b/package/source/manifest/ManifestReader.hxx
@@ -29,12 +29,8 @@
 #define _MANIFEST_READER_HXX
 
 #include <cppuhelper/implbase2.hxx>
-#ifndef _COM_SUN_STAR_PACKAGES_MANIFEST_XMANIFESTREADER_HPP
 #include <com/sun/star/packages/manifest/XManifestReader.hpp>
-#endif
-#ifndef _COM_SUN_STAR_LANG_XPSERVICEINFO_HPP_
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#endif
 
 namespace com { namespace sun { namespace star {
     namespace lang { class XMultiServiceFactory; class XSingleServiceFactory; }
diff --git a/package/source/manifest/ManifestWriter.hxx b/package/source/manifest/ManifestWriter.hxx
index 3c5097e55cb2..66d8c2cbda9e 100644
--- a/package/source/manifest/ManifestWriter.hxx
+++ b/package/source/manifest/ManifestWriter.hxx
@@ -29,12 +29,8 @@
 #define _MANIFEST_WRITER_HXX
 
 #include <cppuhelper/implbase2.hxx>
-#ifndef _COM_SUN_STAR_PACKAGES_MANIFEST_XMANIFESTWRITER_HPP
 #include <com/sun/star/packages/manifest/XManifestWriter.hpp>
-#endif
-#ifndef _COM_SUN_STAR_LANG_XPSERVICEINFO_HPP_
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#endif
 
 namespace com { namespace sun { namespace star {
     namespace lang { class XMultiServiceFactory; class XSingleServiceFactory; }
diff --git a/package/source/zipapi/EntryInputStream.hxx b/package/source/zipapi/EntryInputStream.hxx
index c04a5dc2d33b..fb8153eb11cd 100644
--- a/package/source/zipapi/EntryInputStream.hxx
+++ b/package/source/zipapi/EntryInputStream.hxx
@@ -32,12 +32,8 @@
 #include <com/sun/star/io/XSeekable.hpp>
 #include <Inflater.hxx>
 #include <com/sun/star/packages/zip/ZipEntry.hpp>
-#ifndef _VOS_REF_H_
 #include <vos/ref.hxx>
-#endif
-#ifndef _ENCRYPTION_DATA_HXX
 #include <EncryptionData.hxx>
-#endif
 class EntryInputStream : public cppu::WeakImplHelper2< com::sun::star::io::XInputStream,
                                                        com::sun::star::io::XSeekable >
 {
diff --git a/package/source/zipapi/XFileStream.hxx b/package/source/zipapi/XFileStream.hxx
index 0cf82c5f35cd..c89b0b875a62 100644
--- a/package/source/zipapi/XFileStream.hxx
+++ b/package/source/zipapi/XFileStream.hxx
@@ -31,12 +31,8 @@
 #include <com/sun/star/io/XSeekable.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <cppuhelper/implbase2.hxx>
-#ifndef _VOS_REF_H_
 #include <vos/ref.hxx>
-#endif
-#ifndef _INFLATER_HXX
 #include <Inflater.hxx>
-#endif
 #include <ZipEntry.hxx>
 
 namespace com { namespace sun { namespace star {
diff --git a/package/source/zippackage/ContentInfo.hxx b/package/source/zippackage/ContentInfo.hxx
index 6d88d17e3780..a8d4a6077dd7 100644
--- a/package/source/zippackage/ContentInfo.hxx
+++ b/package/source/zippackage/ContentInfo.hxx
@@ -28,9 +28,7 @@
 #define _CONTENT_INFO_HXX_
 
 #include <com/sun/star/container/XNameContainer.hpp>
-#ifndef _COM_SUN_STAR_LANG_XUNOTUNNEl_HPP_
 #include <com/sun/star/lang/XUnoTunnel.hpp>
-#endif
 #include <ZipPackageFolder.hxx>
 #include <ZipPackageStream.hxx>
 
diff --git a/package/source/zippackage/ZipPackageEntry.hxx b/package/source/zippackage/ZipPackageEntry.hxx
index 767d84511a12..28bea7b059bc 100644
--- a/package/source/zippackage/ZipPackageEntry.hxx
+++ b/package/source/zippackage/ZipPackageEntry.hxx
@@ -32,9 +32,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
-#ifndef _COM_SUN_STAR_LANG_XPSERVICEINFO_HPP_
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#endif
 #include <ZipEntry.hxx>
 #include <cppuhelper/implbase5.hxx>
 
diff --git a/package/source/zippackage/ZipPackageFolderEnumeration.hxx b/package/source/zippackage/ZipPackageFolderEnumeration.hxx
index bea038d684f3..7ca14c7d6855 100644
--- a/package/source/zippackage/ZipPackageFolderEnumeration.hxx
+++ b/package/source/zippackage/ZipPackageFolderEnumeration.hxx
@@ -29,12 +29,8 @@
 
 #include <cppuhelper/implbase2.hxx> // helper for implementations
 #include <com/sun/star/container/XEnumeration.hpp>
-#ifndef _COM_SUN_STAR_LANG_XPSERVICEINFO_HPP_
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#endif
-#ifndef _HASH_MAPS_HXX
 #include <HashMaps.hxx>
-#endif
 
 class ZipPackageFolderEnumeration : public cppu::WeakImplHelper2
 <
diff --git a/package/source/zippackage/ZipPackageStream.hxx b/package/source/zippackage/ZipPackageStream.hxx
index a0d5fad6e4da..698c6b35f598 100644
--- a/package/source/zippackage/ZipPackageStream.hxx
+++ b/package/source/zippackage/ZipPackageStream.hxx
@@ -31,13 +31,9 @@
 #include <com/sun/star/io/XSeekable.hpp>
 #include <com/sun/star/packages/XDataSinkEncrSupport.hpp>
 #include <ZipPackageEntry.hxx>
-#ifndef _VOS_REF_H_
 #include <vos/ref.hxx>
-#endif
 #include <EncryptionData.hxx>
-#ifndef _CPPUHELPER_IMPLBASE2_HXX
 #include <cppuhelper/implbase2.hxx>
-#endif
 #include <mutexholder.hxx>
 
 #define PACKAGE_STREAM_NOTSET           0