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

fpspreadsheet: Less hints and warnings.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@8577 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2022-10-19 21:15:56 +00:00
parent 88f48bfdcb
commit 506dbe52b7
3 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/fpspreadsheet/source/common/fpsopendocument.pas
View File

@ -34,7 +34,7 @@ unit fpsOpenDocument;
interface interface
uses uses
Classes, SysUtils, LazVersion, Classes, SysUtils,
laz2_xmlread, laz2_DOM, laz2_xmlread, laz2_DOM,
avglvltree, math, dateutils, contnrs, avglvltree, math, dateutils, contnrs,
{$IF FPC_FULLVERSION >= 20701} {$IF FPC_FULLVERSION >= 20701}
@ -325,9 +325,6 @@ uses
StrUtils, Variants, LazFileUtils, URIParser, LazUTF8, StrUtils, Variants, LazFileUtils, URIParser, LazUTF8,
{$IFDEF FPS_VARISBOOL} {$IFDEF FPS_VARISBOOL}
fpsPatches, fpsPatches,
{$ENDIF}
{$IFNDEF FPS_NO_LAZUNICODE}
LazUnicode,
{$ENDIF} {$ENDIF}
fpsStrings, fpsStreams, fpsCrypto, fpsClasses, fpspreadsheet, fpsStrings, fpsStreams, fpsCrypto, fpsClasses, fpspreadsheet,
fpsExprParser, fpsImages, fpsConditionalFormat; fpsExprParser, fpsImages, fpsConditionalFormat;

1
components/fpspreadsheet/source/common/fpsutils.pas
View File

@ -263,7 +263,6 @@ implementation
uses uses
Math, lazutf8, lazfileutils, Math, lazutf8, lazfileutils,
{$IFNDEF FPS_NO_LAZUNICODE}LazUnicode,{$ENDIF}
fpsStrings, fpsReaderWriter; fpsStrings, fpsReaderWriter;
const const

16
components/fpspreadsheet/source/common/xlsxooxml.pas
View File

@ -2707,7 +2707,7 @@ end;
procedure TsSpreadOOXMLReader.ReadDrawingRels(ANode: TDOMNode; ASheet: TsBasicWorksheet); procedure TsSpreadOOXMLReader.ReadDrawingRels(ANode: TDOMNode; ASheet: TsBasicWorksheet);
var var
nodeName: String; {%H-}nodeName: String;
relID, relTarget, relType: String; relID, relTarget, relType: String;
data: TEmbeddedObjData; data: TEmbeddedObjData;
j: Integer; j: Integer;
@ -2747,7 +2747,7 @@ end;
procedure TsSpreadOOXMLReader.ReadEmbeddedObjs(AStream: TStream); procedure TsSpreadOOXMLReader.ReadEmbeddedObjs(AStream: TStream);
var var
i, j: Integer; i, j: Integer;
fn, relsFn, s: String; fn, {%H-}relsFn: String;
XMLStream: TStream; XMLStream: TStream;
doc: TXMLDocument; doc: TXMLDocument;
sheet: TsWorksheet; sheet: TsWorksheet;
@ -3155,7 +3155,6 @@ var
nodeName: String; nodeName: String;
sheetData: TSheetData; sheetData: TSheetData;
hyperlinkData: THyperlinkListData; hyperlinkData: THyperlinkListData;
s: String;
function FindHyperlinkID(ID: String): THyperlinkListData; function FindHyperlinkID(ID: String): THyperlinkListData;
var var
@ -4202,11 +4201,12 @@ procedure TsSpreadOOXMLReader.ReadVmlDrawing(ANode: TDOMNode;
function ExtractMMFromStyle(AStyle, AKey: String): Double; function ExtractMMFromStyle(AStyle, AKey: String): Double;
var var
s, sval, sunit: String; s: String;
sval: String = '';
sunit: String = '';
i: Integer; i: Integer;
begin begin
s := ExtractFromStyle(AStyle, AKey); s := ExtractFromStyle(AStyle, AKey);
sval := '';
for i := 1 to Length(s) do for i := 1 to Length(s) do
if s[i] in ['0'..'9', '.', '+', '-'] then if s[i] in ['0'..'9', '.', '+', '-'] then
sval := sval + s[i] sval := sval + s[i]
@ -5685,6 +5685,7 @@ var
begin begin
book := FWorkbook as TsWorkbook; book := FWorkbook as TsWorkbook;
sheet := AWorksheet as TsWorksheet; sheet := AWorksheet as TsWorksheet;
lCell := Default(TCell);
AppendToStream(AStream, AppendToStream(AStream,
'<sheetData>'); '<sheetData>');
@ -5713,15 +5714,12 @@ begin
AppendToStream(AStream, Format( AppendToStream(AStream, Format(
'<row r="%d" spans="1:%d"%s>', [r+1, sheet.VirtualColCount, s])); '<row r="%d" spans="1:%d"%s>', [r+1, sheet.VirtualColCount, s]));
for c := 0 to c2 do begin for c := 0 to c2 do begin
lCell.Row := r; // to silence a compiler hint InitCell(sheet, r, c, lCell);
InitCell(lCell);
value := varNull; value := varNull;
styleCell := nil; styleCell := nil;
sheet.OnWriteCellData(sheet, r, c, value, styleCell); sheet.OnWriteCellData(sheet, r, c, value, styleCell);
if styleCell <> nil then if styleCell <> nil then
lCell.FormatIndex := styleCell^.FormatIndex; lCell.FormatIndex := styleCell^.FormatIndex;
lCell.Row := r;
lCell.Col := c;
if VarIsNull(value) then if VarIsNull(value) then
begin begin
if styleCell <> nil then if styleCell <> nil then