From cfc02a22792b828ef158681cec6396f067ecdde1 Mon Sep 17 00:00:00 2001
From: alexs75 <alexs75@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Fri, 9 Jun 2017 13:40:16 +0000
Subject: [PATCH] RxFPC:fix show text data in RxDBGrid

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5927 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 .../demos/rxdbgrid/MergeCell/project1.lps     | 103 +++++++++---------
 components/rx/trunk/rxdb/rxdbgrid.pas         |   2 +-
 2 files changed, 52 insertions(+), 53 deletions(-)

diff --git a/components/rx/trunk/demos/rxdbgrid/MergeCell/project1.lps b/components/rx/trunk/demos/rxdbgrid/MergeCell/project1.lps
index 83e8d28f7..8c125732d 100644
--- a/components/rx/trunk/demos/rxdbgrid/MergeCell/project1.lps
+++ b/components/rx/trunk/demos/rxdbgrid/MergeCell/project1.lps
@@ -17,6 +17,7 @@
         <Filename Value="unit1.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="Form1"/>
+        <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Unit1"/>
         <TopLine Value="43"/>
@@ -26,11 +27,11 @@
         <LoadedDesigner Value="True"/>
       </Unit1>
       <Unit2>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdb/rxdbgrid.pas"/>
+        <Filename Value="../../../rxdb/rxdbgrid.pas"/>
         <IsVisibleTab Value="True"/>
         <EditorIndex Value="1"/>
-        <TopLine Value="4317"/>
-        <CursorPos Y="4335"/>
+        <TopLine Value="4344"/>
+        <CursorPos X="3" Y="4366"/>
         <UsageCount Value="10"/>
         <Bookmarks Count="1">
           <Item0 X="7" Y="4331" ID="1"/>
@@ -38,18 +39,18 @@
         <Loaded Value="True"/>
       </Unit2>
       <Unit3>
-        <Filename Value="/usr/local/share/lazarus/lcl/grids.pas"/>
+        <Filename Value="../../../../../lcl/grids.pas"/>
         <UnitName Value="Grids"/>
-        <EditorIndex Value="8"/>
+        <EditorIndex Value="6"/>
         <TopLine Value="4437"/>
         <CursorPos Y="4468"/>
         <UsageCount Value="10"/>
         <Loaded Value="True"/>
       </Unit3>
       <Unit4>
-        <Filename Value="/usr/local/share/lazarus/lcl/dbgrids.pas"/>
+        <Filename Value="../../../../../lcl/dbgrids.pas"/>
         <UnitName Value="DBGrids"/>
-        <EditorIndex Value="7"/>
+        <EditorIndex Value="5"/>
         <TopLine Value="1920"/>
         <CursorPos Y="1939"/>
         <UsageCount Value="10"/>
@@ -70,16 +71,16 @@
         <UsageCount Value="10"/>
       </Unit6>
       <Unit7>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxtools/rxutils.pas"/>
-        <EditorIndex Value="5"/>
+        <Filename Value="../../../rxtools/rxutils.pas"/>
+        <EditorIndex Value="3"/>
         <TopLine Value="64"/>
         <CursorPos X="2" Y="91"/>
         <UsageCount Value="10"/>
         <Loaded Value="True"/>
       </Unit7>
       <Unit8>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxtools/rxstrutils.pas"/>
-        <EditorIndex Value="6"/>
+        <Filename Value="../../../rxtools/rxstrutils.pas"/>
+        <EditorIndex Value="4"/>
         <UsageCount Value="10"/>
         <Loaded Value="True"/>
       </Unit8>
@@ -92,22 +93,20 @@
       </Unit9>
       <Unit10>
         <Filename Value="../../../../install/source/fpcsrc/packages/fcl-db/src/base/db.pas"/>
-        <EditorIndex Value="3"/>
+        <EditorIndex Value="-1"/>
         <TopLine Value="1783"/>
         <CursorPos X="15" Y="1801"/>
         <UsageCount Value="10"/>
-        <Loaded Value="True"/>
       </Unit10>
       <Unit11>
         <Filename Value="../../../../install/source/fpcsrc/packages/fcl-db/src/base/datasource.inc"/>
