diff options
| author | Noel Grandin <noel@peralex.com> | 2016-01-18 11:43:03 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-01-18 11:43:03 +0200 |
| commit | 0761c148dd4579cec69eaeaace260f6bcec2dbed (patch) | |
| tree | cc8d4048fbfb0af7747df6c09c2e2019ba601430 /vcl | |
| parent | 36ec485c70cfd952426bc072e40fb07a7ee1172a (diff) | |
Revert "fix windows build"
This reverts commit 36ec485c70cfd952426bc072e40fb07a7ee1172a.
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/win/salprn.h | 2 | ||||
| -rw-r--r-- | vcl/win/gdi/salprn.cxx | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/vcl/inc/win/salprn.h b/vcl/inc/win/salprn.h index 90c707735edd..1eed33ad8fb5 100644 --- a/vcl/inc/win/salprn.h +++ b/vcl/inc/win/salprn.h @@ -99,7 +99,7 @@ public: bool bCollate, bool bDirect, ImplJobSetup* pSetupData ) override; - virtual void EndJob() override; + virtual bool EndJob() override; virtual SalGraphics* StartPage( ImplJobSetup* pSetupData, bool bNewJobData ) override; virtual bool EndPage() override; virtual sal_uIntPtr GetErrorCode() override; diff --git a/vcl/win/gdi/salprn.cxx b/vcl/win/gdi/salprn.cxx index e7bdbb249c84..b0aca3c25a27 100644 --- a/vcl/win/gdi/salprn.cxx +++ b/vcl/win/gdi/salprn.cxx @@ -1650,7 +1650,7 @@ SalGraphics* WinSalPrinter::StartPage( ImplJobSetup* pSetupData, bool bNewJobDat return mpGraphics; } -void WinSalPrinter::EndPage() +bool WinSalPrinter::EndPage() { HDC hDC = mhDC; if ( hDC && mpGraphics ) @@ -1661,17 +1661,20 @@ void WinSalPrinter::EndPage() } if( ! isValid() ) - return; + return FALSE; volatile int nRet = 0; CATCH_DRIVER_EX_BEGIN; nRet = ::EndPage( hDC ); CATCH_DRIVER_EX_END( "exception in EndPage", this ); - if ( nRet <= 0 ) + if ( nRet > 0 ) + return TRUE; + else { GetLastError(); mnError = SAL_PRINTER_ERROR_GENERALERROR; + return FALSE; } } |