diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 22:14:41 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 22:14:41 +0000 |
| commit | af9bfebb44e1cbbd8be5f50dc6114229cb733fca (patch) | |
| tree | c8d9359fb3ffca1a8e9f01ca3e8360814288ba49 /cppuhelper | |
| parent | ab6ce282dcbb4b3954fed873b4be655479b9b447 (diff) | |
INTEGRATION: CWS geordi2q14 (1.22.20); FILE MERGED
2004/01/29 15:10:03 hr 1.22.20.1: #111934#: merge CWS ooo111fix2
Diffstat (limited to 'cppuhelper')
| -rw-r--r-- | cppuhelper/source/component_context.cxx | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/cppuhelper/source/component_context.cxx b/cppuhelper/source/component_context.cxx index ef6cecd1c218..546a68451568 100644 --- a/cppuhelper/source/component_context.cxx +++ b/cppuhelper/source/component_context.cxx @@ -2,9 +2,9 @@ * * $RCSfile: component_context.cxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: obo $ $Date: 2003-09-04 10:54:25 $ + * last change: $Author: hr $ $Date: 2004-02-02 23:14:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -332,11 +332,6 @@ static inline void try_dispose( Reference< lang::XComponent > const & xComp ) //================================================================================================== -#if defined( MACOSX ) && ( __GNUC__ < 3 ) -// Initialize static template data here to break circular reference to libstatic -ClassData1 WeakImplHelper1< lang::XEventListener >::s_aCD(1); -#endif - class DisposingForwarder : public WeakImplHelper1< lang::XEventListener > { @@ -382,11 +377,6 @@ struct MutexHolder }; //================================================================================================== -#if defined( MACOSX ) && ( __GNUC__ < 3 ) -// Initialize static template data here to break circular reference to libstatic -ClassData1 WeakComponentImplHelper1< XComponentContext >::s_aCD(1); -#endif - class ComponentContext : public MutexHolder , public WeakComponentImplHelper1< XComponentContext > |