[libreoffice/f20] improve impress notes brochure printing

[Caolán McNamara]

commit e5ebf4c5059734204cff1cd4603dec24c9546934
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Sep 23 11:28:53 2014 +0100

    improve impress notes brochure printing

 ...ing-done-by-vcl-brochures-by-draw-impress.patch |   44 ++++++++++++++++++++
 libreoffice.spec                                   |    6 ++-
 2 files changed, 49 insertions(+), 1 deletions(-)
---
diff --git a/0001-n-up-printing-done-by-vcl-brochures-by-draw-impress.patch b/0001-n-up-printing-done-by-vcl-brochures-by-draw-impress.patch
new file mode 100644
index 0000000..3ce9105
--- /dev/null
+++ b/0001-n-up-printing-done-by-vcl-brochures-by-draw-impress.patch
@@ -0,0 +1,44 @@
+From 2c37487470c7ea76d493eb0554cf2f9458ed5075 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
+Date: Tue, 23 Sep 2014 10:20:06 +0100
+Subject: [PATCH] n-up printing done by vcl, brochures by draw/impress
+
+Change-Id: If38365d949ad91d50138798a0a386f9543eb4f22
+---
+ sd/source/ui/view/DocumentRenderer.cxx | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
+index 723aa02e..1a903f7 100644
+--- a/sd/source/ui/view/DocumentRenderer.cxx
++++ b/sd/source/ui/view/DocumentRenderer.cxx
+@@ -1411,7 +1411,7 @@ private:
+         SdDrawDocument* pDocument = mrBase.GetMainViewShell()->GetDoc();
+         bool bIsDraw = pDocument->GetDocumentType() == DOCUMENT_TYPE_DRAW;
+         rInfo.meOrientation = ORIENTATION_PORTRAIT;
+-        bool bDoDodgyHeightWidthFit = !bIsDraw && !mpOptions->IsNotes();
++        bool bDoDodgyHeightWidthFit = mpOptions->IsBooklet() || (!bIsDraw && !mpOptions->IsNotes());
+ 
+         if( ! mpOptions->IsBooklet())
+         {
+@@ -1420,7 +1420,8 @@ private:
+         else if (rInfo.maPageSize.Width() < rInfo.maPageSize.Height())
+             rInfo.meOrientation = ORIENTATION_LANDSCAPE;
+ 
+-        // Draw and Notes should abide by their specified paper size
++        // Draw and Notes should abide by their specified paper size, except
++        // for booklets
+         Size aPaperSize;
+         if (!bDoDodgyHeightWidthFit)
+         {
+@@ -1499,8 +1500,8 @@ private:
+             if (mpOptions->IsTime())
+                 aInfo.msTimeDate += GetSdrGlobalData().GetLocaleData()->getTime( Time( Time::SYSTEM ), sal_False, sal_False );
+ 
+-            // Draw should use specified paper size when printing
+-            if (mrBase.GetDocShell()->GetDocumentType() == DOCUMENT_TYPE_DRAW)
++            // Draw should use specified paper size when printing, except for booklets
++            if (!mpOptions->IsBooklet() && mrBase.GetDocShell()->GetDocumentType() == DOCUMENT_TYPE_DRAW)
+             {
+                 aInfo.maPrintSize = mrBase.GetDocument()->GetSdPage(0, PK_STANDARD)->GetSize();
+                 maPrintSize = awt::Size(aInfo.maPrintSize.Width(),
diff --git a/libreoffice.spec b/libreoffice.spec
index fb6e550..18bf893 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -36,7 +36,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.3
-Release:        5%{?libo_prerelease}%{?dist}
+Release:        6%{?libo_prerelease}%{?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 and MPLv2.0
 Group:          Applications/Productivity
 URL:            http://www.libreoffice.org/
@@ -315,6 +315,7 @@ Patch60: 0001-fdo-82496-Change-picture-option-by-rightclicking.patch
 Patch61: 0001-create-a-master-document-template-type.patch
 Patch62: 0001-Resolves-fdo-80911-don-t-swap-notes-page-width-heigh.patch
 Patch63: 0001-default-n-up-printing-of-notes-to-sensible-2-x-1-not.patch
+Patch64: 0001-n-up-printing-done-by-vcl-brochures-by-draw-impress.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice
@@ -2256,6 +2257,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
+* Tue Sep 23 2014 Caolán McNamara <caolanm at redhat.com> - 1:4.2.6.3-6
+- improve impress notes brochure printing
+
 * Thu Sep 18 2014 Caolán McNamara <caolanm at redhat.com> - 1:4.2.6.3-5
 - default n-up printing of notes to sensible 2x1