[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - vcl/source

[Justin Luth (via logerrit)]

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

New commits:
commit 6809461add683eaa49a11530445c1f4c4b3d8fe8
Author:     Justin Luth <justin_l...@sil.org>
AuthorDate: Tue Nov 23 09:18:20 2021 +0200
Commit:     Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Wed Nov 24 03:04:03 2021 +0100

    tdf#129638 print preview: use new paper size after switching page
    
    This is a partial revert of LO 6.3
    commit 2c23a96f7b6888c0e05fdc2aba57f03cd797b647.
    
    Change-Id: I17525d06d96779671caaa84e1e48629289453ad2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125685
    Tested-by: Jenkins
    Reviewed-by: Justin Luth <jl...@mail.com>
    (cherry picked from commit 324daa38a823477e1d1b650b5d91f3dc91c6a9af)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125466
    Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>

diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index c69799ed1c4e..251ce6002535 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -975,6 +975,7 @@ void PrintDialog::preparePreview( bool i_bMayUseCache )
     {
         PrinterController::PageSize aPageSize =
             maPController->getFilteredPageFile( mnCurPage, aMtf, 
i_bMayUseCache );
+        aCurPageSize = aPrt->PixelToLogic(aPrt->GetPaperSizePixel(), 
MapMode(MapUnit::Map100thMM));
         if( ! aPageSize.bFullPaper )
         {
             Point aOff( aPrt->PixelToLogic( aPrt->GetPageOffsetPixel(), 
aMapMode ) );