summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2004-02-03 17:01:44 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2004-02-03 17:01:44 +0000
commit1ad68b72ca8c5ccba4a6c0e55bbb4e8b9a6736d6 (patch)
tree0aaade8cc69b51d29cc49c1de3e3b779ef2f0914 /package
parentb6c30122e4b2b5eb7e904d6a6b15243fca5a0709 (diff)
INTEGRATION: CWS readstorage (1.14.20); FILE MERGED
2004/01/13 10:13:47 mav 1.14.20.2: #114521# cloning of encrypted storages 2004/01/06 14:28:07 mav 1.14.20.1: #114521# instead of staream return wrappers that share mutex and remember own position
Diffstat (limited to 'package')
-rw-r--r--package/source/zippackage/ZipPackageStream.hxx16
1 files changed, 13 insertions, 3 deletions
diff --git a/package/source/zippackage/ZipPackageStream.hxx b/package/source/zippackage/ZipPackageStream.hxx
index 4974f4db87b3..c005407ff76d 100644
--- a/package/source/zippackage/ZipPackageStream.hxx
+++ b/package/source/zippackage/ZipPackageStream.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ZipPackageStream.hxx,v $
*
- * $Revision: 1.15 $
+ * $Revision: 1.16 $
*
- * last change: $Author: hr $ $Date: 2004-02-02 19:22:12 $
+ * last change: $Author: hr $ $Date: 2004-02-03 18:01:44 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -81,6 +81,10 @@
#include <cppuhelper/implbase2.hxx>
#endif
+#ifndef __MUTEXHOLDER_HXX_
+#include <mutexholder.hxx>
+#endif
+
#define PACKAGE_STREAM_NOTSET 0
#define PACKAGE_STREAM_PACKAGEMEMBER 1
#define PACKAGE_STREAM_DETECT 2
@@ -99,6 +103,7 @@ class ZipPackageStream : public cppu::ImplInheritanceHelper2
static com::sun::star::uno::Sequence < sal_Int8 > aImplementationId;
protected:
com::sun::star::uno::Reference < com::sun::star::io::XInputStream > xStream;
+ const ::com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory > m_xFactory;
ZipPackage &rZipPackage;
sal_Bool bToBeCompressed, bToBeEncrypted, bHaveOwnKey, bIsEncrypted;
vos::ORef < EncryptionData > xEncryptionData;
@@ -107,6 +112,8 @@ protected:
sal_uInt32 m_nMagicalHackPos;
sal_uInt32 m_nMagicalHackSize;
+ SotMutexHolderRef m_aSharedMutexRef;
+
public:
sal_Bool HasOwnKey () { return bHaveOwnKey;}
sal_Bool IsToBeCompressed () { return bToBeCompressed;}
@@ -155,9 +162,12 @@ public:
{ xEncryptionData->nIterationCount = nNewCount;}
void setSize (const sal_Int32 nNewSize);
- ZipPackageStream (ZipPackage & rNewPackage);
+ ZipPackageStream ( ZipPackage & rNewPackage,
+ const ::com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory >& xFactory );
virtual ~ZipPackageStream( void );
+ ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > TryToGetRawFromDataStream();
+
sal_Bool ParsePackageRawStream();
void setZipEntry( const ZipEntry &rInEntry);