diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-10-21 09:20:24 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-11-17 10:49:21 +0100 |
| commit | 3e3b8483d7866e96bc75ddda283416c6829714af (patch) | |
| tree | 28b0417cd7b7299c1ca69ce7f652bbbb0272d009 /package/inc | |
| parent | 3e7ab1ac1dc91544bdc58949ac62853b0ee33760 (diff) | |
package: Use memory stream for compressing zip entries
Change-Id: Ibf81dc3cd8a9a9da3dfd6ee6e587a522c4d56a44
Diffstat (limited to 'package/inc')
| -rw-r--r-- | package/inc/ZipOutputEntry.hxx | 10 | ||||
| -rw-r--r-- | package/inc/ZipOutputStream.hxx | 1 |
2 files changed, 6 insertions, 5 deletions
diff --git a/package/inc/ZipOutputEntry.hxx b/package/inc/ZipOutputEntry.hxx index 73bd8a481afd..e04cebf7d23b 100644 --- a/package/inc/ZipOutputEntry.hxx +++ b/package/inc/ZipOutputEntry.hxx @@ -29,19 +29,19 @@ #include <CRC32.hxx> struct ZipEntry; -class ZipOutputStream; +class ZipPackageBuffer; class ZipPackageStream; class ZipOutputEntry { ::com::sun::star::uno::Sequence< sal_Int8 > m_aDeflateBuffer; - ZipUtils::Deflater m_aDeflater; + ZipUtils::Deflater m_aDeflater; + css::uno::Reference< ZipPackageBuffer > m_pBuffer; ::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; CRC32 m_aCRC; - ZipOutputStream* m_pZipOutputStream; ZipEntry *m_pCurrentEntry; sal_Int16 m_nDigested; bool m_bEncryptCurrentEntry; @@ -50,10 +50,12 @@ class ZipOutputEntry public: ZipOutputEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, - ZipOutputStream *pZipOutputStream, ZipEntry& rEntry, ZipPackageStream* pStream, bool bEncrypt = false); + ZipEntry& rEntry, ZipPackageStream* pStream, bool bEncrypt = false); ~ZipOutputEntry(); + css::uno::Sequence< sal_Int8 > getData(); + // XZipOutputEntry interfaces void SAL_CALL closeEntry( ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); diff --git a/package/inc/ZipOutputStream.hxx b/package/inc/ZipOutputStream.hxx index 6775bd02c3be..0c8dafe6fee2 100644 --- a/package/inc/ZipOutputStream.hxx +++ b/package/inc/ZipOutputStream.hxx @@ -53,7 +53,6 @@ public: throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); void finish() throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - ByteChucker& getChucker(); static sal_uInt32 getCurrentDosTime(); |