diff options
Diffstat (limited to 'package/inc')
-rw-r--r-- | package/inc/ByteChucker.hxx | 3 | ||||
-rw-r--r-- | package/inc/ByteGrabber.hxx | 3 | ||||
-rw-r--r-- | package/inc/CRC32.hxx | 3 | ||||
-rw-r--r-- | package/inc/Deflater.hxx | 15 | ||||
-rw-r--r-- | package/inc/EncryptedDataHeader.hxx | 3 | ||||
-rw-r--r-- | package/inc/EncryptionData.hxx | 3 | ||||
-rw-r--r-- | package/inc/HashMaps.hxx | 15 | ||||
-rw-r--r-- | package/inc/Inflater.hxx | 16 | ||||
-rw-r--r-- | package/inc/PackageConstants.hxx | 2 | ||||
-rw-r--r-- | package/inc/ZipEntry.hxx | 3 | ||||
-rw-r--r-- | package/inc/ZipEnumeration.hxx | 3 | ||||
-rw-r--r-- | package/inc/ZipFile.hxx | 13 | ||||
-rw-r--r-- | package/inc/ZipOutputStream.hxx | 9 | ||||
-rw-r--r-- | package/inc/ZipPackage.hxx | 4 | ||||
-rw-r--r-- | package/inc/ZipPackageBuffer.hxx | 5 | ||||
-rw-r--r-- | package/inc/ZipPackageEntry.hxx | 5 | ||||
-rw-r--r-- | package/inc/ZipPackageFolder.hxx | 4 | ||||
-rw-r--r-- | package/inc/ZipPackageStream.hxx | 6 | ||||
-rw-r--r-- | package/inc/mutexholder.hxx | 2 | ||||
-rw-r--r-- | package/inc/packagedllapi.hxx | 15 | ||||
-rw-r--r-- | package/inc/pch/precompiled_package.cxx | 2 | ||||
-rw-r--r-- | package/inc/pch/precompiled_package.hxx | 2 | ||||
-rw-r--r-- | package/inc/zipfileaccess.hxx | 2 |
23 files changed, 113 insertions, 25 deletions
diff --git a/package/inc/ByteChucker.hxx b/package/inc/ByteChucker.hxx index d0a07cdfadaf..733756e2dd65 100644 --- a/package/inc/ByteChucker.hxx +++ b/package/inc/ByteChucker.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -65,3 +66,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/inc/ByteGrabber.hxx b/package/inc/ByteGrabber.hxx index 8ef127900655..a9bdfb1e1928 100644 --- a/package/inc/ByteGrabber.hxx +++ b/package/inc/ByteGrabber.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -75,3 +76,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/inc/CRC32.hxx b/package/inc/CRC32.hxx index b8de389c8721..cb3c75e41685 100644 --- a/package/inc/CRC32.hxx +++ b/package/inc/CRC32.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -54,3 +55,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/inc/Deflater.hxx b/package/inc/Deflater.hxx index f39b8e2b9547..6c1cf4456d30 100644 --- a/package/inc/Deflater.hxx +++ b/package/inc/Deflater.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,14 +29,16 @@ #define _DEFLATER_HXX_ #include <com/sun/star/uno/Sequence.hxx> +#include "packagedllapi.hxx" -extern "C" +struct z_stream_s; + +namespace ZipUtils { + +class DLLPUBLIC_PACKAGE Deflater { typedef struct z_stream_s z_stream; -} -class Deflater -{ protected: com::sun::star::uno::Sequence< sal_Int8 > sInBuffer; sal_Bool bFinish; @@ -63,4 +66,8 @@ public: void SAL_CALL end( ); }; +} + #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/inc/EncryptedDataHeader.hxx b/package/inc/EncryptedDataHeader.hxx index be2c7643ec51..43487ac88ea0 100644 --- a/package/inc/EncryptedDataHeader.hxx +++ b/package/inc/EncryptedDataHeader.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -53,3 +54,5 @@ const sal_uInt32 n_ConstHeader = 0x05024d4dL; // "MM\002\005" const sal_Int32 n_ConstHeaderSize = 38; // + salt length + iv length + digest length + mediatype length const sal_Int16 n_ConstCurrentVersion = 1; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/inc/EncryptionData.hxx b/package/inc/EncryptionData.hxx index 5d49ae2b7b0f..283b0b94caea 100644 --- a/package/inc/EncryptionData.hxx +++ b/package/inc/EncryptionData.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -79,3 +80,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/inc/HashMaps.hxx b/package/inc/HashMaps.hxx index b10f42aa7020..0a2fb3d9b7ae 100644 --- a/package/inc/HashMaps.hxx +++ b/package/inc/HashMaps.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,8 +29,8 @@ #define _HASHMAPS_HXX #include <ZipEntry.hxx> -#include <vos/ref.hxx> -#include <hash_map> +#include <rtl/ref.hxx> +#include <boost/unordered_map.hpp> struct eqFunc { @@ -45,19 +46,21 @@ namespace com { namespace sun { namespace star { namespace packages { class ContentInfo; } } } } -typedef std::hash_map < rtl::OUString, +typedef boost::unordered_map < rtl::OUString, ZipPackageFolder *, ::rtl::OUStringHash, eqFunc > FolderHash; -typedef std::hash_map < rtl::OUString, - vos::ORef < com::sun::star::packages::ContentInfo >, +typedef boost::unordered_map < rtl::OUString, + rtl::Reference < com::sun::star::packages::ContentInfo >, ::rtl::OUStringHash, eqFunc > ContentHash; -typedef std::hash_map < rtl::OUString, +typedef boost::unordered_map < rtl::OUString, ZipEntry, rtl::OUStringHash, eqFunc > EntryHash; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/inc/Inflater.hxx b/package/inc/Inflater.hxx index 26c903ae5c47..f5241df133d2 100644 --- a/package/inc/Inflater.hxx +++ b/package/inc/Inflater.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,13 +29,16 @@ #define _INFLATER_HXX_ #include <com/sun/star/uno/Sequence.hxx> +#include "packagedllapi.hxx" -extern "C" +struct z_stream_s; + +namespace ZipUtils { + +class DLLPUBLIC_PACKAGE Inflater { typedef struct z_stream_s z_stream; -} -class Inflater -{ + protected: sal_Bool bFinish, bFinished, bSetParams, bNeedDict; sal_Int32 nOffset, nLength, nLastInflateError; @@ -54,4 +58,8 @@ public: sal_Int32 getLastInflateError() { return nLastInflateError; } }; +} + #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/inc/PackageConstants.hxx b/package/inc/PackageConstants.hxx index 90c73edf2ba7..be82010175fc 100644 --- a/package/inc/PackageConstants.hxx +++ b/package/inc/PackageConstants.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -68,3 +69,4 @@ const sal_Int32 n_ConstDigestDecrypt = 1056; // 1024 + 32 #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/inc/ZipEntry.hxx b/package/inc/ZipEntry.hxx index 4f47f25a1329..915d1ca7bb21 100644 --- a/package/inc/ZipEntry.hxx +++ b/package/inc/ZipEntry.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -44,3 +45,5 @@ struct ZipEntry ::rtl::OUString sPath; }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/inc/ZipEnumeration.hxx b/package/inc/ZipEnumeration.hxx index 967007ade78d..bd64b31e9373 100644 --- a/package/inc/ZipEnumeration.hxx +++ b/package/inc/ZipEnumeration.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -41,3 +42,5 @@ public: ~ZipEnumeration(); }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/inc/ZipFile.hxx b/package/inc/ZipFile.hxx index 2be52615c90b..05186c0abccf 100644 --- a/package/inc/ZipFile.hxx +++ b/package/inc/ZipFile.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,8 +35,6 @@ #include <com/sun/star/xml/crypto/XCipherContext.hpp> #include <com/sun/star/xml/crypto/XDigestContext.hpp> -#include <rtl/ref.hxx> - #include <ByteGrabber.hxx> #include <HashMaps.hxx> #include <Inflater.hxx> @@ -47,6 +46,10 @@ namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } namespace ucb { class XProgressHandler; } } } } +namespace rtl +{ + template < class T > class Reference; +} /* * We impose arbitrary but reasonable limit on ZIP files. @@ -66,7 +69,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 > m_xFactory; @@ -95,7 +98,7 @@ protected: sal_Bool bDecrypt, ::rtl::OUString aMediaType = ::rtl::OUString() ); - sal_Bool hasValidPassword ( ZipEntry & rEntry, const ::rtl::Reference < EncryptionData > &rData ); + sal_Bool hasValidPassword ( ZipEntry & rEntry, const rtl::Reference < EncryptionData > &rData ); sal_Bool checkSizeAndCRC( const ZipEntry& aEntry ); @@ -210,3 +213,5 @@ protected: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/inc/ZipOutputStream.hxx b/package/inc/ZipOutputStream.hxx index 48fafb4c4a9c..b5d6ee8b54f2 100644 --- a/package/inc/ZipOutputStream.hxx +++ b/package/inc/ZipOutputStream.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -41,6 +42,10 @@ struct ZipEntry; class ZipPackageStream; +namespace rtl +{ + template < class T > class Reference; +} class ZipOutputStream { @@ -53,7 +58,7 @@ protected: ::com::sun::star::uno::Sequence< sal_Int8 > m_aDeflateBuffer; ::rtl::OUString sComment; - Deflater aDeflater; + ZipUtils::Deflater aDeflater; ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XCipherContext > m_xCipherContext; ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XDigestContext > m_xDigestContext; @@ -106,3 +111,5 @@ protected: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/inc/ZipPackage.hxx b/package/inc/ZipPackage.hxx index f7b80f38b359..ed7be23ea429 100644 --- a/package/inc/ZipPackage.hxx +++ b/package/inc/ZipPackage.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -43,6 +44,7 @@ #include <HashMaps.hxx> #include <osl/file.h> #include <mutexholder.hxx> +#include <vector> class ZipOutputStream; class ZipPackageFolder; @@ -199,3 +201,5 @@ public: sal_Bool SAL_CALL static_supportsService(rtl::OUString const & rServiceName); }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/inc/ZipPackageBuffer.hxx b/package/inc/ZipPackageBuffer.hxx index 54876d97bde1..e8cf9ff87e86 100644 --- a/package/inc/ZipPackageBuffer.hxx +++ b/package/inc/ZipPackageBuffer.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,9 +31,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; @@ -82,3 +81,5 @@ public: throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/inc/ZipPackageEntry.hxx b/package/inc/ZipPackageEntry.hxx index 767d84511a12..6ae623a50664 100644 --- a/package/inc/ZipPackageEntry.hxx +++ b/package/inc/ZipPackageEntry.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,9 +33,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> @@ -103,3 +102,5 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/inc/ZipPackageFolder.hxx b/package/inc/ZipPackageFolder.hxx index 6a80f0effdaa..59be1b7b36ce 100644 --- a/package/inc/ZipPackageFolder.hxx +++ b/package/inc/ZipPackageFolder.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,6 +34,7 @@ #include <HashMaps.hxx> #include <ZipPackageEntry.hxx> #include <cppuhelper/implbase2.hxx> +#include <vector> namespace com { namespace sun { namespace star { namespace beans @@ -144,3 +146,5 @@ public: throw (::com::sun::star::uno::RuntimeException); }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/inc/ZipPackageStream.hxx b/package/inc/ZipPackageStream.hxx index a3bbf73bf84c..cb165af9ee97 100644 --- a/package/inc/ZipPackageStream.hxx +++ b/package/inc/ZipPackageStream.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,11 +32,10 @@ #include <com/sun/star/io/XSeekable.hpp> #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/packages/XDataSinkEncrSupport.hpp> - +#include <ZipPackageEntry.hxx> #include <rtl/ref.hxx> #include <cppuhelper/implbase2.hxx> -#include <ZipPackageEntry.hxx> #include <EncryptionData.hxx> #include <mutexholder.hxx> @@ -214,3 +214,5 @@ public: throw (::com::sun::star::uno::RuntimeException); }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/inc/mutexholder.hxx b/package/inc/mutexholder.hxx index 97b410ad549b..3fbbd4c5738a 100644 --- a/package/inc/mutexholder.hxx +++ b/package/inc/mutexholder.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -129,3 +130,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/inc/packagedllapi.hxx b/package/inc/packagedllapi.hxx new file mode 100644 index 000000000000..41e8efa4dae4 --- /dev/null +++ b/package/inc/packagedllapi.hxx @@ -0,0 +1,15 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +#ifndef INCLUDED_PACKAGEDLLAPI_H +#define INCLUDED_PACKAGEDLLAPI_H + +#include "sal/types.h" + +#if defined(DLLIMPLEMENTATION_PACKAGE) +#define DLLPUBLIC_PACKAGE SAL_DLLPUBLIC_EXPORT +#else +#define DLLPUBLIC_PACKAGE SAL_DLLPUBLIC_IMPORT +#endif + +#endif /* INCLUDED_PACKAGEDLLAPI_H */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/inc/pch/precompiled_package.cxx b/package/inc/pch/precompiled_package.cxx index da7eca4d4557..49b45ad88d87 100644 --- a/package/inc/pch/precompiled_package.cxx +++ b/package/inc/pch/precompiled_package.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,3 +28,4 @@ #include "precompiled_package.hxx" +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/inc/pch/precompiled_package.hxx b/package/inc/pch/precompiled_package.hxx index 3fc91f789528..dfadd0a869a6 100644 --- a/package/inc/pch/precompiled_package.hxx +++ b/package/inc/pch/precompiled_package.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,3 +31,4 @@ #ifdef PRECOMPILED_HEADERS #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/inc/zipfileaccess.hxx b/package/inc/zipfileaccess.hxx index 61297aed6da6..1516aa4d7fef 100644 --- a/package/inc/zipfileaccess.hxx +++ b/package/inc/zipfileaccess.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -107,3 +108,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |