pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

fpspreadsheet: Fix compilation of visual package

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3962 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2015-02-24 23:23:15 +00:00
parent 5d939e5821
commit 1b35aa8bb2
3 changed files with 9 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
components/fpspreadsheet/fpspreadsheet.pas
View File

@ -3563,8 +3563,6 @@ procedure TsWorksheet.RemoveMergedRange(ABaseRow, ABaseCol: Cardinal);
var var
lCellRange: TsCellRange; lCellRange: TsCellRange;
AVLNode: TAVLTreeNode; AVLNode: TAVLTreeNode;
cell: PCell;
r, c: Cardinal;
begin begin
lCellRange.Row1 := ABaseRow; lCellRange.Row1 := ABaseRow;
lCellRange.Col1 := ABaseCol; lCellRange.Col1 := ABaseCol;
@ -6789,9 +6787,8 @@ procedure TsWorksheet.InsertCol(ACol: Cardinal);
var var
col: PCol; col: PCol;
i: Integer; i: Integer;
r, c: Cardinal; r: Cardinal;
rFirst, rLast: Cardinal; cell: PCell;
cell, nextcell, gapcell: PCell;
AVLNode: TAVLTreeNode; AVLNode: TAVLTreeNode;
rng: PsCellRange; rng: PsCellRange;
comment: PsComment; comment: PsComment;
@ -6873,7 +6870,6 @@ var
col: Cardinal; col: Cardinal;
formula: TsRPNFormula; formula: TsRPNFormula;
i: Integer; i: Integer;
comment: PsComment;
begin begin
col := LongInt({%H-}PtrInt(arg)); col := LongInt({%H-}PtrInt(arg));
cell := PCell(data); cell := PCell(data);
@ -6918,8 +6914,8 @@ procedure TsWorksheet.InsertRow(ARow: Cardinal);
var var
row: PRow; row: PRow;
i: Integer; i: Integer;
r, c: Cardinal; c: Cardinal;
cell, nextcell, gapcell: PCell; cell: PCell;
AVLNode: TAVLTreeNode; AVLNode: TAVLTreeNode;
rng: PsCellRange; rng: PsCellRange;
comment: PsComment; comment: PsComment;
@ -7000,7 +6996,6 @@ var
row: Cardinal; row: Cardinal;
i: Integer; i: Integer;
formula: TsRPNFormula; formula: TsRPNFormula;
comment: PsComment;
begin begin
row := LongInt({%H-}PtrInt(arg)); row := LongInt({%H-}PtrInt(arg));
cell := PCell(data); cell := PCell(data);

6
components/fpspreadsheet/fpspreadsheetctrls.pas
View File

@ -903,11 +903,8 @@ var
j: Integer; j: Integer;
I: IsSpreadsheetControl; I: IsSpreadsheetControl;
C: TComponent; C: TComponent;
cell: PCell;
begin begin
for j:=0 to FListeners.Count-1 do begin for j:=0 to FListeners.Count-1 do begin
if Worksheet <> nil then cell := Worksheet.FindCell(0,0);
C := TComponent(FListeners[j]); C := TComponent(FListeners[j]);
if C.GetInterface(GUID_SpreadsheetControl, I) then if C.GetInterface(GUID_SpreadsheetControl, I) then
I.ListenerNotification(AChangedItems, AData) I.ListenerNotification(AChangedItems, AData)
@ -2693,8 +2690,7 @@ begin
case hyperlink^.Kind of case hyperlink^.Kind of
hkNone: s := s + ' <error>'; hkNone: s := s + ' <error>';
hkCell: s := s + ' (internal cell reference)'; hkCell: s := s + ' (internal cell reference)';
hkFile: s := s + ' (external file)'; hkURI : s := s + ' (external URI)';
hkURL : s := s + ' (URL)';
end; end;
end else end else
s := '<error>'; s := '<error>';

12
components/fpspreadsheet/xlsxooxml.pas
View File

