summaryrefslogtreecommitdiff
path: root/extensions/source
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2004-05-10 12:46:27 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2004-05-10 12:46:27 +0000
commit6c4e76b0e8e49b94be059c1b2693c295de338d5a (patch)
tree9947f2189969372f645fbb58d52b27b00d0e6882 /extensions/source
parent5feb71fe2b7b245ccfd68be388d867ff8d43a245 (diff)
INTEGRATION: CWS dba09 (1.18.54); FILE MERGED
2004/04/29 08:35:02 fs 1.18.54.4: copying the changes which happend on the cws_src680_frmcontrols03 branch to the cws_src680_dba09 branch - this is since both CWS' have some interdependencies 2004/04/26 15:01:10 fs 1.18.54.3: RESYNC: (1.19-1.20); FILE MERGED 2004/03/24 09:22:48 fs 1.18.54.2: RESYNC: (1.18-1.19); FILE MERGED 2004/03/19 15:26:36 fs 1.18.54.1: #i13497# #i14649#
Diffstat (limited to 'extensions/source')
-rw-r--r--extensions/source/propctrlr/formresid.hrc9
1 files changed, 6 insertions, 3 deletions
diff --git a/extensions/source/propctrlr/formresid.hrc b/extensions/source/propctrlr/formresid.hrc
index ceced37bb..fddaa9fff 100644
--- a/extensions/source/propctrlr/formresid.hrc
+++ b/extensions/source/propctrlr/formresid.hrc
@@ -2,9 +2,9 @@
*
* $RCSfile: formresid.hrc,v $
*
- * $Revision: 1.21 $
+ * $Revision: 1.22 $
*
- * last change: $Author: rt $ $Date: 2004-05-07 16:04:39 $
+ * last change: $Author: hr $ $Date: 2004-05-10 13:46:27 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -273,6 +273,8 @@
#define RID_STR_SHOW_RECORDACTIONS ( RID_FORMBROWSER_START + 211 )
#define RID_STR_SHOW_FILTERSORT ( RID_FORMBROWSER_START + 212 )
#define RID_STR_TEXTTYPE ( RID_FORMBROWSER_START + 213 )
+#define RID_STR_AUTOLINEBREAK ( RID_FORMBROWSER_START + 214 )
+#define RID_STR_LINEEND_FORMAT ( RID_FORMBROWSER_START + 215 )
// -----------------------------------------------------------------------
// - dialogs
@@ -298,7 +300,8 @@
#define RID_RSC_ENUM_SCROLLBARS ( RID_PROPCONTROLLER_START + 0 )
#define RID_RSC_ENUM_COMMAND_TYPE ( RID_PROPCONTROLLER_START + 1 )
-#define RID_RSC_ENUM_TEXTTYPE ( RID_PROPCONTROLLER_START + 2 )
+#define RID_RSC_ENUM_LINEEND_FORMAT ( RID_PROPCONTROLLER_START + 2 )
+#define RID_RSC_ENUM_TEXTTYPE ( RID_PROPCONTROLLER_START + 3 )
// -----------------------------------------------------------------------
// - ImageList - local ids