diff options
Diffstat (limited to 'vcl/win/source')
-rw-r--r-- | vcl/win/source/app/salinst.cxx | 4 | ||||
-rw-r--r-- | vcl/win/source/gdi/salprn.cxx | 53 |
2 files changed, 0 insertions, 57 deletions
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx index 8a794712882f..8726814548b3 100644 --- a/vcl/win/source/app/salinst.cxx +++ b/vcl/win/source/app/salinst.cxx @@ -705,10 +705,6 @@ LRESULT CALLBACK SalComWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lPar switch ( nMsg ) { - case SAL_MSG_PRINTABORTJOB: - ImplSalPrinterAbortJobAsync( (HDC)wParam ); - rDef = FALSE; - break; case SAL_MSG_THREADYIELD: ImplSalYield( (bool)wParam, (bool)lParam ); rDef = FALSE; diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx index c6d7623af238..7179e8cbefcc 100644 --- a/vcl/win/source/gdi/salprn.cxx +++ b/vcl/win/source/gdi/salprn.cxx @@ -1607,59 +1607,6 @@ bool WinSalPrinter::EndJob() return TRUE; } -bool WinSalPrinter::AbortJob() -{ - mbAbort = TRUE; - - // trigger Abort asynchronously - HDC hDC = mhDC; - if ( hDC ) - { - SalData* pSalData = GetSalData(); - PostMessageW( pSalData->mpFirstInstance->mhComWnd, - SAL_MSG_PRINTABORTJOB, (WPARAM)hDC, 0 ); - } - - return TRUE; -} - -void ImplSalPrinterAbortJobAsync( HDC hPrnDC ) -{ - SalData* pSalData = GetSalData(); - WinSalPrinter* pPrinter = pSalData->mpFirstPrinter; - - // check if printer still exists - while ( pPrinter ) - { - if ( pPrinter->mhDC == hPrnDC ) - break; - - pPrinter = pPrinter->mpNextPrinter; - } - - // if printer still exists, cancel the job - if ( pPrinter ) - { - HDC hDC = pPrinter->mhDC; - if ( hDC ) - { - if ( pPrinter->mpGraphics ) - { - pPrinter->mpGraphics->DeInitGraphics(); - delete pPrinter->mpGraphics; - pPrinter->mpGraphics = NULL; - } - - CATCH_DRIVER_EX_BEGIN; - ::AbortDoc( hDC ); - CATCH_DRIVER_EX_END( "exception in AbortDoc", pPrinter ); - - DeleteDC( hDC ); - pPrinter->mhDC = 0; - } - } -} - SalGraphics* WinSalPrinter::StartPage( ImplJobSetup* pSetupData, bool bNewJobData ) { if( ! isValid() || mhDC == 0 ) |