summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2004-02-03 16:59:42 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2004-02-03 16:59:42 +0000
commite4bf4dd29171efb81c14055972990eb1437ccb12 (patch)
treeff3282e31bbc215b1a7fe62e5dfe8ecb50fb9c00 /package
parentab6662a014bfe6d8fbf22124ca54962d1c10c052 (diff)
INTEGRATION: CWS readstorage (1.3.10); FILE MERGED
2004/01/15 17:57:39 mav 1.3.10.3: RESYNC: (1.3-1.4); FILE MERGED 2004/01/14 12:06:09 mav 1.3.10.2: #114521# multiple readonly access to substorages 2004/01/09 09:04:49 mav 1.3.10.1: #114521# cloning of storage's subelements
Diffstat (limited to 'package')
-rw-r--r--package/source/xstor/owriteablestream.hxx23
1 files changed, 17 insertions, 6 deletions
diff --git a/package/source/xstor/owriteablestream.hxx b/package/source/xstor/owriteablestream.hxx
index 565a532e4cb8..308d13a3e5e8 100644
--- a/package/source/xstor/owriteablestream.hxx
+++ b/package/source/xstor/owriteablestream.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: owriteablestream.hxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: rt $ $Date: 2004-01-06 08:46:18 $
+ * last change: $Author: hr $ $Date: 2004-02-03 17:59:42 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -94,6 +94,10 @@
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#endif
+#ifndef _COM_SUN_STAR_LANG_XCOMPONENT_HPP_
+#include <com/sun/star/lang/XComponent.hpp>
+#endif
+
#ifndef _COM_SUN_STAR_EMBED_XENCRYPTIONPROTECTEDSOURCE_HPP_
#include <com/sun/star/embed/XEncryptionProtectedSource.hpp>
#endif
@@ -158,8 +162,8 @@ struct OWriteStream_Impl : public PreCreationStruct
InputStreamsList_Impl m_aInputStreamsList;
- sal_Bool m_bIsModified; // only modified elements will be sent to the original content
- sal_Bool m_bCommited; // sending the streams is coordinated by the root storage of the package
+ sal_Bool m_bHasDataToFlush; // only modified elements will be sent to the original content
+ sal_Bool m_bFlushed; // sending the streams is coordinated by the root storage of the package
::com::sun::star::uno::Reference< ::com::sun::star::packages::XDataSinkEncrSupport > m_xPackageStream;
@@ -202,11 +206,11 @@ public:
const ::rtl::OUString& aName,
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& xParentPackageFolder );
- void SetToBeCommited() { m_bCommited = sal_True; }
+ void SetToBeCommited() { m_bFlushed = sal_True; }
sal_Bool HasCachedPassword() { return m_bHasCachedPassword; }
::com::sun::star::uno::Sequence< sal_Int8 > GetCachedPassword() { return m_aKey; }
- sal_Bool IsModified() { return m_bIsModified; }
+ sal_Bool IsModified() { return m_bHasDataToFlush || m_bFlushed; }
sal_Bool IsEncrypted();
@@ -238,6 +242,13 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetRawInStream();
void InputStreamDisposed( OInputCompStream* pStream );
+
+ ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > CreateReadonlyCopyBasedOnData(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xDataToCopy );
+
+ ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > GetCopyOfLastCommit();
+ ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > GetCopyOfLastCommit(
+ const ::com::sun::star::uno::Sequence< sal_Int8 >& aKey );
};
class OWriteStream : public cppu::WeakImplHelper8 < ::com::sun::star::io::XInputStream