diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 16:57:41 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 16:57:41 +0000 |
| commit | c571bb981c230b79f4f56f56b6c145dac611c509 (patch) | |
| tree | 8dfb69397e290be308591ce7159cf3e96c07033f /svx | |
| parent | 9ea08c74b3e36b726331b86dc2bd8b0e11f79bad (diff) | |
INTEGRATION: CWS ooo11rc2 (1.88.4); FILE MERGED
2003/07/15 03:16:21 fa 1.88.4.1: Conditionalize OS X + gcc 2.95 hacks for gcc 2.95 only.
http://www.openoffice.org/issues/show_bug.cgi?id=16851
Contributor:
Kevin Hendricks
Dan
fa@ooo
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/editeng/impedit2.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/svx/source/editeng/impedit2.cxx b/svx/source/editeng/impedit2.cxx index d864913965c4..3a8f80574dc7 100644 --- a/svx/source/editeng/impedit2.cxx +++ b/svx/source/editeng/impedit2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: impedit2.cxx,v $ * - * $Revision: 1.88 $ + * $Revision: 1.89 $ * - * last change: $Author: vg $ $Date: 2003-07-01 14:51:19 $ + * last change: $Author: hr $ $Date: 2003-07-16 17:57:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -133,7 +133,7 @@ #include <unicode/ubidi.h> -#ifdef MACOSX +#if defined(MACOSX) && ( __GNUC__ < 3 ) // moved from editundo.hxx const EPaM& EditUndoRemoveChars::GetEPaM() { return aEPaM; } String& EditUndoRemoveChars::GetStr() { return aText; } |