From 1b35aa8bb2e5270467d0c95e96af8a1cfd15b44b Mon Sep 17 00:00:00 2001
From: wp_xxyyzz <wp_xxyyzz@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Tue, 24 Feb 2015 23:23:15 +0000
Subject: [PATCH] fpspreadsheet: Fix compilation of visual package

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3962 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 components/fpspreadsheet/fpspreadsheet.pas      | 13 ++++---------
 components/fpspreadsheet/fpspreadsheetctrls.pas |  6 +-----
 components/fpspreadsheet/xlsxooxml.pas          | 12 ++++--------
 3 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/components/fpspreadsheet/fpspreadsheet.pas b/components/fpspreadsheet/fpspreadsheet.pas
index 85d878734..6ae3d076e 100755
--- a/components/fpspreadsheet/fpspreadsheet.pas
+++ b/components/fpspreadsheet/fpspreadsheet.pas
@@ -3563,8 +3563,6 @@ procedure TsWorksheet.RemoveMergedRange(ABaseRow, ABaseCol: Cardinal);
 var
   lCellRange: TsCellRange;
   AVLNode: TAVLTreeNode;
-  cell: PCell;
-  r, c: Cardinal;
 begin
   lCellRange.Row1 := ABaseRow;
   lCellRange.Col1 := ABaseCol;
@@ -6789,9 +6787,8 @@ procedure TsWorksheet.InsertCol(ACol: Cardinal);
 var
   col: PCol;
   i: Integer;
-  r, c: Cardinal;
-  rFirst, rLast: Cardinal;
-  cell, nextcell, gapcell: PCell;
+  r: Cardinal;
+  cell: PCell;
   AVLNode: TAVLTreeNode;
   rng: PsCellRange;
   comment: PsComment;
@@ -6873,7 +6870,6 @@ var
   col: Cardinal;
   formula: TsRPNFormula;
   i: Integer;
-  comment: PsComment;
 begin
   col := LongInt({%H-}PtrInt(arg));
   cell := PCell(data);
@@ -6918,8 +6914,8 @@ procedure TsWorksheet.InsertRow(ARow: Cardinal);
 var
   row: PRow;
   i: Integer;
-  r, c: Cardinal;
-  cell, nextcell, gapcell: PCell;
+  c: Cardinal;
+  cell: PCell;
   AVLNode: TAVLTreeNode;
   rng: PsCellRange;
   comment: PsComment;
@@ -7000,7 +6996,6 @@ var
   row: Cardinal;
   i: Integer;
   formula: TsRPNFormula;
-  comment: PsComment;
 begin
   row := LongInt({%H-}PtrInt(arg));
   cell := PCell(data);
diff --git a/components/fpspreadsheet/fpspreadsheetctrls.pas b/components/fpspreadsheet/fpspreadsheetctrls.pas
index 551d27cd9..c87d3e491 100644
--- a/components/fpspreadsheet/fpspreadsheetctrls.pas
+++ b/components/fpspreadsheet/fpspreadsheetctrls.pas
@@ -903,11 +903,8 @@ var
   j: Integer;
   I: IsSpreadsheetControl;
   C: TComponent;
-
-  cell: PCell;
 begin
   for j:=0 to FListeners.Count-1 do begin
-    if Worksheet <> nil then cell := Worksheet.FindCell(0,0);
     C := TComponent(FListeners[j]);
     if C.GetInterface(GUID_SpreadsheetControl, I) then
       I.ListenerNotification(AChangedItems, AData)
@@ -2693,8 +2690,7 @@ begin
         case hyperlink^.Kind of
           hkNone: s := s + ' <error>';
           hkCell: s := s + ' (internal cell reference)';
-          hkFile: s := s + ' (external file)';
-          hkURL : s := s + ' (URL)';
+          hkURI : s := s + ' (external URI)';
         end;
       end else
         s := '<error>';
diff --git a/components/fpspreadsheet/xlsxooxml.pas b/components/fpspreadsheet/xlsxooxml.pas
index e515989bd..2263c61ca 100755
--- a/components/fpspreadsheet/xlsxooxml.pas
+++ b/components/fpspreadsheet/xlsxooxml.pas
@@ -82,7 +82,7 @@ type
     procedure ReadFills(ANode: TDOMNode);
     procedure ReadFont(ANode: TDOMNode);
     procedure ReadFonts(ANode: TDOMNode);
-    procedure ReadHyperlinks(ANode: TDOMNode; AWorksheet: TsWorksheet);
+    procedure ReadHyperlinks(ANode: TDOMNode);
     procedure ReadMergedCells(ANode: TDOMNode; AWorksheet: TsWorksheet);
     procedure ReadNumFormats(ANode: TDOMNode);
     procedure ReadPalette(ANode: TDOMNode);
@@ -1232,8 +1232,7 @@ begin
     FWorkbook.DeleteFont(4);
 end;
 
-procedure TsSpreadOOXMLReader.ReadHyperlinks(ANode: TDOMNode;
-  AWorksheet: TsWorksheet);
+procedure TsSpreadOOXMLReader.ReadHyperlinks(ANode: TDOMNode);
 var
   node: TDOMNode;
   nodeName: String;
@@ -1612,7 +1611,6 @@ procedure TsSpreadOOXMLReader.ReadWorksheet(ANode: TDOMNode; AWorksheet: TsWorks
 var
   rownode: TDOMNode;
   cellnode: TDOMNode;
-  nodename: String;
 begin
   rownode := ANode.FirstChild;
   while Assigned(rownode) do begin
@@ -1717,7 +1715,7 @@ begin
       ReadCols(Doc.DocumentElement.FindNode('cols'), FWorksheet);
       ReadWorksheet(Doc.DocumentElement.FindNode('sheetData'), FWorksheet);
       ReadMergedCells(Doc.DocumentElement.FindNode('mergeCells'), FWorksheet);
-      ReadHyperlinks(Doc.DocumentElement.FindNode('hyperlinks'), FWorksheet);
+      ReadHyperlinks(Doc.DocumentElement.FindNode('hyperlinks'));
 
       FreeAndNil(Doc);
 
@@ -1733,7 +1731,7 @@ begin
         ReadXMLFile(Doc, FilePath + fn);
         DeleteFile(FilePath + fn);
         fn_comments := FindCommentsFileName(Doc.DocumentElement.FindNode('Relationship'));
-        ReadHyperlinks(Doc.DocumentElement.FindNode('Relationship'), FWorksheet);
+        ReadHyperlinks(Doc.DocumentElement.FindNode('Relationship'));
         FreeAndNil(Doc);
       end else
       if (SheetList.Count = 1) then
@@ -2171,7 +2169,6 @@ end;
 procedure TsSpreadOOXMLWriter.WriteHyperlinks(AStream: TStream;
   AWorksheet: TsWorksheet);
 var
-  i: Integer;
   hyperlink: PsHyperlink;
   s: String;
   txt: String;
@@ -2642,7 +2639,6 @@ end;
 
 procedure TsSpreadOOXMLWriter.WriteWorksheetRels(AWorksheet: TsWorksheet);
 var
-  i: Integer;
   AVLNode: TAVLTreeNode;
   hyperlink: PsHyperlink;
   s: String;