diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-01-20 11:25:01 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-01-20 11:25:01 +0000 |
| commit | 34fed384194df76848d92025f7f147eebb6382b7 (patch) | |
| tree | 942ef92e882fc6a33db78605d0fbda153819743e /sd/source/ui/inc/sdstring.hrc | |
| parent | 03a14f9091a7fadeae2475d8eeb279fa345474fd (diff) | |
INTEGRATION: CWS impress1 (1.3.128); FILE MERGED
2003/09/16 13:45:38 af 1.3.128.1: #111996# Added some #undef directives to avoid compiler warnings.
Diffstat (limited to 'sd/source/ui/inc/sdstring.hrc')
| -rw-r--r-- | sd/source/ui/inc/sdstring.hrc | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/sd/source/ui/inc/sdstring.hrc b/sd/source/ui/inc/sdstring.hrc index c2c581a9e57b..d237f9e75276 100644 --- a/sd/source/ui/inc/sdstring.hrc +++ b/sd/source/ui/inc/sdstring.hrc @@ -2,9 +2,9 @@ * * $RCSfile: sdstring.hrc,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: hr $ $Date: 2003-03-27 10:57:58 $ + * last change: $Author: obo $ $Date: 2004-01-20 12:25:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,6 +61,16 @@ #include <sfx2/sfx.hrc> #define SID_SD_STRING_START RID_APP_START+300 +#undef STR_SOLID +#undef STR_LINESTYLE +#undef STR_DESC_LINESTYLE +#undef STR_DEL_LINESTYLE +#undef STR_ASK_DEL_LINESTYLE +#undef STR_INVISIBLE +#undef STR_COLOR +#undef STR_HATCH +#undef STR_CHANGE + #define STR_SOLID SID_SD_STRING_START+0 #define STR_GRADIENT SID_SD_STRING_START+1 |