diff options
| author | Katarina Behrens <Katarina.Behrens@cib.de> | 2017-11-22 14:39:39 +0100 |
|---|---|---|
| committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2017-12-20 13:53:55 +0100 |
| commit | 45429e4518fb265dc817d96f41ad4238a5d09c65 (patch) | |
| tree | 2210230e0f8e4a20708a5a2180182e3dc7b98814 /vcl/unx | |
| parent | 30b6545eb626a8ae91a0d3dd9f50b93efd180475 (diff) | |
tdf#79077: Cleanup PapersizeFromSetup related code
Change-Id: If77c43a7eb97de0a2e23195a9539f00e452343d8
Reviewed-on: https://gerrit.libreoffice.org/45096
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/generic/print/genprnpsp.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/generic/printer/jobdata.cxx | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/vcl/unx/generic/print/genprnpsp.cxx b/vcl/unx/generic/print/genprnpsp.cxx index 7a90bd0b0b3d..7dd74f0396fc 100644 --- a/vcl/unx/generic/print/genprnpsp.cxx +++ b/vcl/unx/generic/print/genprnpsp.cxx @@ -247,6 +247,7 @@ static void copyJobDataToJobSetup( ImplJobSetup* pJobSetup, JobData& rData ) pJobSetup->SetDriverDataLen( 0 ); pJobSetup->SetDriverData( nullptr ); } + pJobSetup->SetPapersizeFromSetup( rData.m_bPapersizeFromSetup ); } // Needs a cleaner abstraction ... @@ -689,6 +690,7 @@ bool PspSalInfoPrinter::SetData( aData.m_aContext.setValue( pKey, pValue ); } } + aData.m_bPapersizeFromSetup = pJobSetup->GetPapersizeFromSetup(); m_aJobData = aData; copyJobDataToJobSetup( pJobSetup, aData ); diff --git a/vcl/unx/generic/printer/jobdata.cxx b/vcl/unx/generic/printer/jobdata.cxx index b5a6b113f9d6..31275762ac2a 100644 --- a/vcl/unx/generic/printer/jobdata.cxx +++ b/vcl/unx/generic/printer/jobdata.cxx @@ -38,6 +38,7 @@ JobData& JobData::operator=(const JobData& rRight) m_nColorDepth = rRight.m_nColorDepth; m_eOrientation = rRight.m_eOrientation; m_aPrinterName = rRight.m_aPrinterName; + m_bPapersizeFromSetup = rRight.m_bPapersizeFromSetup; m_pParser = rRight.m_pParser; m_aContext = rRight.m_aContext; m_nPSLevel = rRight.m_nPSLevel; |