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

fpspreadsheet: Some more ooxml fixes

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@1864 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
sekelsenmat
2011-08-29 13:24:16 +00:00
parent 054f1bacde
commit 36bcb9079b
1 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
components/fpspreadsheet/xlsxooxml.pas
View File

@ -54,7 +54,7 @@ type
FSSheets: array of TStringStream; FSSheets: array of TStringStream;
FCurSheetNum: Integer; FCurSheetNum: Integer;
{ Routines to write those files } { Routines to write those files }
procedure WriteGlobalFiles; procedure WriteGlobalFiles(AData: TsWorkbook);
procedure WriteContent(AData: TsWorkbook); procedure WriteContent(AData: TsWorkbook);
procedure WriteWorksheet(CurSheet: TsWorksheet); procedure WriteWorksheet(CurSheet: TsWorksheet);
public public
@ -108,7 +108,9 @@ const
{ TsSpreadOOXMLWriter } { TsSpreadOOXMLWriter }
procedure TsSpreadOOXMLWriter.WriteGlobalFiles; procedure TsSpreadOOXMLWriter.WriteGlobalFiles(AData: TsWorkbook);
var
i: Integer;
begin begin
// WriteCellsToStream(AStream, AData.GetFirstWorksheet.FCells); // WriteCellsToStream(AStream, AData.GetFirstWorksheet.FCells);
@ -117,8 +119,14 @@ begin
'<Types xmlns="' + SCHEMAS_TYPES + '">' + LineEnding + '<Types xmlns="' + SCHEMAS_TYPES + '">' + LineEnding +
' <Default Extension="xml" ContentType="' + MIME_XML + '" />' + LineEnding + ' <Default Extension="xml" ContentType="' + MIME_XML + '" />' + LineEnding +
' <Default Extension="rels" ContentType="' + MIME_RELS + '" />' + LineEnding + ' <Default Extension="rels" ContentType="' + MIME_RELS + '" />' + LineEnding +
' <Override PartName="/xl/workbook.xml" ContentType="' + MIME_SHEET + '" />' + LineEnding + ' <Override PartName="/xl/workbook.xml" ContentType="' + MIME_SHEET + '" />' + LineEnding;
' <Override PartName="/xl/worksheets/sheet1.xml" ContentType="' + MIME_WORKSHEET + '" />' + LineEnding + for i := 1 to AData.GetWorksheetCount do
begin
FContentTypes := FContentTypes +
Format(' <Override PartName="/xl/worksheets/sheet%d.xml" ContentType="%s" />', [i, MIME_WORKSHEET]) + LineEnding;
end;
FContentTypes := FContentTypes +
' <Override PartName="/xl/styles.xml" ContentType="' + MIME_STYLES + '" />' + LineEnding + ' <Override PartName="/xl/styles.xml" ContentType="' + MIME_STYLES + '" />' + LineEnding +
' <Override PartName="/xl/sharedStrings.xml" ContentType="' + MIME_STRINGS + '" />' + LineEnding + ' <Override PartName="/xl/sharedStrings.xml" ContentType="' + MIME_STRINGS + '" />' + LineEnding +
'</Types>'; '</Types>';
@ -231,18 +239,6 @@ begin
'<sst xmlns="' + SCHEMAS_SPREADML + '" count="' + IntToStr(FSharedStringsCount) + '<sst xmlns="' + SCHEMAS_SPREADML + '" count="' + IntToStr(FSharedStringsCount) +
'" uniqueCount="' + IntToStr(FSharedStringsCount) + '">' + LineEnding + '" uniqueCount="' + IntToStr(FSharedStringsCount) + '">' + LineEnding +
FSharedStrings + FSharedStrings +
{ ' <si>' + LineEnding +
' <t>First</t>' + LineEnding +
' </si>' + LineEnding +
' <si>' + LineEnding +
' <t>Second</t>' + LineEnding +
' </si>' + LineEnding +
' <si>' + LineEnding +
' <t>Third</t>' + LineEnding +
' </si>' + LineEnding +
' <si>' + LineEnding +
' <t>Fourth</t>' + LineEnding +
' </si>' + LineEnding + }
'</sst>'; '</sst>';
end; end;
@ -376,7 +372,7 @@ var
begin begin
{ Fill the strings with the contents of the files } { Fill the strings with the contents of the files }
WriteGlobalFiles(); WriteGlobalFiles(AData);
WriteContent(AData); WriteContent(AData);
{ Write the data to streams } { Write the data to streams }
@ -432,7 +428,7 @@ var
begin begin
{ Fill the strings with the contents of the files } { Fill the strings with the contents of the files }
WriteGlobalFiles(); WriteGlobalFiles(AData);
WriteContent(AData); WriteContent(AData);
{ Write the data to streams } { Write the data to streams }
@ -490,11 +486,16 @@ procedure TsSpreadOOXMLWriter.WriteLabel(AStream: TStream; const ARow,
var var
CellPosText: string; CellPosText: string;
begin begin
FSharedStrings := FSharedStrings +
' <si>' + LineEnding +
Format(' <t>%s</t>', [AValue]) + LineEnding +
' </si>' + LineEnding;
Inc(FSharedStringsCount);
CellPosText := TsWorksheet.CellPosToText(ARow, ACol); CellPosText := TsWorksheet.CellPosToText(ARow, ACol);
FSheets[FCurSheetNum] := FSheets[FCurSheetNum] + FSheets[FCurSheetNum] := FSheets[FCurSheetNum] +
Format(' <c r="%s" t="s">', [CellPosText]) + LineEnding + Format(' <c r="%s" s="0" t="s"><v>%d</v></c>', [CellPosText, FSharedStringsCount]) + LineEnding;
Format(' <v>%s</v>', [AValue]) + LineEnding +
' </c>' + LineEnding;
end; end;
{ {
@ -507,9 +508,7 @@ var
begin begin
CellPosText := TsWorksheet.CellPosToText(ARow, ACol); CellPosText := TsWorksheet.CellPosToText(ARow, ACol);
FSheets[FCurSheetNum] := FSheets[FCurSheetNum] + FSheets[FCurSheetNum] := FSheets[FCurSheetNum] +
Format(' <c r="%s">', [CellPosText]) + LineEnding + Format(' <c r="%s" s="0" t="n"><v>%f</v></c>', [CellPosText, AValue]) + LineEnding;
Format(' <v>%f</v>', [AValue]) + LineEnding +
' </c>' + LineEnding;
end; end;
{ {