summaryrefslogtreecommitdiff
path: root/extensions/source/propctrlr/formmetadata.cxx
diff options
context:
space:
mode:
authorPascal Junck <pjunck@openoffice.org>2004-10-22 11:26:12 +0000
committerPascal Junck <pjunck@openoffice.org>2004-10-22 11:26:12 +0000
commit5e57f6d3c6f56b39017af5a1de1af35725303f67 (patch)
treea88ac22346871cfae25f4d4046ef7e2e7a0ede76 /extensions/source/propctrlr/formmetadata.cxx
parent252cdc8374105ac26f2c6aa0d2e6cf6a73ba87a0 (diff)
INTEGRATION: CWS dba17 (1.28.24); FILE MERGED
2004/09/29 09:55:51 fs 1.28.24.1: #i34773# LINEEND_FORMAT below TEXTTYPE, since the former depends on the latter
Diffstat (limited to 'extensions/source/propctrlr/formmetadata.cxx')
-rw-r--r--extensions/source/propctrlr/formmetadata.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx
index b210c179b71d..4327047b0c67 100644
--- a/extensions/source/propctrlr/formmetadata.cxx
+++ b/extensions/source/propctrlr/formmetadata.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: formmetadata.cxx,v $
*
- * $Revision: 1.28 $
+ * $Revision: 1.29 $
*
- * last change: $Author: kz $ $Date: 2004-07-30 16:47:47 $
+ * last change: $Author: pjunck $ $Date: 2004-10-22 12:26:12 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -293,9 +293,9 @@ namespace pcr
DEF_INFO_2( LINECOUNT, LINECOUNT, LINECOUNT, FORM_VISIBLE, DIALOG_VISIBLE ),
DEF_INFO_2( AUTOCOMPLETE, AUTOCOMPLETE, AUTOCOMPLETE, FORM_VISIBLE, DIALOG_VISIBLE ),
DEF_INFO_3( MULTILINE, MULTILINE, MULTILINE, FORM_VISIBLE, DIALOG_VISIBLE, ACTUATING ),
- DEF_INFO_2( LINEEND_FORMAT, LINEEND_FORMAT, LINEEND_FORMAT, FORM_VISIBLE, ENUM_ONE ),
DEF_INFO_2( WORDBREAK, WORDBREAK, WORDBREAK, FORM_VISIBLE, DIALOG_VISIBLE ),
DEF_INFO_4( TEXTTYPE, TEXTTYPE, TEXTTYPE, FORM_VISIBLE, VIRTUAL_PROP, ENUM, ACTUATING ),
+ DEF_INFO_2( LINEEND_FORMAT, LINEEND_FORMAT, LINEEND_FORMAT, FORM_VISIBLE, ENUM_ONE ),
DEF_INFO_2( MULTISELECTION, MULTISELECTION, MULTISELECTION, FORM_VISIBLE, DIALOG_VISIBLE ),
DEF_INFO_4( SHOW_SCROLLBARS, SHOW_SCROLLBARS, SHOW_SCROLLBARS, FORM_VISIBLE, DIALOG_VISIBLE, VIRTUAL_PROP, ENUM ),
DEF_INFO_2( HSCROLL, HSCROLL, HSCROLL, FORM_VISIBLE, DIALOG_VISIBLE ),