From 8f9163c3b8ad561b64e3c5e24ef81923e5ad5c3f Mon Sep 17 00:00:00 2001
From: wp_xxyyzz <wp_xxyyzz@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Sun, 26 Jul 2020 16:53:10 +0000
Subject: [PATCH] fpspreadsheet: Refactor ODS styles writing

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7569 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 .../source/common/fpsopendocument.pas         | 42 +++++++++++--------
 1 file changed, 25 insertions(+), 17 deletions(-)

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,
       '</office:font-face-decls>');
 
-  AppendToStream(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>');
-
+  WriteOfficeStyles(FSStyles);
   WriteAutomaticStyles(FSStyles);
   WriteMasterStyles(FSStyles);
 
@@ -6799,6 +6784,29 @@ begin
   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;
   ASheet: TsBasicWorksheet);
 var