paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-16 10:39:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Merging revisions r45744 from trunk:

Browse Source 
------------------------------------------------------------------------
    r45744 | michael | 2020-07-09 09:25:03 +0200 (Thu, 09 Jul 2020) | 1 line
    
    * Fix from Pascal Riekenberg for bug ID #37309 (font search failure)
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@46595 -
This commit is contained in:
michael 2020-08-23 09:23:27 +00:00
parent 467135735b
commit 6f6a0582da
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/fcl-report/src/fpreportpdfexport.pp
View File

@ -124,14 +124,11 @@ begin
else else
begin begin
fnt := gTTFontCache.Find(AFontName); // we are doing a PostScript Name lookup (it contains Bold, Italic info) fnt := gTTFontCache.Find(AFontName); // we are doing a PostScript Name lookup (it contains Bold, Italic info)
if Assigned(fnt) then if not Assigned(fnt) then
Result := Document.AddFont(fnt.FileName, AFontName)
else
begin
fnt:=gTTFontCache.FindFont(AFontName); fnt:=gTTFontCache.FindFont(AFontName);
if fnt=Nil then if fnt=Nil then
raise Exception.CreateFmt('fpreport: Could not find the font <%s> in the font cache.', [AFontName]); raise Exception.CreateFmt('fpreport: Could not find the font <%s> in the font cache.', [AFontName]);
end; Result := Document.AddFont(fnt.FileName, AFontName)
end; end;
end; end;
end; end;