--- a/PrintingDialog.st	Mon Jul 25 15:32:21 2011 +0200
+++ b/PrintingDialog.st	Wed Aug 17 09:44:21 2011 +0200
@@ -647,7 +647,7 @@
 !PrintingDialog class methodsFor:'others'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libwidg2/PrintingDialog.st,v 1.21 2011-07-19 11:48:04 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/PrintingDialog.st,v 1.22 2011-08-17 07:44:21 cg Exp $'
 ! !
 
 !PrintingDialog class methodsFor:'queries'!
@@ -1054,10 +1054,13 @@
 !
 
 hasSelectedPrinter
-    ^ self selectedPrinterHolder value notNil and:[ self selectedPrinterHolder value > 0]
+    |printerIndex|
+
+    printerIndex := self selectedPrinterHolder value.
+    ^ printerIndex notNil and:[ printerIndex > 0]
 
     "Modified: / 28-07-2006 / 11:34:10 / fm"
-    "Modified: / 10-10-2006 / 17:48:13 / cg"
+    "Modified: / 17-08-2011 / 09:41:17 / cg"
 !
 
 isPortraitSelected
@@ -1068,12 +1071,15 @@
 !
 
 isSelectedPaperSize
-    ^ self selectedPaperSizeHolder value notEmptyOrNil 
-      and:[ (self selectedPaperSizeHolder value ~= self unknownPaperSizeNameDescription)]
+    |paperSize|
+
+    paperSize := self selectedPaperSizeHolder value.
+    ^ paperSize notEmptyOrNil 
+      and:[ (paperSize ~= self unknownPaperSizeNameDescription)]
 
     "Created: / 31-07-2006 / 16:05:59 / fm"
     "Modified: / 01-08-2006 / 12:18:56 / fm"
-    "Modified: / 10-10-2006 / 17:48:48 / cg"
+    "Modified: / 17-08-2011 / 09:41:43 / cg"
 !
 
 isSelectedPrinterAvailable
@@ -1139,14 +1145,17 @@
 !
 
 updatePrinterInPrintersSettings
+    |printer|
 
     self isSelectedPrinterAvailable ifFalse:[^ nil].
 
-    self class printersSettingsAt:self selectedPrinter printerName
-        put:self selectedPrinter.
+    printer := self selectedPrinter.
+    self class 
+        printersSettingsAt:printer printerName
+        put:printer.
 
     "Created: / 04-08-2006 / 13:58:21 / fm"
-    "Modified: / 10-10-2006 / 17:49:46 / cg"
+    "Modified: / 17-08-2011 / 09:42:31 / cg"
 ! !
 
 !PrintingDialog methodsFor:'unknownPaperSize'!
@@ -1201,13 +1210,16 @@
 !
 
 updateInfo
-    statusLabel label:self selectedPrinter status.
-    driverNameLabel label:self selectedPrinter pDriverName.
-    locationLabel label:self selectedPrinter location.
-    commentLabel label:self selectedPrinter comment.
+    |printer|
+
+    printer := self selectedPrinter.
+    statusLabel label:printer status.
+    driverNameLabel label:printer pDriverName.
+    locationLabel label:printer location.
+    commentLabel label:printer comment.
 
     "Created: / 01-08-2006 / 15:05:08 / fm"
-    "Modified: / 10-10-2006 / 17:50:24 / cg"
+    "Modified: / 17-08-2011 / 09:39:00 / cg"
 !
 
 updateLastUsedPrinterSettings
@@ -1437,7 +1449,7 @@
 !PrintingDialog class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/PrintingDialog.st,v 1.21 2011-07-19 11:48:04 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/PrintingDialog.st,v 1.22 2011-08-17 07:44:21 cg Exp $'
 ! !
 
 PrintingDialog initialize!