From 7086d255d4c9d804991fbb13382dc905a574038f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 23 Sep 2014 10:30:10 +0100 Subject: [PATCH] make brochure printing of impress/draw work out of the box --- ...one-by-vcl-brochures-by-draw-impress.patch | 47 +++++++++++++++++++ libreoffice.spec | 6 ++- 2 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 0001-n-up-printing-done-by-vcl-brochures-by-draw-impress.patch 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..f9a04b8 --- /dev/null +++ b/0001-n-up-printing-done-by-vcl-brochures-by-draw-impress.patch @@ -0,0 +1,47 @@ +From 2c37487470c7ea76d493eb0554cf2f9458ed5075 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +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 +@@ -1362,7 +1362,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()) + { +@@ -1371,7 +1371,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) + { +@@ -1448,8 +1449,8 @@ private: + if (mpOptions->IsTime()) + aInfo.msTimeDate += GetSdrGlobalData().GetLocaleData()->getTime( Time( Time::SYSTEM ), false, 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(), +-- +1.9.3 + diff --git a/libreoffice.spec b/libreoffice.spec index e03701e..4661a89 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -46,7 +46,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.2 -Release: 1%{?libo_prerelease}%{?dist} +Release: 2%{?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/ @@ -319,6 +319,7 @@ Patch27: 0001-fdo-82496-Change-picture-option-by-rightclicking.patch Patch28: 0001-create-a-master-document-template-type.patch Patch29: 0001-Resolves-fdo-80911-don-t-swap-notes-page-width-heigh.patch Patch30: 0001-default-n-up-printing-of-notes-to-sensible-2-x-1-not.patch +Patch31: 0001-n-up-printing-done-by-vcl-brochures-by-draw-impress.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/libreoffice @@ -2295,6 +2296,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog +* Tue Sep 23 2014 Caolán McNamara - 1:4.3.2.2-2 +- make brochure printing of impress/draw work out of the box + * Mon Sep 22 2014 David Tardon - 1:4.3.2.2-1 - update to 4.3.2 rc2