diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 22:15:26 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 22:15:26 +0000 |
| commit | f1f8a965455b80da18bf47d0c91645ac4c69d964 (patch) | |
| tree | c378a9f4c8af515e4dffb2093ae6e4d1d549f70c /cppuhelper/source/macro_expander.cxx | |
| parent | 554ccd33991e794b2c7a653fbe1e2f711e3acb1d (diff) | |
INTEGRATION: CWS geordi2q14 (1.4.40); FILE MERGED
2004/01/29 15:10:12 hr 1.4.40.1: #111934#: merge CWS ooo111fix2
Diffstat (limited to 'cppuhelper/source/macro_expander.cxx')
| -rw-r--r-- | cppuhelper/source/macro_expander.cxx | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/cppuhelper/source/macro_expander.cxx b/cppuhelper/source/macro_expander.cxx index 1351751352c0..577336dd9daa 100644 --- a/cppuhelper/source/macro_expander.cxx +++ b/cppuhelper/source/macro_expander.cxx @@ -2,9 +2,9 @@ * * $RCSfile: macro_expander.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: hr $ $Date: 2003-07-16 17:52:22 $ + * last change: $Author: hr $ $Date: 2004-02-02 23:15:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -112,12 +112,6 @@ static Sequence< OUString > const & s_get_service_names() typedef ::cppu::WeakComponentImplHelper3< util::XMacroExpander, lang::XServiceInfo, lang::XInitialization > t_uno_impl; -#if defined( MACOSX ) && ( __GNUC__ < 3 ) -// Initialize static template data here to break circular reference to libstatic - -cppu::ClassData3 cppu::WeakComponentImplHelper3< com::sun::star::util::XMacroExpander, com::sun::star::lang::XServiceInfo, com::sun::star::lang::XInitialization >::s_aCD(1); -#endif - struct mutex_holder { Mutex m_mutex; |