diff --git a/components/printers/carbon/carbonprinters.inc b/components/printers/carbon/carbonprinters.inc index b2e33531fc..be9425ad09 100644 --- a/components/printers/carbon/carbonprinters.inc +++ b/components/printers/carbon/carbonprinters.inc @@ -432,9 +432,9 @@ begin BeginPage; end; -procedure TCarbonPrinter.DoEndDoc(aAborded: Boolean); +procedure TCarbonPrinter.DoEndDoc(aAborted: Boolean); begin - inherited DoEndDoc(aAborded); + inherited DoEndDoc(aAborted); EndPage; if FBeginDocumentStatus = noErr then diff --git a/components/printers/carbon/carbonprinters_h.inc b/components/printers/carbon/carbonprinters_h.inc index 0f14a385d5..95d2cc556e 100644 --- a/components/printers/carbon/carbonprinters_h.inc +++ b/components/printers/carbon/carbonprinters_h.inc @@ -57,7 +57,7 @@ type protected procedure DoBeginDoc; override; procedure DoNewPage; override; - procedure DoEndDoc(aAborded : Boolean); override; + procedure DoEndDoc(aAborted : Boolean); override; procedure DoAbort; override; procedure DoEnumPrinters(Lst : TStrings); override; diff --git a/components/printers/cocoa/cocoaprinters.inc b/components/printers/cocoa/cocoaprinters.inc index eb576cd918..1dddf11132 100644 --- a/components/printers/cocoa/cocoaprinters.inc +++ b/components/printers/cocoa/cocoaprinters.inc @@ -636,7 +636,7 @@ begin Error('Error on getting DestinationType'); end; -procedure TCocoaPrinter.DoEndDoc(aAborded: Boolean); +procedure TCocoaPrinter.DoEndDoc(aAborted: Boolean); var preview: TCocoaPrinterView; op: NSPrintOperation; @@ -647,7 +647,7 @@ begin if not fDocStarted then exit; - if aAborded then + if aAborted then begin // TODO: check leaks ... end; diff --git a/components/printers/cocoa/cocoaprinters_h.inc b/components/printers/cocoa/cocoaprinters_h.inc index 6a388d7a67..bd97d633c5 100644 --- a/components/printers/cocoa/cocoaprinters_h.inc +++ b/components/printers/cocoa/cocoaprinters_h.inc @@ -91,7 +91,7 @@ type procedure DoBeginDoc; override; procedure DoBeginPage; override; procedure DoEndPage; override; - procedure DoEndDoc(aAborded : Boolean); override; + procedure DoEndDoc(aAborted : Boolean); override; procedure DoAbort; override; procedure DoEnumPrinters(Lst : TStrings); override; diff --git a/components/printers/qt/qtprinters.inc b/components/printers/qt/qtprinters.inc index 89f8f9d2a1..1c78b43b94 100644 --- a/components/printers/qt/qtprinters.inc +++ b/components/printers/qt/qtprinters.inc @@ -383,12 +383,12 @@ begin QtDefaultPrinter.NewPage; end; -procedure TQtPrinters.DoEndDoc(aAborded: Boolean); +procedure TQtPrinters.DoEndDoc(aAborted: Boolean); begin {$IFDEF VERBOSE_QT_PRINTING} DebugLn('TQtPrinters.DoEndDoc()'); {$ENDIF} - inherited DoEndDoc(aAborded); + inherited DoEndDoc(aAborted); EndPage; end; diff --git a/components/printers/qt/qtprinters_h.inc b/components/printers/qt/qtprinters_h.inc index d89c59880a..2713c1100d 100644 --- a/components/printers/qt/qtprinters_h.inc +++ b/components/printers/qt/qtprinters_h.inc @@ -46,7 +46,7 @@ type protected procedure DoBeginDoc; override; procedure DoNewPage; override; - procedure DoEndDoc(aAborded : Boolean); override; + procedure DoEndDoc(aAborted : Boolean); override; procedure DoAbort; override; procedure DoEnumPrinters(Lst : TStrings); override; diff --git a/components/printers/win32/winprinters.inc b/components/printers/win32/winprinters.inc index 5bd7a90add..e4504222df 100644 --- a/components/printers/win32/winprinters.inc +++ b/components/printers/win32/winprinters.inc @@ -326,9 +326,9 @@ begin Windows.EndPage(fDC); end; -procedure TWinPrinter.DoEndDoc(aAborded: Boolean); +procedure TWinPrinter.DoEndDoc(aAborted: Boolean); begin - inherited DoEndDoc(aAborded); + inherited DoEndDoc(aAborted); if RawMode then begin @@ -340,7 +340,7 @@ begin } end else begin Windows.EndPage(fDC); - if not aAborded then + if not aAborted then WinUtilPrn.EndDoc(fDC); end; end; diff --git a/components/printers/win32/winprinters_h.inc b/components/printers/win32/winprinters_h.inc index 43391eeb3f..0aceb3a5a0 100644 --- a/components/printers/win32/winprinters_h.inc +++ b/components/printers/win32/winprinters_h.inc @@ -46,7 +46,7 @@ Type procedure DoNewPage; override; procedure DoBeginPage; override; procedure DoEndPage; override; - procedure DoEndDoc(aAborded : Boolean); override; + procedure DoEndDoc(aAborted : Boolean); override; procedure DoAbort; override; procedure DoEnumPrinters(Lst : TStrings); override; diff --git a/lcl/printers.pas b/lcl/printers.pas index fb43baaed8..3054dd5e10 100644 --- a/lcl/printers.pas +++ b/lcl/printers.pas @@ -239,7 +239,7 @@ type procedure DoNewPage; virtual; procedure DoBeginPage; virtual; procedure DoEndPage; virtual; - procedure DoEndDoc(aAborded : Boolean); virtual; + procedure DoEndDoc(aAborted : Boolean); virtual; procedure DoAbort; virtual; procedure DoResetPrintersList; virtual; procedure DoResetFontsList; virtual; @@ -828,7 +828,7 @@ begin //Override this method end; -procedure TPrinter.DoEndDoc(aAborded : Boolean); +procedure TPrinter.DoEndDoc(aAborted : Boolean); begin //Override this method end;