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 /include/vcl | |
| parent | ofz: Null-deref (diff) | |
| download | core-45429e4518fb265dc817d96f41ad4238a5d09c65.tar.gz core-45429e4518fb265dc817d96f41ad4238a5d09c65.zip | |
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 'include/vcl')
| -rw-r--r-- | include/vcl/jobdata.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/print.hxx | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/include/vcl/jobdata.hxx b/include/vcl/jobdata.hxx index 311351894a94..65a050f80423 100644 --- a/include/vcl/jobdata.hxx +++ b/include/vcl/jobdata.hxx @@ -44,6 +44,7 @@ struct VCL_DLLPUBLIC JobData int m_nPDFDevice; // 0: no override, -1 PostScript, +1: Automatically PDF, +2: Explicitly PDF orientation m_eOrientation; OUString m_aPrinterName; + bool m_bPapersizeFromSetup; const PPDParser* m_pParser; PPDContext m_aContext; @@ -59,6 +60,7 @@ struct VCL_DLLPUBLIC JobData m_nColorDevice( 0 ), m_nPDFDevice( 0 ), m_eOrientation( orientation::Portrait ), + m_bPapersizeFromSetup( false ), m_pParser( nullptr ) {} JobData& operator=(const psp::JobData& rRight); diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index a4846becd1bb..59724e73223f 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -292,7 +292,7 @@ public: bool SetJobSetup( const JobSetup& rSetup ); const JobSetup& GetJobSetup() const { return maJobSetup; } - bool Setup( vcl::Window* pWindow, bool bPapersizeFromSetup = false ); + bool Setup( vcl::Window* pWindow ); bool SetPrinterProps( const Printer* pPrinter ); /** SetPrinterOptions is used internally only now @@ -328,6 +328,9 @@ public: sal_uInt16 GetPaperBinCount() const; OUString GetPaperBinName( sal_uInt16 nPaperBin ) const; + bool GetPrinterSettingsPreferred() const; + void SetPrinterSettingsPreferred( bool bPaperSizeFromSetup ); + const Size& GetPaperSizePixel() const { return maPaperSize; } Size GetPaperSize() const { return PixelToLogic( maPaperSize ); } const Point& GetPageOffsetPixel() const { return maPageOffset; } |