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

fpspreadsheet: Add method AddCell to worksheet which does not check if cell already exists. --> some speed-up of reading.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4031 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2015-03-14 22:48:38 +00:00
parent d5e7867abd
commit eab9c797ef
8 changed files with 76 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
components/fpspreadsheet/fpscsv.pas
View File

@ -383,15 +383,18 @@ var
warning: String; warning: String;
nf: TsNumberFormat; nf: TsNumberFormat;
decs: Integer; decs: Integer;
cell: PCell;
begin begin
// Empty strings are blank cells -- nothing to do // Empty strings are blank cells -- nothing to do
if AText = '' then if AText = '' then
exit; exit;
cell := FWorksheet.AddCell(ARow, ACol);
// Do not try to interpret the strings. --> everything is a LABEL cell. // Do not try to interpret the strings. --> everything is a LABEL cell.
if not CSVParams.DetectContentType then if not CSVParams.DetectContentType then
begin begin
FWorksheet.WriteUTF8Text(ARow, aCol, AText); FWorksheet.WriteUTF8Text(cell, AText);
exit; exit;
end; end;
@ -399,9 +402,9 @@ begin
if IsNumber(AText, dblValue, nf, decs, currSym, warning) then if IsNumber(AText, dblValue, nf, decs, currSym, warning) then
begin begin
if currSym <> '' then if currSym <> '' then
FWorksheet.WriteCurrency(ARow, ACol, dblValue, nfCurrency, decs, currSym) FWorksheet.WriteCurrency(cell, dblValue, nfCurrency, decs, currSym)
else else
FWorksheet.WriteNumber(ARow, ACol, dblValue, nf, decs); FWorksheet.WriteNumber(cell, dblValue, nf, decs);
if warning <> '' then if warning <> '' then
FWorkbook.AddErrorMsg('Cell %s: %s', [GetCellString(ARow, ACol), warning]); FWorkbook.AddErrorMsg('Cell %s: %s', [GetCellString(ARow, ACol), warning]);
exit; exit;
@ -411,19 +414,19 @@ begin
// No idea how to apply the date/time formatsettings here... // No idea how to apply the date/time formatsettings here...
if IsDateTime(AText, dtValue, nf) then if IsDateTime(AText, dtValue, nf) then
begin begin
FWorksheet.WriteDateTime(ARow, ACol, dtValue, nf); FWorksheet.WriteDateTime(cell, dtValue, nf);
exit; exit;
end; end;
// Check for a BOOLEAN cell // Check for a BOOLEAN cell
if IsBool(AText, boolValue) then if IsBool(AText, boolValue) then
begin begin
FWorksheet.WriteBoolValue(ARow, aCol, boolValue); FWorksheet.WriteBoolValue(cell, boolValue);
exit; exit;
end; end;
// What is left is handled as a TEXT cell // What is left is handled as a TEXT cell
FWorksheet.WriteUTF8Text(ARow, ACol, AText); FWorksheet.WriteUTF8Text(cell, AText);
end; end;
procedure TsCSVReader.ReadFormula(AStream: TStream); procedure TsCSVReader.ReadFormula(AStream: TStream);

12
components/fpspreadsheet/fpsopendocument.pas
View File

