diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2002-08-23 11:52:37 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2002-08-23 11:52:37 +0000 |
| commit | c54d70ff227e40b93624a70b57fae9c8d6bc7c32 (patch) | |
| tree | 18f3930ca8187ffef120cfde8bf59f1dd6077309 /sw/inc/fmtclbl.hxx | |
| parent | 4a81bab411c79882a9ec4be7a10e38c6e14a8018 (diff) | |
#101685#,#i6886#: merge OOO_STABLE_1_PORTS (1.2-1.2.20.1) -> HEAD
Diffstat (limited to 'sw/inc/fmtclbl.hxx')
| -rw-r--r-- | sw/inc/fmtclbl.hxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sw/inc/fmtclbl.hxx b/sw/inc/fmtclbl.hxx index 6c65ae569c99..911c85388818 100644 --- a/sw/inc/fmtclbl.hxx +++ b/sw/inc/fmtclbl.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fmtclbl.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: er $ $Date: 2001-05-13 03:32:47 $ + * last change: $Author: hr $ $Date: 2002-08-23 12:46:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -92,11 +92,15 @@ public: */ virtual USHORT GetVersion( USHORT nFFVer ) const; }; + +#ifndef MACOSX +// 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 |