diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-09-23 10:20:06 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-09-23 10:21:01 +0100 |
| commit | a3b099837cb3d39d9623e5054294d7f42b0257f6 (patch) | |
| tree | 66f01288c69b50f85c2928e82288dfb2bcca6d0d | |
| parent | 1da676eb86adc0fb3bb07bffbfc8b6704fdf0518 (diff) | |
n-up printing done by vcl, brochures by draw/impress
Change-Id: If38365d949ad91d50138798a0a386f9543eb4f22
| -rw-r--r-- | sd/source/ui/view/DocumentRenderer.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index 723aa02ef65f..1a903f74eadb 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(), |