pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

RxFPC:fix export memo fields to spreadsheet

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6266 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
alexs75
2018-03-23 11:05:50 +00:00
parent 244eca2cc8
commit 5e9a89ed42
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
components/rx/trunk/LazReport/lrrxcontrols.pas
View File

@ -304,6 +304,7 @@ begin
Result:=TRxDBLookupCombo.Create(nil);
TRxDBLookupCombo(Result).DisplayAllFields:=true;
TRxDBLookupCombo(Result).OnClosePopup:=@RxDBLookupComboBox1CloseUp;
TRxDBLookupCombo(Result).Style:=rxcsDropDownList;
end;
procedure TlrRxDBLookupComboBox.AfterLoad;

6
components/rx/trunk/rxdb/rxdbgrid.pas
View File

@ -3782,10 +3782,8 @@ begin
if Assigned(C) then
begin
C.Width := FPropertyStorageLink.Storage.ReadInteger(S1 + sWidth, C.Width);
C.Visible := FPropertyStorageLink.Storage.ReadInteger(S1 +
sVisible, Ord(C.Visible)) = 1;
C.Index := Min(FPropertyStorageLink.Storage.ReadInteger(S1 + sIndex, C.Index),
Columns.Count - 1);
C.Visible := FPropertyStorageLink.Storage.ReadInteger(S1 + sVisible, Ord(C.Visible)) = 1;
C.Index := Min(FPropertyStorageLink.Storage.ReadInteger(S1 + sIndex, C.Index), Columns.Count - 1);
end;
end;
end;

3
components/rx/trunk/rxdbgrid_export_spreadsheet/rxdbgridexportspreadsheet.pas
View File

@ -159,7 +159,8 @@ begin
begin
if Assigned(C.Field) then
begin
S:=C.Field.DisplayText;
//S:=C.Field.DisplayText;
S:=THackRxDBGrid(FRxDBGrid).GetFieldDisplayText(C.Field, C);
if (C.KeyList.Count > 0) and (C.PickList.Count > 0) then
begin
J := C.KeyList.IndexOf(S);