|
 |
7086d25 |
From 2c37487470c7ea76d493eb0554cf2f9458ed5075 Mon Sep 17 00:00:00 2001
|
|
|
7086d25 |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
|
7086d25 |
Date: Tue, 23 Sep 2014 10:20:06 +0100
|
|
|
7086d25 |
Subject: [PATCH] n-up printing done by vcl, brochures by draw/impress
|
|
|
7086d25 |
|
|
|
7086d25 |
Change-Id: If38365d949ad91d50138798a0a386f9543eb4f22
|
|
|
7086d25 |
---
|
|
|
7086d25 |
sd/source/ui/view/DocumentRenderer.cxx | 9 +++++----
|
|
|
7086d25 |
1 file changed, 5 insertions(+), 4 deletions(-)
|
|
|
7086d25 |
|
|
|
7086d25 |
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
|
|
|
7086d25 |
index 723aa02e..1a903f7 100644
|
|
|
7086d25 |
--- a/sd/source/ui/view/DocumentRenderer.cxx
|
|
|
7086d25 |
+++ b/sd/source/ui/view/DocumentRenderer.cxx
|
|
|
7086d25 |
@@ -1362,7 +1362,7 @@ private:
|
|
|
7086d25 |
SdDrawDocument* pDocument = mrBase.GetMainViewShell()->GetDoc();
|
|
|
7086d25 |
bool bIsDraw = pDocument->GetDocumentType() == DOCUMENT_TYPE_DRAW;
|
|
|
7086d25 |
rInfo.meOrientation = ORIENTATION_PORTRAIT;
|
|
|
7086d25 |
- bool bDoDodgyHeightWidthFit = !bIsDraw && !mpOptions->IsNotes();
|
|
|
7086d25 |
+ bool bDoDodgyHeightWidthFit = mpOptions->IsBooklet() || (!bIsDraw && !mpOptions->IsNotes());
|
|
|
7086d25 |
|
|
|
7086d25 |
if( ! mpOptions->IsBooklet())
|
|
|
7086d25 |
{
|
|
|
7086d25 |
@@ -1371,7 +1371,8 @@ private:
|
|
|
7086d25 |
else if (rInfo.maPageSize.Width() < rInfo.maPageSize.Height())
|
|
|
7086d25 |
rInfo.meOrientation = ORIENTATION_LANDSCAPE;
|
|
|
7086d25 |
|
|
|
7086d25 |
- // Draw and Notes should abide by their specified paper size
|
|
|
7086d25 |
+ // Draw and Notes should abide by their specified paper size, except
|
|
|
7086d25 |
+ // for booklets
|
|
|
7086d25 |
Size aPaperSize;
|
|
|
7086d25 |
if (!bDoDodgyHeightWidthFit)
|
|
|
7086d25 |
{
|
|
|
7086d25 |
@@ -1448,8 +1449,8 @@ private:
|
|
|
7086d25 |
if (mpOptions->IsTime())
|
|
|
7086d25 |
aInfo.msTimeDate += GetSdrGlobalData().GetLocaleData()->getTime( Time( Time::SYSTEM ), false, false );
|
|
|
7086d25 |
|
|
|
7086d25 |
- // Draw should use specified paper size when printing
|
|
|
7086d25 |
- if (mrBase.GetDocShell()->GetDocumentType() == DOCUMENT_TYPE_DRAW)
|
|
|
7086d25 |
+ // Draw should use specified paper size when printing, except for booklets
|
|
|
7086d25 |
+ if (!mpOptions->IsBooklet() && mrBase.GetDocShell()->GetDocumentType() == DOCUMENT_TYPE_DRAW)
|
|
|
7086d25 |
{
|
|
|
7086d25 |
aInfo.maPrintSize = mrBase.GetDocument()->GetSdPage(0, PK_STANDARD)->GetSize();
|
|
|
7086d25 |
maPrintSize = awt::Size(aInfo.maPrintSize.Width(),
|
|
|
7086d25 |
--
|
|
|
7086d25 |
1.9.3
|
|
|
7086d25 |
|