From 94774d56fb07f6ced39f5a0a9188f4d5927abc34 Mon Sep 17 00:00:00 2001
From: jesus <jesus@lazarus-ide.org>
Date: Tue, 18 May 2010 01:13:27 +0000
Subject: [PATCH] LCL, fix recursion on getting default paper name, issue
 #16496

git-svn-id: trunk@25492 -
---
 lcl/printers.pas | 39 +++++++++++++++++++++++++--------------
 1 file changed, 25 insertions(+), 14 deletions(-)

diff --git a/lcl/printers.pas b/lcl/printers.pas
index bf538b05eb..b9cb33e5e7 100644
--- a/lcl/printers.pas
+++ b/lcl/printers.pas
@@ -155,6 +155,7 @@ type
     function GetSupportedPapers: TStrings;
     procedure SetPaperName(const AName: string);
     function PaperRectOfName(const AName: string) : TPaperRect;
+    procedure CheckSupportedPapers;
   private
     fInternalPapers    : array of TPaperItem;
     fDefaultPapers     : boolean;
@@ -885,6 +886,8 @@ end;
 
 function TPaperSize.GetDefaultPaperName: string;
 begin
+  CheckSupportedPapers;
+
   if fDefaultPapers then
     Result := FSupportedPapers[0]
   else
@@ -924,6 +927,8 @@ end;
 
 function TPaperSize.GetPaperName: string;
 begin
+  CheckSupportedPapers;
+
   if fDefaultPapers then
     Result := SupportedPapers[FDefaultPaperIndex]
   else
@@ -945,21 +950,8 @@ end;
 
 function TPaperSize.GetSupportedPapers: TStrings;
 begin
-  if (fSupportedPapers.Count=0) or
-     (fLastPrinterIndex<>fOwnedPrinter.PrinterIndex) then
-  begin
-    fOwnedPrinter.SelectCurrentPrinterOrDefault;
-    
-    fSupportedPapers.Clear;
-    fDefaultPapers := false;
-    //DebugLn(['TPaperSize.GetSupportedPapers ',dbgsName(fOwnedPrinter),' ',dbgsName(Printer),' ',fOwnedPrinter=Printer]);
-    fOwnedPrinter.DoEnumPapers(fSupportedPapers);
+  CheckSupportedPapers;
 
-    if fSupportedPapers.Count=0 then
-      FillDefaultPapers;
-
-    fLastPrinterIndex:=fOwnedPrinter.PrinterIndex;
-  end;
   Result:=fSupportedPapers;
 end;
 
@@ -1016,6 +1008,25 @@ begin
   else raise EPrinter.Create(Format('Paper "%s" not supported !',[aName]));
 end;
 
+procedure TPaperSize.CheckSupportedPapers;
+begin
+  if (fSupportedPapers.Count=0) or
+     (fLastPrinterIndex<>fOwnedPrinter.PrinterIndex) then
+  begin
+    fOwnedPrinter.SelectCurrentPrinterOrDefault;
+
+    fSupportedPapers.Clear;
+    fDefaultPapers := false;
+    //DebugLn(['TPaperSize.GetSupportedPapers ',dbgsName(fOwnedPrinter),' ',dbgsName(Printer),' ',fOwnedPrinter=Printer]);
+    fOwnedPrinter.DoEnumPapers(fSupportedPapers);
+
+    if fSupportedPapers.Count=0 then
+      FillDefaultPapers;
+
+    fLastPrinterIndex:=fOwnedPrinter.PrinterIndex;
+  end;
+end;
+
 constructor TPaperSize.Create(aOwner: TPrinter);
 begin
   if not assigned(aOwner) then