Namespace ZipUtils for the Inflater / Deflater classes.

4 files changed, 17 insertions, 10 deletions

diff --git a/package/inc/Deflater.hxx b/package/inc/Deflater.hxx
index cf1229d8a9fa..6c1cf4456d30 100644
--- a/package/inc/Deflater.hxx
+++ b/package/inc/Deflater.hxx
@@ -31,13 +31,14 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include "packagedllapi.hxx"
 
-extern "C"
-{
-    typedef struct z_stream_s z_stream;
-}
+struct z_stream_s;
+
+namespace ZipUtils {
 
 class DLLPUBLIC_PACKAGE Deflater
 {
+    typedef struct z_stream_s z_stream;
+
 protected:
     com::sun::star::uno::Sequence< sal_Int8 > sInBuffer;
     sal_Bool                bFinish;
@@ -65,6 +66,8 @@ public:
     void SAL_CALL end(  );
 };
 
+}
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/package/inc/Inflater.hxx b/package/inc/Inflater.hxx
index a7adcf371477..f5241df133d2 100644
--- a/package/inc/Inflater.hxx
+++ b/package/inc/Inflater.hxx
@@ -31,12 +31,14 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include "packagedllapi.hxx"
 
-extern "C"
-{
-    typedef struct z_stream_s z_stream;
-}
+struct z_stream_s;
+
+namespace ZipUtils {
+
 class DLLPUBLIC_PACKAGE Inflater
 {
+    typedef struct z_stream_s z_stream;
+
 protected:
     sal_Bool                bFinish, bFinished, bSetParams, bNeedDict;
     sal_Int32               nOffset, nLength, nLastInflateError;
@@ -56,6 +58,8 @@ public:
     sal_Int32 getLastInflateError() { return nLastInflateError; }
 };
 
+}
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/package/inc/ZipFile.hxx b/package/inc/ZipFile.hxx
index 0e182ae6900c..8193eef68a5d 100644
--- a/package/inc/ZipFile.hxx
+++ b/package/inc/ZipFile.hxx
@@ -66,7 +66,7 @@ protected:
     ::rtl::OUString sComment;       /* zip file comment */
     EntryHash       aEntries;
     ByteGrabber     aGrabber;
-    Inflater        aInflater;
+    ZipUtils::Inflater aInflater;
     com::sun::star::uno::Reference < com::sun::star::io::XInputStream > xStream;
     com::sun::star::uno::Reference < com::sun::star::io::XSeekable > xSeek;
     const ::com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory > xFactory;
diff --git a/package/inc/ZipOutputStream.hxx b/package/inc/ZipOutputStream.hxx
index 3ea34339428b..9cd58d74e657 100644
--- a/package/inc/ZipOutputStream.hxx
+++ b/package/inc/ZipOutputStream.hxx
@@ -49,7 +49,7 @@ protected:
     ::std::vector < ZipEntry * >            aZipList;
     com::sun::star::uno::Sequence < sal_Int8 > aBuffer, aEncryptionBuffer;
     ::rtl::OUString     sComment;
-    Deflater            aDeflater;
+    ZipUtils::Deflater  aDeflater;
     rtlCipher           aCipher;
     rtlDigest           aDigest;
     CRC32               aCRC;