summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2008-06-20 06:18:40 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2008-06-20 06:18:40 +0000
commite0d86386690e704c39df69b4f9fe014b7b27b52d (patch)
treecc37e66e0026862fe3867c1d5e95d755e5abc7f0 /package
parentcd0aa4e72d30c8abb8c1542e0bd56d010ea1253e (diff)
INTEGRATION: CWS fwk88 (1.6.8); FILE MERGED
2008/05/27 15:57:23 mav 1.6.8.1: #i86348# integrate the patch
Diffstat (limited to 'package')
-rw-r--r--package/source/xstor/ocompinstream.hxx5
-rw-r--r--package/source/xstor/oseekinstream.hxx11
2 files changed, 2 insertions, 14 deletions
diff --git a/package/source/xstor/ocompinstream.hxx b/package/source/xstor/ocompinstream.hxx
index 459f3af54..841f98dfa 100644
--- a/package/source/xstor/ocompinstream.hxx
+++ b/package/source/xstor/ocompinstream.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ocompinstream.hxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
* This file is part of OpenOffice.org.
*
@@ -65,9 +65,6 @@ protected:
sal_Int16 m_nStorageType;
- OInputCompStream( sal_Int16 nStorageType );
- OInputCompStream( OWriteStream_Impl& pImpl, sal_Int16 nStorageType );
-
public:
OInputCompStream( OWriteStream_Impl& pImpl,
::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > xStream,
diff --git a/package/source/xstor/oseekinstream.hxx b/package/source/xstor/oseekinstream.hxx
index ebd2d59f6..b04a3505f 100644
--- a/package/source/xstor/oseekinstream.hxx
+++ b/package/source/xstor/oseekinstream.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: oseekinstream.hxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
* This file is part of OpenOffice.org.
*
@@ -47,19 +47,10 @@ public:
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,
- 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,
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,
- sal_Int16 nStorageType );
-
virtual ~OInputSeekStream();
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException);