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

fpspreadsheet: Adapt virtual mode writer to ods writer after r8574.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@8575 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2022-10-19 20:40:44 +00:00
parent 8a005864a4
commit 963fa9bc2f
3 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
components/fpspreadsheet/source/common/xlscommon.pas
View File

@ -5814,14 +5814,13 @@ begin
for c := 0 to LongInt(sheet.VirtualColCount) - 1 do for c := 0 to LongInt(sheet.VirtualColCount) - 1 do
begin begin
lCell.Row := r; // to silence a compiler hint... lCell.Row := r; // to silence a compiler hint...
InitCell(lCell); InitCell(ASheet, r, c, lCell);
lCell.Worksheet := ASheet; lCell.Worksheet := ASheet;
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 lCell := styleCell^; if styleCell <> nil then
lCell.Row := r; lCell.FormatIndex := styleCell^.FormatIndex;
lCell.Col := c;
if VarIsNull(value) then if VarIsNull(value) then
begin // ignore empty cells that don't have a format begin // ignore empty cells that don't have a format
if styleCell <> nil then if styleCell <> nil then
@ -5837,7 +5836,7 @@ begin
if VarType(value) = varDate then if VarType(value) = varDate then
begin begin
lCell.ContentType := cctDateTime; lCell.ContentType := cctDateTime;
lCell.DateTimeValue := StrToDateTime(VarToStr(value), Workbook.FormatSettings); lCell.DateTimeValue := VarToDateTime(value);
end else end else
if VarIsStr(value) then if VarIsStr(value) then
begin begin

8
components/fpspreadsheet/source/common/xlsxml.pas
View File

@ -2419,14 +2419,12 @@ begin
begin begin
if (boVirtualMode in FWorkbook.Options) then begin if (boVirtualMode in FWorkbook.Options) then begin
lCell.Row := ARow; // to silence a compiler hint lCell.Row := ARow; // to silence a compiler hint
InitCell(lCell); InitCell(AWorksheet, ARow, c, lCell);
value := varNull; value := varNull;
styleCell := nil; styleCell := nil;
sheet.OnWriteCellData(sheet, ARow, c, value, styleCell); sheet.OnWriteCellData(sheet, ARow, c, value, styleCell);
if styleCell <> nil then if styleCell <> nil then
lCell := styleCell^; lCell.FormatIndex := styleCell^.FormatIndex;
lCell.Row := ARow;
lCell.Col := c;
if VarIsNull(value) then if VarIsNull(value) then
begin begin
if styleCell <> nil then if styleCell <> nil then
@ -2442,7 +2440,7 @@ begin
if VarType(value) = varDate then if VarType(value) = varDate then
begin begin
lCell.ContentType := cctDateTime; lCell.ContentType := cctDateTime;
lCell.DateTimeValue := StrToDateTime(VarToStr(value), Workbook.FormatSettings); // was: StrToDate lCell.DateTimeValue := VarToDateTime(value);
end else end else
if VarIsStr(value) then if VarIsStr(value) then
begin begin

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

@ -5719,7 +5719,7 @@ begin
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 := styleCell^; lCell.FormatIndex := styleCell^.FormatIndex;
lCell.Row := r; lCell.Row := r;
lCell.Col := c; lCell.Col := c;
if VarIsNull(value) then if VarIsNull(value) then
@ -5737,7 +5737,7 @@ begin
if VarType(value) = varDate then if VarType(value) = varDate then
begin begin
lCell.ContentType := cctDateTime; lCell.ContentType := cctDateTime;
lCell.DateTimeValue := StrToDateTime(VarToStr(value), Workbook.FormatSettings); // was: StrToDate lCell.DateTimeValue := VarToDateTime(value);
end else end else
if VarIsStr(value) then if VarIsStr(value) then
begin begin