From 118cc3399ce1ca48e61abbb5969b6b6d3d97a0c3 Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien <hr@openoffice.org>
Date: Thu, 15 Aug 2002 11:26:49 +0000
Subject: #101685#,#i6886# merge OOO_STABLE_1_PORTS (1.15-1.15.12.1) -> HEAD

---
 cppuhelper/source/factory.cxx | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'cppuhelper')

diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx
index 3171b7f7a..88e12365a 100644
--- a/cppuhelper/source/factory.cxx
+++ b/cppuhelper/source/factory.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: factory.cxx,v $
  *
- *  $Revision: 1.15 $
+ *  $Revision: 1.16 $
  *
- *  last change: $Author: dbo $ $Date: 2001-10-15 13:37:05 $
+ *  last change: $Author: hr $ $Date: 2002-08-15 12:26:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -881,6 +881,10 @@ sal_Bool SAL_CALL ORegistryFactoryHelper::releaseOnNotification() throw(::com::s
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 
+#if defined(MACOSX)
+// Initialize static template data here to break circular reference to libstatic
+ClassData3 WeakImplHelper3< XServiceInfo, XSingleServiceFactory, XUnloadingPreference >::s_aCD(3);
+#endif
 
 class OFactoryProxyHelper : public WeakImplHelper3< XServiceInfo, XSingleServiceFactory,
                                                     XUnloadingPreference >
-- 
cgit v1.2.3