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

fpspreadsheet: Fix failures in unit tests introduced by r8569.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@8576 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2022-10-19 21:14:57 +00:00
parent 963fa9bc2f
commit 88f48bfdcb
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
components/fpspreadsheet/source/common/fpsxmlcommon.pas
View File

@ -203,14 +203,27 @@ end;
@param ProcessLineEndings If TRUE line ending characters are replaced by @param ProcessLineEndings If TRUE line ending characters are replaced by
their HTML entities. their HTML entities.
@param InvalidUTF8Replacement UTF8-character inserted for a malformed UTF8 codepoint. @param InvalidUTF8Replacement UTF8-character inserted for a malformed UTF8 codepoint.
@return FALSE if characters < #32 were replaced, TRUE otherwise. @return FALSE if characters were replaced, TRUE otherwise.
-------------------------------------------------------------------------------} -------------------------------------------------------------------------------}
function ValidXMLText(var AText: string; function ValidXMLText(var AText: string;
ReplaceSpecialChars: Boolean = true; ReplaceSpecialChars: Boolean = true;
ProcessLineEndings: Boolean = false; ProcessLineEndings: Boolean = false;
InvalidUTF8Replacement: String = #$E2#$8E#$95): Boolean; InvalidUTF8Replacement: String = #$E2#$8E#$95): Boolean;
var
i: Integer;
begin begin
// Replace broken UTF8 codepoints
Result := ValidUTF8Text(AText, InvalidUTF8Replacement); Result := ValidUTF8Text(AText, InvalidUTF8Replacement);
// Replace ASCII characters which are not allowed in XML.
for i := Length(AText) downto 1 do
if (AText[i] < #32) and not (AText[i] in [#9, #10, #13]) then begin
// Replace invalid character by box symbol
Delete(AText, i, 1);
Insert(InvalidUTF8Replacement, AText, i);
Result := false;
end;
if ReplaceSpecialChars then if ReplaceSpecialChars then
AText := UTF8TextToXMLText(AText, ProcessLineEndings); AText := UTF8TextToXMLText(AText, ProcessLineEndings);
end; end;