paweld/lazarus-ccr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fpspreadsheet: Clean-up

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7568 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz 2020-07-26 12:28:57 +00:00
parent cbfea142d0
commit 2f11c78071
3 changed files with 2 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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>',

3
components/fpspreadsheet/tests/conditionalformattests.pas
View File

@ -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

6
components/fpspreadsheet/tests/spreadtestgui.lpi
View File

@ -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>