openoffice-print-error.patch

   1 Index: sfx2/source/view/prnmon.cxx
   2 ===================================================================
   3 RCS file: /cvs/framework/sfx2/source/view/prnmon.cxx,v
   4 retrieving revision 1.8
   5 diff -u -p -u -r1.8 prnmon.cxx
   6 --- sfx2/source/view/prnmon.cxx 4 Apr 2003 17:40:22 -0000       1.8
   7 +++ sfx2/source/view/prnmon.cxx 7 Aug 2003 14:38:41 -0000
   8 @@ -384,7 +384,7 @@ IMPL_LINK_INLINE_START( SfxPrintProgress
   9  {
  10         if ( pImp->pMonitor )
  11                 pImp->pMonitor->Hide();
  12 -       pImp->pPrinter->AbortJob();
  13 +       pImp->pPrinter->SetErrorHdl( Link() );
  14         InfoBox( pImp->GetViewShell()->GetWindow(),
  15                          String( SfxResId(STR_ERROR_PRINT) ) ).Execute();
  16      if ( pImp->bRestoreFlag && pImp->pViewShell->GetObjectShell()->IsEnableSetModified() != pImp->bOldFlag )
  17 Index: vcl/source/gdi/impprn.cxx
  18 ===================================================================
  19 RCS file: /cvs/gsl/vcl/source/gdi/impprn.cxx,v
  20 retrieving revision 1.5
  21 diff -u -p -u -r1.5 impprn.cxx
  22 --- vcl/source/gdi/impprn.cxx   27 Mar 2003 17:57:57 -0000      1.5
  23 +++ vcl/source/gdi/impprn.cxx   7 Aug 2003 14:39:09 -0000
  24 @@ -350,7 +350,8 @@ IMPL_LINK( ImplQPrinter, ImplPrintHdl, T
  25         {
  26                 maTimer.Stop();
  27                 delete pActPage;
  28 -               EndJob();
  29 +               if (!EndJob())
  30 +                       mpParent->Error();
  31                 mpParent->ImplEndPrint();
  32         }
  33         else