@ -951,7 +951,7 @@ begin
InitCell(ARow, ACol, FVirtualCell); InitCell(ARow, ACol, FVirtualCell);
cell := @FVirtualCell; cell := @FVirtualCell;
end else end else
cell := FWorksheet.GetCell(ARow, ACol); cell := FWorksheet.AddCell(ARow, ACol);
FWorkSheet.WriteBlank(cell); FWorkSheet.WriteBlank(cell);
FWorksheet.CopyFormat(@lCell, cell); FWorksheet.CopyFormat(@lCell, cell);
@ -971,7 +971,7 @@ begin
InitCell(ARow, ACol, FVirtualCell); InitCell(ARow, ACol, FVirtualCell);
cell := @FVirtualCell; cell := @FVirtualCell;
end else end else
cell := FWorksheet.GetCell(ARow, ACol); cell := FWorksheet.AddCell(ARow, ACol);
boolValue := ExtractBoolFromNode(ACellNode); boolValue := ExtractBoolFromNode(ACellNode);
FWorkSheet.WriteBoolValue(cell, boolValue); FWorkSheet.WriteBoolValue(cell, boolValue);
@ -1144,7 +1144,7 @@ begin
InitCell(ARow, ACol, FVirtualCell); InitCell(ARow, ACol, FVirtualCell);
cell := @FVirtualCell; cell := @FVirtualCell;
end else end else
cell := FWorksheet.GetCell(ARow, ACol); cell := FWorksheet.AddCell(ARow, ACol);
styleName := GetAttrValue(ACellNode, 'table:style-name'); styleName := GetAttrValue(ACellNode, 'table:style-name');
ApplyStyleToCell(cell, stylename); ApplyStyleToCell(cell, stylename);
@ -1269,7 +1269,7 @@ begin
InitCell(ARow, ACol, FVirtualCell); InitCell(ARow, ACol, FVirtualCell);
cell := @FVirtualCell; cell := @FVirtualCell;
end else end else
cell := FWorksheet.GetCell(ARow, ACol); cell := FWorksheet.AddCell(ARow, ACol);
styleName := GetAttrValue(ACellNode, 'table:style-name'); styleName := GetAttrValue(ACellNode, 'table:style-name');
ApplyStyleToCell(cell, stylename); ApplyStyleToCell(cell, stylename);
@ -1521,7 +1521,7 @@ begin
InitCell(ARow, ACol, FVirtualCell); InitCell(ARow, ACol, FVirtualCell);
cell := @FVirtualCell; cell := @FVirtualCell;
end else end else
cell := FWorksheet.GetCell(ARow, ACol); cell := FWorksheet.AddCell(ARow, ACol);
FWorkSheet.WriteUTF8Text(cell, cellText); FWorkSheet.WriteUTF8Text(cell, cellText);
if hyperlink <> '' then if hyperlink <> '' then
@ -1556,7 +1556,7 @@ begin
InitCell(ARow, ACol, FVirtualCell); InitCell(ARow, ACol, FVirtualCell);
cell := @FVirtualCell; cell := @FVirtualCell;
end else end else
cell := FWorksheet.GetCell(ARow, ACol); cell := FWorksheet.AddCell(ARow, ACol);
Value := GetAttrValue(ACellNode,'office:value'); Value := GetAttrValue(ACellNode,'office:value');
if UpperCase(Value)='1.#INF' then if UpperCase(Value)='1.#INF' then

51
components/fpspreadsheet/fpspreadsheet.pas
View File

