summaryrefslogtreecommitdiff
path: root/vcl/inc
diff options
context:
space:
mode:
authorFridrich Strba <fridrich.strba@bluewin.ch>2011-02-03 16:55:17 -0700
committerFridrich Štrba <fridrich.strba@bluewin.ch>2011-02-04 01:10:15 +0100
commite99fcbe58ef7533da06ee4658a4ee2cde4df58ea (patch)
tree2dffe52eb92af74244d25f19613b1af187d9eab7 /vcl/inc
parentfad7c8f3e0d0518b1a6411d53d5d0a3a43adf119 (diff)
Bulk move libs-gui to boost unordered containers
Diffstat (limited to 'vcl/inc')
-rw-r--r--vcl/inc/cupsmgr.hxx6
-rw-r--r--vcl/inc/vcl/configsettings.hxx6
-rw-r--r--vcl/inc/vcl/fontcache.hxx6
-rw-r--r--vcl/inc/vcl/fontmanager.hxx36
-rw-r--r--vcl/inc/vcl/glyphcache.hxx10
-rw-r--r--vcl/inc/vcl/graphite_cache.hxx8
-rw-r--r--vcl/inc/vcl/image.h4
-rw-r--r--vcl/inc/vcl/impimagetree.hxx6
-rw-r--r--vcl/inc/vcl/jobset.h4
-rw-r--r--vcl/inc/vcl/lazydelete.hxx4
-rw-r--r--vcl/inc/vcl/outdev.h4
-rw-r--r--vcl/inc/vcl/outfont.hxx6
-rw-r--r--vcl/inc/vcl/ppdparser.hxx8
-rw-r--r--vcl/inc/vcl/print.h4
-rw-r--r--vcl/inc/vcl/print.hxx4
-rw-r--r--vcl/inc/vcl/printergfx.hxx4
-rw-r--r--vcl/inc/vcl/printerinfomanager.hxx10
17 files changed, 65 insertions, 65 deletions
diff --git a/vcl/inc/cupsmgr.hxx b/vcl/inc/cupsmgr.hxx
index 4a9f25ee7317..295f479d5cb8 100644
--- a/vcl/inc/cupsmgr.hxx
+++ b/vcl/inc/cupsmgr.hxx
@@ -49,13 +49,13 @@ struct FPtrHash
class CUPSManager : public PrinterInfoManager
{
CUPSWrapper* m_pCUPSWrapper;
- std::hash_map< FILE*, rtl::OString, FPtrHash > m_aSpoolFiles;
+ boost::unordered_map< FILE*, rtl::OString, FPtrHash > m_aSpoolFiles;
int m_nDests;
void* m_pDests;
bool m_bNewDests;
- std::hash_map< rtl::OUString, int, rtl::OUStringHash > m_aCUPSDestMap;
+ boost::unordered_map< rtl::OUString, int, rtl::OUStringHash > m_aCUPSDestMap;
- std::hash_map< rtl::OUString, PPDContext, rtl::OUStringHash > m_aDefaultContexts;
+ boost::unordered_map< rtl::OUString, PPDContext, rtl::OUStringHash > m_aDefaultContexts;
rtl::OString m_aUser;
// this is a security risk, but the CUPS API demands
diff --git a/vcl/inc/vcl/configsettings.hxx b/vcl/inc/vcl/configsettings.hxx
index c40e9681513d..e9b85d30728e 100644
--- a/vcl/inc/vcl/configsettings.hxx
+++ b/vcl/inc/vcl/configsettings.hxx
@@ -33,14 +33,14 @@
#include <unotools/configitem.hxx>
#include <vcl/dllapi.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
//........................................................................
namespace vcl
{
//........................................................................
- typedef std::hash_map< rtl::OUString, rtl::OUString, rtl::OUStringHash > OUStrMap;
+ typedef boost::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash > OUStrMap;
class SmallOUStrMap : public OUStrMap { public: SmallOUStrMap() : OUStrMap(1) {} };
//====================================================================
@@ -49,7 +49,7 @@ namespace vcl
class VCL_DLLPUBLIC SettingsConfigItem : public ::utl::ConfigItem
{
- std::hash_map< rtl::OUString, SmallOUStrMap, rtl::OUStringHash > m_aSettings;
+ boost::unordered_map< rtl::OUString, SmallOUStrMap, rtl::OUStringHash > m_aSettings;
virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& rPropertyNames );
diff --git a/vcl/inc/vcl/fontcache.hxx b/vcl/inc/vcl/fontcache.hxx
index 726549ae6e5b..f15be8dd1af7 100644
--- a/vcl/inc/vcl/fontcache.hxx
+++ b/vcl/inc/vcl/fontcache.hxx
@@ -34,7 +34,7 @@
#include "tools/string.hxx"
-#include <hash_map>
+#include <boost/unordered_map.hpp>
namespace psp
{
@@ -52,7 +52,7 @@ class VCL_DLLPUBLIC FontCache
FontCacheEntry m_aEntry;
};
- typedef std::hash_map< ::rtl::OString, FontFile, ::rtl::OStringHash > FontDirMap;
+ typedef boost::unordered_map< ::rtl::OString, FontFile, ::rtl::OStringHash > FontDirMap;
struct FontDir
{
sal_Int64 m_nTimestamp;
@@ -63,7 +63,7 @@ class VCL_DLLPUBLIC FontCache
FontDir() : m_nTimestamp(0), m_bNoFiles(false), m_bUserOverrideOnly( false ) {}
};
- typedef std::hash_map< int, FontDir > FontCacheData;
+ typedef boost::unordered_map< int, FontDir > FontCacheData;
FontCacheData m_aCache;
String m_aCacheFile;
bool m_bDoFlush;
diff --git a/vcl/inc/vcl/fontmanager.hxx b/vcl/inc/vcl/fontmanager.hxx
index ef9175cde698..58138d6418cc 100644
--- a/vcl/inc/vcl/fontmanager.hxx
+++ b/vcl/inc/vcl/fontmanager.hxx
@@ -29,7 +29,7 @@
#ifndef _PSPRINT_FONTMANAGER_HXX_
#define _PSPRINT_FONTMANAGER_HXX_
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <map>
#include <list>
#include <set>
@@ -242,7 +242,7 @@ class VCL_DLLPUBLIC PrintFontManager
// upper byte contains: 0 for horizontal metric
// 1 for vertical metric
// highest byte: 0 for now
- std::hash_map< int, CharacterMetric > m_aMetrics;
+ boost::unordered_map< int, CharacterMetric > m_aMetrics;
// contains the unicode blocks for which metrics were queried
// this implies that metrics should be queried in terms of
// unicode blocks. here a unicode block is identified
@@ -257,7 +257,7 @@ class VCL_DLLPUBLIC PrintFontManager
bool m_bKernPairsQueried;
std::list< KernPair > m_aXKernPairs;
std::list< KernPair > m_aYKernPairs;
- std::hash_map< sal_Unicode, bool > m_bVerticalSubstitutions;
+ boost::unordered_map< sal_Unicode, bool > m_bVerticalSubstitutions;
PrintFontMetrics() : m_bKernPairsQueried( false ) {}
@@ -371,8 +371,8 @@ class VCL_DLLPUBLIC PrintFontManager
static rtl::OString s_aEmptyOString;
fontID m_nNextFontID;
- std::hash_map< fontID, PrintFont* > m_aFonts;
- std::hash_map< int, family::type > m_aFamilyTypes;
+ boost::unordered_map< fontID, PrintFont* > m_aFonts;
+ boost::unordered_map< int, family::type > m_aFamilyTypes;
std::list< rtl::OUString > m_aPrinterDrivers;
std::list< rtl::OString > m_aFontDirectories;
std::list< int > m_aPrivateFontDirectories;
@@ -380,20 +380,20 @@ class VCL_DLLPUBLIC PrintFontManager
m_aXLFD_Aliases;
utl::MultiAtomProvider* m_pAtoms;
// for speeding up findFontFileID
- std::hash_map< rtl::OString, std::set< fontID >, rtl::OStringHash >
+ boost::unordered_map< rtl::OString, std::set< fontID >, rtl::OStringHash >
m_aFontFileToFontID;
- std::hash_map< rtl::OString, int, rtl::OStringHash >
+ boost::unordered_map< rtl::OString, int, rtl::OStringHash >
m_aDirToAtom;
- std::hash_map< int, rtl::OString > m_aAtomToDir;
+ boost::unordered_map< int, rtl::OString > m_aAtomToDir;
int m_nNextDirAtom;
- std::hash_multimap< rtl::OString, sal_Unicode, rtl::OStringHash >
+ boost::unordered_multimap< rtl::OString, sal_Unicode, rtl::OStringHash >
m_aAdobenameToUnicode;
- std::hash_multimap< sal_Unicode, rtl::OString >
+ boost::unordered_multimap< sal_Unicode, rtl::OString >
m_aUnicodeToAdobename;
- std::hash_multimap< sal_Unicode, sal_uInt8 > m_aUnicodeToAdobecode;
- std::hash_multimap< sal_uInt8, sal_Unicode > m_aAdobecodeToUnicode;
+ boost::unordered_multimap< sal_Unicode, sal_uInt8 > m_aUnicodeToAdobecode;
+ boost::unordered_multimap< sal_uInt8, sal_Unicode > m_aAdobecodeToUnicode;
mutable FontCache* m_pFontCache;
bool m_bFontconfigSuccess;
@@ -418,7 +418,7 @@ class VCL_DLLPUBLIC PrintFontManager
PrintFont* getFont( fontID nID ) const
{
- std::hash_map< fontID, PrintFont* >::const_iterator it;
+ boost::unordered_map< fontID, PrintFont* >::const_iterator it;
it = m_aFonts.find( nID );
return it == m_aFonts.end() ? NULL : it->second;
}
@@ -438,7 +438,7 @@ class VCL_DLLPUBLIC PrintFontManager
false else (e.g. no libfontconfig found)
*/
bool initFontconfig();
- int countFontconfigFonts( std::hash_map<rtl::OString, int, rtl::OStringHash>& o_rVisitedPaths );
+ int countFontconfigFonts( boost::unordered_map<rtl::OString, int, rtl::OStringHash>& o_rVisitedPaths );
/* deinitialize fontconfig
*/
void deinitFontconfig();
@@ -618,15 +618,15 @@ public:
// helper for type 1 fonts
std::list< rtl::OString > getAdobeNameFromUnicode( sal_Unicode aChar ) const;
- std::pair< std::hash_multimap< sal_Unicode, sal_uInt8 >::const_iterator,
- std::hash_multimap< sal_Unicode, sal_uInt8 >::const_iterator >
+ std::pair< boost::unordered_multimap< sal_Unicode, sal_uInt8 >::const_iterator,
+ boost::unordered_multimap< sal_Unicode, sal_uInt8 >::const_iterator >
getAdobeCodeFromUnicode( sal_Unicode aChar ) const
{
return m_aUnicodeToAdobecode.equal_range( aChar );
}
std::list< sal_Unicode > getUnicodeFromAdobeName( const rtl::OString& rName ) const;
- std::pair< std::hash_multimap< sal_uInt8, sal_Unicode >::const_iterator,
- std::hash_multimap< sal_uInt8, sal_Unicode >::const_iterator >
+ std::pair< boost::unordered_multimap< sal_uInt8, sal_Unicode >::const_iterator,
+ boost::unordered_multimap< sal_uInt8, sal_Unicode >::const_iterator >
getUnicodeFromAdobeCode( sal_uInt8 aChar ) const
{
return m_aAdobecodeToUnicode.equal_range( aChar );
diff --git a/vcl/inc/vcl/glyphcache.hxx b/vcl/inc/vcl/glyphcache.hxx
index 525ac7357271..af72b77d8084 100644
--- a/vcl/inc/vcl/glyphcache.hxx
+++ b/vcl/inc/vcl/glyphcache.hxx
@@ -43,8 +43,8 @@ struct ImplKernPairData;
class ImplFontOptions;
#include <tools/gen.hxx>
-#include <hash_map>
-#include <hash_set>
+#include <boost/unordered_map.hpp>
+#include <boost/unordered_set.hpp>
namespace basegfx { class B2DPolyPolygon; }
@@ -98,7 +98,7 @@ private:
// the FontList key's mpFontData member is reinterpreted as integer font id
struct IFSD_Equal{ bool operator()( const ImplFontSelectData&, const ImplFontSelectData& ) const; };
struct IFSD_Hash{ size_t operator()( const ImplFontSelectData& ) const; };
- typedef ::std::hash_map<ImplFontSelectData,ServerFont*,IFSD_Hash,IFSD_Equal > FontList;
+ typedef ::boost::unordered_map<ImplFontSelectData,ServerFont*,IFSD_Hash,IFSD_Equal > FontList;
FontList maFontList;
ULONG mnMaxSize; // max overall cache size in bytes
mutable ULONG mnBytesUsed;
@@ -227,7 +227,7 @@ protected:
virtual ServerFontLayoutEngine* GetLayoutEngine() { return NULL; }
private:
- typedef ::std::hash_map<int,GlyphData> GlyphList;
+ typedef ::boost::unordered_map<int,GlyphData> GlyphList;
mutable GlyphList maGlyphList;
const ImplFontSelectData maFontSelData;
@@ -373,7 +373,7 @@ protected:
{ return (rA.mnChar1 == rB.mnChar1) && (rA.mnChar2 == rB.mnChar2); } };
struct PairHash{ int operator()(const ImplKernPairData& rA) const
{ return (rA.mnChar1) * 256 ^ rA.mnChar2; } };
- typedef std::hash_set< ImplKernPairData, PairHash, PairEqual > UnicodeKernPairs;
+ typedef boost::unordered_set< ImplKernPairData, PairHash, PairEqual > UnicodeKernPairs;
mutable UnicodeKernPairs maUnicodeKernPairs;
};
diff --git a/vcl/inc/vcl/graphite_cache.hxx b/vcl/inc/vcl/graphite_cache.hxx
index 9891fb6aad7e..3c73f6f9484c 100644
--- a/vcl/inc/vcl/graphite_cache.hxx
+++ b/vcl/inc/vcl/graphite_cache.hxx
@@ -37,7 +37,7 @@
#define GRCACHE_REUSE_VECTORS 1
-#include <hash_map>
+#include <boost/unordered_map.hpp>
class TextSourceAdaptor;
/**
@@ -96,8 +96,8 @@ private:
friend class GraphiteSegmentCache;
};
-typedef std::hash_map<long, GrSegRecord*, std::hash<long> > GraphiteSegMap;
-typedef std::hash_multimap<size_t, GrSegRecord*> GraphiteRopeMap;
+typedef boost::unordered_map<long, GrSegRecord*, std::hash<long> > GraphiteSegMap;
+typedef boost::unordered_multimap<size_t, GrSegRecord*> GraphiteRopeMap;
typedef std::pair<GraphiteRopeMap::iterator, GraphiteRopeMap::iterator> GrRMEntry;
/**
@@ -230,7 +230,7 @@ private:
const xub_Unicode * m_prevKey;
};
-typedef std::hash_map<int, GraphiteSegmentCache *, std::hash<int> > GraphiteCacheMap;
+typedef boost::unordered_map<int, GraphiteSegmentCache *, std::hash<int> > GraphiteCacheMap;
/**
* GraphiteCacheHandler maps a particular font, style, size to a GraphiteSegmentCache
diff --git a/vcl/inc/vcl/image.h b/vcl/inc/vcl/image.h
index 394573ebbf78..fede1f42178a 100644
--- a/vcl/inc/vcl/image.h
+++ b/vcl/inc/vcl/image.h
@@ -31,7 +31,7 @@
#include <vcl/bitmapex.hxx>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
// ----------------
// - ImplImageBmp -
@@ -112,7 +112,7 @@ struct ImageAryData
struct ImplImageList
{
typedef std::vector<ImageAryData *> ImageAryDataVec;
- typedef std::hash_map< rtl::OUString, ImageAryData *, rtl::OUStringHash >
+ typedef boost::unordered_map< rtl::OUString, ImageAryData *, rtl::OUStringHash >
ImageAryDataNameHash;
ImageAryDataVec maImages;
diff --git a/vcl/inc/vcl/impimagetree.hxx b/vcl/inc/vcl/impimagetree.hxx
index cf8117b50ff1..41c4f565ef22 100644
--- a/vcl/inc/vcl/impimagetree.hxx
+++ b/vcl/inc/vcl/impimagetree.hxx
@@ -35,7 +35,7 @@
#include <utility>
#include <vector>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include "boost/noncopyable.hpp"
#include "com/sun/star/uno/Reference.hxx"
@@ -80,9 +80,9 @@ private:
com::sun::star::uno::Reference<
com::sun::star::container::XNameAccess > > > Zips;
- typedef std::hash_map<
+ typedef boost::unordered_map<
rtl::OUString, bool, rtl::OUStringHash > CheckStyleCache;
- typedef std::hash_map<
+ typedef boost::unordered_map<
rtl::OUString, std::pair< bool, BitmapEx >, rtl::OUStringHash > IconCache;
rtl::OUString m_style;
diff --git a/vcl/inc/vcl/jobset.h b/vcl/inc/vcl/jobset.h
index 7d460b908a55..9b26c20dcd94 100644
--- a/vcl/inc/vcl/jobset.h
+++ b/vcl/inc/vcl/jobset.h
@@ -32,7 +32,7 @@
#include <tools/string.hxx>
#include <vcl/sv.h>
#include <vcl/prntypes.hxx>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <rtl/ustring.hxx>
// ------------------
@@ -65,7 +65,7 @@ struct ImplJobSetup
long mnPaperHeight; // paper height (100th mm)
ULONG mnDriverDataLen; // length of system specific data
BYTE* mpDriverData; // system specific data (will be streamed a byte block)
- ::std::hash_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash > maValueMap;
+ ::boost::unordered_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash > maValueMap;
ImplJobSetup();
ImplJobSetup( const ImplJobSetup& rJobSetup );
diff --git a/vcl/inc/vcl/lazydelete.hxx b/vcl/inc/vcl/lazydelete.hxx
index 46804f3b54cb..0a1e2a30f5f5 100644
--- a/vcl/inc/vcl/lazydelete.hxx
+++ b/vcl/inc/vcl/lazydelete.hxx
@@ -32,7 +32,7 @@
#include "dllapi.h"
#include <vector>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <algorithm>
#if OSL_DEBUG_LEVEL > 2
@@ -123,7 +123,7 @@ namespace vcl
};
std::vector< DeleteObjectEntry > m_aObjects;
- typedef std::hash_map< sal_IntPtr, unsigned int > PtrToIndexMap;
+ typedef boost::unordered_map< sal_IntPtr, unsigned int > PtrToIndexMap;
PtrToIndexMap m_aPtrToIndex;
/** strict weak ordering funtion to bring objects to be destroyed lazily
diff --git a/vcl/inc/vcl/outdev.h b/vcl/inc/vcl/outdev.h
index a25636987439..163ca349ed97 100644
--- a/vcl/inc/vcl/outdev.h
+++ b/vcl/inc/vcl/outdev.h
@@ -218,11 +218,11 @@ private:
// cache of recently used font instances
struct IFSD_Equal { bool operator()( const ImplFontSelectData&, const ImplFontSelectData& ) const; };
struct IFSD_Hash { size_t operator()( const ImplFontSelectData& ) const; };
- typedef ::std::hash_map<ImplFontSelectData,ImplFontEntry*,IFSD_Hash,IFSD_Equal > FontInstanceList;
+ typedef ::boost::unordered_map<ImplFontSelectData,ImplFontEntry*,IFSD_Hash,IFSD_Equal > FontInstanceList;
FontInstanceList maFontInstanceList;
// cache of recently requested font names vs. selected font names
- typedef ::std::hash_map<String,String,FontNameHash> FontNameList;
+ typedef ::boost::unordered_map<String,String,FontNameHash> FontNameList;
FontNameList maFontNameList;
public:
diff --git a/vcl/inc/vcl/outfont.hxx b/vcl/inc/vcl/outfont.hxx
index 2bbc4d591ce6..ff59ba9bb5a5 100644
--- a/vcl/inc/vcl/outfont.hxx
+++ b/vcl/inc/vcl/outfont.hxx
@@ -38,7 +38,7 @@
#include <unotools/fontdefs.hxx>
#include <vcl/vclenum.hxx>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <com/sun/star/linguistic2/XLinguServiceManager.hpp>
@@ -193,7 +193,7 @@ private:
mutable bool mbMatchData; // true if matching attributes are initialized
bool mbMapNames; // true if MapNames are available
- typedef std::hash_map<const String, ImplDevFontListData*,FontNameHash> DevFontList;
+ typedef boost::unordered_map<const String, ImplDevFontListData*,FontNameHash> DevFontList;
DevFontList maDevFontList;
ImplPreMatchFontSubstitution* mpPreMatchHook; // device specific prematch substitution
@@ -352,7 +352,7 @@ private:
// TODO: at least the ones which just differ in orientation, stretching or height
typedef ::std::pair<sal_UCS4,FontWeight> GFBCacheKey;
struct GFBCacheKey_Hash{ size_t operator()( const GFBCacheKey& ) const; };
- typedef ::std::hash_map<GFBCacheKey,String,GFBCacheKey_Hash> UnicodeFallbackList;
+ typedef ::boost::unordered_map<GFBCacheKey,String,GFBCacheKey_Hash> UnicodeFallbackList;
UnicodeFallbackList* mpUnicodeFallbackList;
};
diff --git a/vcl/inc/vcl/ppdparser.hxx b/vcl/inc/vcl/ppdparser.hxx
index 614f0b7670f6..e5ebf05c9415 100644
--- a/vcl/inc/vcl/ppdparser.hxx
+++ b/vcl/inc/vcl/ppdparser.hxx
@@ -30,7 +30,7 @@
#include <list>
#include <vector>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include "tools/string.hxx"
#include "tools/stream.hxx"
@@ -63,7 +63,7 @@ class PPDKey
{
friend class PPDParser;
- typedef ::std::hash_map< ::rtl::OUString, PPDValue, ::rtl::OUStringHash > hash_type;
+ typedef ::boost::unordered_map< ::rtl::OUString, PPDValue, ::rtl::OUStringHash > hash_type;
typedef ::std::vector< PPDValue* > value_type;
String m_aKey;
@@ -127,7 +127,7 @@ class PPDParser
friend class CUPSManager;
friend class PPDCache;
- typedef ::std::hash_map< ::rtl::OUString, PPDKey*, ::rtl::OUStringHash > hash_type;
+ typedef ::boost::unordered_map< ::rtl::OUString, PPDKey*, ::rtl::OUStringHash > hash_type;
typedef ::std::vector< PPDKey* > value_type;
void insertKey( const String& rKey, PPDKey* pKey );
@@ -295,7 +295,7 @@ public:
class PPDContext
{
- typedef ::std::hash_map< const PPDKey*, const PPDValue*, PPDKeyhash > hash_type;
+ typedef ::boost::unordered_map< const PPDKey*, const PPDValue*, PPDKeyhash > hash_type;
hash_type m_aCurrentValues;
const PPDParser* m_pParser;
diff --git a/vcl/inc/vcl/print.h b/vcl/inc/vcl/print.h
index 5928cd6649a5..4fe4722714c4 100644
--- a/vcl/inc/vcl/print.h
+++ b/vcl/inc/vcl/print.h
@@ -33,7 +33,7 @@
#include "vcl/dllapi.h"
#include <vector>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
struct SalPrinterQueueInfo;
class QueueInfo;
@@ -59,7 +59,7 @@ struct ImplPrnQueueData
class VCL_DLLPUBLIC ImplPrnQueueList
{
public:
- std::hash_map< rtl::OUString, sal_Int32, rtl::OUStringHash >
+ boost::unordered_map< rtl::OUString, sal_Int32, rtl::OUStringHash >
m_aNameToIndex;
std::vector< ImplPrnQueueData > m_aQueueInfos;
std::vector< rtl::OUString > m_aPrinterList;
diff --git a/vcl/inc/vcl/print.hxx b/vcl/inc/vcl/print.hxx
index cdc414741271..8214f3425848 100644
--- a/vcl/inc/vcl/print.hxx
+++ b/vcl/inc/vcl/print.hxx
@@ -43,7 +43,7 @@
#include "com/sun/star/view/PrintableState.hpp"
#include <boost/shared_ptr.hpp>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <set>
struct SalPrinterInfoQueue;
@@ -540,7 +540,7 @@ public:
class VCL_DLLPUBLIC PrinterOptionsHelper
{
protected:
- std::hash_map< rtl::OUString, com::sun::star::uno::Any, rtl::OUStringHash > m_aPropertyMap;
+ boost::unordered_map< rtl::OUString, com::sun::star::uno::Any, rtl::OUStringHash > m_aPropertyMap;
com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > m_aUIProperties;
public:
diff --git a/vcl/inc/vcl/printergfx.hxx b/vcl/inc/vcl/printergfx.hxx
index 61ace3af65bf..fb1df7c94498 100644
--- a/vcl/inc/vcl/printergfx.hxx
+++ b/vcl/inc/vcl/printergfx.hxx
@@ -35,7 +35,7 @@
#include "tools/gen.hxx"
#include <list>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
namespace psp {
@@ -253,7 +253,7 @@ private:
/* font / font substitution */
friend class Font3;
- const ::std::hash_map< fontID, fontID >* mpFontSubstitutes;
+ const ::boost::unordered_map< fontID, fontID >* mpFontSubstitutes;
int getCharWidth (sal_Bool b_vert, sal_Unicode n_char,
CharacterMetric *p_bbox);
fontID getCharMetric (const Font3 &rFont, sal_Unicode n_char,
diff --git a/vcl/inc/vcl/printerinfomanager.hxx b/vcl/inc/vcl/printerinfomanager.hxx
index 617f0becd491..665f51933688 100644
--- a/vcl/inc/vcl/printerinfomanager.hxx
+++ b/vcl/inc/vcl/printerinfomanager.hxx
@@ -29,7 +29,7 @@
#ifndef _PSPRINT_PRINTERINFOMANAGER_HXX_
#define _PSPRINT_PRINTERINFOMANAGER_HXX_
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <list>
#include "vcl/dllapi.h"
@@ -70,9 +70,9 @@ struct PrinterInfo : JobData
// this vector is currently implicitly given by the adobe
// standard encoding
bool m_bPerformFontSubstitution;
- std::hash_map< rtl::OUString, rtl::OUString, rtl::OUStringHash >
+ boost::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash >
m_aFontSubstitutes;
- std::hash_map< fontID, fontID >
+ boost::unordered_map< fontID, fontID >
m_aFontSubstitutions;
PrinterInfo() :
@@ -122,7 +122,7 @@ protected:
PrinterInfo m_aInfo;
};
- std::hash_map< rtl::OUString, Printer, rtl::OUStringHash > m_aPrinters;
+ boost::unordered_map< rtl::OUString, Printer, rtl::OUStringHash > m_aPrinters;
PrinterInfo m_aGlobalDefaults;
std::list< WatchFile > m_aWatchFiles;
rtl::OUString m_aDefaultPrinter;
@@ -144,7 +144,7 @@ protected:
virtual void initialize();
// fill in font substitutions
- // the resulting hash_map maps from source to target font ids
+ // the resulting boost::unordered_map maps from source to target font ids
void fillFontSubstitutions( PrinterInfo& rInfo ) const;
// fill default paper if not configured in config file