[SCM] LibreOffice packaging repository branch, ubuntu-precise-3.5, updated. libreoffice_3.5.1-1-79-gd756c58
The following commit has been merged in the ubuntu-precise-3.5 branch:
commit fbd24722da58125c015cb561f323fcc5d3a68fb2
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Mon Apr 2 17:47:21 2012 +0200
lp#925836: backport patch to avoid invalid pdf generation on single job collation
diff --git a/patches/bypass-GtkSalPrinter-when-it-is-not-enabled.diff b/patches/bypass-GtkSalPrinter-when-it-is-not-enabled.diff
new file mode 100644
index 0000000..601da7c
--- /dev/null
+++ b/patches/bypass-GtkSalPrinter-when-it-is-not-enabled.diff
@@ -0,0 +1,25 @@
+From fa87093686614d75d63664722de103e47f91c7db Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Wed, 28 Mar 2012 13:25:25 +0200
+Subject: [PATCH] bypass GtkSalPrinter when it is not enabled
+
+---
+ vcl/unx/gtk/gdi/salprn-gtk.cxx | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/vcl/unx/gtk/gdi/salprn-gtk.cxx b/vcl/unx/gtk/gdi/salprn-gtk.cxx
+index ffa584c..4ea5f7b 100644
+--- a/vcl/unx/gtk/gdi/salprn-gtk.cxx
++++ b/vcl/unx/gtk/gdi/salprn-gtk.cxx
+@@ -239,7 +239,7 @@ GtkSalPrinter::StartJob(
+ vcl::PrinterController& io_rController)
+ {
+ if (!lcl_useSystemPrintDialog())
+- return impl_doJob(i_pFileName, i_rJobName, i_rAppName, io_pSetupData, 1, false, io_rController);
++ return PspSalPrinter::StartJob(i_pFileName, i_rJobName, i_rAppName, io_pSetupData, io_rController);
+
+ assert(!m_pImpl);
+
+--
+1.7.9.1
+
diff --git a/patches/series b/patches/series
index c9dbe0c..266983f 100644
--- a/patches/series
+++ b/patches/series
@@ -38,3 +38,4 @@ ubuntu-quicklists.diff
fix-for-kdelibs-enum.diff
fdo-40607-osl_syncFile-having-written-and-avoid-doin.diff
fdo-43895-lp-905355-Never-let-users-save-in-tmp-by-d.diff
+bypass-GtkSalPrinter-when-it-is-not-enabled.diff
--
LibreOffice packaging repository
Reply to: