From cebcdd9dfd25eb2c2dea16bfaf537b8c52481080 Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien <hr@openoffice.org>
Date: Tue, 20 Aug 2002 11:58:51 +0000
Subject: #101685#,#i6886# merge OOO_STABLE_1_PORTS (1..55.4.3-1.55.4.3.6.1) ->
 HEAD

---
 package/source/zippackage/ZipPackageFolder.cxx | 59 +++++++++++++++++++++++++-
 1 file changed, 57 insertions(+), 2 deletions(-)

(limited to 'package')

diff --git a/package/source/zippackage/ZipPackageFolder.cxx b/package/source/zippackage/ZipPackageFolder.cxx
index 514bdb86315c..0831a1866093 100644
--- a/package/source/zippackage/ZipPackageFolder.cxx
+++ b/package/source/zippackage/ZipPackageFolder.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ZipPackageFolder.cxx,v $
  *
- *  $Revision: 1.58 $
+ *  $Revision: 1.59 $
  *
- *  last change: $Author: mav $ $Date: 2002-05-13 10:47:30 $
+ *  last change: $Author: hr $ $Date: 2002-08-20 12:58:51 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -120,6 +120,11 @@ using vos::ORef;
 
 Sequence < sal_Int8 > ZipPackageFolder::aImplementationId = Sequence < sal_Int8 > ();
 
+#ifdef MACOSX
+#include <cppuhelper/typeprovider.hxx>
+static ::cppu::OImplementationId * pId = 0;
+#endif
+
 ZipPackageFolder::ZipPackageFolder ()
 {
     SetFolder ( sal_True );
@@ -132,7 +137,22 @@ ZipPackageFolder::ZipPackageFolder ()
     aEntry.nSize        = 0;
     aEntry.nOffset      = -1;
     if ( !aImplementationId.getLength() )
+        {
+#ifdef MACOSX
+                if (! pId)
+                {
+                        ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
+                        if (! pId)
+                        {
+                                static ::cppu::OImplementationId aId;
+                                pId = &aId;
+                        }
+                }
+                aImplementationId=pId->getImplementationId();
+#else
         aImplementationId = getImplementationId();
+#endif
+        }
 }
 
 
@@ -152,6 +172,41 @@ void ZipPackageFolder::copyZipEntry( ZipEntry &rDest, const ZipEntry &rSource)
     rDest.sName             = rSource.sName;
 }
 
+#ifdef MACOSX
+Any SAL_CALL ZipPackageFolder::queryInterface( const Type& rType )
+    throw(RuntimeException)
+{
+    // cppu::queryInterface is an inline template so it's fast
+    // unfortunately, it always creates an Any...we should be able to optimise
+    // this with a class static containing supported interfaces
+    // ...will research this further ...mtg 15/12/00
+    return ::cppu::queryInterface ( rType                                       ,
+                                        // OWeakObject interfaces
+                                        reinterpret_cast< XInterface*       > ( this )  ,
+                                        static_cast< XWeak*         > ( this )  ,
+                                        // ZipPackageEntry interfaces
+                                        static_cast< XNamed*        > ( this )  ,
+                                        static_cast< XChild*        > ( this )  ,
+                                        static_cast< XUnoTunnel*        > ( this )  ,
+                                        // my own interfaces
+                                        static_cast< XNameContainer*        > ( this )  ,
+                                        static_cast< XEnumerationAccess*        > ( this )  ,
+                                        static_cast< XPropertySet*  > ( this ) );
+
+}
+
+void SAL_CALL ZipPackageFolder::acquire(  )
+    throw()
+{
+    OWeakObject::acquire();
+}
+void SAL_CALL ZipPackageFolder::release(  )
+    throw()
+{
+    OWeakObject::release();
+}
+#endif
+
     // XNameContainer
 void SAL_CALL ZipPackageFolder::insertByName( const OUString& aName, const Any& aElement )
         throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException)
-- 
cgit v1.2.3