diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-20 06:18:40 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-20 06:18:40 +0000 |
| commit | aec2e64adf3132d9748caff16b695b5005a5bd89 (patch) | |
| tree | 57008f6e52647321d377d38115847c1aaebc8cef /package | |
| parent | e813bdfeeb582ed990b86c607cf48cd47f20a2e2 (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.hxx | 5 | ||||
| -rw-r--r-- | package/source/xstor/oseekinstream.hxx | 11 |
2 files changed, 2 insertions, 14 deletions
diff --git a/package/source/xstor/ocompinstream.hxx b/package/source/xstor/ocompinstream.hxx index 3599de5b82c4..cf19fbdd4d8c 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 7d3f1a33044c..326c50b9579b 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); |