The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit 625e25264b5b408ca303fce3b3fabb520d7dc247
Author: Juergen Spitzmueller <[email protected]>
Date:   Mon Dec 10 12:52:23 2012 +0100

    Consider filtering when selecting from categorized combo (#8452)

diff --git a/src/frontends/qt4/CategorizedCombo.cpp 
b/src/frontends/qt4/CategorizedCombo.cpp
index 327059f..1fd7f35 100644
--- a/src/frontends/qt4/CategorizedCombo.cpp
+++ b/src/frontends/qt4/CategorizedCombo.cpp
@@ -557,7 +557,8 @@ void CategorizedCombo::addItemSort(QString const & item, 
QString const & guiname
 
 QString CategorizedCombo::getData(int row) const
 {
-       return d->model_->data(d->model_->index(row, 1), 
Qt::DisplayRole).toString();
+       int srow = d->filterModel_->mapToSource(d->filterModel_->index(row, 
1)).row();
+       return d->model_->data(d->model_->index(srow, 1), 
Qt::DisplayRole).toString();
 }
 
 

-----------------------------------------------------------------------

Summary of changes:
 src/frontends/qt4/CategorizedCombo.cpp |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

Reply via email to