diff options
| author | Eike Rathke <erack@redhat.com> | 2017-06-12 17:22:35 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2017-06-12 17:28:01 +0200 |
| commit | 0f8670ecebcf2af9c98b805c5e446ff073354d92 (patch) | |
| tree | 2f6dd6520e8aa99a089e19cab29f53fd049f9f3a | |
| parent | 6e9f0d3e68bfe1b46e0280815fb969280b1d19c9 (diff) | |
Resolves: tdf#108413 yet some more TYPEDITEMLIST property entries
... which apparently need to be present to be able to override them. You
also can have never enough macro names to obfuscate things for grep..
Change-Id: Ic0bdcb71682136a537b3ce1c564f02f686f1ee9e
| -rw-r--r-- | forms/source/component/ComboBox.cxx | 3 | ||||
| -rw-r--r-- | forms/source/component/ListBox.cxx | 3 | ||||
| -rw-r--r-- | forms/source/misc/property.cxx | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx index f461a25c7bd7..f17586d05982 100644 --- a/forms/source/component/ComboBox.cxx +++ b/forms/source/component/ComboBox.cxx @@ -296,13 +296,14 @@ sal_Bool OComboBoxModel::convertFastPropertyValue( void OComboBoxModel::describeFixedProperties( Sequence< Property >& _rProps ) const { - BEGIN_DESCRIBE_PROPERTIES( 6, OBoundControlModel ) + BEGIN_DESCRIBE_PROPERTIES( 7, OBoundControlModel ) DECL_PROP1(TABINDEX, sal_Int16, BOUND); DECL_PROP1(LISTSOURCETYPE, ListSourceType, BOUND); DECL_PROP1(LISTSOURCE, OUString, BOUND); DECL_BOOL_PROP1(EMPTY_IS_NULL, BOUND); DECL_PROP1(DEFAULT_TEXT, OUString, BOUND); DECL_PROP1(STRINGITEMLIST, Sequence< OUString >,BOUND); + DECL_PROP1(TYPEDITEMLIST, Sequence< Any >, BOUND); END_DESCRIBE_PROPERTIES(); } diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx index ee8a4beb90d5..f1ba24325e00 100644 --- a/forms/source/component/ListBox.cxx +++ b/forms/source/component/ListBox.cxx @@ -484,7 +484,7 @@ namespace frm void OListBoxModel::describeFixedProperties( Sequence< Property >& _rProps ) const { - BEGIN_DESCRIBE_PROPERTIES( 9, OBoundControlModel ) + BEGIN_DESCRIBE_PROPERTIES( 10, OBoundControlModel ) DECL_PROP1(TABINDEX, sal_Int16, BOUND); DECL_PROP2(BOUNDCOLUMN, sal_Int16, BOUND, MAYBEVOID); DECL_PROP1(LISTSOURCETYPE, ListSourceType, BOUND); @@ -494,6 +494,7 @@ namespace frm DECL_PROP2(SELECT_VALUE, Any, BOUND, TRANSIENT); DECL_PROP1(DEFAULT_SELECT_SEQ, Sequence<sal_Int16>, BOUND); DECL_PROP1(STRINGITEMLIST, Sequence< OUString >, BOUND); + DECL_PROP1(TYPEDITEMLIST, Sequence< Any >, BOUND); END_DESCRIBE_PROPERTIES(); } diff --git a/forms/source/misc/property.cxx b/forms/source/misc/property.cxx index 10f0caf31218..9fed981242e9 100644 --- a/forms/source/misc/property.cxx +++ b/forms/source/misc/property.cxx @@ -91,6 +91,7 @@ void PropertyInfoService::initialize() EXPAND_PROP_INIT(TARGET_FRAME), EXPAND_PROP_INIT(BUTTONTYPE), EXPAND_PROP_INIT(STRINGITEMLIST), + EXPAND_PROP_INIT(TYPEDITEMLIST), EXPAND_PROP_INIT(DEFAULT_TEXT), EXPAND_PROP_INIT(DEFAULT_STATE), EXPAND_PROP_INIT(DEFAULT_DATE), |