diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-09-18 11:40:26 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-09-18 14:12:22 +0100 |
| commit | f1f89f0202232635e7fbbd7ca47de51755b2bce0 (patch) | |
| tree | 363e4c992f671d1ec46c8f86fadb57c78b57ae9f | |
| parent | efcdf9004de2c406774f7a1ed207d24c0dbe36cc (diff) | |
IsDraw doesn't mean the app/page is Draw
it means a slide in impress.
commit 7b31e45ec7106d2cfbdbb7915d97667ba710f81c
Date: Mon Jun 23 20:55:21 2014 +0100
Make Draw use paper size when printing - fdo#63905
Previously, Draw/Impress use the default size from the printer.
Now Draw uses the paper size (specified in page formatting).
Impress still uses the old method - not sure if this is correct
but printing handouts etc probably complicate print/paper size.
suggests the intent is for this to not affect Impress and to only
affect Draw, so this does that
Change-Id: I481a824ef244fd837992c893f6de0c051af0a26b
| -rw-r--r-- | sd/source/ui/view/DocumentRenderer.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index 5880a6936d24..723aa02ef65f 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -1360,8 +1360,9 @@ private: PrintInfo& rInfo) { SdDrawDocument* pDocument = mrBase.GetMainViewShell()->GetDoc(); + bool bIsDraw = pDocument->GetDocumentType() == DOCUMENT_TYPE_DRAW; rInfo.meOrientation = ORIENTATION_PORTRAIT; - bool bDoDodgyHeightWidthFit = !mpOptions->IsDraw() && !mpOptions->IsNotes(); + bool bDoDodgyHeightWidthFit = !bIsDraw && !mpOptions->IsNotes(); if( ! mpOptions->IsBooklet()) { @@ -1448,7 +1449,7 @@ private: aInfo.msTimeDate += GetSdrGlobalData().GetLocaleData()->getTime( Time( Time::SYSTEM ), false, false ); // Draw should use specified paper size when printing - if (mpOptions->IsDraw()) + if (mrBase.GetDocShell()->GetDocumentType() == DOCUMENT_TYPE_DRAW) { aInfo.maPrintSize = mrBase.GetDocument()->GetSdPage(0, PK_STANDARD)->GetSize(); maPrintSize = awt::Size(aInfo.maPrintSize.Width(), |