--- sfx2/source/view/prnmon.cxx.print~	2005-08-28 16:37:30.000000000 +0000
+++ sfx2/source/view/prnmon.cxx	2005-08-28 19:27:51.000000000 +0000
@@ -404,7 +404,7 @@
     // AbortJob calls EndPrint hdl, so do not delete pImp just now
     BOOL bWasDeleteOnEndPrint = pImp->bDeleteOnEndPrint;
     pImp->bDeleteOnEndPrint = FALSE;
-	pImp->pPrinter->AbortJob();
+	pImp->pPrinter->SetErrorHdl( Link() );
 	InfoBox( pImp->GetViewShell()->GetWindow(),
 			 String( SfxResId(STR_ERROR_PRINT) ) ).Execute();
     if ( pImp->bRestoreFlag && pImp->pViewShell->GetObjectShell()->IsEnableSetModified() != pImp->bOldFlag )
--- vcl/source/gdi/print.cxx.print~	2005-08-28 16:44:08.000000000 +0000
+++ vcl/source/gdi/print.cxx	2005-08-28 19:25:57.000000000 +0000
@@ -1620,6 +1620,7 @@
 
 BOOL Printer::StartPage()
 {
+	BOOL bSuccess = TRUE;
 	if ( !IsJobActive() )
 		return FALSE;
 
@@ -1660,7 +1661,7 @@
 			}
 		}
 
-		return TRUE;
+		return bSuccess;
 	}
 
 	return FALSE;
