From 4a81bab411c79882a9ec4be7a10e38c6e14a8018 Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien
Date: Fri, 23 Aug 2002 11:25:39 +0000
Subject: #101685#,#i6886#: merge OOO_STABLE_1_PORTS (1.7-1.7.20.1) -> HEAD
---
sw/inc/charatr.hxx | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
(limited to 'sw/inc/charatr.hxx')
diff --git a/sw/inc/charatr.hxx b/sw/inc/charatr.hxx
index 27b359e199c8..7ade9950086c 100644
--- a/sw/inc/charatr.hxx
+++ b/sw/inc/charatr.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: charatr.hxx,v $
*
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
*
- * last change: $Author: os $ $Date: 2002-06-11 08:36:54 $
+ * last change: $Author: hr $ $Date: 2002-08-23 12:25:39 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -108,8 +108,12 @@ inline const SvxFontHeightItem &SwAttrSet::GetCTLSize(BOOL bInP) const
{ return (const SvxFontHeightItem&)Get( RES_CHRATR_CTL_FONTSIZE,bInP); }
inline const SvxPropSizeItem &SwAttrSet::GetPropSize(BOOL bInP) const
{ return (const SvxPropSizeItem&)Get( RES_CHRATR_PROPORTIONALFONTSIZE,bInP); }
+
+#ifndef MACOSX
+// GrP moved to gcc_outl.cxx; revisit with gcc3
inline const SvxFontItem &SwAttrSet::GetFont(BOOL bInP) const
{ return (const SvxFontItem&)Get( RES_CHRATR_FONT,bInP); }
+#endif
inline const SvxFontItem &SwAttrSet::GetCJKFont(BOOL bInP) const
{ return (const SvxFontItem&)Get( RES_CHRATR_CJK_FONT,bInP); }
inline const SvxFontItem &SwAttrSet::GetCTLFont(BOOL bInP) const
@@ -172,8 +176,11 @@ inline const SvxFontHeightItem &SwFmt::GetSize(BOOL bInP) const
{ return aSet.GetSize(bInP); }
inline const SvxPropSizeItem &SwFmt::GetPropSize(BOOL bInP) const
{ return aSet.GetPropSize(bInP); }
+#ifndef MACOSX
+// GrP moved to gcc_outl.cxx; revisit with gcc3
inline const SvxFontItem &SwFmt::GetFont(BOOL bInP) const
{ return aSet.GetFont(bInP); }
+#endif
inline const SvxFontItem &SwFmt::GetCJKFont(BOOL bInP) const
{ return aSet.GetCJKFont(bInP); }
inline const SvxFontItem &SwFmt::GetCTLFont(BOOL bInP) const
--
cgit