From 5bd2fd23eb211d300bcf3a2988dd2929ec150db3 Mon Sep 17 00:00:00 2001 From: wp_xxyyzz Date: Sat, 26 Oct 2019 11:15:21 +0000 Subject: [PATCH] fpspreadsheet: Avoid duplicate assignment of Result in TsWorksheet.ReadAsText. Put Hyperlink code used here in more general context. git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7172 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- .../source/common/fpspreadsheet.pas | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/components/fpspreadsheet/source/common/fpspreadsheet.pas b/components/fpspreadsheet/source/common/fpspreadsheet.pas index 00ad8dd99..2e861d74e 100644 --- a/components/fpspreadsheet/source/common/fpspreadsheet.pas +++ b/components/fpspreadsheet/source/common/fpspreadsheet.pas @@ -2839,6 +2839,7 @@ begin numFmt := Workbook.GetNumberFormat(fmt^.NumberFormatIndex); with ACell^ do + begin case ContentType of cctUTF8String: Result := UTF8StringValue; @@ -2868,15 +2869,15 @@ begin cctError: Result := GetErrorValueStr(TsErrorValue(ErrorValue)); - - else // blank --> display hyperlink target if available - Result := ''; - if HasHyperlink(ACell) then - begin - hyperlink := FindHyperlink(ACell); - if hyperlink <> nil then Result := hyperlink^.Target; - end; end; + + if Result = '' then // blank --> display hyperlink target if available + if HasHyperlink(ACell) then + begin + hyperlink := FindHyperlink(ACell); + if hyperlink <> nil then Result := hyperlink^.Target; + end; + end; end; function TsWorksheet.ReadAsUTF8Text(ACell: PCell;