[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - vcl/source

[Justin Luth (via logerrit)]

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

New commits:
commit a67b4e473100605252a44c87bcdc162b6515f038
Author:     Justin Luth <justin_l...@sil.org>
AuthorDate: Tue Nov 23 09:18:20 2021 +0200
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Tue Feb 1 08:30:00 2022 +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>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129240
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>

diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 60b9d200e7bf..26629168afb6 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -980,6 +980,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 ) );