diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 17:04:46 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 17:04:46 +0000 |
commit | 1cc03c97bb436ac6871c8c3b6d321b3d3a180cf5 (patch) | |
tree | 19ac198d28214e54c6745797af81ee00db5ad567 /sw/inc/swatrset.hxx | |
parent | 0066b01b0c430cae2f98563b3e2992480fa5c7fe (diff) |
INTEGRATION: CWS geordi2q14 (1.17.30); FILE MERGED
2004/01/30 14:26:19 hr 1.17.30.1: #111934#: merge CWS ooo111fix2
Diffstat (limited to 'sw/inc/swatrset.hxx')
-rw-r--r-- | sw/inc/swatrset.hxx | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sw/inc/swatrset.hxx b/sw/inc/swatrset.hxx index 1eea2fcf96f9..b44a3e34c892 100644 --- a/sw/inc/swatrset.hxx +++ b/sw/inc/swatrset.hxx @@ -2,9 +2,9 @@ * * $RCSfile: swatrset.hxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: obo $ $Date: 2004-01-13 11:06:46 $ + * last change: $Author: hr $ $Date: 2004-02-02 18:04:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -178,11 +178,7 @@ class SwTblBoxNumFormat; class SwTblBoxFormula; class SwTblBoxValue; -#if defined(MACOSX) && ( __GNUC__ < 3 ) -#define INLINE /* GrP revisit with gcc3 */ -#else #define INLINE inline -#endif class SwAttrPool : public SfxItemPool { |