diff options
| author | Eike Rathke <erack@redhat.com> | 2017-02-10 18:27:14 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2017-02-10 20:58:52 +0100 |
| commit | e387b69967aabc44d5da5aaad8d94191437dc57c (patch) | |
| tree | 03d090da3436b466037ea5f7f83593150325d931 /extensions | |
| parent | bed701f31a4668a80f6e447c18a3db08cb43de82 (diff) | |
Resolves: tdf#79250 add typed list to form control listbox
... so numeric and text data can be distinguished input.
Change-Id: I63280a93c272ccc6f5e7ca06a1a1fcbfb3db8455
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, 15 insertions, 0 deletions
diff --git a/extensions/source/propctrlr/cellbindinghandler.cxx b/extensions/source/propctrlr/cellbindinghandler.cxx index 578339a5bc1a..3ac05914569c 100644 --- a/extensions/source/propctrlr/cellbindinghandler.cxx +++ b/extensions/source/propctrlr/cellbindinghandler.cxx @@ -162,7 +162,10 @@ 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 9159e451977d..0bd51e8d3e1a 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -1547,11 +1547,13 @@ 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; @@ -1559,6 +1561,7 @@ namespace pcr // ----- ListSource ----- case PROPERTY_ID_LISTSOURCE: aDependentProperties.push_back( PROPERTY_ID_STRINGITEMLIST ); + aDependentProperties.push_back( PROPERTY_ID_TYPEDITEMLIST ); break; // ----- DataField ----- @@ -1808,6 +1811,13 @@ 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 7208a00676c1..0c9f36904249 100644 --- a/extensions/source/propctrlr/formmetadata.hxx +++ b/extensions/source/propctrlr/formmetadata.hxx @@ -326,6 +326,7 @@ 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 c5e8145411fc..a4d8955b348d 100644 --- a/extensions/source/propctrlr/formstrings.hxx +++ b/extensions/source/propctrlr/formstrings.hxx @@ -63,6 +63,7 @@ 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" |