fpspreadsheet: Clean-up
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7568 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
parent
cbfea142d0
commit
2f11c78071
@ -5837,31 +5837,6 @@ begin
|
|||||||
addProtection := (AConditionalFormatIndex = -1);
|
addProtection := (AConditionalFormatIndex = -1);
|
||||||
|
|
||||||
nfs := WriteNumFormatStyleXMLAsString(AFormat);
|
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(
|
AppendToStream(AStream, Format(
|
||||||
'<style:style style:name="%s" style:family="table-cell" ' +
|
'<style:style style:name="%s" style:family="table-cell" ' +
|
||||||
'style:parent-style-name="Default"%s>',
|
'style:parent-style-name="Default"%s>',
|
||||||
|
@ -345,9 +345,6 @@ begin
|
|||||||
actFmt := workbook.GetCellFormat(actFmtIdx);
|
actFmt := workbook.GetCellFormat(actFmtIdx);
|
||||||
|
|
||||||
// - formatting fields
|
// - formatting fields
|
||||||
WriteLn(Integer(ACellFormat.UsedFormattingFields));
|
|
||||||
WriteLn(Integer(actfmt.UsedFormattingFields));
|
|
||||||
|
|
||||||
CheckEquals(integer(ACellFormat.UsedFormattingFields), integer(actFmt.UsedFormattingFields), 'Conditional formatting fields mismatch');
|
CheckEquals(integer(ACellFormat.UsedFormattingFields), integer(actFmt.UsedFormattingFields), 'Conditional formatting fields mismatch');
|
||||||
|
|
||||||
// - background
|
// - background
|
||||||
|
@ -1,13 +1,11 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<CONFIG>
|
<CONFIG>
|
||||||
<ProjectOptions>
|
<ProjectOptions>
|
||||||
<Version Value="12"/>
|
<Version Value="11"/>
|
||||||
<PathDelim Value="\"/>
|
<PathDelim Value="\"/>
|
||||||
<General>
|
<General>
|
||||||
<Flags>
|
|
||||||
<CompatibilityMode Value="True"/>
|
|
||||||
</Flags>
|
|
||||||
<SessionStorage Value="InProjectDir"/>
|
<SessionStorage Value="InProjectDir"/>
|
||||||
|
<MainUnit Value="0"/>
|
||||||
<Title Value="spreadtestgui"/>
|
<Title Value="spreadtestgui"/>
|
||||||
<ResourceType Value="res"/>
|
<ResourceType Value="res"/>
|
||||||
</General>
|
</General>
|
||||||
|
Loading…
Reference in New Issue
Block a user