-        <EditorIndex Value="4"/>
+        <EditorIndex Value="-1"/>
         <TopLine Value="146"/>
         <CursorPos X="48" Y="149"/>
         <UsageCount Value="10"/>
-        <Loaded Value="True"/>
       </Unit11>
       <Unit12>
-        <Filename Value="/usr/local/share/lazarus/lcl/include/wincontrol.inc"/>
+        <Filename Value="../../../../../lcl/include/wincontrol.inc"/>
         <EditorIndex Value="2"/>
         <TopLine Value="8050"/>
         <CursorPos Y="8080"/>
@@ -115,7 +114,7 @@
         <Loaded Value="True"/>
       </Unit12>
       <Unit13>
-        <Filename Value="/usr/local/share/lazarus/lcl/lclproc.pas"/>
+        <Filename Value="../../../../../lcl/lclproc.pas"/>
         <UnitName Value="LCLProc"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="899"/>
@@ -123,24 +122,24 @@
         <UsageCount Value="10"/>
       </Unit13>
       <Unit14>
-        <Filename Value="/usr/local/share/lazarus/lcl/include/control.inc"/>
+        <Filename Value="../../../../../lcl/include/control.inc"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="3877"/>
         <CursorPos Y="3897"/>
         <UsageCount Value="10"/>
       </Unit14>
       <Unit15>
-        <Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/>
-        <EditorIndex Value="10"/>
+        <Filename Value="../../../../../lcl/include/canvas.inc"/>
+        <EditorIndex Value="8"/>
         <TopLine Value="1273"/>
         <CursorPos Y="1303"/>
         <UsageCount Value="10"/>
         <Loaded Value="True"/>
       </Unit15>
       <Unit16>
-        <Filename Value="/usr/local/share/lazarus/lcl/graphics.pp"/>
+        <Filename Value="../../../../../lcl/graphics.pp"/>
         <UnitName Value="Graphics"/>
-        <EditorIndex Value="9"/>
+        <EditorIndex Value="7"/>
         <TopLine Value="1193"/>
         <CursorPos X="15" Y="1210"/>
         <UsageCount Value="10"/>
@@ -149,123 +148,123 @@
     </Units>
     <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
-        <Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/>
+        <Filename Value="../../../../../lcl/include/canvas.inc"/>
         <Caret Line="1246" TopLine="1226"/>
       </Position1>
       <Position2>
-        <Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/>
+        <Filename Value="../../../../../lcl/include/canvas.inc"/>
         <Caret Line="1239" Column="119" TopLine="1226"/>
       </Position2>
       <Position3>
-        <Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/>
+        <Filename Value="../../../../../lcl/include/canvas.inc"/>
         <Caret Line="1248" TopLine="1226"/>
       </Position3>
       <Position4>
-        <Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/>
+        <Filename Value="../../../../../lcl/include/canvas.inc"/>
         <Caret Line="1251" TopLine="1226"/>
       </Position4>
       <Position5>
-        <Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/>
+        <Filename Value="../../../../../lcl/include/canvas.inc"/>
         <Caret Line="1252" TopLine="1226"/>
       </Position5>
       <Position6>
-        <Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/>
+        <Filename Value="../../../../../lcl/include/canvas.inc"/>
         <Caret Line="1255" TopLine="1226"/>
       </Position6>
       <Position7>
-        <Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/>
+        <Filename Value="../../../../../lcl/include/canvas.inc"/>
         <Caret Line="1257" TopLine="1227"/>
       </Position7>
       <Position8>
-        <Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/>
+        <Filename Value="../../../../../lcl/include/canvas.inc"/>
         <Caret Line="1263" TopLine="1233"/>
       </Position8>
       <Position9>
-        <Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/>
+        <Filename Value="../../../../../lcl/include/canvas.inc"/>
         <Caret Line="1264" TopLine="1243"/>
       </Position9>
       <Position10>
-        <Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/>
+        <Filename Value="../../../../../lcl/include/canvas.inc"/>
         <Caret Line="1266" TopLine="1243"/>
       </Position10>
       <Position11>
-        <Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/>
+        <Filename Value="../../../../../lcl/include/canvas.inc"/>
         <Caret Line="1267" TopLine="1243"/>
       </Position11>
       <Position12>
