mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Data-aware ListBox: can have a BoundColumn even without bound database column

Browse Source 
It defines what goes into the ValueList property, what getCurrentValue() returns, and what an external value binding gets.

Change-Id: I9242d3a6040ec98c22b1d4350942dfa0e7aa6c5b
This commit is contained in:
Lionel Elie Mamane
2013-04-21 15:45:58 +02:00
parent 52bc6737cd
commit d645a6a17c
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
extensions/source/propctrlr/formcomponenthandler.cxx
View File

@@ -1331,7 +1331,7 @@ namespace pcr
Optional< double > aMinValue( sal_True, 0 ); Optional< double > aMinValue( sal_True, 0 );
Optional< double > aMaxValue( sal_True, 0x7FFFFFFF ); Optional< double > aMaxValue( sal_True, 0x7FFFFFFF );
if ( nPropId == PROPERTY_ID_MAXTEXTLEN ) if ( nPropId == PROPERTY_ID_MAXTEXTLEN || nPropId == PROPERTY_ID_BOUNDCOLUMN )
aMinValue.Value = -1; aMinValue.Value = -1;
else if ( nPropId == PROPERTY_ID_VISIBLESIZE ) else if ( nPropId == PROPERTY_ID_VISIBLESIZE )
aMinValue.Value = 1; aMinValue.Value = 1;
@@ -1573,7 +1573,6 @@ namespace pcr
if ( !_bFirstTimeInit && m_bHaveListSource ) if ( !_bFirstTimeInit && m_bHaveListSource )
// available list source values (tables or queries) might have changed // available list source values (tables or queries) might have changed
_rxInspectorUI->rebuildPropertyUI( PROPERTY_LISTSOURCE ); _rxInspectorUI->rebuildPropertyUI( PROPERTY_LISTSOURCE );
aDependentProperties.push_back( PROPERTY_ID_BOUNDCOLUMN );
aDependentProperties.push_back( PROPERTY_ID_STRINGITEMLIST ); aDependentProperties.push_back( PROPERTY_ID_STRINGITEMLIST );
// NO break! // NO break!
@@ -1837,15 +1836,11 @@ namespace pcr
// ----- BoundColumn ----- // ----- BoundColumn -----
case PROPERTY_ID_BOUNDCOLUMN: case PROPERTY_ID_BOUNDCOLUMN:
{ {
OUString sControlSource;
OSL_VERIFY( impl_getPropertyValue_throw( PROPERTY_CONTROLSOURCE ) >>= sControlSource );
ListSourceType eLSType = ListSourceType_VALUELIST; ListSourceType eLSType = ListSourceType_VALUELIST;
OSL_VERIFY( impl_getPropertyValue_throw( PROPERTY_LISTSOURCETYPE ) >>= eLSType ); OSL_VERIFY( impl_getPropertyValue_throw( PROPERTY_LISTSOURCETYPE ) >>= eLSType );
_rxInspectorUI->enablePropertyUI( PROPERTY_BOUNDCOLUMN, _rxInspectorUI->enablePropertyUI( PROPERTY_BOUNDCOLUMN,
( !sControlSource.isEmpty() ) ( eLSType != ListSourceType_TABLEFIELDS )
&& ( eLSType != ListSourceType_TABLEFIELDS )
&& ( eLSType != ListSourceType_VALUELIST ) && ( eLSType != ListSourceType_VALUELIST )
); );
} }