configure.ac | 2 +- vcl/source/gdi/print3.cxx | 22 ++++++++++++++++------ 2 files changed, 17 insertions(+), 7 deletions(-)
New commits: commit ddef07df12efc117ea54ddd671947ded6d22db51 Author: Andras Timar <[email protected]> AuthorDate: Fri Dec 5 08:18:03 2025 +0100 Commit: Andras Timar <[email protected]> CommitDate: Fri Dec 5 08:18:03 2025 +0100 Bump version to 25.2.7.4 Change-Id: If475177d2190fc9ff44038596e7b3c8a41e2d7a0 diff --git a/configure.ac b/configure.ac index 14e4f0085e8b..44f5fbf6721c 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[25.2.7.3],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[25.2.7.4],[],[],[http://documentfoundation.org/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard commit 68026dcc1acbc24f71fa534e4dde9aec11ca8ca9 Author: Justin Luth <[email protected]> AuthorDate: Thu Oct 23 15:08:21 2025 -0400 Commit: Andras Timar <[email protected]> CommitDate: Fri Dec 5 08:16:31 2025 +0100 tdf#166185 vcl PrinterController: auto orient in getRealPaperSize This patch fixes the situation when you print a landscape-page-styled document and chose a different paper size (i.e Letter -> Legal) 'automatic orientation' no longer is portrait. This also allows some pages being in landscape mode while other pages are portrait. Change-Id: Iec22ab7a196a775a2a589ae3e9f76114e50db1c2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192926 Tested-by: Jenkins Reviewed-by: Justin Luth <[email protected]> (cherry picked from commit cae2ae964468b3aa5b773676a4c67b40e305725e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194427 Reviewed-by: Miklos Vajna <[email protected]> diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx index 75d28ca69688..d3e257849699 100644 --- a/vcl/source/gdi/print3.cxx +++ b/vcl/source/gdi/print3.cxx @@ -236,15 +236,25 @@ public: size = maMultiPage.aPaperSize; else size = i_rPageSize; + + bool bSwap = false; + const bool bSizeIsLandscape = size.Width() > size.Height(); if(mbOrientationFromUser) { - if ( (meUserOrientation == Orientation::Portrait && size.Width() > size.Height()) || - (meUserOrientation == Orientation::Landscape && size.Width() < size.Height()) ) - { - // coverity[swapped_arguments : FALSE] - this is in the correct order - size = Size( size.Height(), size.Width() ); - } + bSwap = (bSizeIsLandscape && Orientation::Portrait == meUserOrientation) + || (!bSizeIsLandscape && Orientation::Landscape == meUserOrientation); + } + else if (mbPapersizeFromUser || mbPapersizeFromSetup) // automatic orientation + { + const bool bDocumentPageIsLandscape = i_rPageSize.Width() > i_rPageSize.Height(); + bSwap = bDocumentPageIsLandscape != bSizeIsLandscape; + } + if (bSwap) + { + // coverity[swapped_arguments : FALSE] - this is in the correct order + size = Size(size.Height(), size.Width()); } + return size; } PrinterController::PageSize modifyJobSetup( const css::uno::Sequence< css::beans::PropertyValue >& i_rProps );
