From b5839d15f49f473e0e3f717bd3f46548d08d71d1 Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Mon, 2 Feb 2004 16:53:20 +0000 Subject: INTEGRATION: CWS geordi2q14 (1.4.274); FILE MERGED 2004/01/30 14:26:11 hr 1.4.274.1: #111934#: merge CWS ooo111fix2 --- sw/inc/fmtclbl.hxx | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'sw/inc/fmtclbl.hxx') diff --git a/sw/inc/fmtclbl.hxx b/sw/inc/fmtclbl.hxx index 730572b6a5b6..e1dd8676cd16 100644 --- a/sw/inc/fmtclbl.hxx +++ b/sw/inc/fmtclbl.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fmtclbl.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: hr $ $Date: 2003-07-16 18:04:23 $ + * last change: $Author: hr $ $Date: 2004-02-02 17:53:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -93,14 +93,11 @@ public: }; -#if !(defined(MACOSX) && ( __GNUC__ < 3 )) -// GrP moved to gcc_outl.cxx; revisit with gcc3 inline const SwFmtNoBalancedColumns &SwAttrSet::GetBalancedColumns(BOOL bInP) const { return (const SwFmtNoBalancedColumns&)Get( RES_COLUMNBALANCE, bInP ); } inline const SwFmtNoBalancedColumns &SwFmt::GetBalancedColumns(BOOL bInP) const { return aSet.GetBalancedColumns( bInP ); } -#endif #endif -- cgit