summaryrefslogtreecommitdiffstats
path: root/vcl/unx/generic/printer
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/unx/generic/printer')
-rw-r--r--vcl/unx/generic/printer/cupsmgr.cxx20
-rw-r--r--vcl/unx/generic/printer/ppdparser.cxx13
-rw-r--r--vcl/unx/generic/printer/printerinfomanager.cxx30
3 files changed, 32 insertions, 31 deletions
diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx
index a6ed76d29db0..52a255323c64 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -334,7 +334,7 @@ void CUPSManager::initialize()
// behaviour
aPrinter.m_aInfo.m_pParser = NULL;
aPrinter.m_aInfo.m_aContext.setParser( NULL );
- boost::unordered_map< OUString, PPDContext, OUStringHash >::const_iterator c_it = m_aDefaultContexts.find( aPrinterName );
+ std::unordered_map< OUString, PPDContext, OUStringHash >::const_iterator c_it = m_aDefaultContexts.find( aPrinterName );
if( c_it != m_aDefaultContexts.end() )
{
aPrinter.m_aInfo.m_pParser = c_it->second.getParser();
@@ -351,7 +351,7 @@ void CUPSManager::initialize()
// remove everything that is not a CUPS printer and not
// a special purpose printer (PDF, Fax)
std::list< OUString > aRemovePrinters;
- for( boost::unordered_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.begin();
+ for( std::unordered_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.begin();
it != m_aPrinters.end(); ++it )
{
if( m_aCUPSDestMap.find( it->first ) != m_aCUPSDestMap.end() )
@@ -426,7 +426,7 @@ const PPDParser* CUPSManager::createCUPSParser( const OUString& rPrinter )
{
if (m_nDests && m_pDests)
{
- boost::unordered_map< OUString, int, OUStringHash >::iterator dest_it =
+ std::unordered_map< OUString, int, OUStringHash >::iterator dest_it =
m_aCUPSDestMap.find( aPrinter );
if( dest_it != m_aCUPSDestMap.end() )
{
@@ -503,13 +503,13 @@ const PPDParser* CUPSManager::createCUPSParser( const OUString& rPrinter )
void CUPSManager::setupJobContextData( JobData& rData )
{
- boost::unordered_map< OUString, int, OUStringHash >::iterator dest_it =
+ std::unordered_map< OUString, int, OUStringHash >::iterator dest_it =
m_aCUPSDestMap.find( rData.m_aPrinterName );
if( dest_it == m_aCUPSDestMap.end() )
return PrinterInfoManager::setupJobContextData( rData );
- boost::unordered_map< OUString, Printer, OUStringHash >::iterator p_it =
+ std::unordered_map< OUString, Printer, OUStringHash >::iterator p_it =
m_aPrinters.find( rData.m_aPrinterName );
if( p_it == m_aPrinters.end() ) // huh ?
{
@@ -630,7 +630,7 @@ bool CUPSManager::endSpool( const OUString& rPrintername, const OUString& rJobTi
osl::MutexGuard aGuard( m_aCUPSMutex );
- boost::unordered_map< OUString, int, OUStringHash >::iterator dest_it =
+ std::unordered_map< OUString, int, OUStringHash >::iterator dest_it =
m_aCUPSDestMap.find( rPrintername );
if( dest_it == m_aCUPSDestMap.end() )
{
@@ -638,7 +638,7 @@ bool CUPSManager::endSpool( const OUString& rPrintername, const OUString& rJobTi
return PrinterInfoManager::endSpool( rPrintername, rJobTitle, pFile, rDocumentJobData, bBanner, rFaxNumber );
}
- boost::unordered_map< FILE*, OString, FPtrHash >::const_iterator it = m_aSpoolFiles.find( pFile );
+ std::unordered_map< FILE*, OString, FPtrHash >::const_iterator it = m_aSpoolFiles.find( pFile );
if( it != m_aSpoolFiles.end() )
{
fclose( pFile );
@@ -763,7 +763,7 @@ bool CUPSManager::removePrinter( const OUString& rName, bool bCheck )
bool CUPSManager::setDefaultPrinter( const OUString& rName )
{
bool bSuccess = false;
- boost::unordered_map< OUString, int, OUStringHash >::iterator nit =
+ std::unordered_map< OUString, int, OUStringHash >::iterator nit =
m_aCUPSDestMap.find( rName );
if( nit != m_aCUPSDestMap.end() && m_aCUPSMutex.tryToAcquire() )
{
@@ -787,10 +787,10 @@ bool CUPSManager::writePrinterConfig()
bool bDestModified = false;
rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
- for( boost::unordered_map< OUString, Printer, OUStringHash >::iterator prt =
+ for( std::unordered_map< OUString, Printer, OUStringHash >::iterator prt =
m_aPrinters.begin(); prt != m_aPrinters.end(); ++prt )
{
- boost::unordered_map< OUString, int, OUStringHash >::iterator nit =
+ std::unordered_map< OUString, int, OUStringHash >::iterator nit =
m_aCUPSDestMap.find( prt->first );
if( nit == m_aCUPSDestMap.end() )
continue;
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index 7238a44d57f9..ff4cdd685fd7 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -21,7 +21,6 @@
#include <stdio.h>
#include <boost/noncopyable.hpp>
-#include <boost/unordered_map.hpp>
#include <comphelper/string.hxx>
#include "vcl/ppdparser.hxx"
@@ -45,6 +44,8 @@
#include "com/sun/star/lang/Locale.hpp"
+#include <unordered_map>
+
namespace psp
{
class PPDTranslator
@@ -71,8 +72,8 @@ namespace psp
}
};
- typedef boost::unordered_map< com::sun::star::lang::Locale, OUString, LocaleHash, LocaleEqual > translation_map;
- typedef boost::unordered_map< OUString, translation_map, OUStringHash > key_translation_map;
+ typedef std::unordered_map< css::lang::Locale, OUString, LocaleHash, LocaleEqual > translation_map;
+ typedef std::unordered_map< OUString, translation_map, OUStringHash > key_translation_map;
key_translation_map m_aTranslations;
public:
@@ -244,7 +245,7 @@ namespace psp
{
public:
std::list< PPDParser* > aAllParsers;
- boost::unordered_map< OUString, OUString, OUStringHash >* pAllPPDFiles;
+ std::unordered_map< OUString, OUString, OUStringHash >* pAllPPDFiles;
PPDCache()
: pAllPPDFiles(NULL)
{}
@@ -448,7 +449,7 @@ void PPDParser::initPPDFiles(PPDCache &rPPDCache)
if( rPPDCache.pAllPPDFiles )
return;
- rPPDCache.pAllPPDFiles = new boost::unordered_map< OUString, OUString, OUStringHash >();
+ rPPDCache.pAllPPDFiles = new std::unordered_map< OUString, OUString, OUStringHash >();
// check installation directories
std::list< OUString > aPathList;
@@ -483,7 +484,7 @@ OUString PPDParser::getPPDFile( const OUString& rFile )
PPDDecompressStream aStream( aPPD.PathToFileName() );
if( ! aStream.IsOpen() )
{
- boost::unordered_map< OUString, OUString, OUStringHash >::const_iterator it;
+ std::unordered_map< OUString, OUString, OUStringHash >::const_iterator it;
PPDCache &rPPDCache = thePPDCache::get();
bool bRetry = true;
diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx
index 5dd8bfe7007c..1272792c6250 100644
--- a/vcl/unx/generic/printer/printerinfomanager.cxx
+++ b/vcl/unx/generic/printer/printerinfomanager.cxx
@@ -47,7 +47,7 @@
// the group of the global defaults
#define GLOBAL_DEFAULTS_GROUP "__Global_Printer_Defaults__"
-#include <boost/unordered_set.hpp>
+#include <unordered_set>
using namespace psp;
using namespace osl;
@@ -463,7 +463,7 @@ void PrinterInfoManager::initialize()
FileBase::getFileURLFromSystemPath( aFile.PathToFileName(), aPrinter.m_aFile );
aPrinter.m_bModified = false;
aPrinter.m_aGroup = aConfig.GetGroupName( nGroup );
- boost::unordered_map< OUString, Printer, OUStringHash >::const_iterator find_it =
+ std::unordered_map< OUString, Printer, OUStringHash >::const_iterator find_it =
m_aPrinters.find( aPrinterName );
if( find_it != m_aPrinters.end() )
{
@@ -537,7 +537,7 @@ void PrinterInfoManager::initialize()
void PrinterInfoManager::listPrinters( ::std::list< OUString >& rList ) const
{
- ::boost::unordered_map< OUString, Printer, OUStringHash >::const_iterator it;
+ std::unordered_map< OUString, Printer, OUStringHash >::const_iterator it;
rList.clear();
for( it = m_aPrinters.begin(); it != m_aPrinters.end(); ++it )
rList.push_back( it->first );
@@ -546,7 +546,7 @@ void PrinterInfoManager::listPrinters( ::std::list< OUString >& rList ) const
const PrinterInfo& PrinterInfoManager::getPrinterInfo( const OUString& rPrinter ) const
{
static PrinterInfo aEmptyInfo;
- ::boost::unordered_map< OUString, Printer, OUStringHash >::const_iterator it = m_aPrinters.find( rPrinter );
+ std::unordered_map< OUString, Printer, OUStringHash >::const_iterator it = m_aPrinters.find( rPrinter );
DBG_ASSERT( it != m_aPrinters.end(), "Do not ask for info about nonexistent printers" );
@@ -555,7 +555,7 @@ const PrinterInfo& PrinterInfoManager::getPrinterInfo( const OUString& rPrinter
void PrinterInfoManager::changePrinterInfo( const OUString& rPrinter, const PrinterInfo& rNewInfo )
{
- ::boost::unordered_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.find( rPrinter );
+ std::unordered_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.find( rPrinter );
DBG_ASSERT( it != m_aPrinters.end(), "Do not change nonexistant printers" );
@@ -582,9 +582,9 @@ static bool checkWriteability( const OUString& rUniPath )
bool PrinterInfoManager::writePrinterConfig()
{
// find at least one writeable config
- ::boost::unordered_map< OUString, Config*, OUStringHash > files;
- ::boost::unordered_map< OUString, int, OUStringHash > rofiles;
- ::boost::unordered_map< OUString, Config*, OUStringHash >::iterator file_it;
+ std::unordered_map< OUString, Config*, OUStringHash > files;
+ std::unordered_map< OUString, int, OUStringHash > rofiles;
+ std::unordered_map< OUString, Config*, OUStringHash >::iterator file_it;
for( ::std::list< WatchFile >::const_iterator wit = m_aWatchFiles.begin(); wit != m_aWatchFiles.end(); ++wit )
{
@@ -601,7 +601,7 @@ bool PrinterInfoManager::writePrinterConfig()
Config* pGlobal = files.begin()->second;
pGlobal->SetGroup( GLOBAL_DEFAULTS_GROUP );
- ::boost::unordered_map< OUString, Printer, OUStringHash >::iterator it;
+ std::unordered_map< OUString, Printer, OUStringHash >::iterator it;
for( it = m_aPrinters.begin(); it != m_aPrinters.end(); ++it )
{
if( ! it->second.m_bModified )
@@ -772,7 +772,7 @@ bool PrinterInfoManager::removePrinter( const OUString& rPrinterName, bool bChec
{
bool bSuccess = true;
- ::boost::unordered_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.find( rPrinterName );
+ std::unordered_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.find( rPrinterName );
if( it != m_aPrinters.end() )
{
if( !it->second.m_aFile.isEmpty() )
@@ -823,7 +823,7 @@ bool PrinterInfoManager::setDefaultPrinter( const OUString& rPrinterName )
{
bool bSuccess = false;
- ::boost::unordered_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.find( rPrinterName );
+ std::unordered_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.find( rPrinterName );
if( it != m_aPrinters.end() )
{
bSuccess = true;
@@ -901,7 +901,7 @@ bool PrinterInfoManager::endSpool( const OUString& /*rPrintername*/, const OUStr
void PrinterInfoManager::setupJobContextData( JobData& rData )
{
- boost::unordered_map< OUString, Printer, OUStringHash >::iterator it =
+ std::unordered_map< OUString, Printer, OUStringHash >::iterator it =
m_aPrinters.find( rData.m_aPrinterName );
if( it != m_aPrinters.end() )
{
@@ -1013,8 +1013,8 @@ static void lpgetSysQueueTokenHandler(
const SystemCommandParameters* )
{
rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
- boost::unordered_set< OUString, OUStringHash > aUniqueSet;
- boost::unordered_set< OUString, OUStringHash > aOnlySet;
+ std::unordered_set< OUString, OUStringHash > aUniqueSet;
+ std::unordered_set< OUString, OUStringHash > aOnlySet;
aUniqueSet.insert( OUString( "_all" ) );
aUniqueSet.insert( OUString( "_default" ) );
@@ -1110,7 +1110,7 @@ static void standardSysQueueTokenHandler(
const SystemCommandParameters* i_pParms)
{
rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
- boost::unordered_set< OUString, OUStringHash > aUniqueSet;
+ std::unordered_set< OUString, OUStringHash > aUniqueSet;
OString aForeToken( i_pParms->pForeToken );
OString aAftToken( i_pParms->pAftToken );
/* Normal Unix print queue discovery, also used for Darwin 5 LPR printing
generated by cgit (git 2.34.1) at 2024-07-12 01:33:59 +0000