diff --git a/components/fpspreadsheet/source/common/fpsopendocument.pas b/components/fpspreadsheet/source/common/fpsopendocument.pas index 7e421bb79..ba2fd7b16 100644 --- a/components/fpspreadsheet/source/common/fpsopendocument.pas +++ b/components/fpspreadsheet/source/common/fpsopendocument.pas @@ -214,6 +214,7 @@ type procedure WriteMasterStyles(AStream: TStream); procedure WriteNamedExpressions(AStream: TStream; ASheet: TsBasicWorksheet); procedure WriteNumFormats(AStream: TStream); + procedure WriteOfficeStyles(AStream: TStream); procedure WriteRowStyles(AStream: TStream); procedure WriteRowsAndCells(AStream: TStream; ASheet: TsBasicWorksheet); procedure WriteShapes(AStream: TStream; ASheet: TsBasicWorksheet); @@ -5902,23 +5903,7 @@ begin AppendToStream(FSStyles, ''); - AppendToStream(FSStyles, - ''); - AppendToStream(FSStyles, - '', - WriteDefaultFontXMLAsString, - ''); - - WriteConditionalStyles(FSStyles); - - if (FWorkbook as TsWorkbook).HasEmbeddedSheetImages then - AppendToStream(FSStyles, - '', - WriteDefaultGraphicStyleXMLAsString, - ''); - AppendToStream(FSStyles, - ''); - + WriteOfficeStyles(FSStyles); WriteAutomaticStyles(FSStyles); WriteMasterStyles(FSStyles); @@ -6799,6 +6784,29 @@ begin end; end; +{ Writes the node which is in "styles.xml" } +procedure TsSpreadOpenDocWriter.WriteOfficeStyles(AStream: TStream); +begin + AppendToStream(AStream, + ''); + + AppendToStream(AStream, + '', + WriteDefaultFontXMLAsString, + ''); + + WriteConditionalStyles(AStream); + + if (FWorkbook as TsWorkbook).HasEmbeddedSheetImages then + AppendToStream(AStream, + '', + WriteDefaultGraphicStyleXMLAsString, + ''); + + AppendToStream(AStream, + ''); +end; + procedure TsSpreadOpenDocWriter.WriteRowsAndCells(AStream: TStream; ASheet: TsBasicWorksheet); var