summaryrefslogtreecommitdiff
path: root/sd/source/ui/inc/sdstring.hrc
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2004-09-17 12:48:39 +0000
committerRüdiger Timm <rt@openoffice.org>2004-09-17 12:48:39 +0000
commit492a5329595a15cd08fcec11faf31be39fcee1e9 (patch)
treeb6ccd71949e76e7f50ac77259460aef48c74d813 /sd/source/ui/inc/sdstring.hrc
parent7efe90144817656483b0706e467c2fdff2c70962 (diff)
INTEGRATION: CWS os19 (1.3.170); FILE MERGED
2004/05/03 13:03:25 os 1.3.170.3: #i18881# merge error corrected 2004/04/29 19:07:27 os 1.3.170.2: RESYNC: (1.3-1.4); FILE MERGED 2003/11/10 10:49:44 af 1.3.170.1: #i22089# Commented out definitions of string ids that are defined in strings.hrc as well.
Diffstat (limited to 'sd/source/ui/inc/sdstring.hrc')
-rw-r--r--sd/source/ui/inc/sdstring.hrc22
1 files changed, 12 insertions, 10 deletions
diff --git a/sd/source/ui/inc/sdstring.hrc b/sd/source/ui/inc/sdstring.hrc
index d237f9e75276..32fda1e37455 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.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: obo $ $Date: 2004-01-20 12:25:01 $
+ * last change: $Author: rt $ $Date: 2004-09-17 13:48:39 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -85,16 +85,8 @@
#define STR_ASK_DEL_BITMAP SID_SD_STRING_START+10
#define STR_ASK_CHANGE_BITMAP SID_SD_STRING_START+11
-#define STR_LINESTYLE SID_SD_STRING_START+12
-#define STR_DESC_LINESTYLE SID_SD_STRING_START+13
-#define STR_DEL_LINESTYLE SID_SD_STRING_START+14
-#define STR_ASK_DEL_LINESTYLE SID_SD_STRING_START+15
#define STR_ASK_CHANGE_LINESTYLE SID_SD_STRING_START+16
-#define STR_INVISIBLE SID_SD_STRING_START+17
-#define STR_COLOR SID_SD_STRING_START+18
-#define STR_HATCH SID_SD_STRING_START+19
-#define STR_CHANGE SID_SD_STRING_START+20
#define STR_ADD SID_SD_STRING_START+21
// Texts for search and replace info and question boxes.
@@ -104,3 +96,13 @@
#define STR_SAR_WRAP_BACKWARD SID_SD_STRING_START+25
#define STR_SAR_WRAP_FORWARD_DRAW SID_SD_STRING_START+26
#define STR_SAR_WRAP_BACKWARD_DRAW SID_SD_STRING_START+27
+
+#define STR_SOLID SID_SD_STRING_START+0
+#define STR_LINESTYLE SID_SD_STRING_START+12
+#define STR_DESC_LINESTYLE SID_SD_STRING_START+13
+#define STR_DEL_LINESTYLE SID_SD_STRING_START+14
+#define STR_ASK_DEL_LINESTYLE SID_SD_STRING_START+15
+#define STR_INVISIBLE SID_SD_STRING_START+17
+#define STR_COLOR SID_SD_STRING_START+18
+#define STR_HATCH SID_SD_STRING_START+19
+#define STR_CHANGE SID_SD_STRING_START+20