sd/source/ui/view/DocumentRenderer.cxx | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 57991f885e60d04e93bf5004d4fdceee7d29f3d8
Author: Vasily Melenchuk <vasily.melenc...@cib.de>
Date: Tue Dec 12 11:32:06 2017 +0300
tdf#91362: Use document paper size for printing slides.
By default for priniting slides we use not default A4, but size provided
in slide properties.
Additinally renamed IsPageSize() -> IsPaperSize(): it is less ambiguous.
Change-Id: Iaf38dedb32b14cd6fbdd2ad355ecf3208e32663e
Reviewed-on: https://gerrit.libreoffice.org/46407
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
diff --git a/sd/source/ui/view/DocumentRenderer.cxx
b/sd/source/ui/view/DocumentRenderer.cxx
index 4a4399c83ee1..8572f566b739 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -144,7 +144,7 @@ namespace {
return nQuality;
}
- bool IsPageSize() const
+ bool IsPaperSize() const
{
return GetBoolValue("PageOptions", sal_Int32(1));
}
@@ -164,10 +164,10 @@ namespace {
return GetBoolValue("PrintProspect", false);
}
- bool IsPrinterPreferred(DocumentType eDocType) const
+ bool IsPrinterPreferred() const
{
- bool bIsDraw = eDocType == DocumentType::Draw;
- return IsTilePage() || IsPageSize() || IsBooklet() || (!bIsDraw &&
!IsNotes());
+ return IsTilePage() || IsPaperSize() || IsBooklet() ||
+ IsNotes() || IsHandout() || IsOutline();
}
bool IsPrintExcluded() const
@@ -1352,7 +1352,7 @@ private:
// Draw and Notes should usually abide by their specified paper size
Size aPaperSize;
- if (!mpOptions->IsPrinterPreferred(pDocument->GetDocumentType()))
+ if (!mpOptions->IsPrinterPreferred())
{
aPaperSize.setWidth(rInfo.maPageSize.Width());
aPaperSize.setHeight(rInfo.maPageSize.Height());
@@ -1365,7 +1365,7 @@ private:
maPrintSize = awt::Size(aPaperSize.Width(), aPaperSize.Height());
- if (mpOptions->IsPrinterPreferred(pDocument->GetDocumentType()))
+ if (mpOptions->IsPrinterPreferred())
{
if( (rInfo.meOrientation == Orientation::Landscape &&
(aPaperSize.Width() < aPaperSize.Height()))
@@ -1428,7 +1428,7 @@ private:
aInfo.msTimeDate +=
GetSdrGlobalData().GetLocaleData()->getTime( ::tools::Time(
::tools::Time::SYSTEM ), false );
// Draw and Notes should usually use specified paper size when
printing
- if
(!mpOptions->IsPrinterPreferred(mrBase.GetDocShell()->GetDocumentType()))
+ if (!mpOptions->IsPrinterPreferred())
{
aInfo.maPrintSize = mrBase.GetDocument()->GetSdPage(0,
PageKind::Standard)->GetSize();
maPrintSize = awt::Size(aInfo.maPrintSize.Width(),
@@ -1741,7 +1741,7 @@ private:
OSL_ASSERT(pDocument != nullptr);
SdPage& rHandoutPage (*pDocument->GetSdPage(0, PageKind::Handout));
- const bool bScalePage (mpOptions->IsPageSize());
+ const bool bScalePage (mpOptions->IsPaperSize());
sal_uInt16 nPaperBin;
if ( ! mpOptions->IsPaperBin())
@@ -1902,7 +1902,7 @@ private:
// is it possible that the page size changed?
const Size aPageSize = pPage->GetSize();
- if (mpOptions->IsPageSize())
+ if (mpOptions->IsPrinterPreferred())
{
const double fHorz
(static_cast<double>(rInfo.maPrintSize.Width()) / aPageSize.Width());
const double fVert
(static_cast<double>(rInfo.maPrintSize.Height()) / aPageSize.Height());
@@ -2133,7 +2133,7 @@ private:
// (without the unprintable borders).
// 3. Split the page into parts of the size of the
// printable area.
- const bool bScalePage (mpOptions->IsPageSize());
+ const bool bScalePage (mpOptions->IsPaperSize());
const bool bCutPage (mpOptions->IsCutPage());
MapMode aMap (rInfo.maMap);
if (bScalePage || bCutPage)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
