From 5e9a89ed421285bf21f821bc421c91ea5a575ce2 Mon Sep 17 00:00:00 2001
From: alexs75 <alexs75@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Fri, 23 Mar 2018 11:05:50 +0000
Subject: [PATCH] RxFPC:fix export memo fields to spreadsheet

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6266 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 components/rx/trunk/LazReport/lrrxcontrols.pas              | 1 +
 components/rx/trunk/rxdb/rxdbgrid.pas                       | 6 ++----
 .../rxdbgridexportspreadsheet.pas                           | 3 ++-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/components/rx/trunk/LazReport/lrrxcontrols.pas b/components/rx/trunk/LazReport/lrrxcontrols.pas
index 34dea8a87..f8b11199d 100644
--- a/components/rx/trunk/LazReport/lrrxcontrols.pas
+++ b/components/rx/trunk/LazReport/lrrxcontrols.pas
@@ -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;
diff --git a/components/rx/trunk/rxdb/rxdbgrid.pas b/components/rx/trunk/rxdb/rxdbgrid.pas
index 3d0d3dcf2..b162497cc 100644
--- a/components/rx/trunk/rxdb/rxdbgrid.pas
+++ b/components/rx/trunk/rxdb/rxdbgrid.pas
@@ -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;
diff --git a/components/rx/trunk/rxdbgrid_export_spreadsheet/rxdbgridexportspreadsheet.pas b/components/rx/trunk/rxdbgrid_export_spreadsheet/rxdbgridexportspreadsheet.pas
index da23b5830..971465be5 100644
--- a/components/rx/trunk/rxdbgrid_export_spreadsheet/rxdbgridexportspreadsheet.pas
+++ b/components/rx/trunk/rxdbgrid_export_spreadsheet/rxdbgridexportspreadsheet.pas
@@ -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);