Browse Source

* Merging revisions r45744 from trunk:
------------------------------------------------------------------------
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 -

michael 5 years ago
parent
commit
6f6a0582da
1 changed files with 4 additions and 7 deletions
  1. 4 7
      packages/fcl-report/src/fpreportpdfexport.pp

+ 4 - 7
packages/fcl-report/src/fpreportpdfexport.pp

@@ -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
-        Result := Document.AddFont(fnt.FileName, AFontName)
-      else 
-        begin
+      if not Assigned(fnt) then
         fnt:=gTTFontCache.FindFont(AFontName);
         fnt:=gTTFontCache.FindFont(AFontName);
-        if fnt=Nil then
-          raise Exception.CreateFmt('fpreport: Could not find the font <%s> in the font cache.', [AFontName]);
-        end;
+      if fnt=Nil then
+        raise Exception.CreateFmt('fpreport: Could not find the font <%s> in the font cache.', [AFontName]);
+      Result := Document.AddFont(fnt.FileName, AFontName)
     end;
     end;
   end;
   end;
 end;
 end;