pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

fpspreadsheet: Fix test suite crashing due to changes in ODS writer. All green again.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7528 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2020-07-08 16:59:42 +00:00
parent 57fc4d5095
commit 80a3750dbd
3 changed files with 20 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7159,7 +7159,7 @@ begin
fmt := (FWorkbook as TsWorkbook).GetCellFormat(ACell^.FormatIndex); fmt := (FWorkbook as TsWorkbook).GetCellFormat(ACell^.FormatIndex);
if (fmt.UsedFormattingFields <> []) then if (fmt.UsedFormattingFields <> []) then
AppendToStream(AStream, Format( AppendToStream(AStream, Format(
'<table:table-cell table:style-name="%s"%s>', [lStyle, spannedStr]), '<table:table-cell%s%s>', [lStyle, spannedStr]),
comment, comment,
'</table:table-cell>') '</table:table-cell>')
else else

42
components/fpspreadsheet/tests/spreadtestcli.lpi
View File

@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<CONFIG> <CONFIG>
<ProjectOptions> <ProjectOptions>
<Version Value="11"/> <Version Value="12"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<General> <General>
<Flags> <Flags>
<MainUnitHasCreateFormStatements Value="False"/> <MainUnitHasCreateFormStatements Value="False"/>
<MainUnitHasTitleStatement Value="False"/> <MainUnitHasTitleStatement Value="False"/>
<CompatibilityMode Value="True"/>
</Flags> </Flags>
<SessionStorage Value="InProjectDir"/> <SessionStorage Value="InProjectDir"/>
<MainUnit Value="0"/>
<Title Value="spreadtestcli"/> <Title Value="spreadtestcli"/>
<UseAppBundle Value="False"/> <UseAppBundle Value="False"/>
<ResourceType Value="res"/> <ResourceType Value="res"/>
@ -53,8 +53,6 @@
</BuildModes> </BuildModes>
<PublishOptions> <PublishOptions>
<Version Value="2"/> <Version Value="2"/>
<IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
<ExcludeFileFilter Value="*.(bak|ppu|o|so);*~;backup"/>
</PublishOptions> </PublishOptions>
<RunParams> <RunParams>
<FormatVersion Value="2"/> <FormatVersion Value="2"/>
@ -67,7 +65,7 @@
<PackageName Value="LCLBase"/> <PackageName Value="LCLBase"/>
</Item1> </Item1>
</RequiredPackages> </RequiredPackages>
<Units Count="25"> <Units Count="24">
<Unit0> <Unit0>
<Filename Value="spreadtestcli.lpr"/> <Filename Value="spreadtestcli.lpr"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
@ -105,69 +103,65 @@
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
</Unit8> </Unit8>
<Unit9> <Unit9>
<Filename Value="insertdeletetests.pas"/> <Filename Value="errortests.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
</Unit9> </Unit9>
<Unit10> <Unit10>
<Filename Value="errortests.pas"/> <Filename Value="numberstests.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
</Unit10> </Unit10>
<Unit11> <Unit11>
<Filename Value="numberstests.pas"/> <Filename Value="fonttests.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
</Unit11> </Unit11>
<Unit12> <Unit12>
<Filename Value="fonttests.pas"/> <Filename Value="formulatests.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
</Unit12> </Unit12>
<Unit13> <Unit13>
<Filename Value="formulatests.pas"/> <Filename Value="numformatparsertests.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
</Unit13> </Unit13>
<Unit14> <Unit14>
<Filename Value="numformatparsertests.pas"/> <Filename Value="optiontests.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
</Unit14> </Unit14>
<Unit15> <Unit15>
<Filename Value="optiontests.pas"/> <Filename Value="virtualmodetests.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
</Unit15> </Unit15>
<Unit16> <Unit16>
<Filename Value="virtualmodetests.pas"/> <Filename Value="dbexporttests.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
</Unit16> </Unit16>
<Unit17> <Unit17>
<Filename Value="dbexporttests.pas"/> <Filename Value="sortingtests.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
</Unit17> </Unit17>
<Unit18> <Unit18>
<Filename Value="sortingtests.pas"/> <Filename Value="copytests.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
</Unit18> </Unit18>
<Unit19> <Unit19>
<Filename Value="copytests.pas"/> <Filename Value="celltypetests.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
</Unit19> </Unit19>
<Unit20> <Unit20>
<Filename Value="celltypetests.pas"/> <Filename Value="commenttests.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
</Unit20> </Unit20>
<Unit21> <Unit21>
<Filename Value="commenttests.pas"/> <Filename Value="enumeratortests.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
</Unit21> </Unit21>
<Unit22> <Unit22>
<Filename Value="enumeratortests.pas"/> <Filename Value="hyperlinktests.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
</Unit22> </Unit22>
<Unit23> <Unit23>
<Filename Value="hyperlinktests.pas"/>
<IsPartOfProject Value="True"/>
</Unit23>
<Unit24>
<Filename Value="pagelayouttests.pas"/> <Filename Value="pagelayouttests.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
</Unit24> </Unit23>
</Units> </Units>
</ProjectOptions> </ProjectOptions>
<CompilerOptions> <CompilerOptions>

2
components/fpspreadsheet/tests/spreadtestcli.lpr
View File

@ -12,7 +12,7 @@ uses
{the actual tests} {the actual tests}
datetests, manualtests, stringtests, internaltests, testsutility, testutils, datetests, manualtests, stringtests, internaltests, testsutility, testutils,
formattests, colortests, emptycelltests, insertdeletetests, errortests, formattests, colortests, emptycelltests, errortests,
numberstests, fonttests, formulatests, numformatparsertests, optiontests, numberstests, fonttests, formulatests, numformatparsertests, optiontests,
virtualmodetests, dbexporttests, sortingtests, copytests, celltypetests, virtualmodetests, dbexporttests, sortingtests, copytests, celltypetests,
commenttests, enumeratortests, hyperlinktests, pagelayouttests; commenttests, enumeratortests, hyperlinktests, pagelayouttests;