diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 22:14:56 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 22:14:56 +0000 |
commit | 53f35c5df3b4bdee356f768f511706c1daf6f431 (patch) | |
tree | af93501b56a6f6120d5287891b9a62a362ed35d8 /cppuhelper/source | |
parent | af9bfebb44e1cbbd8be5f50dc6114229cb733fca (diff) |
INTEGRATION: CWS geordi2q14 (1.19.40); FILE MERGED
2004/01/29 15:10:07 hr 1.19.40.1: #111934#: merge CWS ooo111fix2
Diffstat (limited to 'cppuhelper/source')
-rw-r--r-- | cppuhelper/source/factory.cxx | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx index ff560224c442..276f6da12384 100644 --- a/cppuhelper/source/factory.cxx +++ b/cppuhelper/source/factory.cxx @@ -2,9 +2,9 @@ * * $RCSfile: factory.cxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: hr $ $Date: 2003-07-16 17:52:00 $ + * last change: $Author: hr $ $Date: 2004-02-02 23:14:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -883,11 +883,6 @@ sal_Bool SAL_CALL ORegistryFactoryHelper::releaseOnNotification() throw(::com::s //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -#if defined( MACOSX ) && ( __GNUC__ < 3 ) -// 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 > { |