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

* Fix bug ID #0035252, eliminate wrong combination of options

Browse Source 
git-svn-id: trunk@41798 -
This commit is contained in:
michael 2019-03-26 21:31:46 +00:00
parent efd77fdc92
commit d66e959ad7
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/fcl-pdf/src/fppdf.pp
View File

@ -1026,6 +1026,7 @@ type
procedure SetFonts(AValue: TPDFFontDefs); procedure SetFonts(AValue: TPDFFontDefs);
procedure SetInfos(AValue: TPDFInfos); procedure SetInfos(AValue: TPDFInfos);
procedure SetLineStyles(AValue: TPDFLineStyleDefs); procedure SetLineStyles(AValue: TPDFLineStyleDefs);
Procedure SetOptions(aValue : TPDFOptions);
protected protected
// Create all kinds of things, virtual so they can be overridden to create descendents instead // Create all kinds of things, virtual so they can be overridden to create descendents instead
function CreatePDFPages: TPDFPages; virtual; function CreatePDFPages: TPDFPages; virtual;
@ -1126,7 +1127,7 @@ type
Property ObjectCount : Integer Read FObjectCount; Property ObjectCount : Integer Read FObjectCount;
Property LineCapStyle: TPDFLineCapStyle Read FLineCapStyle Write FLineCapStyle; Property LineCapStyle: TPDFLineCapStyle Read FLineCapStyle Write FLineCapStyle;
Published Published
Property Options : TPDFOptions Read FOptions Write FOPtions; Property Options : TPDFOptions Read FOptions Write SetOptions;
Property LineStyles : TPDFLineStyleDefs Read FLineStyleDefs Write SetLineStyles; Property LineStyles : TPDFLineStyleDefs Read FLineStyleDefs Write SetLineStyles;
property PageLayout: TPDFPageLayout read FPageLayout write FPageLayout default lSingle; property PageLayout: TPDFPageLayout read FPageLayout write FPageLayout default lSingle;
Property Infos : TPDFInfos Read FInfos Write SetInfos; Property Infos : TPDFInfos Read FInfos Write SetInfos;
@ -4488,6 +4489,14 @@ begin
FInfos.Assign(AValue); FInfos.Assign(AValue);
end; end;
procedure TPDFDocument.SetOptions(AValue: TPDFOptions);
begin
if FOptions=AValue then Exit;
if (poNoEmbeddedFonts in aValue) then
Exclude(aValue,poSubsetFont);
FOptions:=aValue;
end;
procedure TPDFDocument.SetLineStyles(AValue: TPDFLineStyleDefs); procedure TPDFDocument.SetLineStyles(AValue: TPDFLineStyleDefs);
begin begin
if FLineStyleDefs=AValue then Exit; if FLineStyleDefs=AValue then Exit;