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@1865 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
sekelsenmat
2011-08-29 13:40:10 +00:00
parent 36bcb9079b
commit feb164c7c0
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
components/fpspreadsheet/xlsxooxml.pas
View File

@ -117,15 +117,18 @@ begin
FContentTypes := FContentTypes :=
XML_HEADER + LineEnding + XML_HEADER + LineEnding +
'<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="/_rels/.rels" ContentType="' + MIME_RELS + '" />' + LineEnding +
// <Override PartName="/docProps/core.xml" ContentType="application/vnd.openxmlformats-package.core-properties+xml"/>
// <Override PartName="/docProps/app.xml" ContentType="application/vnd.openxmlformats-officedocument.extended-properties+xml"/>
' <Override PartName="/xl/_rels/workbook.xml.rels" ContentType="application/vnd.openxmlformats-package.relationships+xml" />' + LineEnding +
' <Override PartName="/xl/workbook.xml" ContentType="' + MIME_SHEET + '" />' + LineEnding; ' <Override PartName="/xl/workbook.xml" ContentType="' + MIME_SHEET + '" />' + LineEnding;
for i := 1 to AData.GetWorksheetCount do for i := 1 to AData.GetWorksheetCount do
begin begin
FContentTypes := FContentTypes + FContentTypes := FContentTypes +
Format(' <Override PartName="/xl/worksheets/sheet%d.xml" ContentType="%s" />', [i, MIME_WORKSHEET]) + LineEnding; Format(' <Override PartName="/xl/worksheets/sheet%d.xml" ContentType="%s" />', [i, MIME_WORKSHEET]) + LineEnding;
end; end;
FContentTypes := FContentTypes + 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 +
@ -191,8 +194,7 @@ begin
for i := 1 to AData.GetWorksheetCount do for i := 1 to AData.GetWorksheetCount do
begin begin
FWorkbookRels := FWorkbookRels + FWorkbookRels := FWorkbookRels +
'<Relationship Type="' + SCHEMAS_WORKSHEET + '" Target="/xl/worksheets/sheet' + IntToStr(i) + Format('<Relationship Type="%s" Target="/xl/worksheets/sheet%d.xml" Id="rId%d" />', [SCHEMAS_WORKSHEET, i, i+2]) + LineEnding;
'.xml" Id="rId' + IntToStr(i + 2) + '" />' + LineEnding;
end; end;
FWorkbookRels := FWorkbookRels + FWorkbookRels := FWorkbookRels +
@ -202,7 +204,7 @@ begin
FWorkbook := FWorkbook :=
XML_HEADER + LineEnding + XML_HEADER + LineEnding +
'<workbook xmlns="' + SCHEMAS_SPREADML + '" xmlns:r="' + SCHEMAS_DOC_RELS + '">' + LineEnding + '<workbook xmlns="' + SCHEMAS_SPREADML + '" xmlns:r="' + SCHEMAS_DOC_RELS + '">' + LineEnding +
' <fileVersion appName="xl" lastEdited="4" lowestEdited="4" rupBuild="4505" />' + LineEnding + ' <fileVersion appName="fpspreadsheet" />' + LineEnding + // lastEdited="4" lowestEdited="4" rupBuild="4505"
' <workbookPr defaultThemeVersion="124226" />' + LineEnding + ' <workbookPr defaultThemeVersion="124226" />' + LineEnding +
' <bookViews>' + LineEnding + ' <bookViews>' + LineEnding +
' <workbookView xWindow="480" yWindow="90" windowWidth="15195" windowHeight="12525" />' + LineEnding + ' <workbookView xWindow="480" yWindow="90" windowWidth="15195" windowHeight="12525" />' + LineEnding +