diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 17:03:50 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 17:03:50 +0000 |
| commit | 891e39d482749b556e0b38d33ed77009b0325310 (patch) | |
| tree | d5ee5f19807ee5ec40ae2b5e17f0644a3372b41f /sw/inc/cellatr.hxx | |
| parent | 16cc5bc12dc955b1ed0255fce8cf553b31fd2d9f (diff) | |
INTEGRATION: CWS ooo11rc2 (1.2.272); FILE MERGED
2003/07/15 03:08:49 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/cellatr.hxx')
| -rw-r--r-- | sw/inc/cellatr.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/inc/cellatr.hxx b/sw/inc/cellatr.hxx index 8c78fa3207dc..5965811abe20 100644 --- a/sw/inc/cellatr.hxx +++ b/sw/inc/cellatr.hxx @@ -2,9 +2,9 @@ * * $RCSfile: cellatr.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: hr $ $Date: 2002-08-23 12:09:19 $ + * last change: $Author: hr $ $Date: 2003-07-16 18:03:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -159,7 +159,7 @@ public: //*************************************************************************** -#ifndef MACOSX +#if !(defined(MACOSX) && ( __GNUC__ < 3 )) // GrP moved to gcc_outl.cxx; revisit with gcc3 inline const SwTblBoxNumFormat &SwAttrSet::GetTblBoxNumFmt(BOOL bInP) const { return (const SwTblBoxNumFormat&)Get( RES_BOXATR_FORMAT,bInP); } @@ -171,7 +171,7 @@ inline const SwTblBoxValue &SwAttrSet::GetTblBoxValue(BOOL bInP) const //*************************************************************************** -#ifndef MACOSX +#if !(defined(MACOSX) && ( __GNUC__ < 3 )) // GrP moved to gcc_outl.cxx; revisit with gcc3 inline const SwTblBoxNumFormat &SwFmt::GetTblBoxNumFmt(BOOL bInP) const { return aSet.GetTblBoxNumFmt(bInP); } |