From ceb2a84741f3c4fd0168bb4a7e7e20f7bd3e645a Mon Sep 17 00:00:00 2001 From: fredkiefer Date: Tue, 14 Jul 2009 08:10:53 +0000 Subject: [PATCH] * Source/NSPrintOperation.m (-_printPaginateWithInfo:knowsRange:): Use scale 1.0 if none is given. Patch by Georg Fleischmann . git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@28394 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 6 ++++++ Source/NSPrintOperation.m | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1e5908bf8..8c0225906 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-07-14 Fred Kiefer + + * Source/NSPrintOperation.m (-_printPaginateWithInfo:knowsRange:): + Use scale 1.0 if none is given. + Patch by Georg Fleischmann . + 2009-07-13 14:12-EDT Gregory John Casamento * Source/NSAlert.m: Implementation of GSAlertSheet. diff --git a/Source/NSPrintOperation.m b/Source/NSPrintOperation.m index deebf6351..07233276c 100644 --- a/Source/NSPrintOperation.m +++ b/Source/NSPrintOperation.m @@ -764,7 +764,10 @@ scaleRect(NSRect rect, double scale) info->paperSize = [_print_info paperSize]; info->orient = [_print_info orientation]; - info->printScale = [[dict objectForKey: NSPrintScalingFactor] doubleValue]; + if ([dict objectForKey: NSPrintScalingFactor]) + info->printScale = [[dict objectForKey: NSPrintScalingFactor] doubleValue]; + else + info->printScale = 1.0; info->nup = [[dict objectForKey: NSPrintPagesPerSheet] intValue]; info->nupScale = 1; if (info->nup < 1 || (info->nup > 1 && (((info->nup) & 0x1) == 1)))