summaryrefslogtreecommitdiff
path: root/svx/source/inc
diff options
context:
space:
mode:
authorPascal Junck <pjunck@openoffice.org>2004-11-03 07:19:15 +0000
committerPascal Junck <pjunck@openoffice.org>2004-11-03 07:19:15 +0000
commit16d5601414a81a81f8c2cb87158c1c0b7335ef56 (patch)
tree0f8d33a21b6165f820e7030746506f9b1dca67ef /svx/source/inc
parent05b395b32ab6071b08356dea19a31e7bd97fbbc7 (diff)
INTEGRATION: CWS dr28 (1.16.88); FILE MERGED
2004/10/20 10:34:30 dr 1.16.88.1: #i35426# redefine warnings
Diffstat (limited to 'svx/source/inc')
-rw-r--r--svx/source/inc/fmresids.hrc6
1 files changed, 3 insertions, 3 deletions
diff --git a/svx/source/inc/fmresids.hrc b/svx/source/inc/fmresids.hrc
index 2f53fdb06785..20adfe4e3caa 100644
--- a/svx/source/inc/fmresids.hrc
+++ b/svx/source/inc/fmresids.hrc
@@ -2,9 +2,9 @@
*
* $RCSfile: fmresids.hrc,v $
*
- * $Revision: 1.16 $
+ * $Revision: 1.17 $
*
- * last change: $Author: rt $ $Date: 2004-09-09 10:24:07 $
+ * last change: $Author: pjunck $ $Date: 2004-11-03 08:19:15 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -72,7 +72,7 @@
#define RID_SVXIMGLIST_FMEXPL_HC (RID_FORMS_START + 2)
// Image-Id's -----------------------------------------------------------
-#define SID_FMSLOTS_START (SID_SVX_START + 592)
+//#define SID_FMSLOTS_START (SID_SVX_START + 592) -> svxids.hrc
#define RID_SVXIMG_FORM SID_FM_CONFIG
#define RID_SVXIMG_CONTROL SID_CHOOSE_CONTROLS
#define RID_SVXIMG_COLLAPSEDNODE (RID_FORMS_START + 2)