|
 |
92a97ad |
From 6d4cca9c22c52b5a7742adc47ebf1a2930e29764 Mon Sep 17 00:00:00 2001
|
|
|
92a97ad |
From: David Tardon <dtardon@redhat.com>
|
|
|
92a97ad |
Date: Wed, 14 Mar 2012 13:58:37 +0100
|
|
|
92a97ad |
Subject: [PATCH] fix setting of paper tray from print dialog (fdo#43932)
|
|
|
92a97ad |
|
|
|
92a97ad |
This fixes the simple case when all pages are to be printed from the
|
|
|
92a97ad |
same paper tray. The use of this setting is still confusing when there
|
|
|
92a97ad |
is application-set tray for a page (e.g., for a page style in Writer,
|
|
|
92a97ad |
through Format->Page), because the change in Preferences is applied (and
|
|
|
92a97ad |
will be used for pages without application-set tray), but Preferences
|
|
|
92a97ad |
shows the application-set value on second try again...
|
|
|
92a97ad |
|
|
|
92a97ad |
IOW, it still s---s, but it s---s a bit less .-)
|
|
|
92a97ad |
---
|
|
|
92a97ad |
vcl/source/gdi/print3.cxx | 2 +-
|
|
|
92a97ad |
1 files changed, 1 insertions(+), 1 deletions(-)
|
|
|
92a97ad |
|
|
|
92a97ad |
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
|
|
|
92a97ad |
index 4824203..817e6d5 100644
|
|
|
92a97ad |
--- a/vcl/source/gdi/print3.cxx
|
|
|
92a97ad |
+++ b/vcl/source/gdi/print3.cxx
|
|
|
92a97ad |
@@ -773,7 +773,7 @@ PrinterController::PageSize vcl::ImplPrinterControllerData::modifyJobSetup( cons
|
|
|
92a97ad |
PrinterController::PageSize aPageSize;
|
|
|
92a97ad |
aPageSize.aSize = mpPrinter->GetPaperSize();
|
|
|
92a97ad |
awt::Size aSetSize, aIsSize;
|
|
|
92a97ad |
- sal_Int32 nPaperBin = mnDefaultPaperBin;
|
|
|
92a97ad |
+ sal_Int32 nPaperBin = (mnFixedPaperBin != -1) ? mnFixedPaperBin : mnDefaultPaperBin;
|
|
|
92a97ad |
for( sal_Int32 nProperty = 0, nPropertyCount = i_rProps.getLength(); nProperty < nPropertyCount; ++nProperty )
|
|
|
92a97ad |
{
|
|
|
92a97ad |
if( i_rProps[ nProperty ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PreferredPageSize" ) ) )
|
|
|
92a97ad |
--
|
|
|
92a97ad |
1.7.7.6
|
|
|
92a97ad |
|