diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-07-05 15:23:34 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-07-05 15:23:34 +0000 |
| commit | 2450448a58f3eb990933f9976c24caa51ab9f665 (patch) | |
| tree | 452c52a156d4e7ca6f58c9884dd390fc9594bee5 | |
| parent | a82b1752a92b33fb6828b2d216f3035c023dc7d5 (diff) | |
INTEGRATION: CWS frmcontrols04 (1.22.10); FILE MERGED
2004/06/16 04:08:38 fs 1.22.10.7: RESYNC: (1.22-1.26); FILE MERGED
2004/05/05 09:06:41 fs 1.22.10.6: new properties also for the Basic dialog editor
2004/05/04 12:39:40 fs 1.22.10.5: Style -> VisualEffect
2004/05/03 16:00:29 fs 1.22.10.4: #28672# ImagePosition replacing ImageAlign
2004/04/29 11:01:38 fs 1.22.10.3: #i24694# support for BorderColor
2004/04/29 10:55:58 fs 1.22.10.2: #i24694# support for BorderColor
2004/04/29 06:28:49 fs 1.22.10.1: #i24683# #i24684# #i24685# #i24686# new properties: flat/3D for radios/check boxes, HideSelection for edits, Toggle/TakeFocusOnClick for buttons
| -rw-r--r-- | extensions/source/propctrlr/formmetadata.cxx | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx index caa32137f53a..a1a23c875e61 100644 --- a/extensions/source/propctrlr/formmetadata.cxx +++ b/extensions/source/propctrlr/formmetadata.cxx @@ -2,9 +2,9 @@ * * $RCSfile: formmetadata.cxx,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: hr $ $Date: 2004-05-10 13:45:30 $ + * last change: $Author: obo $ $Date: 2004-07-05 16:23:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -259,6 +259,8 @@ namespace pcr DEF_INFO_2( SPIN, SPIN, SPIN, FORM_VISIBLE, DIALOG_VISIBLE ), DEF_INFO_3( REPEAT, REPEAT, REPEAT, FORM_VISIBLE, DIALOG_VISIBLE, ACTUATING ), DEF_INFO_2( REPEAT_DELAY, REPEAT_DELAY, REPEAT_DELAY, FORM_VISIBLE, DIALOG_VISIBLE ), + DEF_INFO_2( TOGGLE, TOGGLE, TOGGLE, FORM_VISIBLE, DIALOG_VISIBLE ), + DEF_INFO_2( FOCUSONCLICK, FOCUSONCLICK, FOCUSONCLICK, FORM_VISIBLE, DIALOG_VISIBLE ), DEF_INFO_2( VISIBLESIZE, VISIBLESIZE, VISIBLESIZE, FORM_VISIBLE, DIALOG_VISIBLE ), DEF_INFO_3( ORIENTATION, ORIENTATION, ORIENTATION, FORM_VISIBLE, DIALOG_VISIBLE, ENUM ), @@ -272,14 +274,15 @@ namespace pcr DEF_INFO_3( STRINGITEMLIST, STRINGITEMLIST, STRINGITEMLIST, FORM_VISIBLE, DIALOG_VISIBLE, ACTUATING ), DEF_INFO_1( DEFAULT_TEXT, DEFAULTTEXT, DEFAULTVALUE, FORM_VISIBLE ), DEF_INFO_2( FONT_NAME, FONT, FONT, FORM_VISIBLE, DIALOG_VISIBLE ), + DEF_INFO_2( VISUALEFFECT, VISUALEFFECT, VISUALEFFECT, FORM_VISIBLE, ENUM_ONE ), DEF_INFO_3( ALIGN, ALIGN, ALIGN, FORM_VISIBLE, DIALOG_VISIBLE, ENUM ), DEF_INFO_1( ROWHEIGHT, ROWHEIGHT, ROWHEIGHT, FORM_VISIBLE ), DEF_INFO_2( BACKGROUNDCOLOR, BACKGROUNDCOLOR, BACKGROUNDCOLOR, FORM_VISIBLE, DIALOG_VISIBLE ), DEF_INFO_2( SYMBOLCOLOR, SYMBOLCOLOR, SYMBOLCOLOR, FORM_VISIBLE, DIALOG_VISIBLE ), DEF_INFO_2( FILLCOLOR, FILLCOLOR, FILLCOLOR, FORM_VISIBLE, DIALOG_VISIBLE ), DEF_INFO_2( LINECOLOR, LINECOLOR, LINECOLOR, FORM_VISIBLE, DIALOG_VISIBLE ), - DEF_INFO_3( BORDER, BORDER, BORDER, FORM_VISIBLE, DIALOG_VISIBLE, ENUM ), - + DEF_INFO_4( BORDER, BORDER, BORDER, FORM_VISIBLE, DIALOG_VISIBLE, ENUM, ACTUATING ), + DEF_INFO_2( BORDERCOLOR, BORDERCOLOR, BORDERCOLOR, FORM_VISIBLE, DIALOG_VISIBLE ), DEF_INFO_2( ICONSIZE, ICONSIZE, ICONSIZE, FORM_VISIBLE, ENUM ), DEF_INFO_1( SHOW_POSITION, SHOW_POSITION, SHOW_POSITION, FORM_VISIBLE ), DEF_INFO_1( SHOW_NAVIGATION, SHOW_NAVIGATION, SHOW_NAVIGATION, FORM_VISIBLE ), @@ -290,7 +293,7 @@ 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 ), + 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( MULTISELECTION, MULTISELECTION, MULTISELECTION, FORM_VISIBLE, DIALOG_VISIBLE ), @@ -309,11 +312,12 @@ namespace pcr DEF_INFO_2( DEFAULTCHECKED, DEFAULT_CHECKED, DEFAULT_CHECKED, FORM_VISIBLE, ENUM ), DEF_INFO_2( DEFAULTBUTTON, DEFAULT_BUTTON, DEFAULT_BUTTON, FORM_VISIBLE, DIALOG_VISIBLE ), DEF_INFO_3( IMAGE_URL, IMAGE_URL, IMAGE_URL, FORM_VISIBLE, DIALOG_VISIBLE, ACTUATING ), - DEF_INFO_3( IMAGEALIGN, IMAGE_ALIGN, IMAGE_ALIGN, FORM_VISIBLE, DIALOG_VISIBLE, ENUM ), + DEF_INFO_3( IMAGEPOSITION, IMAGEPOSITION, IMAGEPOSITION, FORM_VISIBLE, DIALOG_VISIBLE, ENUM ), DEF_INFO_2( SCALEIMAGE, SCALEIMAGE, SCALEIMAGE, FORM_VISIBLE, DIALOG_VISIBLE ), DEF_INFO_1( DEFAULT_SELECT_SEQ,DEFAULT_SELECT_SEQ, DEFAULT_SELECT_SEQ,FORM_VISIBLE ), DEF_INFO_1( SELECTEDITEMS, SELECTEDITEMS, SELECTEDITEMS, DIALOG_VISIBLE ), DEF_INFO_2( ECHO_CHAR, ECHO_CHAR, ECHO_CHAR, FORM_VISIBLE, DIALOG_VISIBLE ), + DEF_INFO_2( HIDEINACTIVESELECTION, HIDEINACTIVESELECTION, HIDEINACTIVESELECTION, FORM_VISIBLE, DIALOG_VISIBLE ), DEF_INFO_2( TRISTATE, TRISTATE, TRISTATE, FORM_VISIBLE, DIALOG_VISIBLE ), DEF_INFO_1( HASNAVIGATION, NAVIGATION, NAVIGATIONBAR, FORM_VISIBLE ), DEF_INFO_1( RECORDMARKER, RECORDMARKER, RECORDMARKER, FORM_VISIBLE ), @@ -379,8 +383,8 @@ namespace pcr sal_Int16 nStringItemsResId = 0; switch ( _nId ) { - case PROPERTY_ID_IMAGEALIGN: - nCommaSeparatedListResId = RID_STR_ENUM_SIDE_ALIGN; + case PROPERTY_ID_IMAGEPOSITION: + nStringItemsResId = RID_RSC_ENUM_IMAGE_POSITION; break; case PROPERTY_ID_BORDER: nCommaSeparatedListResId = RID_STR_BORDER_TYPE; @@ -437,6 +441,9 @@ namespace pcr case PROPERTY_ID_SHOW_SCROLLBARS: nStringItemsResId = RID_RSC_ENUM_SCROLLBARS; break; + case PROPERTY_ID_VISUALEFFECT: + nStringItemsResId = RID_RSC_ENUM_VISUALEFFECT; + break; case PROPERTY_ID_TEXTTYPE: nStringItemsResId = RID_RSC_ENUM_TEXTTYPE; break; |