From 033ec3788d0380140d374a2793abd2a325271dfb Mon Sep 17 00:00:00 2001 From: David Tardon Date: Mar 14 2012 14:03:44 +0000 Subject: Resolves: rhbz#770209 can't change paper tray setting while printing --- diff --git a/0001-fix-setting-of-paper-tray-from-print-dialog-fdo-4393.patch b/0001-fix-setting-of-paper-tray-from-print-dialog-fdo-4393.patch new file mode 100644 index 0000000..0d6a301 --- /dev/null +++ b/0001-fix-setting-of-paper-tray-from-print-dialog-fdo-4393.patch @@ -0,0 +1,33 @@ +From 6d4cca9c22c52b5a7742adc47ebf1a2930e29764 Mon Sep 17 00:00:00 2001 +From: David Tardon +Date: Wed, 14 Mar 2012 13:58:37 +0100 +Subject: [PATCH] fix setting of paper tray from print dialog (fdo#43932) + +This fixes the simple case when all pages are to be printed from the +same paper tray. The use of this setting is still confusing when there +is application-set tray for a page (e.g., for a page style in Writer, +through Format->Page), because the change in Preferences is applied (and +will be used for pages without application-set tray), but Preferences +shows the application-set value on second try again... + +IOW, it still s---s, but it s---s a bit less .-) +--- + vcl/source/gdi/print3.cxx | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx +index 4824203..817e6d5 100644 +--- a/vcl/source/gdi/print3.cxx ++++ b/vcl/source/gdi/print3.cxx +@@ -773,7 +773,7 @@ PrinterController::PageSize vcl::ImplPrinterControllerData::modifyJobSetup( cons + PrinterController::PageSize aPageSize; + aPageSize.aSize = mpPrinter->GetPaperSize(); + awt::Size aSetSize, aIsSize; +- sal_Int32 nPaperBin = mnDefaultPaperBin; ++ sal_Int32 nPaperBin = (mnFixedPaperBin != -1) ? mnFixedPaperBin : mnDefaultPaperBin; + for( sal_Int32 nProperty = 0, nPropertyCount = i_rProps.getLength(); nProperty < nPropertyCount; ++nProperty ) + { + if( i_rProps[ nProperty ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PreferredPageSize" ) ) ) +-- +1.7.7.6 + diff --git a/libreoffice.spec b/libreoffice.spec index c6b87f9..b803971 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -241,6 +241,7 @@ Patch119: 0001-Disable-problematic-reading-of-external-entities-in-.patch Patch120: 0001-Splash-screen-fix-for-multi-head-on-Linux-fdo-33214.patch Patch121: 0001-Resolves-rhbz-800272-complain-about-unknown-command-.patch Patch122: 0001-desktop-do-not-complain-about-soffice-command-line-o.patch +Patch123: 0001-fix-setting-of-paper-tray-from-print-dialog-fdo-4393.patch %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %define instdir %{_libdir} @@ -1161,7 +1162,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch120 -p1 -b .Splash-screen-fix-for-multi-head-on-Linux-fdo-33214.patch %patch121 -p1 -b .rhbz-800272-complain-about-unknown-command-.patch %patch122 -p1 -b .desktop-do-not-complain-about-soffice-command-line-o.patch - +%patch123 -p1 -b .fix-setting-of-paper-tray-from-print-dialog-fdo-4393.patch # these are horribly incomplete--empty translations and copied english # strings with spattering of translated strings rm -rf translations/source/{gu,he,hr}/helpcontent2 @@ -2480,7 +2481,8 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog -* Tue Mar 06 2012 Caolán McNamara - 3.4.5.2-9.UNBUILT +* Tue Mar 14 2012 Caolán McNamara - 3.4.5.2-9.UNBUILT +- Resolves: rhbz#770209 can't change paper tray setting while printing * Tue Mar 06 2012 Caolán McNamara - 3.4.5.2-8 - Resolves: fdo#31966 do not create an empty slide when printing handouts