summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLionel Elie Mamane <lionel@mamane.lu>2015-07-22 16:26:31 +0200
committerLionel Elie Mamane <lionel@mamane.lu>2015-07-22 16:35:28 +0200
commit6c2f0c1001b0586b3092e80d63866ae018f09eb8 (patch)
tree031aeea3d4660473303ad59beef59599d2e539d7
parent3b9e66fdcade5a222a9dc99ad74627473b1fd4e7 (diff)
ListBox in grid: properly set selection on change from model
In particular when changing row. 1) Teach DbCellControl about "SelectedItems" as known value property. 2) Fix DbListBox::updateFromModel to actually use the SelectedItems it reads from the model, as opposed to throwing it away. Change-Id: I7074c13b3d271bf2362aa059378aa857682a040b
-rw-r--r--svx/source/fmcomp/gridcell.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index fe7627114de8..82082319c7d0 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -572,6 +572,7 @@ DbCellControl::DbCellControl( DbGridColumn& _rColumn, bool /*_bText*/ )
implDoPropertyListening( FM_PROP_STATE, false );
implDoPropertyListening( FM_PROP_TEXT, false );
implDoPropertyListening( FM_PROP_EFFECTIVE_VALUE, false );
+ implDoPropertyListening( FM_PROP_SELECT_SEQ, false );
// be listener at the bound field as well
try
@@ -676,6 +677,7 @@ void DbCellControl::_propertyChanged(const PropertyChangeEvent& _rEvent) throw(R
|| _rEvent.PropertyName == FM_PROP_STATE
|| _rEvent.PropertyName == FM_PROP_TEXT
|| _rEvent.PropertyName == FM_PROP_EFFECTIVE_VALUE
+ || _rEvent.PropertyName == FM_PROP_SELECT_SEQ
)
{ // it was one of the known "value" properties
if ( !isValuePropertyLocked() )
@@ -2645,7 +2647,7 @@ void DbListBox::updateFromModel( Reference< XPropertySet > _rxModel )
OSL_ENSURE( _rxModel.is() && m_pWindow, "DbListBox::updateFromModel: invalid call!" );
Sequence< sal_Int16 > aSelection;
- _rxModel->getPropertyValue( FM_PROP_SELECT_SEQ );
+ _rxModel->getPropertyValue( FM_PROP_SELECT_SEQ ) >>= aSelection;
sal_Int16 nSelection = -1;
if ( aSelection.getLength() > 0 )