diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-01-22 10:54:46 +0000 |
|---|---|---|
| committer | Ilhan Yesil <ilhanyesil@gmx.de> | 2023-01-04 09:16:56 +0000 |
| commit | c6bede5c55d7a791ec2d292401dfd6f1420589f8 (patch) | |
| tree | 1330dc4c8a5afc6dd1524236b792af12f3f6eff6 /vcl | |
| parent | 3a2b58b03d07308a902cc42c53be6afb7d8dbbfc (diff) | |
tdf#135590 rotated paper sizes reported as portrait size they are not
since...
commit ff4896a2af1df6138e9246fe1588dfe8c3748f1a
Date: Fri Jun 29 11:36:03 2018 -0300
Sets paper sizes listbox in print dialog
see as the above commit added some uses of doSloppyFit to vcl I imagine
the calls there want to be able to match rotated paper sizes, but in
the cases of tdf#135590 we don't want that behaviour because it doesn't
match what the user is presented with, the width and height are swapped.
So drop matching against swapped height/width by default, but let calls
added in 'Sets paper sizes listbox in print dialog' continue to match
rotated sizes.
Change-Id: I34aeddf12a7ca22234fbc6394487d3c8da7772ca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109792
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
(cherry picked from commit 9355d020e0b6bec6c6e08bd5155ed1428df5f674)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143696
Tested-by: Ilhan Yesil <ilhanyesil@gmx.de>
Reviewed-by: Ilhan Yesil <ilhanyesil@gmx.de>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/printdlg.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index 1515b8b74264..e19abd69b2db 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -833,7 +833,7 @@ void PrintDialog::setPaperSizes() for (int nPaper = 0; nPaper < aPrt->GetPaperInfoCount(); nPaper++) { PaperInfo aInfo = aPrt->GetPaperInfo( nPaper ); - aInfo.doSloppyFit(); + aInfo.doSloppyFit(true); Paper ePaper = aInfo.getPaper(); const LocaleDataWrapper& rLocWrap(Application::GetSettings().GetLocaleDataWrapper()); @@ -1870,7 +1870,7 @@ IMPL_LINK(PrintDialog, ClickHdl, weld::Button&, rButton, void) for (int nPaper = 0; nPaper < aPrt->GetPaperInfoCount(); nPaper++ ) { PaperInfo aInfo = aPrt->GetPaperInfo( nPaper ); - aInfo.doSloppyFit(); + aInfo.doSloppyFit(true); Paper ePaper = aInfo.getPaper(); if ( mePaper == ePaper ) @@ -1952,7 +1952,7 @@ IMPL_LINK( PrintDialog, SelectHdl, weld::ComboBox&, rBox, void ) { VclPtr<Printer> aPrt( maPController->getPrinter() ); PaperInfo aInfo = aPrt->GetPaperInfo( rBox.get_active() ); - aInfo.doSloppyFit(); + aInfo.doSloppyFit(true); mePaper = aInfo.getPaper(); if ( mePaper == PAPER_USER ) |