From 705a7956ce8c63a81483f274d58ad1c9c83c2111 Mon Sep 17 00:00:00 2001
From: wp_xxyyzz <wp_xxyyzz@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Sun, 11 May 2014 16:22:48 +0000
Subject: [PATCH] fpspreadsheet: Pass visibility of gridlines and sheet headers
 from TsWorksheetGrid to underlying Worksheet for saving.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3041 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 .../examples/fpsgrid/fpsgrid.lpi              | 136 +++++++++---------
 .../fpspreadsheet/fpspreadsheetgrid.pas       |  13 ++
 2 files changed, 81 insertions(+), 68 deletions(-)

diff --git a/components/fpspreadsheet/examples/fpsgrid/fpsgrid.lpi b/components/fpspreadsheet/examples/fpsgrid/fpsgrid.lpi
index 78254f20b..ccd169e5d 100644
--- a/components/fpspreadsheet/examples/fpsgrid/fpsgrid.lpi
+++ b/components/fpspreadsheet/examples/fpsgrid/fpsgrid.lpi
@@ -139,8 +139,8 @@
         <UnitName Value="fpspreadsheet"/>
         <EditorIndex Value="8"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="2255"/>
-        <CursorPos X="19" Y="2262"/>
+        <TopLine Value="280"/>
+        <CursorPos X="17" Y="312"/>
         <UsageCount Value="100"/>
         <Loaded Value="True"/>
       </Unit2>
@@ -150,8 +150,8 @@
         <IsVisibleTab Value="True"/>
         <EditorIndex Value="6"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="2007"/>
-        <CursorPos X="1" Y="1983"/>
+        <TopLine Value="2096"/>
+        <CursorPos X="1" Y="2120"/>
         <UsageCount Value="100"/>
         <Bookmarks Count="1">
           <Item0 X="7" Y="1938" ID="1"/>
@@ -585,123 +585,123 @@
     <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
         <Filename Value="..\..\fpspreadsheetgrid.pas"/>
-        <Caret Line="1360" Column="1" TopLine="1335"/>
+        <Caret Line="1368" Column="1" TopLine="1336"/>
       </Position1>
       <Position2>
-        <Filename Value="..\..\fpspreadsheetgrid.pas"/>
-        <Caret Line="1361" Column="1" TopLine="1335"/>
+        <Filename Value="mainform.pas"/>
+        <Caret Line="610" Column="1" TopLine="602"/>
       </Position2>
       <Position3>
-        <Filename Value="..\..\fpspreadsheetgrid.pas"/>
-        <Caret Line="1362" Column="1" TopLine="1335"/>
+        <Filename Value="mainform.pas"/>
+        <Caret Line="613" Column="1" TopLine="602"/>
       </Position3>
       <Position4>
-        <Filename Value="..\..\fpspreadsheetgrid.pas"/>
-        <Caret Line="1363" Column="1" TopLine="1335"/>
+        <Filename Value="mainform.pas"/>
+        <Caret Line="603" Column="19" TopLine="603"/>
       </Position4>
       <Position5>
-        <Filename Value="..\..\fpspreadsheetgrid.pas"/>
-        <Caret Line="1368" Column="1" TopLine="1336"/>
+        <Filename Value="mainform.pas"/>
+        <Caret Line="310" Column="3" TopLine="310"/>
       </Position5>
       <Position6>
         <Filename Value="mainform.pas"/>
-        <Caret Line="610" Column="1" TopLine="602"/>
+        <Caret Line="1" Column="1" TopLine="1"/>
       </Position6>
       <Position7>
         <Filename Value="mainform.pas"/>
-        <Caret Line="613" Column="1" TopLine="602"/>
+        <Caret Line="173" Column="29" TopLine="142"/>
       </Position7>
       <Position8>
         <Filename Value="mainform.pas"/>
-        <Caret Line="603" Column="19" TopLine="603"/>
+        <Caret Line="556" Column="17" TopLine="524"/>
       </Position8>
       <Position9>
-        <Filename Value="mainform.pas"/>
-        <Caret Line="310" Column="3" TopLine="310"/>
-      </Position9>
-      <Position10>
-        <Filename Value="mainform.pas"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
-      </Position10>
-      <Position11>
-        <Filename Value="mainform.pas"/>
-        <Caret Line="173" Column="29" TopLine="142"/>
-      </Position11>
-      <Position12>
-        <Filename Value="mainform.pas"/>
-        <Caret Line="556" Column="17" TopLine="524"/>
-      </Position12>
-      <Position13>
         <Filename Value="..\..\fpspreadsheetgrid.pas"/>
         <Caret Line="2038" Column="1" TopLine="2031"/>
-      </Position13>
-      <Position14>
+      </Position9>
+      <Position10>
         <Filename Value="..\..\fpspreadsheetgrid.pas"/>
         <Caret Line="2041" Column="1" TopLine="2031"/>
-      </Position14>
-      <Position15>
+      </Position10>
+      <Position11>
         <Filename Value="..\..\fpspreadsheetgrid.pas"/>
         <Caret Line="2044" Column="1" TopLine="2031"/>
+      </Position11>
+      <Position12>
+        <Filename Value="d:\lazarus-svn\lcl\grids.pas"/>
+        <Caret Line="2483" Column="1" TopLine="2464"/>
+      </Position12>
+      <Position13>
+        <Filename Value="d:\lazarus-svn\lcl\grids.pas"/>
+        <Caret Line="2484" Column="1" TopLine="2464"/>
+      </Position13>
+      <Position14>
+        <Filename Value="d:\lazarus-svn\lcl\grids.pas"/>
+        <Caret Line="2485" Column="1" TopLine="2464"/>
+      </Position14>
+      <Position15>
+        <Filename Value="d:\lazarus-svn\lcl\grids.pas"/>
+        <Caret Line="2486" Column="1" TopLine="2464"/>
       </Position15>
       <Position16>
         <Filename Value="d:\lazarus-svn\lcl\grids.pas"/>
