commit a7eed1e17cfb101210db8aa839171f00d0730582
author Eilidh McAdam <eilidh@lanedo.com> Mon Jun 23 20:55:21 2014 +0100
committer Matúš Kukan <matus.kukan@collabora.com> Wed Aug 20 08:40:03 2014 +0200
tree e26c1b35c2e42c5476d9a81f861f4f02b9477c6d
parent dac4825abef1c9a4d970dab7dbec26673126342a

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.

Change-Id: If90bae4ac59cd95dd50fcd8deb25fd900756193e
Reviewed-on: https://gerrit.libreoffice.org/9866
Reviewed-by: Matúš Kukan <matus.kukan@collabora.com>
Tested-by: Matúš Kukan <matus.kukan@collabora.com>
(cherry picked from commit 7b31e45ec7106d2cfbdbb7915d97667ba710f81c)

sd/source/ui/view/DocumentRenderer.cxx

diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index 59106a74..7080e9d 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -1418,7 +1418,19 @@ private:
        else if (rInfo.maPageSize.Width() < rInfo.maPageSize.Height())
            rInfo.meOrientation = ORIENTATION_LANDSCAPE;

        const Size aPaperSize (rInfo.mpPrinter->GetPaperSize());
        // Draw should abide by specified paper size
        Size aPaperSize;
        if (mpOptions->IsDraw())
        {
            aPaperSize.setWidth(rInfo.maPageSize.Width());
            aPaperSize.setHeight(rInfo.maPageSize.Height());
        }
        else
        {
            aPaperSize.setWidth(rInfo.mpPrinter->GetPaperSize().Width());
            aPaperSize.setHeight(rInfo.mpPrinter->GetPaperSize().Height());
        }

        if( (rInfo.meOrientation == ORIENTATION_LANDSCAPE &&
              (aPaperSize.Width() < aPaperSize.Height()))
           ||
@@ -1483,10 +1495,21 @@ private:

            if (mpOptions->IsTime())
                aInfo.msTimeDate += GetSdrGlobalData().GetLocaleData()->getTime( Time( Time::SYSTEM ), false, false );
            aInfo.maPrintSize = aInfo.mpPrinter->GetOutputSize();
            maPrintSize = awt::Size(
                aInfo.mpPrinter->GetPaperSize().Width(),
                aInfo.mpPrinter->GetPaperSize().Height());

            // Draw should use specified paper size when printing
            if (mpOptions->IsDraw())
            {
                aInfo.maPrintSize = mrBase.GetDocument()->GetSdPage(0, PK_STANDARD)->GetSize();
                maPrintSize = awt::Size(aInfo.maPrintSize.Width(),
                                        aInfo.maPrintSize.Height());
            }
            else
            {
                aInfo.maPrintSize = aInfo.mpPrinter->GetOutputSize();
                maPrintSize = awt::Size(
                    aInfo.mpPrinter->GetPaperSize().Width(),
                    aInfo.mpPrinter->GetPaperSize().Height());
            }

            switch (mpOptions->GetOutputQuality())
            {