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

fpspreadsheet: Fixes remaining ooxml issues, now it actually works

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@1867 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
sekelsenmat
2011-08-29 15:06:41 +00:00
parent 02caee546b
commit 9f27990b0a
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
components/fpspreadsheet/xlsxooxml.pas
View File

@ -188,13 +188,13 @@ begin
FWorkbookRels := FWorkbookRels :=
XML_HEADER + LineEnding + XML_HEADER + LineEnding +
'<Relationships xmlns="' + SCHEMAS_RELS + '">' + LineEnding + '<Relationships xmlns="' + SCHEMAS_RELS + '">' + LineEnding +
'<Relationship Type="' + SCHEMAS_STYLES + '" Target="xl/styles.xml" Id="rId1" />' + LineEnding + '<Relationship Id="rId1" Type="' + SCHEMAS_STYLES + '" Target="styles.xml" />' + LineEnding +
'<Relationship Type="' + SCHEMAS_STRINGS + '" Target="xl/sharedStrings.xml" Id="rId2" />' + LineEnding; '<Relationship Id="rId2" Type="' + SCHEMAS_STRINGS + '" Target="sharedStrings.xml" />' + LineEnding;
for i := 1 to AData.GetWorksheetCount do for i := 1 to AData.GetWorksheetCount do
begin begin
FWorkbookRels := FWorkbookRels + FWorkbookRels := FWorkbookRels +
Format('<Relationship Type="%s" Target="xl/worksheets/sheet%d.xml" Id="rId%d" />', [SCHEMAS_WORKSHEET, i, i+2]) + LineEnding; Format('<Relationship Type="%s" Target="worksheets/sheet%d.xml" Id="rId%d" />', [SCHEMAS_WORKSHEET, i, i+2]) + LineEnding;
end; end;
FWorkbookRels := FWorkbookRels + FWorkbookRels := FWorkbookRels +
@ -214,8 +214,7 @@ begin
begin begin
FWorkbook := FWorkbook + FWorkbook := FWorkbook +
' <sheets>' + LineEnding + ' <sheets>' + LineEnding +
' <sheet name="Sheet' + IntToStr(i) + '" sheetId="' Format(' <sheet name="Sheet%d" sheetId="%d" r:id="rId%d" />', [i, i, i+2]) + LineEnding +
+ IntToStr(i) + '" r:id="rId' + IntToStr(i) + '" />' + LineEnding +
' </sheets>' + LineEnding; ' </sheets>' + LineEnding;
end; end;
@ -493,11 +492,11 @@ begin
Format(' <t>%s</t>', [AValue]) + LineEnding + Format(' <t>%s</t>', [AValue]) + LineEnding +
' </si>' + 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" s="0" t="s"><v>%d</v></c>', [CellPosText, FSharedStringsCount]) + LineEnding; Format(' <c r="%s" s="0" t="s"><v>%d</v></c>', [CellPosText, FSharedStringsCount]) + LineEnding;
Inc(FSharedStringsCount);
end; end;
{ {