diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 16:56:18 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 16:56:18 +0000 |
| commit | a8e0e08ab753234a9b7de6239d63d0c01ce5e809 (patch) | |
| tree | ee4033cdaf630b67dd50f4145bffb642679b2373 /sw/inc/fmtfsize.hxx | |
| parent | 90e4dd9791d7a4ad5393c4b00e197d9aabbd018c (diff) | |
INTEGRATION: CWS geordi2q14 (1.6.274); FILE MERGED
2004/01/30 14:26:13 hr 1.6.274.1: #111934#: merge CWS ooo111fix2
Diffstat (limited to 'sw/inc/fmtfsize.hxx')
| -rw-r--r-- | sw/inc/fmtfsize.hxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sw/inc/fmtfsize.hxx b/sw/inc/fmtfsize.hxx index 68c65e7d65d8..7874aaa20779 100644 --- a/sw/inc/fmtfsize.hxx +++ b/sw/inc/fmtfsize.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fmtfsize.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: hr $ $Date: 2003-07-16 18:05:31 $ + * last change: $Author: hr $ $Date: 2004-02-02 17:56:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -151,14 +151,11 @@ public: const SvxULSpaceItem *pULSpace ) const; }; -#if !(defined(MACOSX) && ( __GNUC__ < 3 )) -// GrP moved to gcc_outl.cxx; revisit with gcc3 inline const SwFmtFrmSize &SwAttrSet::GetFrmSize(BOOL bInP) const { return (const SwFmtFrmSize&)Get( RES_FRM_SIZE,bInP); } inline const SwFmtFrmSize &SwFmt::GetFrmSize(BOOL bInP) const { return aSet.GetFrmSize(bInP); } -#endif #endif |