INTEGRATION: CWS ooo11rc2 (1.3.46); FILE MERGED

2003/07/14 15:18:57 fa 1.3.46.1: Conditionalize OS X + gcc 2.95 hacks for gcc 2.95 only.

http://www.openoffice.org/project/www/issues/show_bug.cgi?id=16611

Dan
fa@ooo
This commit is contained in:
Jens-Heiner Rechtien 2003-07-16 16:52:22 +00:00
parent afc564da91
commit cffd33b24f

View file

@ -2,9 +2,9 @@
*
* $RCSfile: macro_expander.cxx,v $
*
* $Revision: 1.3 $
* $Revision: 1.4 $
*
* last change: $Author: dbo $ $Date: 2002-12-06 10:12:28 $
* last change: $Author: hr $ $Date: 2003-07-16 17:52:22 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -112,7 +112,7 @@ static Sequence< OUString > const & s_get_service_names()
typedef ::cppu::WeakComponentImplHelper3<
util::XMacroExpander, lang::XServiceInfo, lang::XInitialization > t_uno_impl;
#if defined(MACOSX)
#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);