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

fpspreadsheet: Refactor ODS styles writing

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7569 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2020-07-26 16:53:10 +00:00
parent 2f11c78071
commit 8f9163c3b8
1 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
components/fpspreadsheet/source/common/fpsopendocument.pas
View File

@ -214,6 +214,7 @@ type
procedure WriteMasterStyles(AStream: TStream); procedure WriteMasterStyles(AStream: TStream);
procedure WriteNamedExpressions(AStream: TStream; ASheet: TsBasicWorksheet); procedure WriteNamedExpressions(AStream: TStream; ASheet: TsBasicWorksheet);
procedure WriteNumFormats(AStream: TStream); procedure WriteNumFormats(AStream: TStream);
procedure WriteOfficeStyles(AStream: TStream);
procedure WriteRowStyles(AStream: TStream); procedure WriteRowStyles(AStream: TStream);
procedure WriteRowsAndCells(AStream: TStream; ASheet: TsBasicWorksheet); procedure WriteRowsAndCells(AStream: TStream; ASheet: TsBasicWorksheet);
procedure WriteShapes(AStream: TStream; ASheet: TsBasicWorksheet); procedure WriteShapes(AStream: TStream; ASheet: TsBasicWorksheet);
@ -5902,23 +5903,7 @@ begin
AppendToStream(FSStyles, AppendToStream(FSStyles,
'</office:font-face-decls>'); '</office:font-face-decls>');
AppendToStream(FSStyles, WriteOfficeStyles(FSStyles);
'<office:styles>');
AppendToStream(FSStyles,
'<style:style style:name="Default" style:family="table-cell">',
WriteDefaultFontXMLAsString,
'</style:style>');
WriteConditionalStyles(FSStyles);
if (FWorkbook as TsWorkbook).HasEmbeddedSheetImages then
AppendToStream(FSStyles,
'<style:default-style style:family="graphic">',
WriteDefaultGraphicStyleXMLAsString,
'</style:default-style>');
AppendToStream(FSStyles,
'</office:styles>');
WriteAutomaticStyles(FSStyles); WriteAutomaticStyles(FSStyles);
WriteMasterStyles(FSStyles); WriteMasterStyles(FSStyles);
@ -6799,6 +6784,29 @@ begin
end; end;
end; end;
{ Writes the node <office:style> which is in "styles.xml" }
procedure TsSpreadOpenDocWriter.WriteOfficeStyles(AStream: TStream);
begin
AppendToStream(AStream,
'<office:styles>');
AppendToStream(AStream,
'<style:style style:name="Default" style:family="table-cell">',
WriteDefaultFontXMLAsString,
'</style:style>');
WriteConditionalStyles(AStream);
if (FWorkbook as TsWorkbook).HasEmbeddedSheetImages then
AppendToStream(AStream,
'<style:default-style style:family="graphic">',
WriteDefaultGraphicStyleXMLAsString,
'</style:default-style>');
AppendToStream(AStream,
'</office:styles>');
end;
procedure TsSpreadOpenDocWriter.WriteRowsAndCells(AStream: TStream; procedure TsSpreadOpenDocWriter.WriteRowsAndCells(AStream: TStream;
ASheet: TsBasicWorksheet); ASheet: TsBasicWorksheet);
var var