diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-02-17 15:02:19 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-02-17 15:02:19 +0000 |
| commit | 26d4bcf66d50bf9a4049cac4f26c77e70e0bff97 (patch) | |
| tree | 3366847ca08ef4d84df96f453d332fc380ed9286 /vcl/source/gdi/print.cxx | |
| parent | 85668aa9cd3eac69717396067481c7bc442a9077 (diff) | |
INTEGRATION: CWS fwkshowstop2_SRC680 (1.52.124); FILE MERGED
2006/02/15 12:42:56 mba 1.52.124.1: #i60509#: make it possible to detect wether StartJob was done already
Diffstat (limited to 'vcl/source/gdi/print.cxx')
| -rw-r--r-- | vcl/source/gdi/print.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index 13e221b1d4ba..c1a4d6d5467c 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -4,9 +4,9 @@ * * $RCSfile: print.cxx,v $ * - * $Revision: 1.52 $ + * $Revision: 1.53 $ * - * last change: $Author: rt $ $Date: 2005-11-10 15:48:54 $ + * last change: $Author: hr $ $Date: 2006-02-17 16:02:19 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1458,7 +1458,6 @@ BOOL Printer::StartJob( const XubString& rJobName ) maJobName = rJobName; mnCurPage = 1; mnCurPrintPage = 1; - mbJobActive = TRUE; mbPrinting = TRUE; if ( !mpPrinter->StartJob( pPrintFile, rJobName, Application::GetDisplayName(), @@ -1474,12 +1473,12 @@ BOOL Printer::StartJob( const XubString& rJobName ) maJobName = aSaveJobName; mnCurPage = 0; mnCurPrintPage = 0; - mbJobActive = FALSE; mbPrinting = FALSE; mpPrinter = NULL; return FALSE; } + mbJobActive = TRUE; StartPrint(); } else @@ -1496,11 +1495,11 @@ BOOL Printer::StartJob( const XubString& rJobName ) String aSaveJobName = maJobName; maJobName = rJobName; mnCurPage = 1; - mbJobActive = TRUE; mbPrinting = TRUE; if ( mpQPrinter->StartJob( rJobName ) ) { + mbJobActive = TRUE; StartPrint(); mpQPrinter->StartQueuePrint(); } @@ -1509,7 +1508,6 @@ BOOL Printer::StartJob( const XubString& rJobName ) mbNewJobSetup = bSaveNewJobSetup; maJobName = aSaveJobName; mnCurPage = 0; - mbJobActive = FALSE; mbPrinting = FALSE; mnError = mpQPrinter->GetErrorCode(); mpQPrinter->Destroy(); |