From 341dbf72356541617deb81cd61935085d2350fd4 Mon Sep 17 00:00:00 2001
From: unodgs <unodgs@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Wed, 28 Jul 2010 21:45:09 +0000
Subject: [PATCH] *GridCtrl: Fixed searching AttrText fields

git-svn-id: svn://ultimatepp.org/upp/trunk@2576 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/GridCtrl/GridCtrl.cpp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/uppsrc/GridCtrl/GridCtrl.cpp b/uppsrc/GridCtrl/GridCtrl.cpp
index e0c1b4fab..01d0450ec 100644
--- a/uppsrc/GridCtrl/GridCtrl.cpp
+++ b/uppsrc/GridCtrl/GridCtrl.cpp
@@ -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