diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 16:58:56 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 16:58:56 +0000 |
commit | e2fc71589b370e4cb4a2f55b44a470bf34066d73 (patch) | |
tree | b8e170efef9752775b02c022df3eca1bddd2ad8b /sw/inc/fmtornt.hxx | |
parent | e37caea2fa42618d0caf175722330b81ceb82e97 (diff) |
INTEGRATION: CWS geordi2q14 (1.6.274); FILE MERGED
2004/01/30 14:26:15 hr 1.6.274.1: #111934#: merge CWS ooo111fix2
Diffstat (limited to 'sw/inc/fmtornt.hxx')
-rw-r--r-- | sw/inc/fmtornt.hxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sw/inc/fmtornt.hxx b/sw/inc/fmtornt.hxx index 2ea1a9854d46..ad57c5a96a7d 100644 --- a/sw/inc/fmtornt.hxx +++ b/sw/inc/fmtornt.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fmtornt.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: hr $ $Date: 2003-07-16 18:06:28 $ + * last change: $Author: hr $ $Date: 2004-02-02 17:58:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -181,8 +181,6 @@ inline SwFmtHoriOrient &SwFmtHoriOrient::operator=( const SwFmtHoriOrient &rCpy return *this; } -#if !(defined(MACOSX) && ( __GNUC__ < 3 )) -// GrP moved to gcc_outl.cxx inline const SwFmtVertOrient &SwAttrSet::GetVertOrient(BOOL bInP) const { return (const SwFmtVertOrient&)Get( RES_VERT_ORIENT,bInP); } inline const SwFmtHoriOrient &SwAttrSet::GetHoriOrient(BOOL bInP) const @@ -192,7 +190,6 @@ inline const SwFmtVertOrient &SwFmt::GetVertOrient(BOOL bInP) const { return aSet.GetVertOrient(bInP); } inline const SwFmtHoriOrient &SwFmt::GetHoriOrient(BOOL bInP) const { return aSet.GetHoriOrient(bInP); } -#endif #endif |