-        <Caret Line="2483" Column="1" TopLine="2464"/>
+        <Caret Line="2490" Column="1" TopLine="2464"/>
       </Position16>
       <Position17>
         <Filename Value="d:\lazarus-svn\lcl\grids.pas"/>
-        <Caret Line="2484" Column="1" TopLine="2464"/>
+        <Caret Line="2492" Column="1" TopLine="2464"/>
       </Position17>
       <Position18>
         <Filename Value="d:\lazarus-svn\lcl\grids.pas"/>
-        <Caret Line="2485" Column="1" TopLine="2464"/>
+        <Caret Line="2494" Column="1" TopLine="2464"/>
       </Position18>
       <Position19>
         <Filename Value="d:\lazarus-svn\lcl\grids.pas"/>
-        <Caret Line="2486" Column="1" TopLine="2464"/>
+        <Caret Line="2495" Column="1" TopLine="2464"/>
       </Position19>
       <Position20>
-        <Filename Value="d:\lazarus-svn\lcl\grids.pas"/>
-        <Caret Line="2490" Column="1" TopLine="2464"/>
-      </Position20>
-      <Position21>
-        <Filename Value="d:\lazarus-svn\lcl\grids.pas"/>
-        <Caret Line="2492" Column="1" TopLine="2464"/>
-      </Position21>
-      <Position22>
-        <Filename Value="d:\lazarus-svn\lcl\grids.pas"/>
-        <Caret Line="2494" Column="1" TopLine="2464"/>
-      </Position22>
-      <Position23>
-        <Filename Value="d:\lazarus-svn\lcl\grids.pas"/>
-        <Caret Line="2495" Column="1" TopLine="2464"/>
-      </Position23>
-      <Position24>
         <Filename Value="..\..\fpspreadsheetgrid.pas"/>
         <Caret Line="2038" Column="1" TopLine="2031"/>
-      </Position24>
-      <Position25>
+      </Position20>
+      <Position21>
         <Filename Value="..\..\fpspreadsheetgrid.pas"/>
         <Caret Line="1626" Column="1" TopLine="1607"/>
-      </Position25>
-      <Position26>
+      </Position21>
+      <Position22>
         <Filename Value="..\..\fpspreadsheet.pas"/>
         <Caret Line="414" Column="14" TopLine="397"/>
-      </Position26>
-      <Position27>
+      </Position22>
+      <Position23>
         <Filename Value="mainform.pas"/>
         <Caret Line="564" Column="1" TopLine="557"/>
-      </Position27>
-      <Position28>
+      </Position23>
+      <Position24>
         <Filename Value="mainform.pas"/>
         <Caret Line="640" Column="31" TopLine="604"/>
-      </Position28>
-      <Position29>
+      </Position24>
+      <Position25>
         <Filename Value="mainform.pas"/>
         <Caret Line="641" Column="31" TopLine="605"/>
-      </Position29>
-      <Position30>
+      </Position25>
+      <Position26>
         <Filename Value="mainform.pas"/>
         <Caret Line="640" Column="31" TopLine="604"/>
+      </Position26>
+      <Position27>
+        <Filename Value="..\..\fpspreadsheetgrid.pas"/>
+        <Caret Line="2024" Column="25" TopLine="2007"/>
+      </Position27>
+      <Position28>
+        <Filename Value="..\..\fpspreadsheet.pas"/>
+        <Caret Line="2262" Column="19" TopLine="2255"/>
+      </Position28>
+      <Position29>
+        <Filename Value="..\..\fpspreadsheet.pas"/>
+        <Caret Line="1" Column="1" TopLine="1"/>
+      </Position29>
+      <Position30>
+        <Filename Value="..\..\fpspreadsheetgrid.pas"/>
+        <Caret Line="2104" Column="68" TopLine="2087"/>
       </Position30>
     </JumpHistory>
   </ProjectOptions>
diff --git a/components/fpspreadsheet/fpspreadsheetgrid.pas b/components/fpspreadsheet/fpspreadsheetgrid.pas
index cd3562d9b..1056637f5 100644
--- a/components/fpspreadsheet/fpspreadsheetgrid.pas
+++ b/components/fpspreadsheet/fpspreadsheetgrid.pas
@@ -2096,13 +2096,26 @@ begin
     Options := Options + [goHorzLine, goVertLine]
   else
     Options := Options - [goHorzLine, goVertLine];
+
+  if FWorksheet <> nil then
+    if AValue then
+      FWorksheet.Options := FWorksheet.Options + [soShowGridLines]
+    else
+      FWorksheet.Options := FWorksheet.Options - [soShowGridLines];
 end;
 
 { Shows / hides the worksheet's row and column headers. }
 procedure TsCustomWorksheetGrid.SetShowHeaders(AValue: Boolean);
 begin
   if AValue = GetShowHeaders then Exit;
+
   FHeaderCount := ord(AValue);
+  if FWorksheet <> nil then
+    if AValue then
+      FWorksheet.Options := FWorksheet.Options + [soShowHeaders]
+    else
+      FWorksheet.Options := FWorksheet.Options - [soShowHeaders];
+
   Setup;
 end;