github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-21 06:45:39 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

*GridCtrl: Fixed searching AttrText fields

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@2576 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
unodgs 2010-07-28 21:45:09 +00:00
parent 2a74663e7e
commit 341dbf7235
1 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
uppsrc/GridCtrl/GridCtrl.cpp
View file

@ -1585,7 +1585,17 @@ Value GridCtrl::GetConvertedColumn(int col, const Value &v) const
Value GridCtrl::GetStdConvertedColumn(int col, const Value &v) const
{
Value val = GetConvertedColumn(col, v);
return IsString(val) ? val : StdConvert().Format(val);//GetStdConvertedValue(val);
if(IsString(val))
{
return val;
}
else if(IsType<AttrText>(val))
{
const AttrText& t = ValueTo<AttrText>(val);
return t.text;
}
else
return StdConvert().Format(val);//GetStdConvertedValue(val);
}
String GridCtrl::GetString(Id id) const