From fdd9b88f43c4d97a6e5eed81432177e7122421dc Mon Sep 17 00:00:00 2001
From: wp_xxyyzz <wp_xxyyzz@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Sat, 6 Dec 2014 18:09:15 +0000
Subject: [PATCH] fpspreadsheet: Set package versions 1.3 in order to follow
 the convention of giving the trunk version an odd number. Silence some
 compiler hints.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3826 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 components/fpspreadsheet/fpsopendocument.pas                | 2 ++
 components/fpspreadsheet/fpspreadsheet.pas                  | 1 -
 components/fpspreadsheet/laz_fpspreadsheet.lpk              | 2 +-
 components/fpspreadsheet/laz_fpspreadsheet_visual.lpk       | 2 +-
 components/fpspreadsheet/laz_fpspreadsheetexport_visual.lpk | 2 +-
 components/fpspreadsheet/xlscommon.pas                      | 1 +
 components/fpspreadsheet/xlsxooxml.pas                      | 1 +
 7 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/components/fpspreadsheet/fpsopendocument.pas b/components/fpspreadsheet/fpsopendocument.pas
index 33da8adbb..6f5d9c48c 100755
--- a/components/fpspreadsheet/fpsopendocument.pas
+++ b/components/fpspreadsheet/fpsopendocument.pas
@@ -1037,6 +1037,7 @@ var
   lCell: TCell;
 begin
   // a temporary cell record to store the formatting if there is any
+  lCell.Row := ARow;  // to silence a compiler warning...
   InitCell(ARow, ACol, lCell);
   lCell.ContentType := cctEmpty;
 
@@ -3813,6 +3814,7 @@ begin
       // Empty cell? Need to count how many "table:number-columns-repeated" to be added
       colsRepeated := 1;
 
+      lCell.Row := r;  // to silence a compiler hint...
       InitCell(r, c, lCell);
       value := varNull;
       styleCell := nil;
diff --git a/components/fpspreadsheet/fpspreadsheet.pas b/components/fpspreadsheet/fpspreadsheet.pas
index 717f1bdb6..fc70b6d10 100755
--- a/components/fpspreadsheet/fpspreadsheet.pas
+++ b/components/fpspreadsheet/fpspreadsheet.pas
@@ -2018,7 +2018,6 @@ end;
 procedure TsWorksheet.CopyFormula(AFromCell, AToCell: PCell);
 var
   rpnFormula: TsRPNFormula;
-  isSharedFormula: Boolean;
   lCell: TCell;
 begin
   if (AFromCell = nil) or (AToCell = nil) then
diff --git a/components/fpspreadsheet/laz_fpspreadsheet.lpk b/components/fpspreadsheet/laz_fpspreadsheet.lpk
index e0924302e..b73296a83 100644
--- a/components/fpspreadsheet/laz_fpspreadsheet.lpk
+++ b/components/fpspreadsheet/laz_fpspreadsheet.lpk
@@ -25,7 +25,7 @@
 
 This package is all you need if you don't want graphical components (like grids and charts)."/>
     <License Value="LGPL with static linking exception. This is the same license as is used in the LCL (Lazarus Component Library)."/>
-    <Version Major="1" Minor="2"/>
+    <Version Major="1" Minor="3"/>
     <Files Count="27">
       <Item1>
         <Filename Value="fpolestorage.pas"/>
diff --git a/components/fpspreadsheet/laz_fpspreadsheet_visual.lpk b/components/fpspreadsheet/laz_fpspreadsheet_visual.lpk
index ea8a1b394..e725fe5ca 100644
--- a/components/fpspreadsheet/laz_fpspreadsheet_visual.lpk
+++ b/components/fpspreadsheet/laz_fpspreadsheet_visual.lpk
@@ -19,7 +19,7 @@
 
 It provides graphical components like a grid and chart."/>
     <License Value="LGPL with static linking exception. This is the same license as is used in the LCL (Lazarus Component Library)."/>
-    <Version Major="1" Minor="2"/>
+    <Version Major="1" Minor="3"/>
     <Files Count="5">
       <Item1>
         <Filename Value="fpspreadsheetctrls.pas"/>
diff --git a/components/fpspreadsheet/laz_fpspreadsheetexport_visual.lpk b/components/fpspreadsheet/laz_fpspreadsheetexport_visual.lpk
index 3698f2f56..7e787c0fd 100644
--- a/components/fpspreadsheet/laz_fpspreadsheetexport_visual.lpk
+++ b/components/fpspreadsheet/laz_fpspreadsheetexport_visual.lpk
@@ -23,7 +23,7 @@
 
 It provides a graphical export component on the Data Export tab."/>
     <License Value="LGPL with static linking exception. This is the same license as is used in the LCL (Lazarus Component Library)."/>
-    <Version Major="1" Minor="2"/>
+    <Version Major="1" Minor="3"/>
     <Files Count="2">
       <Item1>
         <Filename Value="fpsexport.pas"/>
diff --git a/components/fpspreadsheet/xlscommon.pas b/components/fpspreadsheet/xlscommon.pas
index e6e9bc52d..f27e9d288 100644
--- a/components/fpspreadsheet/xlscommon.pas
+++ b/components/fpspreadsheet/xlscommon.pas
@@ -2938,6 +2938,7 @@ begin
   for r := 0 to Workbook.VirtualRowCount-1 do
     for c := 0 to Workbook.VirtualColCount-1 do
     begin
+      lCell.Row := r; // to silence a compiler hint...
       InitCell(lCell);
       value := varNull;
       styleCell := nil;
diff --git a/components/fpspreadsheet/xlsxooxml.pas b/components/fpspreadsheet/xlsxooxml.pas
index a5beca0ba..56e886fe7 100755
--- a/components/fpspreadsheet/xlsxooxml.pas
+++ b/components/fpspreadsheet/xlsxooxml.pas
@@ -1937,6 +1937,7 @@ begin
       AppendToStream(AStream, Format(
         '<row r="%d" spans="1:%d"%s>', [r+1, Workbook.VirtualColCount, rh]));
       for c := 0 to c2 do begin
+        lCell.Row := r; // to silence a compiler hint
         InitCell(lCell);
         value := varNull;
         styleCell := nil;