diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 17:06:28 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 17:06:28 +0000 |
| commit | ba0144b104b7811dabb218bf7e1fb95c8b45aa36 (patch) | |
| tree | a449c5a12b609140e07ad2ecd39894b95e7809a8 /sw/inc/fmtornt.hxx | |
| parent | 22e36684496aa122e0373beb38d29ef7847be94e (diff) | |
INTEGRATION: CWS ooo11rc2 (1.5.272); FILE MERGED
2003/07/15 03:08:53 fa 1.5.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/fmtornt.hxx')
| -rw-r--r-- | sw/inc/fmtornt.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/inc/fmtornt.hxx b/sw/inc/fmtornt.hxx index 263063f374c6..2ea1a9854d46 100644 --- a/sw/inc/fmtornt.hxx +++ b/sw/inc/fmtornt.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fmtornt.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: hr $ $Date: 2002-08-23 13:21:17 $ + * last change: $Author: hr $ $Date: 2003-07-16 18:06:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -181,7 +181,7 @@ inline SwFmtHoriOrient &SwFmtHoriOrient::operator=( const SwFmtHoriOrient &rCpy return *this; } -#ifndef MACOSX +#if !(defined(MACOSX) && ( __GNUC__ < 3 )) // GrP moved to gcc_outl.cxx inline const SwFmtVertOrient &SwAttrSet::GetVertOrient(BOOL bInP) const { return (const SwFmtVertOrient&)Get( RES_VERT_ORIENT,bInP); } |