rpms/libreoffice
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolves: rhbz#770209 can't change paper tray setting while printing

Browse Source
This commit is contained in:
David Tardon 2012-03-14 14:52:46 +01:00
parent 01f4c51977
commit 92a97ad05e
2 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
0001-fix-setting-of-paper-tray-from-print-dialog-fdo-4393.patch Normal file
View File

@ -0,0 +1,33 @@
From 6d4cca9c22c52b5a7742adc47ebf1a2930e29764 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
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

7
libreoffice.spec
View File

@ -35,7 +35,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: %{libo_version}.2
Release: 1%{?dist}
Release: 2%{?dist}
License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic
Group: Applications/Productivity
URL: http://www.documentfoundation.org/develop
@ -139,6 +139,7 @@ Patch22: 0001-silence-SolarMutex-not-locked-spew.patch
Patch23: 0001-Resolves-rhbz-799525-put-flat-odf-mimetypes-in-xsltf.patch
Patch24: 0001-Resolves-rhbz-800272-complain-about-unknown-command-.patch
Patch25: 0001-yet-another-clash-with-macro-name.patch
Patch26: 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}
@ -986,6 +987,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
%patch23 -p1 -b .rhbz-799525-put-flat-odf-mimetypes-in-xsltf.patch
%patch24 -p1 -b .rhbz-800272-complain-about-unknown-command-.patch
%patch25 -p1 -b .yet-another-clash-with-macro-name.patch
%patch26 -p1 -b .fix-setting-of-paper-tray-from-print-dialog-fdo-4393.patch
# TODO: check this
# these are horribly incomplete--empty translations and copied english
@ -2273,6 +2275,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%endif
%changelog
* Wed Mar 14 2012 David Tardon <dtardon@redhat.com> - 3.5.1.2-2
- Resolves: rhbz#770209 can't change paper tray setting while printing
* Thu Mar 08 2012 David Tardon <dtardon@redhat.com> - 3.5.1.2-1
- 3.5.1 rc2