INTEGRATION: CWS geordi2q14 (1.4.40); FILE MERGED

2004/01/29 15:10:12 hr 1.4.40.1: #111934#: merge CWS ooo111fix2
This commit is contained in:
Jens-Heiner Rechtien
2004-02-02 22:15:26 +00:00
parent 554ccd3399
commit f1f8a96545

View File

@@ -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;