summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorOliver-Rainer Wittmann <orw@apache.org>2013-04-19 10:41:08 +0000
committerCaolán McNamara <caolanm@redhat.com>2013-05-24 20:46:04 +0100
commit09e7888105b7f8ca3894cecee22766ee0939a6c2 (patch)
treedc49c4c70f514c5cee39ef80238a2d7a3d42d482 /vcl
parent0699c4ee199e8d18b9e3b98967b3fd4bd1ee301c (diff)
Resolves: #i120529# abort print controller job, if no pages will be printed
(cherry picked from commit aad8d0b80c56b956ce674e713d4d09a077e20f68) Change-Id: I7c341961370ce12de1aeb8f0caed18f2dc496390 (cherry picked from commit 3bcbc800a5598854be473a7397eac384e0d8a07e)
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/gdi/print3.cxx8
1 files changed, 7 insertions, 1 deletions
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index 7ea71ccc776c..a3f976be2691 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -658,7 +658,13 @@ bool Printer::StartJob( const OUString& i_rJobName, boost::shared_ptr<vcl::Print
{
mbJobActive = sal_True;
i_pController->createProgressDialog();
- int nPages = i_pController->getFilteredPageCount();
+ const int nPages = i_pController->getFilteredPageCount();
+ // abort job, if no pages will be printed.
+ if ( nPages == 0 )
+ {
+ i_pController->abortJob();
+ bAborted = true;
+ }
for( int nOuterIteration = 0; nOuterIteration < nOuterRepeatCount && ! bAborted; nOuterIteration++ )
{
for( int nPage = 0; nPage < nPages && ! bAborted; nPage++ )