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 /extensions | |
| 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 'extensions')
| -rw-r--r-- | extensions/source/propctrlr/cellbindinghandler.cxx | 3 | ||||
| -rw-r--r-- | extensions/source/propctrlr/formcomponenthandler.cxx | 10 | ||||
| -rw-r--r-- | extensions/source/propctrlr/formmetadata.hxx | 1 | ||||
| -rw-r--r-- | extensions/source/propctrlr/formstrings.hxx | 1 |
4 files changed, 0 insertions, 15 deletions
diff --git a/extensions/source/propctrlr/cellbindinghandler.cxx b/extensions/source/propctrlr/cellbindinghandler.cxx index 3ac05914569c..578339a5bc1a 100644 --- a/extensions/source/propctrlr/cellbindinghandler.cxx +++ b/extensions/source/propctrlr/cellbindinghandler.cxx @@ -162,10 +162,7 @@ namespace pcr try { if ( !xSource.is() ) - { setPropertyValue( PROPERTY_STRINGITEMLIST, makeAny( Sequence< OUString >() ) ); - setPropertyValue( PROPERTY_TYPEDITEMLIST, makeAny( Sequence< Any >() ) ); - } } catch( const Exception& ) { diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index 0bd51e8d3e1a..9159e451977d 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -1547,13 +1547,11 @@ namespace pcr // available list source values (tables or queries) might have changed _rxInspectorUI->rebuildPropertyUI( PROPERTY_LISTSOURCE ); aDependentProperties.push_back( PROPERTY_ID_STRINGITEMLIST ); - aDependentProperties.push_back( PROPERTY_ID_TYPEDITEMLIST ); aDependentProperties.push_back( PROPERTY_ID_BOUNDCOLUMN ); SAL_FALLTHROUGH; // ----- StringItemList ----- case PROPERTY_ID_STRINGITEMLIST: - aDependentProperties.push_back( PROPERTY_ID_TYPEDITEMLIST ); aDependentProperties.push_back( PROPERTY_ID_SELECTEDITEMS ); aDependentProperties.push_back( PROPERTY_ID_DEFAULT_SELECT_SEQ ); break; @@ -1561,7 +1559,6 @@ namespace pcr // ----- ListSource ----- case PROPERTY_ID_LISTSOURCE: aDependentProperties.push_back( PROPERTY_ID_STRINGITEMLIST ); - aDependentProperties.push_back( PROPERTY_ID_TYPEDITEMLIST ); break; // ----- DataField ----- @@ -1811,13 +1808,6 @@ namespace pcr } break; // case PROPERTY_ID_STRINGITEMLIST - // ----- TypedItemList ----- - case PROPERTY_ID_TYPEDITEMLIST: - { - /* TODO: anything? */ - } - break; // case PROPERTY_ID_TYPEDITEMLIST - // ----- BoundColumn ----- case PROPERTY_ID_BOUNDCOLUMN: { diff --git a/extensions/source/propctrlr/formmetadata.hxx b/extensions/source/propctrlr/formmetadata.hxx index 0c9f36904249..7208a00676c1 100644 --- a/extensions/source/propctrlr/formmetadata.hxx +++ b/extensions/source/propctrlr/formmetadata.hxx @@ -326,7 +326,6 @@ namespace pcr #define PROPERTY_ID_SCROLL_HEIGHT 204 #define PROPERTY_ID_SCROLL_TOP 205 #define PROPERTY_ID_SCROLL_LEFT 206 - #define PROPERTY_ID_TYPEDITEMLIST 207 } // namespace pcr diff --git a/extensions/source/propctrlr/formstrings.hxx b/extensions/source/propctrlr/formstrings.hxx index a4d8955b348d..c5e8145411fc 100644 --- a/extensions/source/propctrlr/formstrings.hxx +++ b/extensions/source/propctrlr/formstrings.hxx @@ -63,7 +63,6 @@ namespace pcr #define PROPERTY_BUTTONTYPE "ButtonType" #define PROPERTY_XFORMS_BUTTONTYPE "XFormsButtonType" #define PROPERTY_STRINGITEMLIST "StringItemList" - #define PROPERTY_TYPEDITEMLIST "TypedItemList" #define PROPERTY_DEFAULT_TEXT "DefaultText" #define PROPERTY_DEFAULT_STATE "DefaultState" #define PROPERTY_FORMATKEY "FormatKey" |