summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2005-08-25 15:14:29 +0000
committerKurt Zenker <kz@openoffice.org>2005-08-25 15:14:29 +0000
commitac9336fdbc79c577bb4910c363640e59051bec0c (patch)
tree716490227927931caf7ea4ab8fd4e3382da6fead /vcl
parentf7c90346cdcdcb54a8cc9bd2836cc5a5e76b330d (diff)
INTEGRATION: CWS gslpatches4 (1.8.316); FILE MERGED
2005/07/11 14:47:52 pl 1.8.316.1: #i51673# catch some errors in printer error handling
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/gdi/impprn.cxx9
1 files changed, 6 insertions, 3 deletions
diff --git a/vcl/source/gdi/impprn.cxx b/vcl/source/gdi/impprn.cxx
index cafdf4fd6b6b..b113cfab15ea 100644
--- a/vcl/source/gdi/impprn.cxx
+++ b/vcl/source/gdi/impprn.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: impprn.cxx,v $
*
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
*
- * last change: $Author: hr $ $Date: 2004-09-08 15:36:32 $
+ * last change: $Author: kz $ $Date: 2005-08-25 16:14:29 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -339,13 +339,16 @@ IMPL_LINK( ImplQPrinter, ImplPrintHdl, Timer*, EMPTYARG )
// Druck-Job zuende?
QueuePage* pActPage = (QueuePage*) mpQueue->Get();
+
+ vcl::DeletionListener aDel( this );
if ( pActPage->mbEndJob )
{
maTimer.Stop();
delete pActPage;
if( ! EndJob() )
mpParent->Error();
- mpParent->ImplEndPrint();
+ if( ! aDel.isDeleted() )
+ mpParent->ImplEndPrint();
}
else
{