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

fpspreadsheet: Fix ooxml reader choking on files written by Adobe Acrobat X which writes HTML colors with # prefix. https://forum.lazarus.freepascal.org/index.php/topic,47749.msg342501.html.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7207 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2019-12-12 10:17:39 +00:00
parent 7ee6c517b0
commit 6a1b03adfa
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/fpspreadsheet/source/common/xlsxooxml.pas
View File

@ -1118,7 +1118,10 @@ begin
s := GetAttrValue(ANode, 'rgb'); s := GetAttrValue(ANode, 'rgb');
if s <> '' then begin if s <> '' then begin
Result := HTMLColorStrToColor('#' + s); if s[1] = '#' then
Result := HTMLColorStrToColor(s)
else
Result := HTMLColorStrToColor('#' + s);
exit; exit;
end; end;