From 4ca04aed771ecbdcbf33cec69a6f171be96de0c9 Mon Sep 17 00:00:00 2001
From: wp_xxyyzz <wp_xxyyzz@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Thu, 6 Sep 2018 07:19:26 +0000
Subject: [PATCH] fpspreadsheet: Undo incidental change of fpsworksheetgrid in
 prev commit.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6633 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 .../source/visual/fpspreadsheetgrid.pas       | 34 +++++++++----------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas b/components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas
index 3f8f1bf56..5fbf33f3d 100644
--- a/components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas
+++ b/components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas
@@ -1444,15 +1444,12 @@ end;
   has occured at the border of a row header. Sets optimum row height.
 -------------------------------------------------------------------------------}
 procedure TsCustomWorksheetGrid.AutoAdjustRow(ARow: Integer);
-var
-  h: Integer;
 begin
   inc(FZoomLock);
   if Worksheet <> nil then
-    h := CalcAutoRowHeight(ARow)
+    RowHeights[ARow] := CalcAutoRowHeight(ARow)
   else
-    h := -1;
-  RowHeights[ARow] := IfThen(h > -1, h, DefaultRowHeight);
+    RowHeights[ARow] := DefaultRowHeight;
   HeaderSized(false, ARow);
   dec(FZoomLock);
 end;
@@ -1524,10 +1521,15 @@ end;
 function TsCustomWorksheetGrid.CalcAutoRowHeight(ARow: Integer): Integer;
 var
   c: Integer;
+  h: Integer;
 begin
-  Result := -1;
+  h := 0;
   for c := FHeaderCount to ColCount-1 do
-    Result := Max(Result, GetCellHeight(c, ARow));  // Zoom factor is applied to font size
+    h := Max(h, GetCellHeight(c, ARow));  // Zoom factor is applied to font size
+  if h = 0 then
+    Result := DefaultRowHeight            // Zoom factor applied by getter function
+  else
+    Result := h;
 end;
 
 {@@ ----------------------------------------------------------------------------
@@ -1813,7 +1815,6 @@ procedure TsCustomWorksheetGrid.ChangedFontHandler(ASender: TObject;
 var
   lRow: PRow;
   gr: Integer; // row index in grid units
-  h: Integer;
 begin
   Unused(ASender, ACol);
   if (Worksheet <> nil) then begin
@@ -1822,8 +1823,7 @@ begin
       // There is no row record --> row height changes according to font height
       // Otherwise the row height would be fixed according to the value in the row record.
       gr := GetGridRow(ARow);  // convert row index to grid units
-      h := CalcAutoRowHeight(gr);
-      RowHeights[gr] := IfThen(h > -1, h, DefaultRowHeight);
+      RowHeights[gr] := CalcAutoRowHeight(gr);
     end;
     Invalidate;
   end;
@@ -3745,7 +3745,7 @@ var
   txtRot: TsTextRotation;
   RTL: Boolean;
 begin
-  Result := -1;
+  Result := 0;
   if (ACol < FHeaderCount) or (ARow < FHeaderCount) then
     exit;
   if Worksheet = nil then
@@ -5777,11 +5777,11 @@ begin
     if (lRow <> nil) then begin
       case lRow^.RowHeightType of
         rhtCustom:
-          if lRow^.Height > 0 then begin
+          begin
             h := round(CalcRowHeightFromSheet(lRow^.Height) * ZoomFactor);
             if AEnforceCalcRowHeight then begin
               h := CalcAutoRowHeight(ARow);
-              if h = -1 then begin
+              if h = 0 then begin
                 h := DefaultRowHeight;
                 lRow^.RowHeightType := rhtDefault;
               end else
@@ -5795,7 +5795,7 @@ begin
             if doCalcRowHeight then begin
               // Calculate current grid row height in pixels by iterating over all cells in row
               h := CalcAutoRowHeight(ARow);  // ZoomFactor already applied to font heights
-              if h = -1 then begin
+              if h = 0 then begin
                 h := DefaultRowHeight;       // Zoom factor applied by getter function
                 lRow^.RowHeightType := rhtDefault;
               end else
@@ -5817,10 +5817,8 @@ begin
     begin
       // Case 1: This row does contain cells
       lRow := Worksheet.AddRow(sr);
-      h := -1;
       if AEnforceCalcRowHeight then
-        h := CalcAutoRowHeight(ARow);
-      if h = -1 then
+        h := CalcAutoRowHeight(ARow) else
         h := DefaultRowHeight;
       lRow^.Height := CalcRowHeightToSheet(round(h / ZoomFactor));
       if h <> DefaultRowHeight then
@@ -5832,7 +5830,7 @@ begin
       h := DefaultRowHeight;   // Zoom factor is applied by getter function
   end;
 
-  if h = -1 then
+  if h = 0 then
     h := DefaultRowHeight;     // Zoom factor is applied by getter function
 
   inc(FZoomLock);  // We don't want to modify the sheet row heights here.