[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - vcl/source

[Gabor Kelemen (via logerrit)]

 vcl/source/window/printdlg.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 8659c42c4a016722cf6418e6ff1cd34bc5bdf88e
Author:     Gabor Kelemen <kelemen.gabor2 at nisz.hu>
AuthorDate: Tue Dec 10 23:24:29 2019 +0100
Commit:     Xisco Faulí <xiscofauli at libreoffice.org>
CommitDate: Thu Dec 12 17:47:50 2019 +0100

    tdf#123076 Get paper size for print preview
    
    Initialize from current paper size which can be different from A4
    
    Change-Id: Iae5e33d79c0783a32dad8635a66cc3fbe83dc568
    Reviewed-on: https://gerrit.libreoffice.org/84920
    Tested-by: Jenkins
    Tested-by: Xisco Faulí <xiscofauli at libreoffice.org>
    Reviewed-by: László Németh <nemeth at numbertext.org>
    (cherry picked from commit 562c30d5ad142fcdc77be6125fdac6d48b782fd7)
    Reviewed-on: https://gerrit.libreoffice.org/85053
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>

diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index c50fb512dd92..b42a1ce41213 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -890,6 +890,8 @@ void PrintDialog::preparePreview( bool i_bMayUseCache )
 {
     VclPtr<Printer> aPrt( maPController->getPrinter() );
     Size aCurPageSize = aPrt->PixelToLogic( aPrt->GetPaperSizePixel(), MapMode( MapUnit::Map100thMM ) );
+    // tdf#123076 Get paper size for the preview top label
+    mePaper = aPrt->GetPaper();
     GDIMetaFile aMtf;
 
     // page range may have changed depending on options