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

fpspreadsheet: Clean-up

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4317 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2015-09-09 13:20:09 +00:00
parent a5cbacff27
commit f9c7e354c5
12 changed files with 26 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/fpspreadsheet/examples/visual/shared/ssearchform.lfm
View File

@ -163,7 +163,6 @@ object SearchForm: TSearchForm
BevelOuter = bvNone
ClientHeight = 33
ClientWidth = 467
Color = clNone
ParentColor = False
TabOrder = 1
object LblSearchText: TLabel
@ -193,7 +192,6 @@ object SearchForm: TSearchForm
BevelOuter = bvNone
ClientHeight = 33
ClientWidth = 467
Color = clNone
ParentColor = False
TabOrder = 2
Visible = False
@ -224,7 +222,6 @@ object SearchForm: TSearchForm
BevelOuter = bvNone
ClientHeight = 196
ClientWidth = 467
Color = clNone
ParentColor = False
TabOrder = 3
object CgOptions: TCheckGroup

5
components/fpspreadsheet/examples/visual/shared/ssearchform.pas
View File

@ -204,6 +204,11 @@ end;
procedure TSearchForm.FormCreate(Sender: TObject);
begin
{$IFDEF MSWINDOWS}
SearchTextPanel.Color := clNone;
ReplaceTextPanel.Color := clNone;
SearchParamsPanel.Color := clNone;
{$ENDIF}
Position := poMainFormCenter;
PopulateOptions;
end;

20
components/fpspreadsheet/fpshtml.pas
View File

