diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 17:01:34 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 17:01:34 +0000 |
| commit | e9dab5c31f4d04ba930d6a5c131f4e5c326d75b7 (patch) | |
| tree | 66edbdc289a7e20994b8c48680e3e97da900f347 /sw/inc/fmturl.hxx | |
| parent | 5e7530db4dfcdd21f9396fb40145cd3b2760e3fc (diff) | |
INTEGRATION: CWS geordi2q14 (1.4.274); FILE MERGED
2004/01/30 14:26:16 hr 1.4.274.1: #111934#: merge CWS ooo111fix2
Diffstat (limited to 'sw/inc/fmturl.hxx')
| -rw-r--r-- | sw/inc/fmturl.hxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sw/inc/fmturl.hxx b/sw/inc/fmturl.hxx index 2fff60a00683..c652ce6d6fdd 100644 --- a/sw/inc/fmturl.hxx +++ b/sw/inc/fmturl.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fmturl.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: hr $ $Date: 2003-07-16 18:07:02 $ + * last change: $Author: hr $ $Date: 2004-02-02 18:00:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -122,14 +122,11 @@ public: }; -#if ! (defined(MACOSX) && ( __GNUC__ < 3 )) -// GrP moved to gcc_outl.cxx; revisit with gcc3 inline const SwFmtURL &SwAttrSet::GetURL(BOOL bInP) const { return (const SwFmtURL&)Get( RES_URL,bInP); } inline const SwFmtURL &SwFmt::GetURL(BOOL bInP) const { return aSet.GetURL(bInP); } -#endif #endif |