@ -82,7 +82,7 @@ type
procedure ReadFills(ANode: TDOMNode); procedure ReadFills(ANode: TDOMNode);
procedure ReadFont(ANode: TDOMNode); procedure ReadFont(ANode: TDOMNode);
procedure ReadFonts(ANode: TDOMNode); procedure ReadFonts(ANode: TDOMNode);
procedure ReadHyperlinks(ANode: TDOMNode; AWorksheet: TsWorksheet); procedure ReadHyperlinks(ANode: TDOMNode);
procedure ReadMergedCells(ANode: TDOMNode; AWorksheet: TsWorksheet); procedure ReadMergedCells(ANode: TDOMNode; AWorksheet: TsWorksheet);
procedure ReadNumFormats(ANode: TDOMNode); procedure ReadNumFormats(ANode: TDOMNode);
procedure ReadPalette(ANode: TDOMNode); procedure ReadPalette(ANode: TDOMNode);
@ -1232,8 +1232,7 @@ begin
FWorkbook.DeleteFont(4); FWorkbook.DeleteFont(4);
end; end;
procedure TsSpreadOOXMLReader.ReadHyperlinks(ANode: TDOMNode; procedure TsSpreadOOXMLReader.ReadHyperlinks(ANode: TDOMNode);
AWorksheet: TsWorksheet);
var var
node: TDOMNode; node: TDOMNode;
nodeName: String; nodeName: String;
@ -1612,7 +1611,6 @@ procedure TsSpreadOOXMLReader.ReadWorksheet(ANode: TDOMNode; AWorksheet: TsWorks
var var
rownode: TDOMNode; rownode: TDOMNode;
cellnode: TDOMNode; cellnode: TDOMNode;
nodename: String;
begin begin
rownode := ANode.FirstChild; rownode := ANode.FirstChild;
while Assigned(rownode) do begin while Assigned(rownode) do begin
@ -1717,7 +1715,7 @@ begin
ReadCols(Doc.DocumentElement.FindNode('cols'), FWorksheet); ReadCols(Doc.DocumentElement.FindNode('cols'), FWorksheet);
ReadWorksheet(Doc.DocumentElement.FindNode('sheetData'), FWorksheet); ReadWorksheet(Doc.DocumentElement.FindNode('sheetData'), FWorksheet);
ReadMergedCells(Doc.DocumentElement.FindNode('mergeCells'), FWorksheet); ReadMergedCells(Doc.DocumentElement.FindNode('mergeCells'), FWorksheet);
ReadHyperlinks(Doc.DocumentElement.FindNode('hyperlinks'), FWorksheet); ReadHyperlinks(Doc.DocumentElement.FindNode('hyperlinks'));
FreeAndNil(Doc); FreeAndNil(Doc);
@ -1733,7 +1731,7 @@ begin
ReadXMLFile(Doc, FilePath + fn); ReadXMLFile(Doc, FilePath + fn);
DeleteFile(FilePath + fn); DeleteFile(FilePath + fn);
fn_comments := FindCommentsFileName(Doc.DocumentElement.FindNode('Relationship')); fn_comments := FindCommentsFileName(Doc.DocumentElement.FindNode('Relationship'));
ReadHyperlinks(Doc.DocumentElement.FindNode('Relationship'), FWorksheet); ReadHyperlinks(Doc.DocumentElement.FindNode('Relationship'));
FreeAndNil(Doc); FreeAndNil(Doc);
end else end else
if (SheetList.Count = 1) then if (SheetList.Count = 1) then
@ -2171,7 +2169,6 @@ end;
procedure TsSpreadOOXMLWriter.WriteHyperlinks(AStream: TStream; procedure TsSpreadOOXMLWriter.WriteHyperlinks(AStream: TStream;
AWorksheet: TsWorksheet); AWorksheet: TsWorksheet);
var var
i: Integer;
hyperlink: PsHyperlink; hyperlink: PsHyperlink;
s: String; s: String;
txt: String; txt: String;
@ -2642,7 +2639,6 @@ end;
procedure TsSpreadOOXMLWriter.WriteWorksheetRels(AWorksheet: TsWorksheet); procedure TsSpreadOOXMLWriter.WriteWorksheetRels(AWorksheet: TsWorksheet);
var var
i: Integer;
AVLNode: TAVLTreeNode; AVLNode: TAVLTreeNode;
hyperlink: PsHyperlink; hyperlink: PsHyperlink;
s: String; s: String;