diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-07-26 06:57:05 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-07-26 06:57:05 +0000 |
| commit | 1bc00de2a96ebd916398debdd6c352331b9838c7 (patch) | |
| tree | c59c124814e473c606847c81f8d474afcde1ce4c /extensions/source/propctrlr/formmetadata.cxx | |
| parent | da8c0cb9f73146ee0f1387434d7e2ed7237d433d (diff) | |
INTEGRATION: CWS dba204b (1.36.66); FILE MERGED
2006/07/07 12:29:56 fs 1.36.66.1: let the button navigation handler supersede ButtonType with ActionButtonType
Diffstat (limited to 'extensions/source/propctrlr/formmetadata.cxx')
| -rw-r--r-- | extensions/source/propctrlr/formmetadata.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx index 0e6f047b63b2..788bd56d520f 100644 --- a/extensions/source/propctrlr/formmetadata.cxx +++ b/extensions/source/propctrlr/formmetadata.cxx @@ -4,9 +4,9 @@ * * $RCSfile: formmetadata.cxx,v $ * - * $Revision: 1.36 $ + * $Revision: 1.37 $ * - * last change: $Author: vg $ $Date: 2006-03-14 11:24:30 $ + * last change: $Author: rt $ $Date: 2006-07-26 07:57:05 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -340,6 +340,7 @@ namespace pcr DEF_INFO_3( VSCROLL, VSCROLL, VSCROLL, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ), DEF_INFO_3( BUTTONTYPE, BUTTONTYPE, BUTTONTYPE, FORM_VISIBLE, ENUM, COMPOSEABLE ), DEF_INFO_2( XFORMS_BUTTONTYPE, BUTTONTYPE, BUTTONTYPE, FORM_VISIBLE, ENUM ), + DEF_INFO_2( ACTION_BUTTONTYPE, BUTTONTYPE, BUTTONTYPE, FORM_VISIBLE, ENUM ), DEF_INFO_1( SUBMISSION_ID, SUBMISSION_ID, SUBMISSION_ID, FORM_VISIBLE ), DEF_INFO_2( PUSHBUTTONTYPE, PUSHBUTTONTYPE, PUSHBUTTONTYPE, DIALOG_VISIBLE, ENUM ), DEF_INFO_2( TARGET_URL, TARGET_URL, TARGET_URL, FORM_VISIBLE, COMPOSEABLE ), @@ -452,6 +453,7 @@ namespace pcr nStringItemsResId = RID_RSC_ENUM_VERTICAL_ALIGN; break; case PROPERTY_ID_BUTTONTYPE: + case PROPERTY_ID_ACTION_BUTTONTYPE: nCommaSeparatedListResId = RID_STR_ENUM_BUTTONTYPE; break; case PROPERTY_ID_PUSHBUTTONTYPE: |