From ff2e533d0640c1579e695cea4114528f904126fd Mon Sep 17 00:00:00 2001 From: wp_xxyyzz Date: Sat, 24 Sep 2016 21:38:57 +0000 Subject: [PATCH] fpspreadsheet: Fix rewinding error of rtf memory stream when reading biff8 (see forum http://forum.lazarus.freepascal.org/index.php/topic,34150.msg223013) git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5207 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- .../fpspreadsheet/examples/visual/fpsctrls/demo_ctrls.lpi | 3 --- components/fpspreadsheet/xlsbiff8.pas | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/components/fpspreadsheet/examples/visual/fpsctrls/demo_ctrls.lpi b/components/fpspreadsheet/examples/visual/fpsctrls/demo_ctrls.lpi index e9d6940ec..c5c817026 100644 --- a/components/fpspreadsheet/examples/visual/fpsctrls/demo_ctrls.lpi +++ b/components/fpspreadsheet/examples/visual/fpsctrls/demo_ctrls.lpi @@ -14,9 +14,6 @@ - - - diff --git a/components/fpspreadsheet/xlsbiff8.pas b/components/fpspreadsheet/xlsbiff8.pas index 11398b0f3..78b72dbaf 100755 --- a/components/fpspreadsheet/xlsbiff8.pas +++ b/components/fpspreadsheet/xlsbiff8.pas @@ -1421,7 +1421,7 @@ begin end else cell := FWorksheet.AddCell(ARow, ACol); - FWorksheet.WriteText(cell, FSharedStringTable[SSTIndex]); + FWorksheet.WriteText(cell, FSharedStringTable.Strings[SSTIndex]); { Add attributes } ApplyCellFormatting(cell, XF); @@ -1429,6 +1429,7 @@ begin { Add rich text formatting } ms := TMemoryStream(FSharedStringTable.Objects[SSTIndex]); if ms <> nil then begin + ms.Position := 0; n := WordLEToN(ms.ReadWord); SetLength(rtParams, n); ms.ReadBuffer(rtParams[0], n*SizeOf(TsRichTextParam));