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( '', 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 @@ - + - - - + <ResourceType Value="res"/> </General>