diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 17:00:07 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 17:00:07 +0000 |
| commit | c3d239b0c7f693ae3eb5341bbcad460a85b1f9f6 (patch) | |
| tree | 7b198b4117f8aaabcc9b403754d0c4411a24fb32 /sw/inc/fmtsrnd.hxx | |
| parent | d3d8621151717b175abd0ea1704d893a771a21e2 (diff) | |
INTEGRATION: CWS geordi2q14 (1.4.274); FILE MERGED
2004/01/30 14:26:15 hr 1.4.274.1: #111934#: merge CWS ooo111fix2
Diffstat (limited to 'sw/inc/fmtsrnd.hxx')
| -rw-r--r-- | sw/inc/fmtsrnd.hxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sw/inc/fmtsrnd.hxx b/sw/inc/fmtsrnd.hxx index e840e0a5b7f5..a3ed0bae6e6c 100644 --- a/sw/inc/fmtsrnd.hxx +++ b/sw/inc/fmtsrnd.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fmtsrnd.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: hr $ $Date: 2003-07-16 18:06:49 $ + * last change: $Author: hr $ $Date: 2004-02-02 18:00:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -132,14 +132,11 @@ inline SwFmtSurround &SwFmtSurround::operator=( const SwFmtSurround &rCpy ) return *this; } -#if !(defined(MACOSX) && ( __GNUC__ < 3 )) -// GrP moved to gcc_outl.hxx; revisit with gcc3 inline const SwFmtSurround &SwAttrSet::GetSurround(BOOL bInP) const { return (const SwFmtSurround&)Get( RES_SURROUND,bInP); } inline const SwFmtSurround &SwFmt::GetSurround(BOOL bInP) const { return aSet.GetSurround(bInP); } -#endif #endif |