Merged revision(s) 49856 #684039eff1, 49860 #81a07efed2, 49896 #1ab7a995da from trunk:

LCL, fix crash on inserting record in multiselect dbgrid, from Luiz Americo, issue #28688
........
LCL: TFileNameEdit - use TOpenPictureDialog if kind of dialog is dkPicture.
........
LCL, grids: fix range check error on pasting empty cells, fix by wp, issue #28747
........

git-svn-id: branches/fixes_1_4@49898 -
This commit is contained in:
maxim 2015-09-29 22:20:49 +00:00
parent b760d6e9d5
commit 68eac42c57
3 changed files with 12 additions and 3 deletions

View File

@ -4368,6 +4368,8 @@ begin
{$endif}
Result := False;
if Item=nil then
Exit;
if FCanDoBinarySearch then
BinarySearch
else

View File

@ -2119,7 +2119,10 @@ begin
case AKind of
dkOpen, dkPictureOpen:
begin
O := TOpenDialog.Create(Self);
if AKind = dkPictureOpen then
O := TOpenPictureDialog.Create(Self)
else
O := TOpenDialog.Create(Self);
Result := O;
end;
dkSave, dkPictureSave:

View File

@ -10538,8 +10538,12 @@ var
ini := P;
while (P^<>#0) and (P^<>#9) do
Inc(P);
SetLength(St, P-Ini);
Move(Ini^,St[1],P-Ini);
if P=Ini then
St := ''
else begin
SetLength(St, P-Ini);
Move(Ini^,St[1],P-Ini);
end;
SubL.Add(St);
if P^<>#0 then
Inc(P);