@ -98,6 +98,9 @@ type
FLeftPaneWidth: Integer; FLeftPaneWidth: Integer;
FTopPaneHeight: Integer; FTopPaneHeight: Integer;
FOptions: TsSheetOptions; FOptions: TsSheetOptions;
FLastFoundCell: PCell;
FLastFoundRow: Cardinal;
FLastFoundCol: Cardinal;
FFirstRowIndex: Cardinal; FFirstRowIndex: Cardinal;
FFirstColIndex: Cardinal; FFirstColIndex: Cardinal;
FLastRowIndex: Cardinal; FLastRowIndex: Cardinal;
@ -346,6 +349,7 @@ type
procedure DeleteCell(ACell: PCell); procedure DeleteCell(ACell: PCell);
procedure EraseCell(ACell: PCell); procedure EraseCell(ACell: PCell);
function AddCell(ARow, ACol: Cardinal): PCell;
function FindCell(ARow, ACol: Cardinal): PCell; overload; function FindCell(ARow, ACol: Cardinal): PCell; overload;
function FindCell(AddressStr: String): PCell; overload; function FindCell(AddressStr: String): PCell; overload;
function GetCell(ARow, ACol: Cardinal): PCell; overload; function GetCell(ARow, ACol: Cardinal): PCell; overload;
@ -1067,6 +1071,10 @@ begin
FActiveCellRow := Cardinal(-1); FActiveCellRow := Cardinal(-1);
FActiveCellCol := Cardinal(-1); FActiveCellCol := Cardinal(-1);
FLastFoundCell := nil;
FLastFoundRow := Cardinal(-1);
FLastFoundCol := Cardinal(-1);
FOptions := [soShowGridLines, soShowHeaders]; FOptions := [soShowGridLines, soShowHeaders];
end; end;
@ -1991,6 +1999,26 @@ begin
FHyperlinks.Exchange(ARow1, ACol1, ARow2, ACol2); FHyperlinks.Exchange(ARow1, ACol1, ARow2, ACol2);
end; end;
{@@ ----------------------------------------------------------------------------
Adds a new cell at a specified row and column index to the Cells list.
NOTE: It is not checked if there exists already another cell at this location.
This case must be avoided. USE CAREFULLY WITHOUT FindCell
(e.g., during reading into empty worksheets).
-------------------------------------------------------------------------------}
function TsWorksheet.AddCell(ARow, ACol: Cardinal): PCell;
begin
Result := Cells.AddCell(ARow, ACol);
if FFirstColIndex = $FFFFFFFF then FFirstColIndex := GetFirstColIndex(true)
else FFirstColIndex := Min(FFirstColIndex, ACol);
if FFirstRowIndex = $FFFFFFFF then FFirstRowIndex := GetFirstRowIndex(true)
else FFirstRowIndex := Min(FFirstRowIndex, ARow);
if FLastColIndex = 0 then FLastColIndex := GetLastColIndex(true)
else FLastColIndex := Max(FLastColIndex, ACol);
if FLastRowIndex = 0 then FLastRowIndex := GetLastRowIndex(true)
else FLastRowIndex := Max(FLastRowIndex, ARow);
end;
{@@ ---------------------------------------------------------------------------- {@@ ----------------------------------------------------------------------------
Tries to locate a Cell in the list of already written Cells Tries to locate a Cell in the list of already written Cells
@ -2002,6 +2030,17 @@ end;
function TsWorksheet.FindCell(ARow, ACol: Cardinal): PCell; function TsWorksheet.FindCell(ARow, ACol: Cardinal): PCell;
begin begin
Result := PCell(FCells.Find(ARow, ACol)); Result := PCell(FCells.Find(ARow, ACol));
{
if (ARow = FLastFoundRow) and (ACol = FLastFoundCol) then
Result := FLastFoundCell
else
begin
Result := PCell(FCells.Find(ARow, ACol));
FLastFoundCell := Result;
FLastFoundRow := ARow;
FLastFoundCol := ACol;
end;
}
end; end;
{@@ ---------------------------------------------------------------------------- {@@ ----------------------------------------------------------------------------
@ -2040,17 +2079,7 @@ function TsWorksheet.GetCell(ARow, ACol: Cardinal): PCell;
begin begin
Result := Cells.FindCell(ARow, ACol); Result := Cells.FindCell(ARow, ACol);
if Result = nil then if Result = nil then
begin Result := AddCell(ARow, ACol);
Result := Cells.AddCell(ARow, ACol);
if FFirstColIndex = $FFFFFFFF then FFirstColIndex := GetFirstColIndex(true)
else FFirstColIndex := Min(FFirstColIndex, ACol);
if FFirstRowIndex = $FFFFFFFF then FFirstRowIndex := GetFirstRowIndex(true)
else FFirstRowIndex := Min(FFirstRowIndex, ARow);
if FLastColIndex = 0 then FLastColIndex := GetLastColIndex(true)
else FLastColIndex := Max(FLastColIndex, ACol);
if FLastRowIndex = 0 then FLastRowIndex := GetLastRowIndex(true)
else FLastRowIndex := Max(FLastRowIndex, ARow);
end;
end; end;
{@@ ---------------------------------------------------------------------------- {@@ ----------------------------------------------------------------------------

12
components/fpspreadsheet/xlsbiff2.pas
View File

@ -403,7 +403,7 @@ begin
InitCell(ARow, ACol, FVirtualCell); InitCell(ARow, ACol, FVirtualCell);
cell := @FVirtualCell; cell := @FVirtualCell;
end else end else
cell := FWorksheet.GetCell(ARow, ACol); cell := FWorksheet.AddCell(ARow, ACol);
ApplyCellFormatting(cell, XF); ApplyCellFormatting(cell, XF);
if FIsVirtualMode then if FIsVirtualMode then
Workbook.OnReadCellData(Workbook, ARow, ACol, cell); Workbook.OnReadCellData(Workbook, ARow, ACol, cell);
@ -433,7 +433,7 @@ begin
InitCell(r, c, FVirtualCell); InitCell(r, c, FVirtualCell);
cell := @FVirtualCell; cell := @FVirtualCell;
end else end else
cell := FWorksheet.GetCell(r, c); cell := FWorksheet.AddCell(r, c);
{ Retrieve boolean or error value depending on the "ValueType" } { Retrieve boolean or error value depending on the "ValueType" }
case rec.ValueType of case rec.ValueType of
@ -609,7 +609,7 @@ begin
InitCell(ARow, ACol, FVirtualCell); InitCell(ARow, ACol, FVirtualCell);
cell := @FVirtualCell; cell := @FVirtualCell;
end else end else
cell := FWorksheet.GetCell(ARow, ACol); cell := FWorksheet.AddCell(ARow, ACol);
// Now determine the type of the formula result // Now determine the type of the formula result
if (Data[6] = $FF) and (Data[7] = $FF) then if (Data[6] = $FF) and (Data[7] = $FF) then
@ -704,7 +704,7 @@ begin
InitCell(ARow, ACol, FVirtualCell); InitCell(ARow, ACol, FVirtualCell);
cell := @FVirtualCell; cell := @FVirtualCell;
end else end else
cell := FWorksheet.GetCell(ARow, ACol); cell := FWorksheet.AddCell(ARow, ACol);
FWorksheet.WriteUTF8Text(cell, valueStr); FWorksheet.WriteUTF8Text(cell, valueStr);
{ Apply formatting to cell } { Apply formatting to cell }
@ -739,7 +739,7 @@ begin
InitCell(ARow, ACol, FVirtualCell); InitCell(ARow, ACol, FVirtualCell);
cell := @FVirtualCell; cell := @FVirtualCell;
end else end else
cell := FWorksheet.GetCell(ARow, ACol); cell := FWorksheet.AddCell(ARow, ACol);
{Find out what cell type, set content type and value} {Find out what cell type, set content type and value}
ExtractNumberFormat(XF, nf, nfs); ExtractNumberFormat(XF, nf, nfs);
@ -778,7 +778,7 @@ begin
InitCell(ARow, ACol, FVirtualCell); InitCell(ARow, ACol, FVirtualCell);
cell := @FVirtualCell; cell := @FVirtualCell;
end else end else
cell := FWorksheet.GetCell(ARow, ACol); cell := FWorksheet.AddCell(ARow, ACol);
{ Save the data } { Save the data }
FWorksheet.WriteNumber(cell, AWord); FWorksheet.WriteNumber(cell, AWord);

4
components/fpspreadsheet/xlsbiff5.pas
View File

@ -509,7 +509,7 @@ begin
InitCell(ARow, ACol, FVirtualCell); InitCell(ARow, ACol, FVirtualCell);
cell := @FVirtualCell; cell := @FVirtualCell;
end else end else
cell := FWorksheet.GetCell(ARow, ACol); cell := FWorksheet.AddCell(ARow, ACol);
{ Save the data } { Save the data }
FWorksheet.WriteUTF8Text(cell, ISO_8859_1ToUTF8(AStrValue)); FWorksheet.WriteUTF8Text(cell, ISO_8859_1ToUTF8(AStrValue));
@ -896,7 +896,7 @@ begin
InitCell(ARow, ACol, FVirtualCell); InitCell(ARow, ACol, FVirtualCell);
cell := @FVirtualCell; cell := @FVirtualCell;
end else end else
cell := FWorksheet.GetCell(ARow, ACol); cell := FWorksheet.AddCell(ARow, ACol);
{ Save the data } { Save the data }
valueStr := ConvertEncoding(ansistr, FCodePage, encodingUTF8); valueStr := ConvertEncoding(ansistr, FCodePage, encodingUTF8);

6
components/fpspreadsheet/xlsbiff8.pas
View File

@ -850,7 +850,7 @@ begin
InitCell(ARow, ACol, FVirtualCell); // "virtual" cell InitCell(ARow, ACol, FVirtualCell); // "virtual" cell
cell := @FVirtualCell; cell := @FVirtualCell;
end else end else
cell := FWorksheet.GetCell(ARow, ACol); // "real" cell cell := FWorksheet.AddCell(ARow, ACol); // "real" cell
FWorksheet.WriteUTF8Text(cell, UTF16ToUTF8(WideStrValue)); FWorksheet.WriteUTF8Text(cell, UTF16ToUTF8(WideStrValue));
@ -902,7 +902,7 @@ begin
InitCell(ARow, ACol, FVirtualCell); InitCell(ARow, ACol, FVirtualCell);
cell := @FVirtualCell; cell := @FVirtualCell;
end else end else
cell := FWorksheet.GetCell(ARow, ACol); cell := FWorksheet.AddCell(ARow, ACol);
{ Save the data } { Save the data }
FWorksheet.WriteUTF8Text(cell, AStrValue); FWorksheet.WriteUTF8Text(cell, AStrValue);
@ -1119,7 +1119,7 @@ begin
InitCell(ARow, ACol, FVirtualCell); InitCell(ARow, ACol, FVirtualCell);
cell := @FVirtualCell; cell := @FVirtualCell;
end else end else
cell := FWorksheet.GetCell(ARow, ACol); cell := FWorksheet.AddCell(ARow, ACol);
FWorksheet.WriteUTF8Text(cell, FSharedStringTable[SSTIndex]); FWorksheet.WriteUTF8Text(cell, FSharedStringTable[SSTIndex]);

18
components/fpspreadsheet/xlscommon.pas
View File

@ -828,7 +828,7 @@ begin
InitCell(ARow, ACol, FVirtualCell); InitCell(ARow, ACol, FVirtualCell);
cell := @FVirtualCell; cell := @FVirtualCell;
end else end else
cell := FWorksheet.GetCell(ARow, ACol); cell := FWorksheet.AddCell(ARow, ACol);
FWorksheet.WriteBlank(cell); FWorksheet.WriteBlank(cell);
@ -863,7 +863,7 @@ begin
InitCell(r, c, FVirtualCell); InitCell(r, c, FVirtualCell);
cell := @FVirtualCell; cell := @FVirtualCell;
end else end else
cell := FWorksheet.GetCell(r, c); cell := FWorksheet.AddCell(r, c);
{ Retrieve boolean or error value depending on the "ValueType" } { Retrieve boolean or error value depending on the "ValueType" }
case rec.ValueType of case rec.ValueType of
@ -998,7 +998,7 @@ begin
SetLength(s, n); SetLength(s, n);
AStream.ReadBuffer(s[1], n); AStream.ReadBuffer(s[1], n);
FIncompleteNote := s; FIncompleteNote := s;
FIncompleteCell := FWorksheet.GetCell(r, c); FIncompleteCell := FWorksheet.GetCell(r, c); // no AddCell here!
end; end;
end else end else
// One of the continuation records // One of the continuation records
@ -1121,7 +1121,7 @@ begin
InitCell(ARow, ACol, FVirtualCell); InitCell(ARow, ACol, FVirtualCell);
cell := @FVirtualCell; cell := @FVirtualCell;
end else end else
cell := FWorksheet.GetCell(ARow, ACol); // "Real" cell cell := FWorksheet.AddCell(ARow, ACol); // "Real" cell
// Now determine the type of the formula result // Now determine the type of the formula result
if (Data[6] = $FF) and (Data[7] = $FF) then if (Data[6] = $FF) and (Data[7] = $FF) then
@ -1189,7 +1189,7 @@ begin
if FIsVirtualMode then if FIsVirtualMode then
cell^.Col := fc cell^.Col := fc
else else
cell := FWorksheet.GetCell(ARow, fc); cell := FWorksheet.AddCell(ARow, fc);
FWorksheet.WriteBlank(cell); FWorksheet.WriteBlank(cell);
ApplyCellFormatting(cell, XF); ApplyCellFormatting(cell, XF);
if FIsVirtualMode then if FIsVirtualMode then
@ -1233,7 +1233,7 @@ begin
if FIsVirtualMode then if FIsVirtualMode then
cell^.Col := fc cell^.Col := fc
else else
cell := FWorksheet.GetCell(ARow, fc); cell := FWorksheet.AddCell(ARow, fc);
RK := DWordLEtoN(AStream.ReadDWord); RK := DWordLEtoN(AStream.ReadDWord);
lNumber := DecodeRKValue(RK); lNumber := DecodeRKValue(RK);
{Find out what cell type, set contenttype and value} {Find out what cell type, set contenttype and value}
@ -1288,7 +1288,7 @@ begin
InitCell(ARow, ACol, FVirtualCell); InitCell(ARow, ACol, FVirtualCell);
cell := @FVirtualCell; cell := @FVirtualCell;
end else end else
cell := FWorksheet.GetCell(ARow, ACol); // "real" cell cell := FWorksheet.AddCell(ARow, ACol); // "real" cell
if IsDateTime(value, nf, nfs, dt) then if IsDateTime(value, nf, nfs, dt) then
FWorksheet.WriteDateTime(cell, dt, nf, nfs) FWorksheet.WriteDateTime(cell, dt, nf, nfs)
@ -1391,7 +1391,7 @@ begin
InitCell(ARow, ACol, FVirtualCell); InitCell(ARow, ACol, FVirtualCell);
cell := @FVirtualCell; cell := @FVirtualCell;
end else end else
cell := FWorksheet.GetCell(ARow, ACol); cell := FWorksheet.AddCell(ARow, ACol);
{Find out what cell type, set contenttype and value} {Find out what cell type, set contenttype and value}
ExtractNumberFormat(XF, nf, nfs); ExtractNumberFormat(XF, nf, nfs);
@ -1782,7 +1782,7 @@ begin
InitCell(r1, c1, FVirtualCell); InitCell(r1, c1, FVirtualCell);
cell := @FVirtualCell; cell := @FVirtualCell;
end else end else
cell := FWorksheet.GetCell(r1, c1); // "Real" cell cell := FWorksheet.AddCell(r1, c1); // "Real" cell
// Unused // Unused
AStream.ReadByte; AStream.ReadByte;

2
components/fpspreadsheet/xlsxooxml.pas
View File

@ -687,7 +687,7 @@ begin
InitCell(rowIndex, colIndex, FVirtualCell); InitCell(rowIndex, colIndex, FVirtualCell);
cell := @FVirtualCell; cell := @FVirtualCell;
end else end else
cell := AWorksheet.GetCell(rowIndex, colIndex); cell := AWorksheet.AddCell(rowIndex, colIndex);
// get style index // get style index
s := GetAttrValue(ANode, 's'); s := GetAttrValue(ANode, 's');