Skip to content

C
core
Kaydet (Commit) a3b09983 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

n-up printing done by vcl, brochures by draw/impress 

Change-Id: If38365d949ad91d50138798a0a386f9543eb4f22
üst 1da676eb
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
sd/source/ui/view/DocumentRenderer.cxx
Dosyayı görüntüle @ a3b09983
...@@ -1362,7 +1362,7 @@ private: ...@@ -1362,7 +1362,7 @@ private:
SdDrawDocument* pDocument = mrBase.GetMainViewShell()->GetDoc(); SdDrawDocument* pDocument = mrBase.GetMainViewShell()->GetDoc();
bool bIsDraw = pDocument->GetDocumentType() == DOCUMENT_TYPE_DRAW; bool bIsDraw = pDocument->GetDocumentType() == DOCUMENT_TYPE_DRAW;
rInfo.meOrientation = ORIENTATION_PORTRAIT; rInfo.meOrientation = ORIENTATION_PORTRAIT;
bool bDoDodgyHeightWidthFit = !bIsDraw && !mpOptions->IsNotes(); bool bDoDodgyHeightWidthFit = mpOptions->IsBooklet() || (!bIsDraw && !mpOptions->IsNotes());
if( ! mpOptions->IsBooklet()) if( ! mpOptions->IsBooklet())
{ {
...@@ -1371,7 +1371,8 @@ private: ...@@ -1371,7 +1371,8 @@ private:
else if (rInfo.maPageSize.Width() < rInfo.maPageSize.Height()) else if (rInfo.maPageSize.Width() < rInfo.maPageSize.Height())
rInfo.meOrientation = ORIENTATION_LANDSCAPE; 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; Size aPaperSize;
if (!bDoDodgyHeightWidthFit) if (!bDoDodgyHeightWidthFit)
{ {
...@@ -1448,8 +1449,8 @@ private: ...@@ -1448,8 +1449,8 @@ private:
if (mpOptions->IsTime()) if (mpOptions->IsTime())
aInfo.msTimeDate += GetSdrGlobalData().GetLocaleData()->getTime( Time( Time::SYSTEM ), false, false ); aInfo.msTimeDate += GetSdrGlobalData().GetLocaleData()->getTime( Time( Time::SYSTEM ), false, false );
// Draw should use specified paper size when printing // Draw should use specified paper size when printing, except for booklets
if (mrBase.GetDocShell()->GetDocumentType() == DOCUMENT_TYPE_DRAW) if (!mpOptions->IsBooklet() && mrBase.GetDocShell()->GetDocumentType() == DOCUMENT_TYPE_DRAW)
{ {
aInfo.maPrintSize = mrBase.GetDocument()->GetSdPage(0, PK_STANDARD)->GetSize(); aInfo.maPrintSize = mrBase.GetDocument()->GetSdPage(0, PK_STANDARD)->GetSize();
maPrintSize = awt::Size(aInfo.maPrintSize.Width(), maPrintSize = awt::Size(aInfo.maPrintSize.Width(),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment