diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 17:05:19 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 17:05:19 +0000 |
| commit | 209fa5391f5e802ce60b13f327b756f75fa867ba (patch) | |
| tree | ddbb3ba3d2eda625f144193648c9db7a5df298a9 /sw/inc/fmtcntnt.hxx | |
| parent | 54e3393c715710739b1a2470d0f98167c41ce476 (diff) | |
INTEGRATION: CWS ooo11rc2 (1.2.272); FILE MERGED
2003/07/15 03:08:51 fa 1.2.272.1: Conditionalize OS X + gcc 2.95 hacks for gcc 2.95 only.
http://www.openoffice.org/issues/show_bug.cgi?id=16849
Contributor:
Kevin Hendricks
Dan
fa@ooo
Diffstat (limited to 'sw/inc/fmtcntnt.hxx')
| -rw-r--r-- | sw/inc/fmtcntnt.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/inc/fmtcntnt.hxx b/sw/inc/fmtcntnt.hxx index f1e393148b66..66fbffcd0b42 100644 --- a/sw/inc/fmtcntnt.hxx +++ b/sw/inc/fmtcntnt.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fmtcntnt.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: hr $ $Date: 2002-08-23 12:55:37 $ + * last change: $Author: hr $ $Date: 2003-07-16 18:04:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -98,7 +98,7 @@ public: void SetNewCntntIdx( const SwNodeIndex *pIdx ); }; -#ifndef MACOSX +#if !(defined(MACOSX) && ( __GNUC__ < 3 )) // GrP moved to gcc_outl.hxx; revisit with gcc3 inline const SwFmtCntnt &SwAttrSet::GetCntnt(BOOL bInP) const { return (const SwFmtCntnt&)Get( RES_CNTNT,bInP); } |