diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2002-08-23 12:23:56 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2002-08-23 12:23:56 +0000 |
| commit | 283def1c3ad73f75ce7d3240d5d273dad3e34c03 (patch) | |
| tree | b92ebaa15d3bd9952835f8ce884551ac2eab848c /sw/inc/fmthdft.hxx | |
| parent | f63fbc040021f7e996664012f74eb88a4a2768c3 (diff) | |
#101685#,#i6886# merge OOO_STABLE_1_PORTS (1.2-1.2.20.1) -> HEAD
Diffstat (limited to 'sw/inc/fmthdft.hxx')
| -rw-r--r-- | sw/inc/fmthdft.hxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sw/inc/fmthdft.hxx b/sw/inc/fmthdft.hxx index efaa77430fdd..340020d746fb 100644 --- a/sw/inc/fmthdft.hxx +++ b/sw/inc/fmthdft.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fmthdft.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: er $ $Date: 2001-05-13 03:32:47 $ + * last change: $Author: hr $ $Date: 2002-08-23 13:23:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -146,6 +146,8 @@ public: void SetActive( BOOL bNew = TRUE ) { bActive = bNew; } }; +#ifndef MACOSX +// GrP moved to gcc_outl.cxx; revisit with gcc3 inline const SwFmtHeader &SwAttrSet::GetHeader(BOOL bInP) const { return (const SwFmtHeader&)Get( RES_HEADER,bInP); } inline const SwFmtFooter &SwAttrSet::GetFooter(BOOL bInP) const @@ -155,6 +157,7 @@ inline const SwFmtHeader &SwFmt::GetHeader(BOOL bInP) const { return aSet.GetHeader(bInP); } inline const SwFmtFooter &SwFmt::GetFooter(BOOL bInP) const { return aSet.GetFooter(bInP); } +#endif #endif |