diff options
| author | Eike Rathke <erack@redhat.com> | 2017-02-11 01:17:12 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2017-02-11 01:19:37 +0100 |
| commit | d3293c7173210e0246d0dc29377f687f41588da2 (patch) | |
| tree | f44faff71d99dfe6cec402c2abbb9b06bd834e23 /toolkit | |
| parent | b46ed21a33849d2268406feb875f46bc925a65ec (diff) | |
Revert "Resolves: tdf#79250 add typed list to form control listbox"
This reverts commit e387b69967aabc44d5da5aaad8d94191437dc57c.
It breaks toolkit.subsequentcheck with
propertyChangeListener wasn´t called for ´TypedItemList´
Back to the drawing board for the twisted property logic of forms and
toolkit uno control models.
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/source/awt/vclxwindows.cxx | 2 | ||||
| -rw-r--r-- | toolkit/source/controls/unocontrolmodel.cxx | 7 | ||||
| -rw-r--r-- | toolkit/source/controls/unocontrols.cxx | 2 | ||||
| -rw-r--r-- | toolkit/source/helper/property.cxx | 1 |
4 files changed, 0 insertions, 12 deletions
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index 0759ee4f6538..e475b8ec655d 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -1487,7 +1487,6 @@ void VCLXListBox::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) BASEPROPERTY_PRINTABLE, BASEPROPERTY_SELECTEDITEMS, BASEPROPERTY_STRINGITEMLIST, - BASEPROPERTY_TYPEDITEMLIST, BASEPROPERTY_TABSTOP, BASEPROPERTY_READONLY, BASEPROPERTY_ALIGN, @@ -4122,7 +4121,6 @@ void VCLXComboBox::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) BASEPROPERTY_PRINTABLE, BASEPROPERTY_READONLY, BASEPROPERTY_STRINGITEMLIST, - BASEPROPERTY_TYPEDITEMLIST, BASEPROPERTY_TABSTOP, BASEPROPERTY_TEXT, BASEPROPERTY_HIDEINACTIVESELECTION, diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx index 876cb9e05eff..3a2cf610f651 100644 --- a/toolkit/source/controls/unocontrolmodel.cxx +++ b/toolkit/source/controls/unocontrolmodel.cxx @@ -309,13 +309,6 @@ css::uno::Any UnoControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const } break; - case BASEPROPERTY_TYPEDITEMLIST: - { - css::uno::Sequence< css::uno::Any > aAnySeq; - aDefault <<= aAnySeq; - - } - break; case BASEPROPERTY_SELECTEDITEMS: { css::uno::Sequence<sal_Int16> aINT16Seq; diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx index a529d33cb4bf..9a1e5cb65494 100644 --- a/toolkit/source/controls/unocontrols.cxx +++ b/toolkit/source/controls/unocontrols.cxx @@ -2277,8 +2277,6 @@ void UnoControlListBoxModel::ImplNormalizePropertySequence( const sal_Int32 _nCo // dependencies we know: // BASEPROPERTY_STRINGITEMLIST->BASEPROPERTY_SELECTEDITEMS ImplEnsureHandleOrder( _nCount, _pHandles, _pValues, BASEPROPERTY_STRINGITEMLIST, BASEPROPERTY_SELECTEDITEMS ); - // BASEPROPERTY_STRINGITEMLIST->BASEPROPERTY_TYPEDITEMLIST - ImplEnsureHandleOrder( _nCount, _pHandles, _pValues, BASEPROPERTY_STRINGITEMLIST, BASEPROPERTY_TYPEDITEMLIST ); UnoControlModel::ImplNormalizePropertySequence( _nCount, _pHandles, _pValues, _pValidHandles ); } diff --git a/toolkit/source/helper/property.cxx b/toolkit/source/helper/property.cxx index 2ea27d5d5a6d..9e8b544db346 100644 --- a/toolkit/source/helper/property.cxx +++ b/toolkit/source/helper/property.cxx @@ -221,7 +221,6 @@ ImplPropertyInfo* ImplGetPropertyInfos( sal_uInt16& rElementCount ) DECL_DEP_PROP_2 ( "State", STATE, sal_Int16, BOUND, MAYBEDEFAULT ), DECL_PROP_2 ( "StrictFormat", STRICTFORMAT, bool, BOUND, MAYBEDEFAULT ), DECL_PROP_2 ( "StringItemList", STRINGITEMLIST, Sequence< OUString >, BOUND, MAYBEDEFAULT ), - DECL_PROP_2 ( "TypedItemList", TYPEDITEMLIST, Sequence< Any >, BOUND, MAYBEDEFAULT ), DECL_PROP_2 ( "VisualEffect", VISUALEFFECT, sal_Int16, BOUND, MAYBEDEFAULT ), DECL_PROP_3 ( "SymbolColor", SYMBOL_COLOR, sal_Int32, BOUND, MAYBEDEFAULT, MAYBEVOID ), DECL_PROP_3 ( "Tabstop", TABSTOP, bool, BOUND, MAYBEDEFAULT, MAYBEVOID ), |