From e2556075f144aeceeefe6a96ae08a88945aebd3c Mon Sep 17 00:00:00 2001
From: alexs75 <alexs75@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Thu, 21 Dec 2017 11:28:44 +0000
Subject: [PATCH] RxFPC:fix copy to clipboard memo fields from RXDBGrid

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6108 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 components/rx/trunk/rxdb/rxdbgrid.pas | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/components/rx/trunk/rxdb/rxdbgrid.pas b/components/rx/trunk/rxdb/rxdbgrid.pas
index 2a1a780fd..e9dc0d5bb 100644
--- a/components/rx/trunk/rxdb/rxdbgrid.pas
+++ b/components/rx/trunk/rxdb/rxdbgrid.pas
@@ -6268,7 +6268,13 @@ begin
             begin
               if K<>0 then
                 S:=S+#9;
-              S:=S+Columns[i].Field.DisplayText;
+
+              {$IF lcl_fullversion >= 1090000}
+              if CheckDisplayMemo(Columns[i].Field) then
+                S :=S + Columns[i].Field.AsString
+              else
+              {$ENDIF}
+                S:=S+Columns[i].Field.DisplayText;
               inc(K);
             end;
           end;
@@ -6293,7 +6299,7 @@ begin
         end;
       end;
     end
-    else
+(*    else
     if (dgMultiselect in Options) and (SelectedRows.Count>1) then
     begin
       S:='';
@@ -6341,12 +6347,18 @@ begin
           Clipboard.Close;
         end;
       end;
-    end
+    end   *)
     else
     if Assigned(SelectedField) then
     try
       Clipboard.Open;
-      Clipboard.AsText:=SelectedField.DisplayText;
+
+      {$IF lcl_fullversion >= 1090000}
+      if CheckDisplayMemo(SelectedField) then
+        Clipboard.AsText:=SelectedField.AsString
+      else
+      {$ENDIF}
+        Clipboard.AsText:=SelectedField.DisplayText;
     finally
       Clipboard.Close;
     end;