summaryrefslogtreecommitdiffstats
path: root/sw/inc/fmtcnct.hxx
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2002-08-23 11:52:37 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2002-08-23 11:52:37 +0000
commitc54d70ff227e40b93624a70b57fae9c8d6bc7c32 (patch)
tree18f3930ca8187ffef120cfde8bf59f1dd6077309 /sw/inc/fmtcnct.hxx
parent#101685#,#i6886#: merge OOO_STABLE_1_PORTS (1.7-1.7.20.1) -> HEAD (diff)
downloadcore-c54d70ff227e40b93624a70b57fae9c8d6bc7c32.tar.gz
core-c54d70ff227e40b93624a70b57fae9c8d6bc7c32.zip
#101685#,#i6886#: merge OOO_STABLE_1_PORTS (1.2-1.2.20.1) -> HEAD
Diffstat (limited to 'sw/inc/fmtcnct.hxx')
-rw-r--r--sw/inc/fmtcnct.hxx7
1 files changed, 5 insertions, 2 deletions
diff --git a/sw/inc/fmtcnct.hxx b/sw/inc/fmtcnct.hxx
index cf3aa0f38786..115dd6f5f6a0 100644
--- a/sw/inc/fmtcnct.hxx
+++ b/sw/inc/fmtcnct.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: fmtcnct.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:52:37 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -123,11 +123,14 @@ SwFmtChain &SwFmtChain::operator=( const SwFmtChain &rCpy )
}
+#ifndef MACOSX
+// GrP moved to gcc_outl.cxx; revisit with gcc3
inline const SwFmtChain &SwAttrSet::GetChain(BOOL bInP) const
{ return (const SwFmtChain&)Get( RES_CHAIN,bInP); }
inline const SwFmtChain &SwFmt::GetChain(BOOL bInP) const
{ return aSet.GetChain(bInP); }
+#endif
#endif