diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 17:06:39 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 17:06:39 +0000 |
| commit | 4f5ad130e8cff60f9fde2dd12170194d38ccdc6b (patch) | |
| tree | 5d7bdbb386e0066c96ea13aceff1890f807232a0 /sw/inc/fmtpdsc.hxx | |
| parent | ba0144b104b7811dabb218bf7e1fb95c8b45aa36 (diff) | |
INTEGRATION: CWS ooo11rc2 (1.6.272); FILE MERGED
2003/07/15 03:08:54 fa 1.6.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/fmtpdsc.hxx')
| -rw-r--r-- | sw/inc/fmtpdsc.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/inc/fmtpdsc.hxx b/sw/inc/fmtpdsc.hxx index 9b018c0dc366..7d3e82f40040 100644 --- a/sw/inc/fmtpdsc.hxx +++ b/sw/inc/fmtpdsc.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fmtpdsc.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: hr $ $Date: 2002-08-23 13:24:47 $ + * last change: $Author: hr $ $Date: 2003-07-16 18:06:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -137,7 +137,7 @@ public: }; -#ifndef MACOSX +#if !(defined(MACOSX) && ( __GNUC__ < 3 )) // GrP moved to gcc_outl.cxx; revisit with gcc3 inline const SwFmtPageDesc &SwAttrSet::GetPageDesc(BOOL bInP) const { return (const SwFmtPageDesc&)Get( RES_PAGEDESC,bInP); } |