@ -182,7 +182,6 @@ var
currSym: String;
warning: String;
fntIndex: Integer;
fnt: TsFont;
begin
// Empty strings are blank cells -- nothing to do
if (AText = '') then
@ -273,7 +272,6 @@ function TsHTMLReader.AddFont(AFont: TsFont): Integer;
const
EPS = 1e-3;
var
i: Integer;
fnt: TsFont;
begin
// Is the font already stored in the internal font list?
@ -467,6 +465,7 @@ procedure TsHTMLReader.ProcessEndTags(NoCaseTag, ActualTag: String);
var
fntIndex: Integer;
begin
Unused(ActualTag);
if not FInTable then exit;
if (NoCaseTag = '</BODY>') then
@ -580,13 +579,11 @@ end;
procedure TsHTMLReader.ReadBorder;
var
idx: Integer;
cb: TsCellBorders;
value: String;
procedure ReadBorderAttribs(AValue: String; var ABorderStyle: TsCellBorderStyle);
var
L: TStringList;
bs: TsCellBorderStyle;
w: String;
style: String;
color: String;
@ -627,7 +624,6 @@ var
end;
begin
cb := [];
idx := FAttrList.IndexOfName('border');
if idx <> -1 then
begin
@ -864,7 +860,6 @@ end;
procedure TsHTMLReader.ReadHorAlign;
var
idx: Integer;
s: String;
begin
idx := FAttrList.IndexOfName('align'); // html tag
if idx = -1 then
@ -910,11 +905,6 @@ begin
end;
procedure TsHTMLReader.ReadTextRot;
var
idx: Integer;
value, s: String;
p: PChar;
f: Double;
begin
{
// No - text rotation is too complicated...
@ -967,7 +957,6 @@ end;
procedure TsHTMLReader.ReadVertAlign;
var
idx: Integer;
s: String;
begin
idx := FAttrList.IndexOfName('valign'); // html tag
if idx = -1 then
@ -1184,6 +1173,7 @@ end;
function TsHTMLWriter.CellFormatAsString(AFormat: PsCellFormat;
ATagName: String): String;
begin
Unused(ATagName);
Result := '';
if (uffBackground in AFormat^.UsedFormattingFields) then
@ -1389,6 +1379,7 @@ end;
function TsHTMLWriter.GetTextRotationAsStyle(ATextRot: TsTextRotation): String;
begin
Unused(ATextRot);
Result := '';
(* --- no - this is not working
case ATextRot of
@ -1498,7 +1489,7 @@ procedure TsHTMLWriter.WriteDateTime(AStream: TStream; const ARow, ACol: Cardina
var
s: String;
begin
Unused(AValue);
Unused(AValue, ACol, ARow);
s := FWorksheet.ReadAsUTF8Text(ACell);
AppendToStream(AStream,
'<div>' + s + '</div>');
@ -1509,7 +1500,7 @@ procedure TsHTMLWriter.WriteError(AStream: TStream;
var
s: String;
begin
Unused(AValue);
Unused(AValue, ACol, ARow);
s := FWOrksheet.ReadAsUTF8Text(ACell);
AppendToStream(AStream,
'<div>' + s + '</div>');
@ -1543,7 +1534,6 @@ var
txt, textp, target, bookmark: String;
rtParam: TsRichTextParam;
fnt, cellfnt: TsFont;
escapement: String;
hyperlink: PsHyperlink;
isTargetCell: Boolean;
u: TUri;

9
components/fpspreadsheet/fpshtmlutils.pas
View File

@ -48,7 +48,7 @@ procedure RichTextToHTML(AWorkbook: TsWorkbook; AFont: TsFont;
implementation
uses
math, Strings, lazUtf8, fasthtmlparser,
math, lazUtf8, fasthtmlparser, //Strings,
fpsUtils, fpsClasses;
const
@ -349,9 +349,9 @@ function IsHTMLEntity(AText: PChar; out AEntity: TsHTMLEntity): Boolean;
end;
var
j, k: Integer;
k: Integer;
equ: Boolean;
ch1, ch2: Char;
ch1: Char;
P: PChar;
begin
@ -366,7 +366,6 @@ begin
if ch1 = '#' then
begin
inc(P);
ch2 := P^;
if ch1 = 'x' then
equ := Compare(Format('#x%x', [HTMLEntities[k].N]))
else
@ -644,7 +643,6 @@ function TsHTMLAnalyzer.AddFont(AFont: TsFont): Integer;
const
EPS = 1e-3;
var
i: Integer;
fnt: TsFont;
begin
// Is the font already stored in the workbook's font list?
@ -938,7 +936,6 @@ type
FRichTextParams: TsRichTextParams;
FChangedParams: array of TsChangeFlags;
FFonts: array of TsFont;
FHTMLText: String;
function FindChangedParams(AStartIndex: Integer): Integer;
procedure GetFontsFromWorkbook;
function GetTextOfRichTextParam(AIndex: Integer): String;

2
components/fpspreadsheet/fpsopendocument.pas
View File

@ -5157,7 +5157,7 @@ var
valueStr: String;
r1,c1,r2,c2: Cardinal;
begin
Unused(ARow, ACol);
Unused(ARow, ACol, AValue);
fmt := FWorkbook.GetPointerToCellFormat(ACell^.FormatIndex);
if fmt^.UsedFormattingFields <> [] then

2
components/fpspreadsheet/fpspreadsheetgrid.pas
View File

@ -1356,8 +1356,6 @@ var
isSelected: Boolean;
fgcolor, bgcolor: TColor;
numFmt: TsNumFormatParams;
sidx: Integer;
clr: Integer;
begin
GetSelectedState(AState, isSelected);
Canvas.Font.Assign(Font);

9
components/fpspreadsheet/fpssearch.pas
View File

@ -18,7 +18,6 @@ type
FSearchText: String;
FSearchParams: TsSearchParams;
FReplaceParams: TsReplaceParams;
FCurrSel: Integer;
FRegEx: TRegExpr;
FOnConfirmReplacement: TsConfirmReplacementEvent;
protected
@ -75,7 +74,6 @@ end;
function TsSearchEngine.ExecReplace(AWorksheet: TsWorksheet; ARow, ACol: Cardinal) : Boolean;
var
res: Integer;
s: String;
allow: Boolean;
flags: TReplaceFlags;
@ -115,7 +113,7 @@ function TsSearchEngine.ExecSearch(var AWorksheet: TsWorksheet;
var ARow, ACol: Cardinal): Boolean;
var
complete: boolean;
r, c: LongInt;
r, c: Cardinal;
sheet: TsWorksheet;
begin
sheet := AWorksheet;
@ -213,9 +211,6 @@ end;
procedure TsSearchEngine.GotoLast(out AWorksheet: TsWorksheet;
out ARow, ACol: Cardinal);
var
cell: PCell;
sel: TsCellRangeArray;
begin
if soEntireDocument in FSearchParams.Options then
// Search entire document backward from end
@ -258,7 +253,6 @@ function TsSearchEngine.GotoNext(var AWorksheet: TsWorksheet;
var ARow, ACol: Cardinal): Boolean;
var
idx: Integer;
sel: TsCellRangeArray;
begin
Result := true;
@ -351,7 +345,6 @@ function TsSearchEngine.GotoPrev(var AWorksheet: TsWorksheet;
var ARow, ACol: Cardinal): Boolean;
var
idx: Integer;
sel: TsCellRangeArray;
begin
Result := true;

10
components/fpspreadsheet/fpsvisualutils.pas
View File

@ -201,7 +201,6 @@ var
out AFontPos: TsFontPosition);
var
fnt: TsFont;
rtParam: TsRichTextParam;
begin
if (Length(ARichTextParams) > 0) and (charPos >= ARichTextParams[0].FirstIndex) then
begin
@ -613,7 +612,8 @@ procedure DrawRichText(ACanvas: TCanvas; AWorkbook: TsWorkbook; const ARect: TRe
AWordwrap: Boolean; AHorAlignment: TsHorAlignment; AVertAlignment: TsVertAlignment;
ARotation: TsTextRotation; AOverrideTextColor: TColor);
var
w,h: Integer;
w: Integer = 0;
h: Integer = 0;
begin
InternalDrawRichText(ACanvas, AWorkbook, ARect, AText, AFontIndex,
ARichTextParams, AWordWrap, AHorAlignment, AVertAlignment, ARotation,
@ -624,7 +624,8 @@ function RichTextWidth(ACanvas: TCanvas; AWorkbook: TsWorkbook; AMaxRect: TRect;
const AText: String; AFontIndex: Integer; ARichTextParams: TsRichTextParams;
ATextRotation: TsTextRotation; AWordWrap: Boolean): Integer;
var
h, w: Integer;
h: Integer = 0;
w: Integer = 0;
begin
InternalDrawRichText(ACanvas, AWorkbook, AMaxRect, AText, AFontIndex,
ARichTextParams, AWordWrap, haLeft, vaTop, ATextRotation, clNone, true,
@ -641,7 +642,8 @@ function RichTextHeight(ACanvas: TCanvas; AWorkbook: TsWorkbook; AMaxRect: TRect
const AText: String; AFontIndex: Integer; ARichTextParams: TsRichTextParams;
ATextRotation: TsTextRotation; AWordWrap: Boolean): Integer;
var
h, w: Integer;
h: Integer = 0;
w: Integer = 0;
begin
InternalDrawRichText(ACanvas, AWorkbook, AMaxRect, AText, AFontIndex,
ARichTextParams, AWordWrap, haLeft, vaTop, ATextRotation, clNone, true,

4
components/fpspreadsheet/fpsxmlcommon.pas
View File

@ -34,7 +34,7 @@ uses
{$ELSE}
fpszipper,
{$ENDIF}
fpsStreams;
fpsStreams, fpsUtils;
{------------------------------------------------------------------------------}
{ Utilities }
@ -114,6 +114,7 @@ end;
procedure TStreamUnzipper.CreateStream(Sender: TObject; var AStream: TStream;
AItem: TFullZipFileEntry);
begin
Unused(AItem);
FSuccess := True;
AStream := FOutputStream;
end;
@ -121,6 +122,7 @@ end;
procedure TStreamUnzipper.DoneStream(Sender: TObject; var AStream: TStream;
AItem: TFullZipFileEntry);
begin
Unused(AItem);
AStream := nil;
end;

2
components/fpspreadsheet/xlsbiff5.pas
View File

@ -1500,10 +1500,8 @@ var
AnsiValue: ansistring;
rec: TBIFF5_LabelRecord;
buf: array of byte;
fmt: PsCellFormat;
i, nRuns: Integer;
rtfRuns: TBIFF5_RichTextFormattingRuns;
fntIndex, cellFntIndex: Integer;
begin
if (ARow >= FLimitations.MaxRowCount) or (ACol >= FLimitations.MaxColCount) then
exit;

5
components/fpspreadsheet/xlscommon.pas
View File

@ -2172,10 +2172,9 @@ end;
-------------------------------------------------------------------------------}
procedure TsSpreadBIFFReader.ReadSELECTION(AStream: TStream);
var
actPane: byte;
{%H-}actPane: byte;
{%H-}rngIndex: Word;
actRow, actCol: Word;
rngIndex: Word;
i, numRanges: Word;
begin
// Active pane
actPane := AStream.ReadByte;

6
components/fpspreadsheet/xlsxooxml.pas
View File

@ -1055,12 +1055,10 @@ var
patt: String;
fgclr: TsColor;
bgclr: TsColor;
msg: String;
begin
if ANode = nil then
exit;
msg := '';
fillNode := ANode.FirstChild;
while Assigned(fillNode) do begin
nodename := fillNode.NodeName;
@ -1126,8 +1124,6 @@ begin
end;
fillNode := fillNode.NextSibling;
end;
msg := IntToStr(FFillList.Count) + ' items';
end;
{ Reads the font described by the specified node and stores it in the reader's
@ -1630,7 +1626,6 @@ procedure TsSpreadOOXMLReader.ReadSharedStrings(ANode: TDOMNode);
var
valuenode: TDOMNode;
childnode: TDOMNode;
innernode: TDOMNode;
nodename: String;
totaltxt, sval: String;
fntIndex: Integer;
@ -1891,7 +1886,6 @@ end;
procedure TsSpreadOOXMLReader.ReadFromFile(AFilename: String);
var
Doc : TXMLDocument;
RelsNode: TDOMNode;
FilePath : string;
UnZip : TUnZipper;
FileList : TStringList;