[SCM] LibreOffice packaging repository branch, ubuntu-precise-3.5, updated. libreoffice_3.5.2_rc2-1-167-g79517ba
The following commit has been merged in the ubuntu-precise-3.5 branch:
commit 81aa7deefc5bbfe4238c8d932d5741439f33d3eb
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Thu Jan 17 16:21:32 2013 +0100
lp#994388: set correct paper tray in UI
diff --git a/changelog b/changelog
index 84c2529..063bc62 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:3.5.7-0ubuntu4~ppa1) precise; urgency=low
+
+ * backport set correct paper tray in UI (LP: #994388)
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Thu, 17 Jan 2013 16:16:54 +0100
+
libreoffice (1:3.5.7-0ubuntu3) precise-proposed; urgency=low
* remove upstreamed security fix for CVE-2012-2665
diff --git a/patches/lp-994388-fdo-43932-set-correct-paper-tray-in-UI.diff b/patches/lp-994388-fdo-43932-set-correct-paper-tray-in-UI.diff
new file mode 100644
index 0000000..0c2daab
--- /dev/null
+++ b/patches/lp-994388-fdo-43932-set-correct-paper-tray-in-UI.diff
@@ -0,0 +1,54 @@
+From 9dab7eeac8176a28f7176c0e93e8776ad01a13bc Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Wed, 28 Mar 2012 14:03:46 +0200
+Subject: [PATCH] set correct paper tray in UI
+
+---
+ vcl/source/gdi/print3.cxx | 21 +++++++++++++++++++++
+ 1 file changed, 21 insertions(+)
+
+diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
+index cd1cb51..51e4da2 100644
+--- a/vcl/source/gdi/print3.cxx
++++ b/vcl/source/gdi/print3.cxx
+@@ -172,9 +172,25 @@ public:
+ // set by user through printer config dialog
+ // if set, pages are centered and trimmed onto the fixed page
+ Size maFixedPageSize;
++ // set by user through printer config dialog
+ sal_Int32 mnDefaultPaperBin;
++ // Set by user through printer preferences in print dialog.
++ // Overrides application-set tray for a page.
+ sal_Int32 mnFixedPaperBin;
+
++ // N.B. Apparently we have three levels of paper tray settings
++ // (latter overrides former):
++ // 1. default tray
++ // 2. tray set for a concrete page by an application, e.g., writer
++ // allows setting a printer tray (for the default printer) for a
++ // page style. This setting can be overriden by user by selecting
++ // "Use only paper tray from printer preferences" on the Options
++ // page in the print dialog, in which case the default tray is
++ // used for all pages.
++ // 3. tray set in printer properties the printer dialog
++ // I'm not quite sure why 1. and 3. are distinct, but the commit
++ // history suggests this is intentional...
++
+ ImplPrinterControllerData() :
+ mbFirstPage( sal_True ),
+ mbLastPage( sal_False ),
+@@ -818,6 +834,11 @@ PrinterController::PageSize vcl::ImplPrinterControllerData::modifyJobSetup( cons
+ mpPrinter->SetPaperSizeUser( aRealPaperSize, ! isFixedPageSize() );
+ }
+
++ // paper bin set from properties in print dialog overrides
++ // application default for a page
++ if ( mnFixedPaperBin != -1 )
++ nPaperBin = mnFixedPaperBin;
++
+ if( nPaperBin != -1 && nPaperBin != mpPrinter->GetPaperBin() )
+ mpPrinter->SetPaperBin( nPaperBin );
+
+--
+1.7.10.4
+
diff --git a/patches/series b/patches/series
index 274a9e8..c28066d 100644
--- a/patches/series
+++ b/patches/series
@@ -56,3 +56,4 @@ lp-1097811-fdo-53909-STG_FREE-sector-locations-rejecte.diff
lp-1097829-rhbz-689053-fix-crash-following-delete-at-last-table.diff
lp-1097966-fdo-57532-restrict-page-sanity-check-to-non.diff
lp-1097962-rhbz-827695-sw-prevent-crashes-after-incomplete-prin.diff
+lp-994388-fdo-43932-set-correct-paper-tray-in-UI.diff
--
LibreOffice packaging repository
Reply to: