INTEGRATION: CWS opofxmlstorage (1.4.30); FILE MERGED

2006/04/21 11:36:59 mav 1.4.30.1: #i64612# support OFOPXML format

2 files changed, 24 insertions, 17 deletions

diff --git a/package/source/xstor/oseekinstream.cxx b/package/source/xstor/oseekinstream.cxx
index 88fa53c9b25a..8636093941c8 100644
--- a/package/source/xstor/oseekinstream.cxx
+++ b/package/source/xstor/oseekinstream.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: oseekinstream.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: obo $ $Date: 2006-09-17 17:24:25 $
+ *  last change: $Author: obo $ $Date: 2006-10-13 11:49:39 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -55,8 +55,9 @@ using namespace ::com::sun::star;
 
 OInputSeekStream::OInputSeekStream( OWriteStream_Impl& pImpl,
                                     uno::Reference < io::XStream > xStream,
-                                    const uno::Sequence< beans::PropertyValue >& aProps )
-: OInputCompStream( pImpl )
+                                    const uno::Sequence< beans::PropertyValue >& aProps,
+                                    sal_Int16 nStorageType )
+: OInputCompStream( pImpl, nStorageType )
 {
     OSL_ENSURE( xStream.is(), "No stream is provided!\n" );
 
@@ -74,8 +75,9 @@ OInputSeekStream::OInputSeekStream( OWriteStream_Impl& pImpl,
 
 OInputSeekStream::OInputSeekStream( OWriteStream_Impl& pImpl,
                                     uno::Reference < io::XInputStream > xStream,
-                                    const uno::Sequence< beans::PropertyValue >& aProps )
-: OInputCompStream( pImpl, xStream, aProps )
+                                    const uno::Sequence< beans::PropertyValue >& aProps,
+                                    sal_Int16 nStorageType )
+: OInputCompStream( pImpl, xStream, aProps, nStorageType )
 {
     if ( m_xStream.is() )
     {
@@ -85,8 +87,9 @@ OInputSeekStream::OInputSeekStream( OWriteStream_Impl& pImpl,
 }
 
 OInputSeekStream::OInputSeekStream( uno::Reference < io::XStream > xStream,
-                                    const uno::Sequence< beans::PropertyValue >& aProps )
-: OInputCompStream()
+                                    const uno::Sequence< beans::PropertyValue >& aProps,
+                                    sal_Int16 nStorageType )
+: OInputCompStream( nStorageType )
 {
     OSL_ENSURE( xStream.is(), "No stream is provided!\n" );
 
@@ -103,8 +106,9 @@ OInputSeekStream::OInputSeekStream( uno::Reference < io::XStream > xStream,
 }
 
 OInputSeekStream::OInputSeekStream( uno::Reference < io::XInputStream > xStream,
-                                    const uno::Sequence< beans::PropertyValue >& aProps )
-: OInputCompStream( xStream, aProps )
+                                    const uno::Sequence< beans::PropertyValue >& aProps,
+                                    sal_Int16 nStorageType )
+: OInputCompStream( xStream, aProps, nStorageType )
 {
     if ( m_xStream.is() )
     {
@@ -137,7 +141,6 @@ uno::Sequence< uno::Type > SAL_CALL OInputSeekStream::getTypes()
     }
 
     return pTypeCollection->getTypes() ;
-
 }
 
 uno::Any SAL_CALL OInputSeekStream::queryInterface( const uno::Type& rType )
diff --git a/package/source/xstor/oseekinstream.hxx b/package/source/xstor/oseekinstream.hxx
index 32dce430c0ad..439c54677ec2 100644
--- a/package/source/xstor/oseekinstream.hxx
+++ b/package/source/xstor/oseekinstream.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: oseekinstream.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 16:07:40 $
+ *  last change: $Author: obo $ $Date: 2006-10-13 11:49:55 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -51,17 +51,21 @@ protected:
 public:
     OInputSeekStream( OWriteStream_Impl& pImpl,
                       ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream > xStream,
-                      const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps );
+                      const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps,
+                      sal_Int16 nStorageType );
 
     OInputSeekStream( OWriteStream_Impl& pImpl,
                       ::com::sun::star::uno::Reference < ::com::sun::star::io::XStream > xStream,
-                      const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps );
+                      const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps,
+                      sal_Int16 nStorageType );
 
     OInputSeekStream( ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream > xStream,
-                      const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps );
+                      const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps,
+                      sal_Int16 nStorageType );
 
     OInputSeekStream( ::com::sun::star::uno::Reference < ::com::sun::star::io::XStream > xStream,
-                      const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps );
+                      const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps,
+                      sal_Int16 nStorageType );
 
     virtual ~OInputSeekStream();