diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-09-18 11:40:26 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-09-22 10:05:01 +0200 |
| commit | 0dc46296fc34858209b3b99a9ac0677756107b2a (patch) | |
| tree | 520392380c13b1cd9acd8c47f074eede999d2c6b /sd | |
| parent | b735fe08d04e613b031b7cd560941f729d505bbe (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
(cherry picked from commit f1f89f0202232635e7fbbd7ca47de51755b2bce0)
Conflicts:
sd/source/ui/view/DocumentRenderer.cxx
Change-Id: I481a824ef244fd837992c893f6de0c051af0a26b
Reviewed-on: https://gerrit.libreoffice.org/11511
Reviewed-by: Matúš Kukan <matus.kukan@collabora.com>
Tested-by: Matúš Kukan <matus.kukan@collabora.com>
Diffstat (limited to 'sd')
| -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 52aa9c5b9912..e1e3c7d34f17 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -1409,6 +1409,7 @@ private: PrintInfo& rInfo) { SdDrawDocument* pDocument = mrBase.GetMainViewShell()->GetDoc(); + bool bIsDraw = pDocument->GetDocumentType() == DOCUMENT_TYPE_DRAW; rInfo.meOrientation = ORIENTATION_PORTRAIT; if( ! mpOptions->IsBooklet()) @@ -1420,7 +1421,7 @@ private: // Draw should abide by specified paper size Size aPaperSize; - if (mpOptions->IsDraw()) + if (bIsDraw) { aPaperSize.setWidth(rInfo.maPageSize.Width()); aPaperSize.setHeight(rInfo.maPageSize.Height()); @@ -1497,7 +1498,7 @@ private: aInfo.msTimeDate += GetSdrGlobalData().GetLocaleData()->getTime( Time( Time::SYSTEM ), sal_False, sal_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(), |