INTEGRATION: CWS vcl70 (1.38.18); FILE MERGED

2006/12/08 12:21:17 hdu 1.38.18.2: RESYNC: (1.38-1.39); FILE MERGED
2006/11/24 11:15:41 pl 1.38.18.1: #i65684# use IncludeFeature for CUPS >= 1.2
This commit is contained in:
Ivo Hinkelmann
2006-12-21 10:55:53 +00:00
parent 2170673a58
commit d53dc9c9a1

View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: printerinfomanager.cxx,v $ * $RCSfile: printerinfomanager.cxx,v $
* *
* $Revision: 1.39 $ * $Revision: 1.40 $
* *
* last change: $Author: rt $ $Date: 2006-12-04 16:33:36 $ * last change: $Author: ihi $ $Date: 2006-12-21 11:55:53 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -117,7 +117,8 @@ PrinterInfoManager& PrinterInfoManager::get()
PrinterInfoManager::PrinterInfoManager( Type eType ) : PrinterInfoManager::PrinterInfoManager( Type eType ) :
m_pQueueInfo( NULL ), m_pQueueInfo( NULL ),
m_eType( eType ) m_eType( eType ),
m_bUseIncludeFeature( false )
{ {
if( eType == Default ) if( eType == Default )
m_pQueueInfo = new SystemQueueInfo(); m_pQueueInfo = new SystemQueueInfo();
@@ -184,6 +185,7 @@ bool PrinterInfoManager::checkPrintersChanged( bool bWait )
void PrinterInfoManager::initialize() void PrinterInfoManager::initialize()
{ {
m_bUseIncludeFeature = false;
rtl_TextEncoding aEncoding = gsl_getSystemTextEncoding(); rtl_TextEncoding aEncoding = gsl_getSystemTextEncoding();
m_aPrinters.clear(); m_aPrinters.clear();
m_aWatchFiles.clear(); m_aWatchFiles.clear();