diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 18:22:12 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 18:22:12 +0000 |
| commit | 4d2829d8b3a22b83da3a526be0aecd376c725637 (patch) | |
| tree | 3130b339e08961c44ffefcf99d047c714c01625d | |
| parent | a5314f1366aa638f5bfd4a08608540bc4ee2bdaf (diff) | |
INTEGRATION: CWS geordi2q14 (1.14.26); FILE MERGED
2004/01/29 17:44:56 hr 1.14.26.1: #111934#: merge CWS ooo111fix2
| -rw-r--r-- | package/source/zippackage/ZipPackageStream.hxx | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/package/source/zippackage/ZipPackageStream.hxx b/package/source/zippackage/ZipPackageStream.hxx index 7acfdc809764..4974f4db87b3 100644 --- a/package/source/zippackage/ZipPackageStream.hxx +++ b/package/source/zippackage/ZipPackageStream.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ZipPackageStream.hxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: kz $ $Date: 2003-09-11 10:18:17 $ + * last change: $Author: hr $ $Date: 2004-02-02 19:22:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -89,19 +89,12 @@ class ZipPackage; struct ZipEntry; -#if defined( MACOSX ) && ( __GNUC__ < 3 ) -class ZipPackageStream : public ZipPackageEntry, - public ::cppu::OWeakObject, - public ::com::sun::star::io::XActiveDataSink, - public ::com::sun::star::package::XDataSinkEncrSupport -#else class ZipPackageStream : public cppu::ImplInheritanceHelper2 < ZipPackageEntry, ::com::sun::star::io::XActiveDataSink, ::com::sun::star::packages::XDataSinkEncrSupport > -#endif { static com::sun::star::uno::Sequence < sal_Int8 > aImplementationId; protected: @@ -176,16 +169,6 @@ public: return aImplementationId; } -#if defined( MACOSX ) && ( __GNUC__ < 3 ) - // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType ) - throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL acquire( ) - throw(); - virtual void SAL_CALL release( ) - throw(); -#endif - // XActiveDataSink virtual void SAL_CALL setInputStream( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& aStream ) throw(::com::sun::star::uno::RuntimeException); |