summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2004-05-07 15:04:03 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2004-05-07 15:04:03 +0000
commitd71aa3bece11d1cef6c6e447beeee0b67a3618a7 (patch)
treefc8b2d0afb1d3d8279707e30df25962aa975df6e /extensions
parentf1d4ea07db428b79fda60c7743bbe1e28b92ded0 (diff)
INTEGRATION: CWS frmcontrols03 (1.21.10); FILE MERGED
2004/04/28 14:59:02 fs 1.21.10.5: RESYNC: (1.22-1.24); FILE MERGED 2004/04/06 11:02:47 fs 1.21.10.4: inter-property dependencies for rich text control 2004/03/23 15:03:24 fs 1.21.10.3: RESYNC: (1.21-1.22); FILE MERGED 2004/03/01 16:53:25 fs 1.21.10.2: #i24387# TextType property for text field 2004/02/19 11:23:29 fs 1.21.10.1: added functionality for 'Automatic Line Break' property
Diffstat (limited to 'extensions')
-rw-r--r--extensions/source/propctrlr/formmetadata.cxx8
1 files changed, 6 insertions, 2 deletions
diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx
index 6cf8ede2dfc8..ca320c66cbb7 100644
--- a/extensions/source/propctrlr/formmetadata.cxx
+++ b/extensions/source/propctrlr/formmetadata.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: formmetadata.cxx,v $
*
- * $Revision: 1.24 $
+ * $Revision: 1.25 $
*
- * last change: $Author: svesik $ $Date: 2004-04-21 14:19:47 $
+ * last change: $Author: rt $ $Date: 2004-05-07 16:04:03 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -291,6 +291,7 @@ namespace pcr
DEF_INFO_2( AUTOCOMPLETE, AUTOCOMPLETE, AUTOCOMPLETE, FORM_VISIBLE, DIALOG_VISIBLE ),
DEF_INFO_3( MULTILINE, MULTILINE, MULTILINE, FORM_VISIBLE, DIALOG_VISIBLE, ACTUATING ),
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( 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 ),
@@ -435,6 +436,9 @@ namespace pcr
case PROPERTY_ID_SHOW_SCROLLBARS:
nStringItemsResId = RID_RSC_ENUM_SCROLLBARS;
break;
+ case PROPERTY_ID_TEXTTYPE:
+ nStringItemsResId = RID_RSC_ENUM_TEXTTYPE;
+ break;
default:
OSL_ENSURE( sal_False, "OFormPropertyInfoService::getPropertyEnumRepresentations: unknown enum property!" );
}