diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 17:07:02 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 17:07:02 +0000 |
| commit | a00703e8a93ccbc66c00d91fd7b3817d8a29e6f2 (patch) | |
| tree | e08c49ae84b034b3b2c8056c4d52e6b47c8f0381 /sw/inc/fmtsrnd.hxx | |
| parent | 4f5ad130e8cff60f9fde2dd12170194d38ccdc6b (diff) | |
INTEGRATION: CWS ooo11rc2 (1.3.272); FILE MERGED
2003/07/15 03:08:54 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/fmtsrnd.hxx')
| -rw-r--r-- | sw/inc/fmtsrnd.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/inc/fmtsrnd.hxx b/sw/inc/fmtsrnd.hxx index 23e4a6ac582f..e840e0a5b7f5 100644 --- a/sw/inc/fmtsrnd.hxx +++ b/sw/inc/fmtsrnd.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fmtsrnd.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: hr $ $Date: 2002-08-23 13:23:55 $ + * last change: $Author: hr $ $Date: 2003-07-16 18:06:49 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -132,7 +132,7 @@ inline SwFmtSurround &SwFmtSurround::operator=( const SwFmtSurround &rCpy ) return *this; } -#ifndef MACOSX +#if !(defined(MACOSX) && ( __GNUC__ < 3 )) // GrP moved to gcc_outl.hxx; revisit with gcc3 inline const SwFmtSurround &SwAttrSet::GetSurround(BOOL bInP) const { return (const SwFmtSurround&)Get( RES_SURROUND,bInP); } |