diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 17:04:33 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 17:04:33 +0000 |
commit | 68c30284a44643aa2b9830721b60fa5c66cf0c14 (patch) | |
tree | a47d4cee9900cd4902fd749f26ff5a3a2af2c4e3 /sw/inc/fmtanchr.hxx | |
parent | fc75ee4cb831edb1fa02980160298d04d246125c (diff) |
INTEGRATION: CWS ooo11rc2 (1.3.272); FILE MERGED
2003/07/15 03:08:50 fa 1.3.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/fmtanchr.hxx')
-rw-r--r-- | sw/inc/fmtanchr.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/inc/fmtanchr.hxx b/sw/inc/fmtanchr.hxx index 0bad11bf0269..66852631aa5e 100644 --- a/sw/inc/fmtanchr.hxx +++ b/sw/inc/fmtanchr.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fmtanchr.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: hr $ $Date: 2002-08-23 12:43:14 $ + * last change: $Author: hr $ $Date: 2003-07-16 18:04:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -121,7 +121,7 @@ public: void SetAnchor( const SwPosition *pPos ); }; -#ifndef MACOSX +#if !(defined(MACOSX) && ( __GNUC__ < 3 )) // GrP moved to gcc_outl.cxx; revisit with gcc3 inline const SwFmtAnchor &SwAttrSet::GetAnchor(BOOL bInP) const { return (const SwFmtAnchor&)Get( RES_ANCHOR,bInP); } |