From 32271d6662f7cc9a9f762c8d7020b03bb6fd2ae6 Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien <hr@openoffice.org>
Date: Tue, 20 Aug 2002 11:38:45 +0000
Subject: #101685#,#i6886# merge OOO_STABLE_1_PORTS (1.26-1.26.10.1) -> HEAD

---
 package/inc/ZipPackageFolder.hxx | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

(limited to 'package')

diff --git a/package/inc/ZipPackageFolder.hxx b/package/inc/ZipPackageFolder.hxx
index 31f691d7eca8..ec1cbb62860c 100644
--- a/package/inc/ZipPackageFolder.hxx
+++ b/package/inc/ZipPackageFolder.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ZipPackageFolder.hxx,v $
  *
- *  $Revision: 1.26 $
+ *  $Revision: 1.27 $
  *
- *  last change: $Author: mtg $ $Date: 2001-11-15 20:01:49 $
+ *  last change: $Author: hr $ $Date: 2002-08-20 12:38:45 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -89,12 +89,19 @@ class ZipOutputStream;
 struct ZipEntry;
 typedef void* rtlRandomPool;
 
+#ifdef MACOSX
+class ZipPackageFolder : public ZipPackageEntry,
+                                                 public ::cppu::OWeakObject,
+                                                 public ::com::sun::star::container::XNameContainer,
+                                                 public ::com::sun::star::container::XEnumerationAccess
+#else
 class ZipPackageFolder : public cppu::ImplInheritanceHelper2
 <
     ZipPackageEntry,
     ::com::sun::star::container::XNameContainer,
     ::com::sun::star::container::XEnumerationAccess
 >
+#endif
 {
     static com::sun::star::uno::Sequence < sal_Int8 > aImplementationId;
 protected:
@@ -118,6 +125,16 @@ public:
         throw(::com::sun::star::uno::RuntimeException);
     void  releaseUpwardRef();
 
+#ifdef MACOSX
+    // 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
+
     // XNameContainer
     virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement )
         throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-- 
cgit