diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 16:54:50 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 16:54:50 +0000 |
| commit | 5429cdde20b3ea6f1544efac2e43784af61a2a59 (patch) | |
| tree | 1b6ca2ea187cce76839d5a5fae8bf6c0a47068ea /sw/inc/fmtcntnt.hxx | |
| parent | f031f188aa7512af535a5d2a793221023ea27aaa (diff) | |
INTEGRATION: CWS geordi2q14 (1.3.274); FILE MERGED
2004/01/30 14:26:12 hr 1.3.274.1: #111934#: merge CWS ooo111fix2
Diffstat (limited to 'sw/inc/fmtcntnt.hxx')
| -rw-r--r-- | sw/inc/fmtcntnt.hxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sw/inc/fmtcntnt.hxx b/sw/inc/fmtcntnt.hxx index 66fbffcd0b42..b243ed691032 100644 --- a/sw/inc/fmtcntnt.hxx +++ b/sw/inc/fmtcntnt.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fmtcntnt.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: hr $ $Date: 2003-07-16 18:04:55 $ + * last change: $Author: hr $ $Date: 2004-02-02 17:54:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -98,14 +98,11 @@ public: void SetNewCntntIdx( const SwNodeIndex *pIdx ); }; -#if !(defined(MACOSX) && ( __GNUC__ < 3 )) -// GrP moved to gcc_outl.hxx; revisit with gcc3 inline const SwFmtCntnt &SwAttrSet::GetCntnt(BOOL bInP) const { return (const SwFmtCntnt&)Get( RES_CNTNT,bInP); } inline const SwFmtCntnt &SwFmt::GetCntnt(BOOL bInP) const { return aSet.GetCntnt(bInP); } -#endif #endif |