diff options
| author | Clément Lassieur <clement@lassieur.org> | 2014-12-21 17:14:34 +0100 |
|---|---|---|
| committer | Katarina Behrens <bubli@bubli.org> | 2015-03-31 20:19:45 +0000 |
| commit | 3feb370bc82dedfd7dc281aecf8dd670176e52ff (patch) | |
| tree | 05f668326ce66fa60c75edd7c0de8a1332333541 /vcl | |
| parent | 9f2e07aadbf721488aadf19b4891829b7ebedb97 (diff) | |
tdf#63905: fix regression by using paper size set in printer properties
Change-Id: I51407c4b7ebbe3782539e1cb6f3c8294ae29566e
Reviewed-on: https://gerrit.libreoffice.org/13763
Reviewed-by: Katarina Behrens <bubli@bubli.org>
Tested-by: Katarina Behrens <bubli@bubli.org>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/printdlg.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index 9cf25e95a126..c4ea5c7aac3c 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -1608,7 +1608,9 @@ IMPL_LINK( PrintDialog, ClickHdl, Button*, pButton ) if( pButton == maJobPage.mpSetupButton ) { maPController->setupPrinter( this ); - preparePreview( true, true ); + + // tdf#63905 don't use cache: page size may change + preparePreview( true, false ); } checkControlDependencies(); } @@ -1758,6 +1760,10 @@ IMPL_LINK( PrintDialog, UIOption_RadioHdl, RadioButton*, i_pBtn ) sal_Int32 nVal = it->second; pVal->Value <<= nVal; + // tdf#63905 use paper size set in printer properties + if (pVal->Name == "PageOptions") + maPController->resetPaperToLastConfigured(); + checkOptionalControlDependencies(); // update preview and page settings |