diff options
author | Rüdiger Timm <rt@openoffice.org> | 2005-03-30 08:09:56 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2005-03-30 08:09:56 +0000 |
commit | d84eb7b6bf0edca5361e20f068e468280d569891 (patch) | |
tree | 7e88898db437ed69abf71aa591bb9df53eca6c01 /vcl | |
parent | fbf1bd141260727967c13a43ac893009620cc92b (diff) |
INTEGRATION: CWS vcl38 (1.36.54); FILE MERGED
2005/03/18 15:18:57 pl 1.36.54.1: #i45389# start printer detection
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/unx/source/gdi/salprnpsp.cxx | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/vcl/unx/source/gdi/salprnpsp.cxx b/vcl/unx/source/gdi/salprnpsp.cxx index 245e64e73caa..17a0692d9934 100644 --- a/vcl/unx/source/gdi/salprnpsp.cxx +++ b/vcl/unx/source/gdi/salprnpsp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: salprnpsp.cxx,v $ * - * $Revision: 1.36 $ + * $Revision: 1.37 $ * - * last change: $Author: rt $ $Date: 2005-01-31 09:21:00 $ + * last change: $Author: rt $ $Date: 2005-03-30 09:09:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1208,6 +1208,13 @@ IMPL_STATIC_LINK( vcl_sal::PrinterUpdate, UpdateTimerHdl, void*, pDummy ) void vcl_sal::PrinterUpdate::update() { + if( ! static_cast< X11SalInstance* >(GetSalData()->pInstance_)->isPrinterInit() ) + { + // #i45389# start background printer detection + psp::PrinterInfoManager& rManager = psp::PrinterInfoManager::get(); + return; + } + if( nActiveJobs < 1 ) doUpdate(); else if( ! pPrinterUpdateTimer ) |