GridCtrl: Fixed setting incorrect value for option column if it was a last column copied from excel

git-svn-id: svn://ultimatepp.org/upp/trunk@5614 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
unodgs 2012-12-02 15:01:49 +00:00
parent 3976c1a649
commit bbca44affe

View file

@ -707,8 +707,6 @@ void GridCtrl::SetClipboard(bool all, bool silent)
body.Remove(cnt - 1);
}
LOG(body);
String header;
if(copy_column_names)
@ -826,7 +824,8 @@ void GridCtrl::Paste(int mode)
for(int i = 0; i < lines.GetCount(); i++)
{
Vector<String> cells = Upp::Split(lines[i], '\t', false);
String line = TrimRight(lines[i]);
Vector<String> cells = Upp::Split(line, '\t', false);
for(int j = 0; j < cells.GetCount(); j++)
{
int r = i;