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

fpspreadsheet: Fix rewinding error of rtf memory stream when reading biff8 (see forum http://forum.lazarus.freepascal.org/index.php/topic,34150.msg223013)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5207 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2016-09-24 21:38:57 +00:00
parent ec13cdb929
commit ff2e533d06
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/fpspreadsheet/examples/visual/fpsctrls/demo_ctrls.lpi
View File

@ -14,9 +14,6 @@
<i18n> <i18n>
<EnableI18N LFM="False"/> <EnableI18N LFM="False"/>
</i18n> </i18n>
<VersionInfo>
<StringTable ProductVersion=""/>
</VersionInfo>
<BuildModes Count="2"> <BuildModes Count="2">
<Item1 Name="Debug" Default="True"/> <Item1 Name="Debug" Default="True"/>
<Item2 Name="Release"> <Item2 Name="Release">

3
components/fpspreadsheet/xlsbiff8.pas
View File

@ -1421,7 +1421,7 @@ begin
end else end else
cell := FWorksheet.AddCell(ARow, ACol); cell := FWorksheet.AddCell(ARow, ACol);
FWorksheet.WriteText(cell, FSharedStringTable[SSTIndex]); FWorksheet.WriteText(cell, FSharedStringTable.Strings[SSTIndex]);
{ Add attributes } { Add attributes }
ApplyCellFormatting(cell, XF); ApplyCellFormatting(cell, XF);
@ -1429,6 +1429,7 @@ begin
{ Add rich text formatting } { Add rich text formatting }
ms := TMemoryStream(FSharedStringTable.Objects[SSTIndex]); ms := TMemoryStream(FSharedStringTable.Objects[SSTIndex]);
if ms <> nil then begin if ms <> nil then begin
ms.Position := 0;
n := WordLEToN(ms.ReadWord); n := WordLEToN(ms.ReadWord);
SetLength(rtParams, n); SetLength(rtParams, n);
ms.ReadBuffer(rtParams[0], n*SizeOf(TsRichTextParam)); ms.ReadBuffer(rtParams[0], n*SizeOf(TsRichTextParam));