diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2002-08-15 11:26:49 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2002-08-15 11:26:49 +0000 |
| commit | b00b750a4b71620f18a636f7098247a6c09af36e (patch) | |
| tree | b1fae2e4545f273e2ada7112ab96c6edc4f1d8de /cppuhelper/source | |
| parent | 00ffb784a8656886bf6943b084fef8875e1d5ba1 (diff) | |
#101685#,#i6886# merge OOO_STABLE_1_PORTS (1.15-1.15.12.1) -> HEAD
Diffstat (limited to 'cppuhelper/source')
| -rw-r--r-- | cppuhelper/source/factory.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx index 39a8cc31c763..7f8ed3e926be 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 > |