From 2f11c78071ecdd50929c7b7da7d430f078d1df3c Mon Sep 17 00:00:00 2001
From: wp_xxyyzz <wp_xxyyzz@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Sun, 26 Jul 2020 12:28:57 +0000
Subject: [PATCH] fpspreadsheet: Clean-up

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7568 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 .../source/common/fpsopendocument.pas         | 25 -------------------
 .../tests/conditionalformattests.pas          |  3 ---
 .../fpspreadsheet/tests/spreadtestgui.lpi     |  6 ++---
 3 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/components/fpspreadsheet/source/common/fpsopendocument.pas b/components/fpspreadsheet/source/common/fpsopendocument.pas
index 8d4e7e440..7e421bb79 100644
--- a/components/fpspreadsheet/source/common/fpsopendocument.pas
+++ b/components/fpspreadsheet/source/common/fpsopendocument.pas
@@ -5837,31 +5837,6 @@ begin
   addProtection := (AConditionalFormatIndex = -1);
 
   nfs := WriteNumFormatStyleXMLAsString(AFormat);
-  {
-  nfs := '';
-  nfidx := AFormat.NumberFormatIndex;
-  if nfidx <> -1 then
-  begin
-    nfParams := TsWorkbook(FWorkbook).GetNumberFormat(nfidx);
-    if nfParams <> nil then
-    begin
-      nfs := nfParams.NumFormatStr;
-      for j:=0 to NumFormatList.Count-1 do
-      begin
-        s := NumFormatList[j];
-        p := pos(':', s);
-        if SameText(Copy(s, p+1, Length(s)), nfs) then
-        begin
-          nfs := Format(' style:data-style-name="%s"', [copy(s, 1, p-1)]);
-          break;
-        end;
-        p := 0;
-      end;
-      if p = 0 then // not found
-        nfs := '';
-    end;
-  end;
-  }
   AppendToStream(AStream, Format(
     '<style:style style:name="%s" style:family="table-cell" ' +
                  'style:parent-style-name="Default"%s>',
diff --git a/components/fpspreadsheet/tests/conditionalformattests.pas b/components/fpspreadsheet/tests/conditionalformattests.pas
index f7869bb0a..8c725e3ab 100644
--- a/components/fpspreadsheet/tests/conditionalformattests.pas
+++ b/components/fpspreadsheet/tests/conditionalformattests.pas
@@ -345,9 +345,6 @@ begin
       actFmt := workbook.GetCellFormat(actFmtIdx);
 
       // - formatting fields
-      WriteLn(Integer(ACellFormat.UsedFormattingFields));
-      WriteLn(Integer(actfmt.UsedFormattingFields));
-
       CheckEquals(integer(ACellFormat.UsedFormattingFields), integer(actFmt.UsedFormattingFields), 'Conditional formatting fields mismatch');
 
       // - background
diff --git a/components/fpspreadsheet/tests/spreadtestgui.lpi b/components/fpspreadsheet/tests/spreadtestgui.lpi
index c1922ef74..7dc947e60 100644
--- a/components/fpspreadsheet/tests/spreadtestgui.lpi
+++ b/components/fpspreadsheet/tests/spreadtestgui.lpi
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="12"/>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
     <General>
-      <Flags>
-        <CompatibilityMode Value="True"/>
-      </Flags>
       <SessionStorage Value="InProjectDir"/>
+      <MainUnit Value="0"/>
       <Title Value="spreadtestgui"/>
       <ResourceType Value="res"/>
     </General>