[Libreoffice-commits] core.git: sd/source

[Caolán McNamara]

 sd/source/ui/view/DocumentRenderer.cxx |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit a3b099837cb3d39d9623e5054294d7f42b0257f6
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Sep 23 10:20:06 2014 +0100

    n-up printing done by vcl, brochures by draw/impress
    
    Change-Id: If38365d949ad91d50138798a0a386f9543eb4f22

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(),