diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 16:57:13 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 16:57:13 +0000 |
| commit | 635df8cac3a15cf161c0c2efc7884bf2d36f9870 (patch) | |
| tree | 359dfa40121067c70c06c873aa72222eae9d43c9 /sw/inc/fmthdft.hxx | |
| parent | 2f5a2678fa246d5a0e620878564b1b3b544c0f60 (diff) | |
INTEGRATION: CWS geordi2q14 (1.4.274); FILE MERGED
2004/01/30 14:26:14 hr 1.4.274.1: #111934#: merge CWS ooo111fix2
Diffstat (limited to 'sw/inc/fmthdft.hxx')
| -rw-r--r-- | sw/inc/fmthdft.hxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sw/inc/fmthdft.hxx b/sw/inc/fmthdft.hxx index cc8679d55708..511422eccced 100644 --- a/sw/inc/fmthdft.hxx +++ b/sw/inc/fmthdft.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fmthdft.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: hr $ $Date: 2003-07-16 18:05:54 $ + * last change: $Author: hr $ $Date: 2004-02-02 17:57:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -146,8 +146,6 @@ public: void SetActive( BOOL bNew = TRUE ) { bActive = bNew; } }; -#if !(defined(MACOSX) && ( __GNUC__ < 3 ) ) -// 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 @@ -157,7 +155,6 @@ 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 |