-        <Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/>
+        <Filename Value="../../../../../lcl/include/canvas.inc"/>
         <Caret Line="1269" TopLine="1243"/>
       </Position12>
       <Position13>
-        <Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/>
+        <Filename Value="../../../../../lcl/include/canvas.inc"/>
         <Caret Line="1272" TopLine="1243"/>
       </Position13>
       <Position14>
-        <Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/>
+        <Filename Value="../../../../../lcl/include/canvas.inc"/>
         <Caret Line="1273" TopLine="1243"/>
       </Position14>
       <Position15>
-        <Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/>
+        <Filename Value="../../../../../lcl/include/canvas.inc"/>
         <Caret Line="1275" TopLine="1245"/>
       </Position15>
       <Position16>
-        <Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/>
+        <Filename Value="../../../../../lcl/include/canvas.inc"/>
         <Caret Line="1278" TopLine="1248"/>
       </Position16>
       <Position17>
-        <Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/>
+        <Filename Value="../../../../../lcl/include/canvas.inc"/>
         <Caret Line="1279" TopLine="1249"/>
       </Position17>
       <Position18>
-        <Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/>
+        <Filename Value="../../../../../lcl/include/canvas.inc"/>
         <Caret Line="1280" TopLine="1250"/>
       </Position18>
       <Position19>
-        <Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/>
+        <Filename Value="../../../../../lcl/include/canvas.inc"/>
         <Caret Line="1281" TopLine="1251"/>
       </Position19>
       <Position20>
-        <Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/>
+        <Filename Value="../../../../../lcl/include/canvas.inc"/>
         <Caret Line="1283" TopLine="1253"/>
       </Position20>
       <Position21>
-        <Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/>
+        <Filename Value="../../../../../lcl/include/canvas.inc"/>
         <Caret Line="1285" TopLine="1255"/>
       </Position21>
       <Position22>
-        <Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/>
+        <Filename Value="../../../../../lcl/include/canvas.inc"/>
         <Caret Line="1286" TopLine="1256"/>
       </Position22>
       <Position23>
-        <Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/>
+        <Filename Value="../../../../../lcl/include/canvas.inc"/>
         <Caret Line="1287" TopLine="1257"/>
       </Position23>
       <Position24>
-        <Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/>
+        <Filename Value="../../../../../lcl/include/canvas.inc"/>
         <Caret Line="1289" TopLine="1259"/>
       </Position24>
       <Position25>
-        <Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/>
+        <Filename Value="../../../../../lcl/include/canvas.inc"/>
         <Caret Line="1293" TopLine="1263"/>
       </Position25>
       <Position26>
-        <Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/>
+        <Filename Value="../../../../../lcl/include/canvas.inc"/>
         <Caret Line="1294" TopLine="1264"/>
       </Position26>
       <Position27>
-        <Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/>
+        <Filename Value="../../../../../lcl/include/canvas.inc"/>
         <Caret Line="1296" TopLine="1266"/>
       </Position27>
       <Position28>
-        <Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/>
+        <Filename Value="../../../../../lcl/include/canvas.inc"/>
         <Caret Line="1299" TopLine="1269"/>
       </Position28>
       <Position29>
-        <Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/>
+        <Filename Value="../../../../../lcl/include/canvas.inc"/>
         <Caret Line="1302" TopLine="1272"/>
       </Position29>
       <Position30>
-        <Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/>
+        <Filename Value="../../../../../lcl/include/canvas.inc"/>
         <Caret Line="1303" TopLine="1273"/>
       </Position30>
     </JumpHistory>
diff --git a/components/rx/trunk/rxdb/rxdbgrid.pas b/components/rx/trunk/rxdb/rxdbgrid.pas
index 9f99362a0..770bb135c 100644
--- a/components/rx/trunk/rxdb/rxdbgrid.pas
+++ b/components/rx/trunk/rxdb/rxdbgrid.pas
@@ -4363,7 +4363,7 @@ begin
           else
             S := '';
 
-          S:='11';
+//          S:='11';
 
           if (rdgWordWrap in FOptionsRx) and Assigned(C) and (C.WordWrap) then
             WriteTextHeader(Canvas, aRect, S, C.Alignment)