diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 17:07:24 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 17:07:24 +0000 |
| commit | 1667860c99f14c5eab5d2f73704e2363d5a70549 (patch) | |
| tree | 34877a52febb4cd0d6aafa323996f76f5619c9b2 /sw/inc/frmatr.hxx | |
| parent | a2e6bb59d0f2d8e7be71a9d90e87a6d5ade09bcf (diff) | |
INTEGRATION: CWS ooo11rc2 (1.3.268); FILE MERGED
2003/07/15 03:08:55 fa 1.3.268.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/frmatr.hxx')
| -rw-r--r-- | sw/inc/frmatr.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/inc/frmatr.hxx b/sw/inc/frmatr.hxx index 5d69160af19f..633fbbfc7819 100644 --- a/sw/inc/frmatr.hxx +++ b/sw/inc/frmatr.hxx @@ -2,9 +2,9 @@ * * $RCSfile: frmatr.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: hr $ $Date: 2002-08-23 14:17:13 $ + * last change: $Author: hr $ $Date: 2003-07-16 18:07:24 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -75,7 +75,7 @@ * Implementierung der FrameAttribut Methoden vom SwAttrSet ******************************************************************************/ -#ifndef MACOSX +#if ! (defined(MACOSX) && ( __GNUC__ < 3 )) // GrP moved to gcc_outl.cxx; revisit with gcc3 inline const SvxPaperBinItem &SwAttrSet::GetPaperBin(BOOL bInP) const { return (const SvxPaperBinItem&)Get( RES_PAPER_BIN,bInP); } |