From 5bbdbed004ce3d648f10f531604cd1a76ad6bd2a Mon Sep 17 00:00:00 2001
From: wp_xxyyzz <wp_xxyyzz@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Sat, 23 Jul 2016 09:31:57 +0000
Subject: [PATCH] fpspreadsheet: Fix igoring wordwrap flags when painting
 wordwrapped frozen cells (see forum
 http://forum.lazarus.freepascal.org/index.php/topic,33453.msg216815/).

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5025 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 .../fpspreadsheet/fpspreadsheetgrid.pas       | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/components/fpspreadsheet/fpspreadsheetgrid.pas b/components/fpspreadsheet/fpspreadsheetgrid.pas
index 157f5098a..23126c942 100644
--- a/components/fpspreadsheet/fpspreadsheetgrid.pas
+++ b/components/fpspreadsheet/fpspreadsheetgrid.pas
@@ -2441,24 +2441,28 @@ begin
 
   if (ACol < FHeaderCount) or (ARow < FHeaderCount) then
     lCell := nil
-  else
-    lCell := FDrawingCell;
+  else begin
+    if FDrawingCell = nil then
+      lCell := Worksheet.FindCell(GetWorksheetRow(ARow), GetWorksheetCol(ACol))
+    else
+      lCell := FDrawingCell
+  end;
 
   // Header
-  if lCell = nil then
+  if (lCell = nil) and ShowHeaders and ((ACol = 0) or (ARow = 0)) then
   begin
-    if ShowHeaders and ((ACol = 0) or (ARow = 0)) then
-    begin
-      ts.Alignment := taCenter;
-      ts.Layout := tlCenter;
-      ts.Opaque := false;
-      Canvas.TextStyle := ts;
-    end;
+    ts.Alignment := taCenter;
+    ts.Layout := tlCenter;
+    ts.Opaque := false;
+    Canvas.TextStyle := ts;
     inherited DrawCellText(aCol, aRow, aRect, aState, GetCellText(ACol,ARow));
     exit;
   end;
 
   // Cells
+  if lCell = nil then
+    exit;
+
   txt := GetCellText(GetGridRow(lCell^.Col), GetGridCol(lCell^.Row));
   if txt = '' then
     exit;