diff options
| author | Fridrich Strba <fridrich.strba@bluewin.ch> | 2011-02-03 16:55:17 -0700 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-02-04 01:10:15 +0100 |
| commit | e99fcbe58ef7533da06ee4658a4ee2cde4df58ea (patch) | |
| tree | 2dffe52eb92af74244d25f19613b1af187d9eab7 /vcl | |
| parent | fad7c8f3e0d0518b1a6411d53d5d0a3a43adf119 (diff) | |
Bulk move libs-gui to boost unordered containers
Diffstat (limited to 'vcl')
55 files changed, 277 insertions, 277 deletions
diff --git a/vcl/aqua/inc/salatsuifontutils.hxx b/vcl/aqua/inc/salatsuifontutils.hxx index e47745a5552a..51079b8ec5d2 100644 --- a/vcl/aqua/inc/salatsuifontutils.hxx +++ b/vcl/aqua/inc/salatsuifontutils.hxx @@ -54,7 +54,7 @@ public: ATSUFontFallbacks maFontFallbacks; private: - typedef std::hash_map<ATSUFontID,ImplMacFontData*> MacFontContainer; + typedef boost::unordered_map<ATSUFontID,ImplMacFontData*> MacFontContainer; MacFontContainer maFontContainer; void InitGlyphFallbacks(); diff --git a/vcl/aqua/inc/saldata.hxx b/vcl/aqua/inc/saldata.hxx index 4dbf2ea09ee2..fb4a2e19a05b 100644 --- a/vcl/aqua/inc/saldata.hxx +++ b/vcl/aqua/inc/saldata.hxx @@ -43,7 +43,7 @@ #include <list> #include <vector> #include <map> -#include <hash_set> +#include <boost/unordered_set.hpp> #include <cstdio> #include <cstdarg> @@ -85,7 +85,7 @@ struct SalData SALTIMERPROC mpTimerProc; // timer callback proc AquaSalInstance *mpFirstInstance; // pointer of first instance std::list<AquaSalFrame*> maFrames; // pointer of first frame - std::hash_set<const AquaSalFrame*,FrameHash> maFrameCheck; // for fast check of frame existance + boost::unordered_set<const AquaSalFrame*,FrameHash> maFrameCheck; // for fast check of frame existance SalObject *mpFirstObject; // pointer of first object window SalVirtualDevice *mpFirstVD; // first VirDev SalPrinter *mpFirstPrinter; // first printing printer 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 diff --git a/vcl/os2/inc/salgdi.h b/vcl/os2/inc/salgdi.h index b81adf1f4129..0970677b0fb1 100644 --- a/vcl/os2/inc/salgdi.h +++ b/vcl/os2/inc/salgdi.h @@ -35,7 +35,7 @@ #include <vcl/outfont.hxx> #include <vcl/impfont.hxx> -#include <hash_set> +#include <boost/unordered_set.hpp> class ImplOs2FontEntry; @@ -101,7 +101,7 @@ private: #ifdef GNG_VERT_HACK void ReadGsubTable( HDC ) const; - typedef std::hash_set<int> IntHashSet; + typedef boost::unordered_set<int> IntHashSet; mutable IntHashSet maGsubTable; mutable bool mbGsubRead; public: diff --git a/vcl/os2/source/gdi/os2layout.cxx b/vcl/os2/source/gdi/os2layout.cxx index 0d30679bf309..cedec8429670 100644 --- a/vcl/os2/source/gdi/os2layout.cxx +++ b/vcl/os2/source/gdi/os2layout.cxx @@ -49,8 +49,8 @@ // for GetMirroredChar #include <vcl/svapp.hxx> -#include <hash_map> -typedef std::hash_map<int,int> IntMap; +#include <boost/unordered_map.hpp> +typedef boost::unordered_map<int,int> IntMap; #define DROPPED_OUTGLYPH 0xFFFF diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index 0e65740fbba2..5658d39cd3eb 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -47,7 +47,7 @@ #include "vcl/window.h" -#include <hash_map> +#include <boost/unordered_map.hpp> #include <vector> // ======================================================================= @@ -79,8 +79,8 @@ struct ImplTabCtrlData { PushButton* mpLeftBtn; PushButton* mpRightBtn; - std::hash_map< int, int > maLayoutPageIdToLine; - std::hash_map< int, int > maLayoutLineToPageId; + boost::unordered_map< int, int > maLayoutPageIdToLine; + boost::unordered_map< int, int > maLayoutLineToPageId; std::vector< Rectangle > maTabRectangles; Point maItemsOffset; // offset of the tabitems std::vector< ImplTabItem > maItemList; @@ -2238,7 +2238,7 @@ Rectangle TabControl::GetCharacterBounds( USHORT nPageId, long nIndex ) const if( HasLayoutData() ) { - std::hash_map< int, int >::const_iterator it = mpTabCtrlData->maLayoutPageIdToLine.find( (int)nPageId ); + boost::unordered_map< int, int >::const_iterator it = mpTabCtrlData->maLayoutPageIdToLine.find( (int)nPageId ); if( it != mpTabCtrlData->maLayoutPageIdToLine.end() ) { Pair aPair = mpControlData->mpLayoutData->GetLineStartEnd( it->second ); @@ -2303,7 +2303,7 @@ Rectangle TabControl::GetTabPageBounds( USHORT nPage ) const if( HasLayoutData() ) { - std::hash_map< int, int >::const_iterator it = mpTabCtrlData->maLayoutPageIdToLine.find( (int)nPage ); + boost::unordered_map< int, int >::const_iterator it = mpTabCtrlData->maLayoutPageIdToLine.find( (int)nPage ); if( it != mpTabCtrlData->maLayoutPageIdToLine.end() ) { if( it->second >= 0 && it->second < static_cast<int>(mpTabCtrlData->maTabRectangles.size()) ) diff --git a/vcl/source/gdi/configsettings.cxx b/vcl/source/gdi/configsettings.cxx index fa866ba8130a..580ad16d4bd0 100644 --- a/vcl/source/gdi/configsettings.cxx +++ b/vcl/source/gdi/configsettings.cxx @@ -89,7 +89,7 @@ void SettingsConfigItem::Commit() if( ! IsValidConfigMgr() ) return; - std::hash_map< OUString, SmallOUStrMap, rtl::OUStringHash >::const_iterator group; + boost::unordered_map< OUString, SmallOUStrMap, rtl::OUStringHash >::const_iterator group; for( group = m_aSettings.begin(); group != m_aSettings.end(); ++group ) { @@ -181,7 +181,7 @@ void SettingsConfigItem::getValues() const OUString& SettingsConfigItem::getValue( const OUString& rGroup, const OUString& rKey ) const { - ::std::hash_map< OUString, SmallOUStrMap, rtl::OUStringHash >::const_iterator group = m_aSettings.find( rGroup ); + ::boost::unordered_map< OUString, SmallOUStrMap, rtl::OUStringHash >::const_iterator group = m_aSettings.find( rGroup ); if( group == m_aSettings.end() || group->second.find( rKey ) == group->second.end() ) { static OUString aEmpty; diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx index f5d319f6c936..88b465c89f7d 100644 --- a/vcl/source/gdi/impimagetree.cxx +++ b/vcl/source/gdi/impimagetree.cxx @@ -34,7 +34,7 @@ #include <utility> #include <vector> -#include <hash_map> +#include <boost/unordered_map.hpp> #include "com/sun/star/container/XNameAccess.hpp" #include "com/sun/star/io/XInputStream.hpp" diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx index d1e37a44131f..56b9c27b7048 100644 --- a/vcl/source/gdi/jobset.cxx +++ b/vcl/source/gdi/jobset.cxx @@ -212,7 +212,7 @@ String JobSetup::GetValue( const String& rKey ) const { if( mpData ) { - ::std::hash_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash >::const_iterator it; + ::boost::unordered_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash >::const_iterator it; it = mpData->maValueMap.find( rKey ); return it != mpData->maValueMap.end() ? String( it->second ) : String(); } @@ -420,7 +420,7 @@ SvStream& operator<<( SvStream& rOStream, const JobSetup& rJobSetup ) rOStream.Write( (char*)&aOldData, sizeof( aOldData ) ); rOStream.Write( (char*)&aOldJobData, nOldJobDataSize ); rOStream.Write( (char*)pJobData->mpDriverData, pJobData->mnDriverDataLen ); - ::std::hash_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash >::const_iterator it; + ::boost::unordered_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash >::const_iterator it; for( it = pJobData->maValueMap.begin(); it != pJobData->maValueMap.end(); ++it ) { rOStream.WriteByteString( it->first, RTL_TEXTENCODING_UTF8 ); diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 5469a3dd5218..9cb0737dfcb4 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -696,7 +696,7 @@ void PDFWriterImpl::createWidgetFieldName( sal_Int32 i_nWidgetIndex, const PDFWr // find or create a hierarchical field // first find the fully qualified name up to this field aDomain = aFullName.copy( 0, nTokenIndex-1 ); - std::hash_map< rtl::OString, sal_Int32, rtl::OStringHash >::const_iterator it = m_aFieldNameMap.find( aDomain ); + boost::unordered_map< rtl::OString, sal_Int32, rtl::OStringHash >::const_iterator it = m_aFieldNameMap.find( aDomain ); if( it == m_aFieldNameMap.end() ) { // create new hierarchy field @@ -757,7 +757,7 @@ void PDFWriterImpl::createWidgetFieldName( sal_Int32 i_nWidgetIndex, const PDFWr // insert widget into its hierarchy field if( aDomain.getLength() ) { - std::hash_map< rtl::OString, sal_Int32, rtl::OStringHash >::const_iterator it = m_aFieldNameMap.find( aDomain ); + boost::unordered_map< rtl::OString, sal_Int32, rtl::OStringHash >::const_iterator it = m_aFieldNameMap.find( aDomain ); if( it != m_aFieldNameMap.end() ) { OSL_ENSURE( it->second >= 0 && it->second < sal_Int32( m_aWidgets.size() ), "invalid field index" ); @@ -784,11 +784,11 @@ void PDFWriterImpl::createWidgetFieldName( sal_Int32 i_nWidgetIndex, const PDFWr if( ! m_aContext.AllowDuplicateFieldNames ) { - std::hash_map<OString, sal_Int32, OStringHash>::iterator it = m_aFieldNameMap.find( aFullName ); + boost::unordered_map<OString, sal_Int32, OStringHash>::iterator it = m_aFieldNameMap.find( aFullName ); if( it != m_aFieldNameMap.end() ) // not unique { - std::hash_map< OString, sal_Int32, OStringHash >::const_iterator check_it; + boost::unordered_map< OString, sal_Int32, OStringHash >::const_iterator check_it; OString aTry; sal_Int32 nTry = 2; do @@ -2804,7 +2804,7 @@ sal_Int32 PDFWriterImpl::emitStructure( PDFStructureElement& rEle ) if( ! m_aRoleMap.empty() ) { aLine.append( "/RoleMap<<" ); - for( std::hash_map<OString,OString,OStringHash>::const_iterator + for( boost::unordered_map<OString,OString,OStringHash>::const_iterator it = m_aRoleMap.begin(); it != m_aRoleMap.end(); ++it ) { aLine.append( '/' ); @@ -6580,7 +6580,7 @@ void PDFWriterImpl::sortWidgets() { // sort widget annotations on each page as per their // TabOrder attribute - std::hash_map< sal_Int32, AnnotSortContainer > sorted; + boost::unordered_map< sal_Int32, AnnotSortContainer > sorted; int nWidgets = m_aWidgets.size(); for( int nW = 0; nW < nWidgets; nW++ ) { @@ -6600,7 +6600,7 @@ void PDFWriterImpl::sortWidgets() } } } - for( std::hash_map< sal_Int32, AnnotSortContainer >::iterator it = sorted.begin(); it != sorted.end(); ++it ) + for( boost::unordered_map< sal_Int32, AnnotSortContainer >::iterator it = sorted.begin(); it != sorted.end(); ++it ) { // append entries for non widget annotations PDFPage& rPage = m_aPages[ it->first ]; @@ -11637,7 +11637,7 @@ void PDFWriterImpl::ensureUniqueRadioOnValues() { PDFWidget& rGroupWidget = m_aWidgets[ group->second ]; // check whether all kids have a unique OnValue - std::hash_map< OUString, sal_Int32, OUStringHash > aOnValues; + boost::unordered_map< OUString, sal_Int32, OUStringHash > aOnValues; int nChildren = rGroupWidget.m_aKidsIndex.size(); bool bIsUnique = true; for( int nKid = 0; nKid < nChildren && bIsUnique; nKid++ ) diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx index 4e367ddbc169..8aacf749942e 100644 --- a/vcl/source/gdi/pdfwriter_impl.hxx +++ b/vcl/source/gdi/pdfwriter_impl.hxx @@ -51,7 +51,7 @@ #include <vector> #include <map> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <list> #include <boost/shared_array.hpp> @@ -439,8 +439,8 @@ public: {} }; - typedef std::hash_map< rtl::OString, SvMemoryStream*, rtl::OStringHash > PDFAppearanceStreams; - typedef std::hash_map< rtl::OString, PDFAppearanceStreams, rtl::OStringHash > PDFAppearanceMap; + typedef boost::unordered_map< rtl::OString, SvMemoryStream*, rtl::OStringHash > PDFAppearanceStreams; + typedef boost::unordered_map< rtl::OString, PDFAppearanceStreams, rtl::OStringHash > PDFAppearanceMap; struct PDFWidget : public PDFAnnotation { @@ -645,7 +645,7 @@ private: bool m_bEmitStructure; bool m_bNewMCID; /* role map of struct tree root */ - std::hash_map< rtl::OString, rtl::OString, rtl::OStringHash > + boost::unordered_map< rtl::OString, rtl::OString, rtl::OStringHash > m_aRoleMap; /* contains all widgets used in the PDF @@ -655,8 +655,8 @@ private: std::map< sal_Int32, sal_Int32 > m_aRadioGroupWidgets; /* used to store control id during beginControlAppearance/endControlAppearance */ sal_Int32 m_nCurrentControl; - /* hash_map for field names, used to ensure unique field names */ - std::hash_map< rtl::OString, sal_Int32, rtl::OStringHash > m_aFieldNameMap; + /* boost::unordered_map for field names, used to ensure unique field names */ + boost::unordered_map< rtl::OString, sal_Int32, rtl::OStringHash > m_aFieldNameMap; /* contains Bitmaps for gradient functions until they are written * to the file stream */ diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index 5c693648d6c1..774673de0a04 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -233,7 +233,7 @@ ImplPrnQueueList::~ImplPrnQueueList() void ImplPrnQueueList::Add( SalPrinterQueueInfo* pData ) { - std::hash_map< rtl::OUString, sal_Int32, rtl::OUStringHash >::iterator it = + boost::unordered_map< rtl::OUString, sal_Int32, rtl::OUStringHash >::iterator it = m_aNameToIndex.find( pData->maPrinterName ); if( it == m_aNameToIndex.end() ) { @@ -258,7 +258,7 @@ void ImplPrnQueueList::Add( SalPrinterQueueInfo* pData ) ImplPrnQueueData* ImplPrnQueueList::Get( const rtl::OUString& rPrinter ) { ImplPrnQueueData* pData = NULL; - std::hash_map<rtl::OUString,sal_Int32,rtl::OUStringHash>::iterator it = + boost::unordered_map<rtl::OUString,sal_Int32,rtl::OUStringHash>::iterator it = m_aNameToIndex.find( rPrinter ); if( it != m_aNameToIndex.end() ) pData = &m_aQueueInfos[it->second]; diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx index 04ea890bff3f..1b820057092c 100644 --- a/vcl/source/gdi/print3.cxx +++ b/vcl/source/gdi/print3.cxx @@ -50,8 +50,8 @@ #include "com/sun/star/awt/Size.hpp" #include "comphelper/processfactory.hxx" -#include <hash_map> -#include <hash_set> +#include <boost/unordered_map.hpp> +#include <boost/unordered_set.hpp> using namespace com::sun::star; using namespace com::sun::star::uno; @@ -144,8 +144,8 @@ public: ControlDependency() : mnDependsOnEntry( -1 ) {} }; - typedef std::hash_map< rtl::OUString, size_t, rtl::OUStringHash > PropertyToIndexMap; - typedef std::hash_map< rtl::OUString, ControlDependency, rtl::OUStringHash > ControlDependencyMap; + typedef boost::unordered_map< rtl::OUString, size_t, rtl::OUStringHash > PropertyToIndexMap; + typedef boost::unordered_map< rtl::OUString, ControlDependency, rtl::OUStringHash > ControlDependencyMap; boost::shared_ptr<Printer> mpPrinter; Sequence< PropertyValue > maUIOptions; @@ -1221,7 +1221,7 @@ bool PrinterController::getReversePrint() const Sequence< PropertyValue > PrinterController::getJobProperties( const Sequence< PropertyValue >& i_rMergeList ) const { - std::hash_set< rtl::OUString, rtl::OUStringHash > aMergeSet; + boost::unordered_set< rtl::OUString, rtl::OUStringHash > aMergeSet; size_t nResultLen = size_t(i_rMergeList.getLength()) + mpImplData->maUIProperties.size() + 3; for( int i = 0; i < i_rMergeList.getLength(); i++ ) aMergeSet.insert( i_rMergeList[i].Name ); @@ -1270,14 +1270,14 @@ const Sequence< beans::PropertyValue >& PrinterController::getUIOptions() const beans::PropertyValue* PrinterController::getValue( const rtl::OUString& i_rProperty ) { - std::hash_map< rtl::OUString, size_t, rtl::OUStringHash >::const_iterator it = + boost::unordered_map< rtl::OUString, size_t, rtl::OUStringHash >::const_iterator it = mpImplData->maPropertyToIndex.find( i_rProperty ); return it != mpImplData->maPropertyToIndex.end() ? &mpImplData->maUIProperties[it->second] : NULL; } const beans::PropertyValue* PrinterController::getValue( const rtl::OUString& i_rProperty ) const { - std::hash_map< rtl::OUString, size_t, rtl::OUStringHash >::const_iterator it = + boost::unordered_map< rtl::OUString, size_t, rtl::OUStringHash >::const_iterator it = mpImplData->maPropertyToIndex.find( i_rProperty ); return it != mpImplData->maPropertyToIndex.end() ? &mpImplData->maUIProperties[it->second] : NULL; } @@ -1307,7 +1307,7 @@ void PrinterController::setValue( const rtl::OUString& i_rName, const Any& i_rVa void PrinterController::setValue( const beans::PropertyValue& i_rValue ) { - std::hash_map< rtl::OUString, size_t, rtl::OUStringHash >::const_iterator it = + boost::unordered_map< rtl::OUString, size_t, rtl::OUStringHash >::const_iterator it = mpImplData->maPropertyToIndex.find( i_rValue.Name ); if( it != mpImplData->maPropertyToIndex.end() ) mpImplData->maUIProperties[ it->second ] = i_rValue; @@ -1379,7 +1379,7 @@ void PrinterController::setUIOptions( const Sequence< beans::PropertyValue >& i_ void PrinterController::enableUIOption( const rtl::OUString& i_rProperty, bool i_bEnable ) { - std::hash_map< rtl::OUString, size_t, rtl::OUStringHash >::const_iterator it = + boost::unordered_map< rtl::OUString, size_t, rtl::OUStringHash >::const_iterator it = mpImplData->maPropertyToIndex.find( i_rProperty ); if( it != mpImplData->maPropertyToIndex.end() ) { @@ -1397,7 +1397,7 @@ void PrinterController::enableUIOption( const rtl::OUString& i_rProperty, bool i bool PrinterController::isUIOptionEnabled( const rtl::OUString& i_rProperty ) const { bool bEnabled = false; - std::hash_map< rtl::OUString, size_t, rtl::OUStringHash >::const_iterator prop_it = + boost::unordered_map< rtl::OUString, size_t, rtl::OUStringHash >::const_iterator prop_it = mpImplData->maPropertyToIndex.find( i_rProperty ); if( prop_it != mpImplData->maPropertyToIndex.end() ) { @@ -1604,7 +1604,7 @@ sal_Bool PrinterController::getBoolProperty( const rtl::OUString& i_rProperty, s Any PrinterOptionsHelper::getValue( const rtl::OUString& i_rPropertyName ) const { Any aRet; - std::hash_map< rtl::OUString, Any, rtl::OUStringHash >::const_iterator it = + boost::unordered_map< rtl::OUString, Any, rtl::OUStringHash >::const_iterator it = m_aPropertyMap.find( i_rPropertyName ); if( it != m_aPropertyMap.end() ) aRet = it->second; @@ -1619,7 +1619,7 @@ void PrinterOptionsHelper::setValue( const rtl::OUString& i_rPropertyName, const bool PrinterOptionsHelper::hasProperty( const rtl::OUString& i_rPropertyName ) const { Any aRet; - std::hash_map< rtl::OUString, Any, rtl::OUStringHash >::const_iterator it = + boost::unordered_map< rtl::OUString, Any, rtl::OUStringHash >::const_iterator it = m_aPropertyMap.find( i_rPropertyName ); return it != m_aPropertyMap.end(); } @@ -1659,7 +1659,7 @@ bool PrinterOptionsHelper::processProperties( const Sequence< PropertyValue >& i for( sal_Int32 i = 0; i < nElements; i++ ) { bool bElementChanged = false; - std::hash_map< rtl::OUString, Any, rtl::OUStringHash >::iterator it = + boost::unordered_map< rtl::OUString, Any, rtl::OUStringHash >::iterator it = m_aPropertyMap.find( pVals[ i ].Name ); if( it != m_aPropertyMap.end() ) { diff --git a/vcl/source/glyphs/gcach_ftyp.cxx b/vcl/source/glyphs/gcach_ftyp.cxx index 2860eea20d96..5c0dff72703f 100644 --- a/vcl/source/glyphs/gcach_ftyp.cxx +++ b/vcl/source/glyphs/gcach_ftyp.cxx @@ -136,7 +136,7 @@ FT_Error (*pFTOblique)(FT_GlyphSlot); static bool bEnableSizeFT = false; struct EqStr{ bool operator()(const char* a, const char* b) const { return !strcmp(a,b); } }; -typedef ::std::hash_map<const char*,FtFontFile*,::std::hash<const char*>, EqStr> FontFileList; +typedef ::boost::unordered_map<const char*,FtFontFile*,::std::hash<const char*>, EqStr> FontFileList; namespace { struct vclFontFileList : public rtl::Static< FontFileList, vclFontFileList > {}; } // ----------------------------------------------------------------------- @@ -2001,7 +2001,7 @@ ULONG FreetypeServerFont::GetKernPairs( ImplKernPairData** ppKernPairs ) const // prepare glyphindex to character mapping // TODO: this is needed to support VCL's existing kerning infrastructure, // eliminate it up by redesigning kerning infrastructure to work with glyph indizes - typedef std::hash_multimap<USHORT,sal_Unicode> Cmap; + typedef boost::unordered_multimap<USHORT,sal_Unicode> Cmap; Cmap aCmap; for( sal_Unicode aChar = 0x0020; aChar < 0xFFFE; ++aChar ) { diff --git a/vcl/source/glyphs/gcach_ftyp.hxx b/vcl/source/glyphs/gcach_ftyp.hxx index 95f792fa9647..571822375e20 100644 --- a/vcl/source/glyphs/gcach_ftyp.hxx +++ b/vcl/source/glyphs/gcach_ftyp.hxx @@ -110,8 +110,8 @@ private: ImplDevFontAttributes maDevFontAttributes; // cache unicode->glyphid mapping because looking it up is expensive - // TODO: change to hash_multimap when a use case requires a m:n mapping - typedef ::std::hash_map<int,int> Int2IntMap; + // TODO: change to boost::unordered_multimap when a use case requires a m:n mapping + typedef ::boost::unordered_map<int,int> Int2IntMap; mutable Int2IntMap* mpChar2Glyph; mutable Int2IntMap* mpGlyph2Char; void InitHashes() const; @@ -157,7 +157,7 @@ public: FreetypeServerFont* CreateFont( const ImplFontSelectData& ); private: - typedef ::std::hash_map<sal_IntPtr,FtFontInfo*> FontList; + typedef ::boost::unordered_map<sal_IntPtr,FtFontInfo*> FontList; FontList maFontList; sal_IntPtr mnMaxFontId; @@ -224,7 +224,7 @@ private: bool mbArtBold; bool mbUseGamma; - typedef ::std::hash_map<int,int> GlyphSubstitution; + typedef ::boost::unordered_map<int,int> GlyphSubstitution; GlyphSubstitution maGlyphSubstitution; rtl_UnicodeToTextConverter maRecodeConverter; diff --git a/vcl/source/glyphs/graphite_adaptors.cxx b/vcl/source/glyphs/graphite_adaptors.cxx index f5272333bf8d..ae3cccdaf9a1 100644 --- a/vcl/source/glyphs/graphite_adaptors.cxx +++ b/vcl/source/glyphs/graphite_adaptors.cxx @@ -66,7 +66,7 @@ namespace inline float from_hinted(const int x) { return static_cast<float>(x + 32) / 64.0; } - typedef std::hash_map<long,bool> SilfMap; + typedef boost::unordered_map<long,bool> SilfMap; } extern FT_Error (*pFTEmbolden)(FT_GlyphSlot); extern FT_Error (*pFTOblique)(FT_GlyphSlot); diff --git a/vcl/source/helper/canvastools.cxx b/vcl/source/helper/canvastools.cxx index aa667a3f6492..005d544b9e02 100644 --- a/vcl/source/helper/canvastools.cxx +++ b/vcl/source/helper/canvastools.cxx @@ -72,7 +72,7 @@ #include <vcl/canvasbitmap.hxx> #include <vcl/canvastools.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> using namespace ::com::sun::star; @@ -187,8 +187,8 @@ namespace vcl const uno::Sequence< sal_Int8 > getTunnelIdentifier( TunnelIdentifierType eType ) { - static std::hash_map< int, uno::Sequence< sal_Int8 > > aIds; - std::hash_map< int, uno::Sequence< sal_Int8 > >::iterator it = + static boost::unordered_map< int, uno::Sequence< sal_Int8 > > aIds; + boost::unordered_map< int, uno::Sequence< sal_Int8 > >::iterator it = aIds.find( eType ); if( it == aIds.end() ) { diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index 045bfa077806..81f4b951bf7d 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -40,7 +40,7 @@ #include <cmath> #include <vector> #include <algorithm> -#include <hash_map> +#include <boost/unordered_map.hpp> #include "saldata.hxx" #include "saldisp.hxx" @@ -151,7 +151,7 @@ struct NWFWidgetData // Keep a hash table of Widgets->default flags so that we can // easily and quickly reset each to a default state before using // them -static std::hash_map<long, guint> gWidgetDefaultFlags; +static boost::unordered_map<long, guint> gWidgetDefaultFlags; static std::vector<NWFWidgetData> gWidgetData; static const GtkBorder aDefDefBorder = { 1, 1, 1, 1 }; diff --git a/vcl/unx/headless/svpelement.cxx b/vcl/unx/headless/svpelement.cxx index 08dad9afb5cc..55af58700a85 100644 --- a/vcl/unx/headless/svpelement.cxx +++ b/vcl/unx/headless/svpelement.cxx @@ -43,7 +43,7 @@ #include "svpframe.hxx" #include <list> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <sys/types.h> #include <sys/socket.h> @@ -174,14 +174,14 @@ IMPL_LINK( SvpElementContainer, processRequest, void*, pSocket ) rtl::OString aCommand( aBuf.makeStringAndClear() ); if( aCommand.compareTo( "list", 4 ) == 0 ) { - std::hash_map< rtl::OString, std::list<SvpElement*>, rtl::OStringHash > aMap; + boost::unordered_map< rtl::OString, std::list<SvpElement*>, rtl::OStringHash > aMap; for( std::list< SvpElement* >::const_iterator it = m_aElements.begin(); it != m_aElements.end(); ++it ) { std::list<SvpElement*>& rList = aMap[matchType(*it)]; rList.push_back( *it ); } - for( std::hash_map< rtl::OString, std::list<SvpElement*>, rtl::OStringHash>::const_iterator hash_it = aMap.begin(); + for( boost::unordered_map< rtl::OString, std::list<SvpElement*>, rtl::OStringHash>::const_iterator hash_it = aMap.begin(); hash_it != aMap.end(); ++hash_it ) { aAnswer.append( "ElementType: " ); diff --git a/vcl/unx/headless/svpprn.cxx b/vcl/unx/headless/svpprn.cxx index 841f589c2a39..a70cff10541f 100644 --- a/vcl/unx/headless/svpprn.cxx +++ b/vcl/unx/headless/svpprn.cxx @@ -198,7 +198,7 @@ SalInfoPrinter* SvpSalInstance::CreateInfoPrinter( SalPrinterQueueInfo* pQueueIn // set/clear backwards compatibility flag bool bStrictSO52Compatibility = false; - std::hash_map<rtl::OUString, rtl::OUString, rtl::OUStringHash >::const_iterator compat_it = + boost::unordered_map<rtl::OUString, rtl::OUString, rtl::OUStringHash >::const_iterator compat_it = pJobSetup->maValueMap.find( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StrictSO52Compatibility" ) ) ); if( compat_it != pJobSetup->maValueMap.end() ) { diff --git a/vcl/unx/headless/svppspgraphics.cxx b/vcl/unx/headless/svppspgraphics.cxx index 94e3233071a0..99a3eb3cffbc 100644 --- a/vcl/unx/headless/svppspgraphics.cxx +++ b/vcl/unx/headless/svppspgraphics.cxx @@ -788,7 +788,7 @@ void PspGraphics::GetDevFontSubstList( OutputDevice* pOutDev ) const psp::PrinterInfo& rInfo = psp::PrinterInfoManager::get().getPrinterInfo( m_pJobData->m_aPrinterName ); if( rInfo.m_bPerformFontSubstitution ) { - for( std::hash_map< rtl::OUString, rtl::OUString, rtl::OUStringHash >::const_iterator it = rInfo.m_aFontSubstitutes.begin(); it != rInfo.m_aFontSubstitutes.end(); ++it ) + for( boost::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash >::const_iterator it = rInfo.m_aFontSubstitutes.begin(); it != rInfo.m_aFontSubstitutes.end(); ++it ) AddDevFontSubstitute( pOutDev, it->first, it->second, FONT_SUBSTITUTE_ALWAYS ); } } diff --git a/vcl/unx/inc/saldisp.hxx b/vcl/unx/inc/saldisp.hxx index 5b4fd62a2f5e..6a57b5e90a03 100644 --- a/vcl/unx/inc/saldisp.hxx +++ b/vcl/unx/inc/saldisp.hxx @@ -43,7 +43,7 @@ class SalXLib; #include <osl/mutex.h> #include <vector> #include <list> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <tools/gen.hxx> #include <vcl/salwtype.hxx> #include <vcl/dllapi.h> @@ -292,7 +292,7 @@ public: RenderEntry() : m_aPixmap( 0 ), m_aPicture( 0 ) {} }; - typedef std::hash_map<int,RenderEntry> RenderEntryMap; + typedef boost::unordered_map<int,RenderEntry> RenderEntryMap; struct ScreenData { diff --git a/vcl/unx/source/dtrans/X11_selection.cxx b/vcl/unx/source/dtrans/X11_selection.cxx index dcadf9cb7ec6..b2ac2fdad30c 100644 --- a/vcl/unx/source/dtrans/X11_selection.cxx +++ b/vcl/unx/source/dtrans/X11_selection.cxx @@ -209,9 +209,9 @@ rtl_TextEncoding x11::getTextPlainEncoding( const OUString& rMimeType ) // ------------------------------------------------------------------------ -::std::hash_map< OUString, SelectionManager*, OUStringHash >& SelectionManager::getInstances() +::boost::unordered_map< OUString, SelectionManager*, OUStringHash >& SelectionManager::getInstances() { - static ::std::hash_map< OUString, SelectionManager*, OUStringHash > aInstances; + static ::boost::unordered_map< OUString, SelectionManager*, OUStringHash > aInstances; return aInstances; } @@ -478,7 +478,7 @@ SelectionManager::~SelectionManager() { osl::MutexGuard aGuard( *osl::Mutex::getGlobalMutex() ); - ::std::hash_map< OUString, SelectionManager*, OUStringHash >::iterator it; + ::boost::unordered_map< OUString, SelectionManager*, OUStringHash >::iterator it; for( it = getInstances().begin(); it != getInstances().end(); ++it ) if( it->second == this ) { @@ -543,7 +543,7 @@ SelectionManager::~SelectionManager() SelectionAdaptor* SelectionManager::getAdaptor( Atom selection ) { - ::std::hash_map< Atom, Selection* >::iterator it = + ::boost::unordered_map< Atom, Selection* >::iterator it = m_aSelections.find( selection ); return it != m_aSelections.end() ? it->second->m_pAdaptor : NULL; } @@ -710,7 +710,7 @@ SelectionManager& SelectionManager::get( const OUString& rDisplayName ) aDisplayName = OStringToOUString( getenv( "DISPLAY" ), RTL_TEXTENCODING_ISO_8859_1 ); SelectionManager* pInstance = NULL; - ::std::hash_map< OUString, SelectionManager*, OUStringHash >::iterator it = getInstances().find( aDisplayName ); + ::boost::unordered_map< OUString, SelectionManager*, OUStringHash >::iterator it = getInstances().find( aDisplayName ); if( it != getInstances().end() ) pInstance = it->second; else pInstance = getInstances()[ aDisplayName ] = new SelectionManager(); @@ -724,7 +724,7 @@ const OUString& SelectionManager::getString( Atom aAtom ) { osl::MutexGuard aGuard(m_aMutex); - ::std::hash_map< Atom, OUString >::const_iterator it; + ::boost::unordered_map< Atom, OUString >::const_iterator it; if( ( it = m_aAtomToString.find( aAtom ) ) == m_aAtomToString.end() ) { static OUString aEmpty; @@ -745,7 +745,7 @@ Atom SelectionManager::getAtom( const OUString& rString ) { osl::MutexGuard aGuard(m_aMutex); - ::std::hash_map< OUString, Atom, OUStringHash >::const_iterator it; + ::boost::unordered_map< OUString, Atom, OUStringHash >::const_iterator it; if( ( it = m_aStringToAtom.find( rString ) ) == m_aStringToAtom.end() ) { static Atom nNoDisplayAtoms = 1; @@ -900,7 +900,7 @@ OUString SelectionManager::convertTypeFromNative( Atom nType, Atom selection, in bool SelectionManager::getPasteData( Atom selection, Atom type, Sequence< sal_Int8 >& rData ) { osl::ResettableMutexGuard aGuard(m_aMutex); - ::std::hash_map< Atom, Selection* >::iterator it; + ::boost::unordered_map< Atom, Selection* >::iterator it; bool bSuccess = false; #if OSL_DEBUG_LEVEL > 1 @@ -1040,7 +1040,7 @@ bool SelectionManager::getPasteData( Atom selection, const ::rtl::OUString& rTyp { bool bSuccess = false; - ::std::hash_map< Atom, Selection* >::iterator it; + ::boost::unordered_map< Atom, Selection* >::iterator it; { osl::MutexGuard aGuard(m_aMutex); @@ -1250,7 +1250,7 @@ bool SelectionManager::getPasteData( Atom selection, const ::rtl::OUString& rTyp bool SelectionManager::getPasteDataTypes( Atom selection, Sequence< DataFlavor >& rTypes ) { - ::std::hash_map< Atom, Selection* >::iterator it; + ::boost::unordered_map< Atom, Selection* >::iterator it; { osl::MutexGuard aGuard(m_aMutex); @@ -1455,7 +1455,7 @@ bool SelectionManager::getPasteDataTypes( Atom selection, Sequence< DataFlavor > PixmapHolder* SelectionManager::getPixmapHolder( Atom selection ) { - std::hash_map< Atom, Selection* >::const_iterator it = m_aSelections.find( selection ); + boost::unordered_map< Atom, Selection* >::const_iterator it = m_aSelections.find( selection ); if( it == m_aSelections.end() ) return NULL; if( ! it->second->m_pPixmap ) @@ -1577,10 +1577,10 @@ bool SelectionManager::sendData( SelectionAdaptor* pAdaptor, { #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "using INCR protocol\n" ); - std::hash_map< XLIB_Window, std::hash_map< Atom, IncrementalTransfer > >::const_iterator win_it = m_aIncrementals.find( requestor ); + boost::unordered_map< XLIB_Window, boost::unordered_map< Atom, IncrementalTransfer > >::const_iterator win_it = m_aIncrementals.find( requestor ); if( win_it != m_aIncrementals.end() ) { - std::hash_map< Atom, IncrementalTransfer >::const_iterator inc_it = win_it->second.find( property ); + boost::unordered_map< Atom, IncrementalTransfer >::const_iterator inc_it = win_it->second.find( property ); if( inc_it != win_it->second.end() ) { const IncrementalTransfer& rInc = inc_it->second; @@ -1851,7 +1851,7 @@ bool SelectionManager::handleReceivePropertyNotify( XPropertyEvent& rNotify ) #endif bool bHandled = false; - ::std::hash_map< Atom, Selection* >::iterator it = + ::boost::unordered_map< Atom, Selection* >::iterator it = m_aSelections.find( rNotify.atom ); if( it != m_aSelections.end() && rNotify.state == PropertyNewValue && @@ -1976,13 +1976,13 @@ bool SelectionManager::handleSendPropertyNotify( XPropertyEvent& rNotify ) // feed incrementals if( rNotify.state == PropertyDelete ) { - std::hash_map< XLIB_Window, std::hash_map< Atom, IncrementalTransfer > >::iterator it; + boost::unordered_map< XLIB_Window, boost::unordered_map< Atom, IncrementalTransfer > >::iterator it; it = m_aIncrementals.find( rNotify.window ); if( it != m_aIncrementals.end() ) { bHandled = true; int nCurrentTime = time( NULL ); - std::hash_map< Atom, IncrementalTransfer >::iterator inc_it; + boost::unordered_map< Atom, IncrementalTransfer >::iterator inc_it; // throw out aborted transfers std::list< Atom > aTimeouts; for( inc_it = it->second.begin(); inc_it != it->second.end(); ++inc_it ) @@ -2080,7 +2080,7 @@ bool SelectionManager::handleSelectionNotify( XSelectionEvent& rNotify ) if( rNotify.requestor != m_aWindow && rNotify.requestor != m_aCurrentDropWindow ) fprintf( stderr, "Warning: selection notify for unknown window 0x%lx\n", rNotify.requestor ); #endif - ::std::hash_map< Atom, Selection* >::iterator it = + ::boost::unordered_map< Atom, Selection* >::iterator it = m_aSelections.find( rNotify.selection ); if ( (rNotify.requestor == m_aWindow || rNotify.requestor == m_aCurrentDropWindow) && @@ -2163,7 +2163,7 @@ bool SelectionManager::handleDropEvent( XClientMessageEvent& rMessage ) bool bHandled = false; - ::std::hash_map< XLIB_Window, DropTargetEntry >::iterator it = + ::boost::unordered_map< XLIB_Window, DropTargetEntry >::iterator it = m_aDropTargets.find( aTarget ); #if OSL_DEBUG_LEVEL > 1 @@ -2539,7 +2539,7 @@ void SelectionManager::sendDropPosition( bool bForce, XLIB_Time eventTime ) if( m_bDropSent ) return; - ::std::hash_map< XLIB_Window, DropTargetEntry >::const_iterator it = + ::boost::unordered_map< XLIB_Window, DropTargetEntry >::const_iterator it = m_aDropTargets.find( m_aDropWindow ); if( it != m_aDropTargets.end() ) { @@ -2602,7 +2602,7 @@ bool SelectionManager::handleDragEvent( XEvent& rMessage ) bool bHandled = false; // for shortcut - ::std::hash_map< XLIB_Window, DropTargetEntry >::const_iterator it = + ::boost::unordered_map< XLIB_Window, DropTargetEntry >::const_iterator it = m_aDropTargets.find( m_aDropWindow ); #if OSL_DEBUG_LEVEL > 1 switch( rMessage.type ) @@ -3103,7 +3103,7 @@ void SelectionManager::updateDragWindow( int nX, int nY, XLIB_Window aRoot ) dsde.DropAction = nNewProtocolVersion >= 0 ? m_nUserDragAction : DNDConstants::ACTION_COPY; dsde.UserAction = nNewProtocolVersion >= 0 ? m_nUserDragAction : DNDConstants::ACTION_COPY; - ::std::hash_map< XLIB_Window, DropTargetEntry >::const_iterator it; + ::boost::unordered_map< XLIB_Window, DropTargetEntry >::const_iterator it; if( aNewCurrentWindow != m_aDropWindow ) { #if OSL_DEBUG_LEVEL > 1 @@ -3258,7 +3258,7 @@ void SelectionManager::startDrag( int root_x, root_y, win_x, win_y; unsigned int mask; - ::std::hash_map< XLIB_Window, DropTargetEntry >::const_iterator it; + ::boost::unordered_map< XLIB_Window, DropTargetEntry >::const_iterator it; it = m_aDropTargets.begin(); while( it != m_aDropTargets.end() ) { @@ -3663,7 +3663,7 @@ bool SelectionManager::handleXEvent( XEvent& rEvent ) ); #endif SelectionAdaptor* pAdaptor = getAdaptor( rEvent.xselectionclear.selection ); - std::hash_map< Atom, Selection* >::iterator it( m_aSelections.find( rEvent.xselectionclear.selection ) ); + boost::unordered_map< Atom, Selection* >::iterator it( m_aSelections.find( rEvent.xselectionclear.selection ) ); if( it != m_aSelections.end() ) it->second->m_bOwner = false; aGuard.clear(); @@ -3791,7 +3791,7 @@ void SelectionManager::run( void* pThis ) osl::ClearableMutexGuard aGuard(This->m_aMutex); std::list< std::pair< SelectionAdaptor*, Reference< XInterface > > > aChangeList; - for( std::hash_map< Atom, Selection* >::iterator it = This->m_aSelections.begin(); it != This->m_aSelections.end(); ++it ) + for( boost::unordered_map< Atom, Selection* >::iterator it = This->m_aSelections.begin(); it != This->m_aSelections.end(); ++it ) { if( it->first != This->m_nXdndSelection && ! it->second->m_bOwner ) { @@ -3938,7 +3938,7 @@ void SelectionManager::deregisterHandler( Atom selection ) { osl::MutexGuard aGuard(m_aMutex); - ::std::hash_map< Atom, Selection* >::iterator it = + ::boost::unordered_map< Atom, Selection* >::iterator it = m_aSelections.find( selection ); if( it != m_aSelections.end() ) { @@ -3967,7 +3967,7 @@ void SelectionManager::registerDropTarget( XLIB_Window aWindow, DropTarget* pTar osl::MutexGuard aGuard(m_aMutex); // sanity check - ::std::hash_map< XLIB_Window, DropTargetEntry >::const_iterator it = + ::boost::unordered_map< XLIB_Window, DropTargetEntry >::const_iterator it = m_aDropTargets.find( aWindow ); if( it != m_aDropTargets.end() ) OSL_ASSERT( "attempt to register window as drop target twice" ); @@ -4014,7 +4014,7 @@ void SelectionManager::deregisterDropTarget( XLIB_Window aWindow ) if( aWindow == m_aDragSourceWindow && m_aDragRunning.check() ) { // abort drag - std::hash_map< XLIB_Window, DropTargetEntry >::const_iterator it = + boost::unordered_map< XLIB_Window, DropTargetEntry >::const_iterator it = m_aDropTargets.find( m_aDropWindow ); if( it != m_aDropTargets.end() ) { diff --git a/vcl/unx/source/dtrans/X11_selection.hxx b/vcl/unx/source/dtrans/X11_selection.hxx index fb01b95a4335..28ff488c5627 100644 --- a/vcl/unx/source/dtrans/X11_selection.hxx +++ b/vcl/unx/source/dtrans/X11_selection.hxx @@ -43,7 +43,7 @@ #include <osl/conditn.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <list> #include "tools/prex.h" @@ -163,7 +163,7 @@ namespace x11 { >, public SelectionAdaptor { - static ::std::hash_map< ::rtl::OUString, SelectionManager*, ::rtl::OUStringHash >& getInstances(); + static ::boost::unordered_map< ::rtl::OUString, SelectionManager*, ::rtl::OUStringHash >& getInstances(); // for INCR type selection transfer // INCR protocol is used if the data cannot @@ -335,7 +335,7 @@ namespace x11 { // drag and drop int m_nCurrentProtocolVersion; - ::std::hash_map< XLIB_Window, DropTargetEntry > + ::boost::unordered_map< XLIB_Window, DropTargetEntry > m_aDropTargets; @@ -366,16 +366,16 @@ namespace x11 { Atom m_nXdndActionPrivate; // caching for atoms - ::std::hash_map< Atom, ::rtl::OUString > + ::boost::unordered_map< Atom, ::rtl::OUString > m_aAtomToString; - ::std::hash_map< ::rtl::OUString, Atom, ::rtl::OUStringHash > + ::boost::unordered_map< ::rtl::OUString, Atom, ::rtl::OUStringHash > m_aStringToAtom; // the registered selections - ::std::hash_map< Atom, Selection* > + ::boost::unordered_map< Atom, Selection* > m_aSelections; // IncrementalTransfers in progress - std::hash_map< XLIB_Window, std::hash_map< Atom, IncrementalTransfer > > + boost::unordered_map< XLIB_Window, boost::unordered_map< Atom, IncrementalTransfer > > m_aIncrementals; // do not use X11 multithreading capabilities diff --git a/vcl/unx/source/dtrans/X11_service.cxx b/vcl/unx/source/dtrans/X11_service.cxx index 3eab180f8fec..b9ec35fc23e1 100644 --- a/vcl/unx/source/dtrans/X11_service.cxx +++ b/vcl/unx/source/dtrans/X11_service.cxx @@ -72,7 +72,7 @@ Sequence< OUString > SAL_CALL x11::Xdnd_dropTarget_getSupportedServiceNames() Reference< XInterface > X11SalInstance::CreateClipboard( const Sequence< Any >& arguments ) { - static std::hash_map< OUString, ::std::hash_map< Atom, Reference< XClipboard > >, ::rtl::OUStringHash > m_aInstances; + static boost::unordered_map< OUString, ::boost::unordered_map< Atom, Reference< XClipboard > >, ::rtl::OUStringHash > m_aInstances; OUString aDisplayName; Atom nSelection; @@ -108,8 +108,8 @@ Reference< XInterface > X11SalInstance::CreateClipboard( const Sequence< Any >& nSelection = rManager.getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("CLIPBOARD")) ); } - ::std::hash_map< Atom, Reference< XClipboard > >& rMap( m_aInstances[ aDisplayName ] ); - ::std::hash_map< Atom, Reference< XClipboard > >::iterator it = rMap.find( nSelection ); + ::boost::unordered_map< Atom, Reference< XClipboard > >& rMap( m_aInstances[ aDisplayName ] ); + ::boost::unordered_map< Atom, Reference< XClipboard > >::iterator it = rMap.find( nSelection ); if( it != rMap.end() ) return it->second; diff --git a/vcl/unx/source/fontmanager/fontconfig.cxx b/vcl/unx/source/fontmanager/fontconfig.cxx index eddb455c2b07..d41093372990 100644 --- a/vcl/unx/source/fontmanager/fontconfig.cxx +++ b/vcl/unx/source/fontmanager/fontconfig.cxx @@ -263,8 +263,8 @@ public: FcResult LocalizedElementFromPattern(FcPattern* pPattern, FcChar8 **family, const char *elementtype, const char *elementlangtype); //to-do, make private and add some cleanish accessor methods - std::hash_map< rtl::OString, rtl::OString, rtl::OStringHash > m_aFontNameToLocalized; - std::hash_map< rtl::OString, rtl::OString, rtl::OStringHash > m_aLocalizedToCanonical; + boost::unordered_map< rtl::OString, rtl::OString, rtl::OStringHash > m_aFontNameToLocalized; + boost::unordered_map< rtl::OString, rtl::OString, rtl::OStringHash > m_aLocalizedToCanonical; private: void cacheLocalizedFontNames(FcChar8 *origfontname, FcChar8 *bestfontname, const std::vector< lang_and_element > &lang_and_elements); }; @@ -688,7 +688,7 @@ namespace } } -int PrintFontManager::countFontconfigFonts( std::hash_map<rtl::OString, int, rtl::OStringHash>& o_rVisitedPaths ) +int PrintFontManager::countFontconfigFonts( boost::unordered_map<rtl::OString, int, rtl::OStringHash>& o_rVisitedPaths ) { int nFonts = 0; @@ -1042,7 +1042,7 @@ rtl::OUString PrintFontManager::Substitute(const rtl::OUString& rFontName, if( eFileRes == FcResultMatch ) { OString sFamily((sal_Char*)family); - std::hash_map< rtl::OString, rtl::OString, rtl::OStringHash >::const_iterator aI = rWrapper.m_aFontNameToLocalized.find(sFamily); + boost::unordered_map< rtl::OString, rtl::OString, rtl::OStringHash >::const_iterator aI = rWrapper.m_aFontNameToLocalized.find(sFamily); if (aI != rWrapper.m_aFontNameToLocalized.end()) sFamily = aI->second; aName = rtl::OStringToOUString( sFamily, RTL_TEXTENCODING_UTF8 ); @@ -1101,7 +1101,7 @@ bool PrintFontManager::getFontOptions( OString sFamily = OUStringToOString( rInfo.m_aFamilyName, RTL_TEXTENCODING_UTF8 ); - std::hash_map< rtl::OString, rtl::OString, rtl::OStringHash >::const_iterator aI = rWrapper.m_aLocalizedToCanonical.find(sFamily); + boost::unordered_map< rtl::OString, rtl::OString, rtl::OStringHash >::const_iterator aI = rWrapper.m_aLocalizedToCanonical.find(sFamily); if (aI != rWrapper.m_aLocalizedToCanonical.end()) sFamily = aI->second; if( sFamily.getLength() ) @@ -1242,7 +1242,7 @@ bool PrintFontManager::initFontconfig() return false; } -int PrintFontManager::countFontconfigFonts( std::hash_map<rtl::OString, int, rtl::OStringHash>& ) +int PrintFontManager::countFontconfigFonts( boost::unordered_map<rtl::OString, int, rtl::OStringHash>& ) { return 0; } diff --git a/vcl/unx/source/fontmanager/fontmanager.cxx b/vcl/unx/source/fontmanager/fontmanager.cxx index 416a48cae2c9..9c59bf9af524 100644 --- a/vcl/unx/source/fontmanager/fontmanager.cxx +++ b/vcl/unx/source/fontmanager/fontmanager.cxx @@ -75,7 +75,7 @@ #include "sal/alloca.h" #include <set> -#include <hash_set> +#include <boost/unordered_set.hpp> #include <algorithm> #include "adobeenc.tab" // get encoding table for AFM metrics @@ -487,8 +487,8 @@ bool PrintFontManager::TrueTypeFontFile::queryMetricPage( int nPage, MultiAtomPr if( pImplTTFont->nkern && pImplTTFont->kerntype == KT_MICROSOFT ) { // create a glyph -> character mapping - ::std::hash_map< sal_uInt16, sal_Unicode > aGlyphMap; - ::std::hash_map< sal_uInt16, sal_Unicode >::iterator left, right; + ::boost::unordered_map< sal_uInt16, sal_Unicode > aGlyphMap; + ::boost::unordered_map< sal_uInt16, sal_Unicode >::iterator left, right; for( i = 21; i < 0xfffd; i++ ) { sal_uInt16 nGlyph = MapChar( pTTFont, (sal_Unicode)i, 0 ); // kerning for horz only @@ -587,8 +587,8 @@ bool PrintFontManager::TrueTypeFontFile::queryMetricPage( int nPage, MultiAtomPr if( pImplTTFont->nkern && pImplTTFont->kerntype == KT_APPLE_NEW ) { // create a glyph -> character mapping - ::std::hash_map< sal_uInt16, sal_Unicode > aGlyphMap; - ::std::hash_map< sal_uInt16, sal_Unicode >::iterator left, right; + ::boost::unordered_map< sal_uInt16, sal_Unicode > aGlyphMap; + ::boost::unordered_map< sal_uInt16, sal_Unicode >::iterator left, right; for( i = 21; i < 0xfffd; i++ ) { sal_uInt16 nGlyph = MapChar( pTTFont, (sal_Unicode)i, 0 ); // kerning for horz only @@ -731,7 +731,7 @@ bool PrintFontManager::TrueTypeFontFile::queryMetricPage( int nPage, MultiAtomPr */ static bool familyNameOverride( const OUString& i_rPSname, OUString& o_rFamilyName ) { - static std::hash_map< OUString, OUString, OUStringHash > aPSNameToFamily( 16 ); + static boost::unordered_map< OUString, OUString, OUStringHash > aPSNameToFamily( 16 ); if( aPSNameToFamily.empty() ) // initialization { aPSNameToFamily[ OUString( RTL_CONSTASCII_USTRINGPARAM( "Helvetica-Narrow" ) ) ] = @@ -743,7 +743,7 @@ static bool familyNameOverride( const OUString& i_rPSname, OUString& o_rFamilyNa aPSNameToFamily[ OUString( RTL_CONSTASCII_USTRINGPARAM( "Helvetica-Narrow-Oblique" ) ) ] = OUString( RTL_CONSTASCII_USTRINGPARAM( "Helvetica Narrow" ) ); } - std::hash_map<OUString,OUString,OUStringHash>::const_iterator it = + boost::unordered_map<OUString,OUString,OUStringHash>::const_iterator it = aPSNameToFamily.find( i_rPSname ); bool bReplaced = (it != aPSNameToFamily.end() ); if( bReplaced ) @@ -1083,8 +1083,8 @@ bool PrintFontManager::PrintFont::readAfmMetrics( const OString& rFileName, Mult } else if( pChar->code != -1 ) { - ::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 > aCodes = rManager.getUnicodeFromAdobeCode( pChar->code ); while( aCodes.first != aCodes.second ) { @@ -1192,12 +1192,12 @@ PrintFontManager::PrintFontManager() : { for( unsigned int i = 0; i < SAL_N_ELEMENTS( aAdobeCodes ); i++ ) { - m_aUnicodeToAdobename.insert( ::std::hash_multimap< sal_Unicode, ::rtl::OString >::value_type( aAdobeCodes[i].aUnicode, aAdobeCodes[i].pAdobename ) ); - m_aAdobenameToUnicode.insert( ::std::hash_multimap< ::rtl::OString, sal_Unicode, ::rtl::OStringHash >::value_type( aAdobeCodes[i].pAdobename, aAdobeCodes[i].aUnicode ) ); + m_aUnicodeToAdobename.insert( ::boost::unordered_multimap< sal_Unicode, ::rtl::OString >::value_type( aAdobeCodes[i].aUnicode, aAdobeCodes[i].pAdobename ) ); + m_aAdobenameToUnicode.insert( ::boost::unordered_multimap< ::rtl::OString, sal_Unicode, ::rtl::OStringHash >::value_type( aAdobeCodes[i].pAdobename, aAdobeCodes[i].aUnicode ) ); if( aAdobeCodes[i].aAdobeStandardCode ) { - m_aUnicodeToAdobecode.insert( ::std::hash_multimap< sal_Unicode, sal_uInt8 >::value_type( aAdobeCodes[i].aUnicode, aAdobeCodes[i].aAdobeStandardCode ) ); - m_aAdobecodeToUnicode.insert( ::std::hash_multimap< sal_uInt8, sal_Unicode >::value_type( aAdobeCodes[i].aAdobeStandardCode, aAdobeCodes[i].aUnicode ) ); + m_aUnicodeToAdobecode.insert( ::boost::unordered_multimap< sal_Unicode, sal_uInt8 >::value_type( aAdobeCodes[i].aUnicode, aAdobeCodes[i].aAdobeStandardCode ) ); + m_aAdobecodeToUnicode.insert( ::boost::unordered_multimap< sal_uInt8, sal_Unicode >::value_type( aAdobeCodes[i].aAdobeStandardCode, aAdobeCodes[i].aUnicode ) ); } } } @@ -1207,7 +1207,7 @@ PrintFontManager::PrintFontManager() : PrintFontManager::~PrintFontManager() { deinitFontconfig(); - for( ::std::hash_map< fontID, PrintFont* >::const_iterator it = m_aFonts.begin(); it != m_aFonts.end(); ++it ) + for( ::boost::unordered_map< fontID, PrintFont* >::const_iterator it = m_aFonts.begin(); it != m_aFonts.end(); ++it ) delete (*it).second; delete m_pAtoms; if( m_pFontCache ) @@ -1218,7 +1218,7 @@ PrintFontManager::~PrintFontManager() const OString& PrintFontManager::getDirectory( int nAtom ) const { - ::std::hash_map< int, OString >::const_iterator it( m_aAtomToDir.find( nAtom ) ); + ::boost::unordered_map< int, OString >::const_iterator it( m_aAtomToDir.find( nAtom ) ); return it != m_aAtomToDir.end() ? it->second : s_aEmptyOString; } @@ -1227,7 +1227,7 @@ const OString& PrintFontManager::getDirectory( int nAtom ) const int PrintFontManager::getDirectoryAtom( const OString& rDirectory, bool bCreate ) { int nAtom = 0; - ::std::hash_map< OString, int, OStringHash >::const_iterator it + ::boost::unordered_map< OString, int, OStringHash >::const_iterator it ( m_aDirToAtom.find( rDirectory ) ); if( it != m_aDirToAtom.end() ) nAtom = it->second; @@ -1411,7 +1411,7 @@ bool PrintFontManager::analyzeFontFile( int nDirID, const OString& rFontFile, co fontID PrintFontManager::findFontBuiltinID( int nPSNameAtom ) const { fontID nID = 0; - ::std::hash_map< fontID, PrintFont* >::const_iterator it; + ::boost::unordered_map< fontID, PrintFont* >::const_iterator it; for( it = m_aFonts.begin(); nID == 0 && it != m_aFonts.end(); ++it ) { if( it->second->m_eType == fonttype::Builtin && @@ -1427,12 +1427,12 @@ fontID PrintFontManager::findFontFileID( int nDirID, const OString& rFontFile ) { fontID nID = 0; - ::std::hash_map< OString, ::std::set< fontID >, OStringHash >::const_iterator set_it = m_aFontFileToFontID.find( rFontFile ); + ::boost::unordered_map< OString, ::std::set< fontID >, OStringHash >::const_iterator set_it = m_aFontFileToFontID.find( rFontFile ); if( set_it != m_aFontFileToFontID.end() ) { for( ::std::set< fontID >::const_iterator font_it = set_it->second.begin(); font_it != set_it->second.end() && ! nID; ++font_it ) { - ::std::hash_map< fontID, PrintFont* >::const_iterator it = m_aFonts.find( *font_it ); + ::boost::unordered_map< fontID, PrintFont* >::const_iterator it = m_aFonts.find( *font_it ); if( it != m_aFonts.end() ) { switch( it->second->m_eType ) @@ -2117,7 +2117,7 @@ void PrintFontManager::initialize() // initialize may be called twice in the future { - for( ::std::hash_map< fontID, PrintFont* >::const_iterator it = m_aFonts.begin(); it != m_aFonts.end(); ++it ) + for( ::boost::unordered_map< fontID, PrintFont* >::const_iterator it = m_aFonts.begin(); it != m_aFonts.end(); ++it ) delete (*it).second; m_nNextFontID = 1; m_aFonts.clear(); @@ -2169,7 +2169,7 @@ void PrintFontManager::initialize() } // protect against duplicate paths - std::hash_map< OString, int, OStringHash > visited_dirs; + boost::unordered_map< OString, int, OStringHash > visited_dirs; // now that all global and local font dirs are known to fontconfig // check that there are fonts actually managed by fontconfig @@ -2235,7 +2235,7 @@ void PrintFontManager::initialize() if( pDIR ) { // read fonts.dir if possible - ::std::hash_map< OString, ::std::list<OString>, OStringHash > aFontsDir; + ::boost::unordered_map< OString, ::std::list<OString>, OStringHash > aFontsDir; int nDirID = getDirectoryAtom( aPath, true ); // #i38367# no fonts.dir in our own directories anymore std::list< int >::const_iterator priv_dir; @@ -2283,7 +2283,7 @@ void PrintFontManager::initialize() if( findFontFileID( nDirID, aFileName ) == 0 ) { ::std::list<OString> aXLFDs; - ::std::hash_map< OString, ::std::list<OString>, OStringHash >::const_iterator it = + ::boost::unordered_map< OString, ::std::list<OString>, OStringHash >::const_iterator it = aFontsDir.find( aFileName ); if( it != aFontsDir.end() ) aXLFDs = (*it).second; @@ -2414,10 +2414,10 @@ void PrintFontManager::initialize() #endif // part three - fill in family styles - ::std::hash_map< fontID, PrintFont* >::iterator font_it; + ::boost::unordered_map< fontID, PrintFont* >::iterator font_it; for (font_it = m_aFonts.begin(); font_it != m_aFonts.end(); ++font_it) { - ::std::hash_map< int, family::type >::const_iterator it = + ::boost::unordered_map< int, family::type >::const_iterator it = m_aFamilyTypes.find( font_it->second->m_nFamilyName ); if (it != m_aFamilyTypes.end()) continue; @@ -2515,7 +2515,7 @@ namespace { void PrintFontManager::getFontList( ::std::list< fontID >& rFontIDs, const PPDParser* pParser, bool bUseOverrideMetrics ) { rFontIDs.clear(); - std::hash_map< fontID, PrintFont* >::const_iterator it; + boost::unordered_map< fontID, PrintFont* >::const_iterator it; /* * Note: there are two easy steps making this faster: @@ -2537,7 +2537,7 @@ void PrintFontManager::getFontList( ::std::list< fontID >& rFontIDs, const PPDPa if( pParser ) { std::set<int> aBuiltinPSNames; - std::hash_set< BuiltinFontIdentifier, + boost::unordered_set< BuiltinFontIdentifier, BuiltinFontIdentifierHash > aBuiltinFonts; @@ -2548,7 +2548,7 @@ void PrintFontManager::getFontList( ::std::list< fontID >& rFontIDs, const PPDPa for( std::vector<fontID>::const_iterator over = m_aOverrideFonts.begin(); over != m_aOverrideFonts.end(); ++over ) { - std::hash_map<fontID,PrintFont*>::const_iterator font_it = m_aFonts.find( *over ); + boost::unordered_map<fontID,PrintFont*>::const_iterator font_it = m_aFonts.find( *over ); DBG_ASSERT( font_it != m_aFonts.end(), "override to nonexistant font" ); if( font_it != m_aFonts.end() ) aOverridePSNames[ font_it->second->m_nPSName ] = *over; @@ -2638,7 +2638,7 @@ void PrintFontManager::getFontList( ::std::list< fontID >& rFontIDs, const PPDPa void PrintFontManager::fillPrintFontInfo( PrintFont* pFont, FastPrintFontInfo& rInfo ) const { - ::std::hash_map< int, family::type >::const_iterator style_it = + ::boost::unordered_map< int, family::type >::const_iterator style_it = m_aFamilyTypes.find( pFont->m_nFamilyName ); rInfo.m_eType = pFont->m_eType; rInfo.m_aFamilyName = m_pAtoms->getString( ATOM_FAMILYNAME, pFont->m_nFamilyName ); @@ -2855,7 +2855,7 @@ family::type PrintFontManager::getFontFamilyType( fontID nFontID ) const if( !pFont ) return family::Unknown; - ::std::hash_map< int, family::type >::const_iterator it = + ::boost::unordered_map< int, family::type >::const_iterator it = m_aFamilyTypes.find( pFont->m_nFamilyName ); return (it != m_aFamilyTypes.end()) ? it->second : family::Unknown; } @@ -2909,7 +2909,7 @@ OString PrintFontManager::getFontFile( PrintFont* pFont ) const if( pFont && pFont->m_eType == fonttype::Type1 ) { Type1FontFile* pPSFont = static_cast< Type1FontFile* >(pFont); - ::std::hash_map< int, OString >::const_iterator it = m_aAtomToDir.find( pPSFont->m_nDirectory ); + ::boost::unordered_map< int, OString >::const_iterator it = m_aAtomToDir.find( pPSFont->m_nDirectory ); aPath = it->second; aPath += "/"; aPath += pPSFont->m_aFontFile; @@ -2917,7 +2917,7 @@ OString PrintFontManager::getFontFile( PrintFont* pFont ) const else if( pFont && pFont->m_eType == fonttype::TrueType ) { TrueTypeFontFile* pTTFont = static_cast< TrueTypeFontFile* >(pFont); - ::std::hash_map< int, OString >::const_iterator it = m_aAtomToDir.find( pTTFont->m_nDirectory ); + ::boost::unordered_map< int, OString >::const_iterator it = m_aAtomToDir.find( pTTFont->m_nDirectory ); aPath = it->second; aPath += "/"; aPath += pTTFont->m_aFontFile; @@ -3031,7 +3031,7 @@ void PrintFontManager::hasVerticalSubstitutions( fontID nFontID, if( ! pFont->m_pMetrics || ! ( pFont->m_pMetrics->m_aPages[ code >> 11 ] & ( 1 << ( ( code >> 8 ) & 7 ) ) ) ) pFont->queryMetricPage( code >> 8, m_pAtoms ); - ::std::hash_map< sal_Unicode, bool >::const_iterator it = pFont->m_pMetrics->m_bVerticalSubstitutions.find( code ); + ::boost::unordered_map< sal_Unicode, bool >::const_iterator it = pFont->m_pMetrics->m_bVerticalSubstitutions.find( code ); pHasSubst[i] = it != pFont->m_pMetrics->m_bVerticalSubstitutions.end(); } } @@ -3136,7 +3136,7 @@ bool PrintFontManager::getMetrics( fontID nFontID, const sal_Unicode* pString, i { int effectiveCode = pString[i]; effectiveCode |= bVertical ? 1 << 16 : 0; - ::std::hash_map< int, CharacterMetric >::const_iterator it = + ::boost::unordered_map< int, CharacterMetric >::const_iterator it = pFont->m_pMetrics->m_aMetrics.find( effectiveCode ); // if no vertical metrics are available assume rotated horizontal metrics if( bVertical && (it == pFont->m_pMetrics->m_aMetrics.end()) ) @@ -3181,7 +3181,7 @@ bool PrintFontManager::getMetrics( fontID nFontID, sal_Unicode minCharacter, sal { int effectiveCode = code; effectiveCode |= bVertical ? 1 << 16 : 0; - ::std::hash_map< int, CharacterMetric >::const_iterator it = + ::boost::unordered_map< int, CharacterMetric >::const_iterator it = pFont->m_pMetrics->m_aMetrics.find( effectiveCode ); // if no vertical metrics are available assume rotated horizontal metrics if( bVertical && (it == pFont->m_pMetrics->m_aMetrics.end()) ) @@ -3340,7 +3340,7 @@ int PrintFontManager::importFonts( const ::std::list< OString >& rFiles, bool bL { // remove all fonts for the same file // discarding their font ids - ::std::hash_map< fontID, PrintFont* >::iterator current, next; + ::boost::unordered_map< fontID, PrintFont* >::iterator current, next; current = m_aFonts.begin(); OString aFileName( OUStringToOString( aTo.GetName(), aEncoding ) ); while( current != m_aFonts.end() ) @@ -3496,7 +3496,7 @@ bool PrintFontManager::getFileDuplicates( fontID nFont, ::std::list< fontID >& r if( ! aFile.getLength() ) return false; - for( ::std::hash_map< fontID, PrintFont* >::const_iterator it = m_aFonts.begin(); it != m_aFonts.end(); ++it ) + for( ::boost::unordered_map< fontID, PrintFont* >::const_iterator it = m_aFonts.begin(); it != m_aFonts.end(); ++it ) { if( nFont != it->first ) { @@ -3519,7 +3519,7 @@ bool PrintFontManager::removeFonts( const ::std::list< fontID >& rFonts ) ::std::list< fontID > aDuplicates; for( ::std::list< fontID >::const_iterator it = rFonts.begin(); it != rFonts.end(); ++it ) { - ::std::hash_map< fontID, PrintFont* >::const_iterator haveFont = m_aFonts.find( *it ); + ::boost::unordered_map< fontID, PrintFont* >::const_iterator haveFont = m_aFonts.find( *it ); if( haveFont == m_aFonts.end() ) continue; @@ -3855,7 +3855,7 @@ void PrintFontManager::getGlyphWidths( fontID nFont, rUnicodeEnc.clear(); rWidths.clear(); rWidths.reserve( pFont->m_pMetrics->m_aMetrics.size() ); - for( std::hash_map< int, CharacterMetric >::const_iterator it = + for( boost::unordered_map< int, CharacterMetric >::const_iterator it = pFont->m_pMetrics->m_aMetrics.begin(); it != pFont->m_pMetrics->m_aMetrics.end(); ++it ) { @@ -3892,8 +3892,8 @@ const std::map< sal_Unicode, sal_Int32 >* PrintFontManager::getEncodingMap( font std::list< OString > PrintFontManager::getAdobeNameFromUnicode( sal_Unicode aChar ) const { - std::pair< std::hash_multimap< sal_Unicode, rtl::OString >::const_iterator, - std::hash_multimap< sal_Unicode, rtl::OString >::const_iterator > range + std::pair< boost::unordered_multimap< sal_Unicode, rtl::OString >::const_iterator, + boost::unordered_multimap< sal_Unicode, rtl::OString >::const_iterator > range = m_aUnicodeToAdobename.equal_range( aChar ); std::list< OString > aRet; @@ -3913,8 +3913,8 @@ std::list< OString > PrintFontManager::getAdobeNameFromUnicode( sal_Unicode aCha // ------------------------------------------------------------------------- std::list< sal_Unicode > PrintFontManager::getUnicodeFromAdobeName( const rtl::OString& rName ) const { - std::pair< std::hash_multimap< rtl::OString, sal_Unicode, rtl::OStringHash >::const_iterator, - std::hash_multimap< rtl::OString, sal_Unicode, rtl::OStringHash >::const_iterator > range + std::pair< boost::unordered_multimap< rtl::OString, sal_Unicode, rtl::OStringHash >::const_iterator, + boost::unordered_multimap< rtl::OString, sal_Unicode, rtl::OStringHash >::const_iterator > range = m_aAdobenameToUnicode.equal_range( rName ); std::list< sal_Unicode > aRet; diff --git a/vcl/unx/source/gdi/pspgraphics.cxx b/vcl/unx/source/gdi/pspgraphics.cxx index 8e2b7e5921fa..cb481be37b83 100644 --- a/vcl/unx/source/gdi/pspgraphics.cxx +++ b/vcl/unx/source/gdi/pspgraphics.cxx @@ -878,7 +878,7 @@ void PspGraphics::GetDevFontSubstList( OutputDevice* pOutDev ) const psp::PrinterInfo& rInfo = psp::PrinterInfoManager::get().getPrinterInfo( m_pJobData->m_aPrinterName ); if( rInfo.m_bPerformFontSubstitution ) { - for( std::hash_map< rtl::OUString, rtl::OUString, rtl::OUStringHash >::const_iterator it = rInfo.m_aFontSubstitutes.begin(); it != rInfo.m_aFontSubstitutes.end(); ++it ) + for( boost::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash >::const_iterator it = rInfo.m_aFontSubstitutes.begin(); it != rInfo.m_aFontSubstitutes.end(); ++it ) pOutDev->ImplAddDevFontSubstitute( it->first, it->second, FONT_SUBSTITUTE_ALWAYS ); } } diff --git a/vcl/unx/source/gdi/salgdi3.cxx b/vcl/unx/source/gdi/salgdi3.cxx index aaaec1222868..adfe2314b432 100644 --- a/vcl/unx/source/gdi/salgdi3.cxx +++ b/vcl/unx/source/gdi/salgdi3.cxx @@ -78,7 +78,7 @@ #include "i18npool/mslangid.hxx" -#include <hash_set> +#include <boost/unordered_set.hpp> #ifdef ENABLE_GRAPHITE #include <vcl/graphite_layout.hxx> @@ -129,7 +129,7 @@ class FontLookup struct hash; struct equal; - typedef ::std::hash_set< FontLookup, + typedef ::boost::unordered_set< FontLookup, FontLookup::hash, FontLookup::equal > fl_hashset; @@ -1987,7 +1987,7 @@ public: bool FindFontSubstitute( ImplFontSelectData& ) const; private: - typedef ::std::hash_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash > + typedef ::boost::unordered_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash > CachedFontMapType; mutable CachedFontMapType maCachedFontMap; }; diff --git a/vcl/unx/source/gdi/salprnpsp.cxx b/vcl/unx/source/gdi/salprnpsp.cxx index 7e24bff1a7fc..d6985422f3d1 100644 --- a/vcl/unx/source/gdi/salprnpsp.cxx +++ b/vcl/unx/source/gdi/salprnpsp.cxx @@ -398,7 +398,7 @@ SalInfoPrinter* X11SalInstance::CreateInfoPrinter( SalPrinterQueueInfo* pQueueIn // set/clear backwards compatibility flag bool bStrictSO52Compatibility = false; - std::hash_map<rtl::OUString, rtl::OUString, rtl::OUStringHash >::const_iterator compat_it = + boost::unordered_map<rtl::OUString, rtl::OUString, rtl::OUStringHash >::const_iterator compat_it = pJobSetup->maValueMap.find( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StrictSO52Compatibility" ) ) ); if( compat_it != pJobSetup->maValueMap.end() ) @@ -635,7 +635,7 @@ BOOL PspSalInfoPrinter::SetPrinterData( ImplJobSetup* pJobSetup ) { // set/clear backwards compatibility flag bool bStrictSO52Compatibility = false; - std::hash_map<rtl::OUString, rtl::OUString, rtl::OUStringHash >::const_iterator compat_it = + boost::unordered_map<rtl::OUString, rtl::OUString, rtl::OUStringHash >::const_iterator compat_it = pJobSetup->maValueMap.find( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StrictSO52Compatibility" ) ) ); if( compat_it != pJobSetup->maValueMap.end() ) @@ -964,7 +964,7 @@ BOOL PspSalPrinter::StartJob( m_aTmpFile = getTmpName(); nMode = S_IRUSR | S_IWUSR; - ::std::hash_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash >::const_iterator it; + ::boost::unordered_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash >::const_iterator it; it = pJobSetup->maValueMap.find( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FAX#")) ); if( it != pJobSetup->maValueMap.end() ) m_aFaxNr = it->second; @@ -994,7 +994,7 @@ BOOL PspSalPrinter::StartJob( // set/clear backwards compatibility flag bool bStrictSO52Compatibility = false; - std::hash_map<rtl::OUString, rtl::OUString, rtl::OUStringHash >::const_iterator compat_it = + boost::unordered_map<rtl::OUString, rtl::OUString, rtl::OUStringHash >::const_iterator compat_it = pJobSetup->maValueMap.find( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StrictSO52Compatibility" ) ) ); if( compat_it != pJobSetup->maValueMap.end() ) diff --git a/vcl/unx/source/printer/cupsmgr.cxx b/vcl/unx/source/printer/cupsmgr.cxx index bcb9f258de03..fca9a4513f27 100644 --- a/vcl/unx/source/printer/cupsmgr.cxx +++ b/vcl/unx/source/printer/cupsmgr.cxx @@ -587,7 +587,7 @@ void CUPSManager::initialize() // behaviour aPrinter.m_aInfo.m_pParser = NULL; aPrinter.m_aInfo.m_aContext.setParser( NULL ); - std::hash_map< OUString, PPDContext, OUStringHash >::const_iterator c_it = m_aDefaultContexts.find( aPrinterName ); + boost::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(); @@ -603,7 +603,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( std::hash_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.begin(); + for( boost::unordered_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.begin(); it != m_aPrinters.end(); ++it ) { if( m_aCUPSDestMap.find( it->first ) != m_aCUPSDestMap.end() ) @@ -690,7 +690,7 @@ const PPDParser* CUPSManager::createCUPSParser( const OUString& rPrinter ) { if( m_nDests && m_pDests && ! isCUPSDisabled() ) { - std::hash_map< OUString, int, OUStringHash >::iterator dest_it = + boost::unordered_map< OUString, int, OUStringHash >::iterator dest_it = m_aCUPSDestMap.find( aPrinter ); if( dest_it != m_aCUPSDestMap.end() ) { @@ -786,13 +786,13 @@ void CUPSManager::setupJobContextData( ) { #ifdef ENABLE_CUPS - std::hash_map< OUString, int, OUStringHash >::iterator dest_it = + boost::unordered_map< OUString, int, OUStringHash >::iterator dest_it = m_aCUPSDestMap.find( rData.m_aPrinterName ); if( dest_it == m_aCUPSDestMap.end() ) return PrinterInfoManager::setupJobContextData( rData ); - std::hash_map< OUString, Printer, OUStringHash >::iterator p_it = + boost::unordered_map< OUString, Printer, OUStringHash >::iterator p_it = m_aPrinters.find( rData.m_aPrinterName ); if( p_it == m_aPrinters.end() ) // huh ? { @@ -888,13 +888,13 @@ int CUPSManager::endSpool( const OUString& rPrintername, const OUString& rJobTit osl::MutexGuard aGuard( m_aCUPSMutex ); - std::hash_map< OUString, int, OUStringHash >::iterator dest_it = + boost::unordered_map< OUString, int, OUStringHash >::iterator dest_it = m_aCUPSDestMap.find( rPrintername ); if( dest_it == m_aCUPSDestMap.end() ) return PrinterInfoManager::endSpool( rPrintername, rJobTitle, pFile, rDocumentJobData ); #ifdef ENABLE_CUPS - std::hash_map< FILE*, OString, FPtrHash >::const_iterator it = m_aSpoolFiles.find( pFile ); + boost::unordered_map< FILE*, OString, FPtrHash >::const_iterator it = m_aSpoolFiles.find( pFile ); if( it != m_aSpoolFiles.end() ) { fclose( pFile ); @@ -1021,7 +1021,7 @@ bool CUPSManager::setDefaultPrinter( const OUString& rName ) { bool bSuccess = false; #ifdef ENABLE_CUPS - std::hash_map< OUString, int, OUStringHash >::iterator nit = + boost::unordered_map< OUString, int, OUStringHash >::iterator nit = m_aCUPSDestMap.find( rName ); if( nit != m_aCUPSDestMap.end() && m_aCUPSMutex.tryToAcquire() ) { @@ -1047,10 +1047,10 @@ bool CUPSManager::writePrinterConfig() bool bDestModified = false; rtl_TextEncoding aEncoding = osl_getThreadTextEncoding(); - for( std::hash_map< OUString, Printer, OUStringHash >::iterator prt = + for( boost::unordered_map< OUString, Printer, OUStringHash >::iterator prt = m_aPrinters.begin(); prt != m_aPrinters.end(); ++prt ) { - std::hash_map< OUString, int, OUStringHash >::iterator nit = + boost::unordered_map< OUString, int, OUStringHash >::iterator nit = m_aCUPSDestMap.find( prt->first ); if( nit == m_aCUPSDestMap.end() ) continue; diff --git a/vcl/unx/source/printer/ppdparser.cxx b/vcl/unx/source/printer/ppdparser.cxx index 5436845eadba..f477b43c335b 100644 --- a/vcl/unx/source/printer/ppdparser.cxx +++ b/vcl/unx/source/printer/ppdparser.cxx @@ -32,7 +32,7 @@ #include <stdlib.h> #include <stdio.h> -#include <hash_map> +#include <boost/unordered_map.hpp> #include "vcl/ppdparser.hxx" #include "vcl/strhelper.hxx" @@ -80,8 +80,8 @@ namespace psp } }; - typedef std::hash_map< com::sun::star::lang::Locale, rtl::OUString, LocaleHash, LocaleEqual > translation_map; - typedef std::hash_map< rtl::OUString, translation_map, rtl::OUStringHash > key_translation_map; + typedef boost::unordered_map< com::sun::star::lang::Locale, rtl::OUString, LocaleHash, LocaleEqual > translation_map; + typedef boost::unordered_map< rtl::OUString, translation_map, rtl::OUStringHash > key_translation_map; key_translation_map m_aTranslations; public: @@ -251,7 +251,7 @@ namespace psp { public: std::list< PPDParser* > aAllParsers; - std::hash_map< rtl::OUString, rtl::OUString, rtl::OUStringHash >* pAllPPDFiles; + boost::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash >* pAllPPDFiles; PPDCache() : pAllPPDFiles(NULL) {} @@ -485,7 +485,7 @@ void PPDParser::initPPDFiles() if( rPPDCache.pAllPPDFiles ) return; - rPPDCache.pAllPPDFiles = new std::hash_map< OUString, OUString, OUStringHash >(); + rPPDCache.pAllPPDFiles = new boost::unordered_map< OUString, OUString, OUStringHash >(); // check installation directories std::list< OUString > aPathList; @@ -527,7 +527,7 @@ void PPDParser::getKnownPPDDrivers( std::list< rtl::OUString >& o_rDrivers, bool initPPDFiles(); o_rDrivers.clear(); - std::hash_map< OUString, OUString, OUStringHash >::const_iterator it; + boost::unordered_map< OUString, OUString, OUStringHash >::const_iterator it; for( it = rPPDCache.pAllPPDFiles->begin(); it != rPPDCache.pAllPPDFiles->end(); ++it ) o_rDrivers.push_back( it->first ); } @@ -539,7 +539,7 @@ String PPDParser::getPPDFile( const String& rFile ) PPDDecompressStream aStream( aPPD.PathToFileName() ); if( ! aStream.IsOpen() ) { - std::hash_map< OUString, OUString, OUStringHash >::const_iterator it; + boost::unordered_map< OUString, OUString, OUStringHash >::const_iterator it; PPDCache &rPPDCache = thePPDCache::get(); bool bRetry = true; diff --git a/vcl/unx/source/printer/printerinfomanager.cxx b/vcl/unx/source/printer/printerinfomanager.cxx index 9974849f8cfc..b722a8b7804b 100644 --- a/vcl/unx/source/printer/printerinfomanager.cxx +++ b/vcl/unx/source/printer/printerinfomanager.cxx @@ -58,7 +58,7 @@ // the group of the global defaults #define GLOBAL_DEFAULTS_GROUP "__Global_Printer_Defaults__" -#include <hash_set> +#include <boost/unordered_set.hpp> using namespace psp; using namespace rtl; @@ -534,7 +534,7 @@ void PrinterInfoManager::initialize() FileBase::getFileURLFromSystemPath( aFile.PathToFileName(), aPrinter.m_aFile ); aPrinter.m_bModified = false; aPrinter.m_aGroup = aConfig.GetGroupName( nGroup ); - std::hash_map< OUString, Printer, OUStringHash >::const_iterator find_it = + boost::unordered_map< OUString, Printer, OUStringHash >::const_iterator find_it = m_aPrinters.find( aPrinterName ); if( find_it != m_aPrinters.end() ) { @@ -613,7 +613,7 @@ void PrinterInfoManager::initialize() void PrinterInfoManager::listPrinters( ::std::list< OUString >& rList ) const { - ::std::hash_map< OUString, Printer, OUStringHash >::const_iterator it; + ::boost::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 ); @@ -624,7 +624,7 @@ void PrinterInfoManager::listPrinters( ::std::list< OUString >& rList ) const const PrinterInfo& PrinterInfoManager::getPrinterInfo( const OUString& rPrinter ) const { static PrinterInfo aEmptyInfo; - ::std::hash_map< OUString, Printer, OUStringHash >::const_iterator it = m_aPrinters.find( rPrinter ); + ::boost::unordered_map< OUString, Printer, OUStringHash >::const_iterator it = m_aPrinters.find( rPrinter ); DBG_ASSERT( it != m_aPrinters.end(), "Do not ask for info about nonexistant printers" ); @@ -635,7 +635,7 @@ const PrinterInfo& PrinterInfoManager::getPrinterInfo( const OUString& rPrinter void PrinterInfoManager::changePrinterInfo( const OUString& rPrinter, const PrinterInfo& rNewInfo ) { - ::std::hash_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.find( rPrinter ); + ::boost::unordered_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.find( rPrinter ); DBG_ASSERT( it != m_aPrinters.end(), "Do not change nonexistant printers" ); @@ -666,9 +666,9 @@ static bool checkWriteability( const OUString& rUniPath ) bool PrinterInfoManager::writePrinterConfig() { // find at least one writeable config - ::std::hash_map< OUString, Config*, OUStringHash > files; - ::std::hash_map< OUString, int, OUStringHash > rofiles; - ::std::hash_map< OUString, Config*, OUStringHash >::iterator file_it; + ::boost::unordered_map< OUString, Config*, OUStringHash > files; + ::boost::unordered_map< OUString, int, OUStringHash > rofiles; + ::boost::unordered_map< OUString, Config*, OUStringHash >::iterator file_it; for( ::std::list< WatchFile >::const_iterator wit = m_aWatchFiles.begin(); wit != m_aWatchFiles.end(); ++wit ) { @@ -686,7 +686,7 @@ bool PrinterInfoManager::writePrinterConfig() pGlobal->SetGroup( GLOBAL_DEFAULTS_GROUP ); pGlobal->WriteKey( "DisableCUPS", m_bDisableCUPS ? "true" : "false" ); - ::std::hash_map< OUString, Printer, OUStringHash >::iterator it; + ::boost::unordered_map< OUString, Printer, OUStringHash >::iterator it; for( it = m_aPrinters.begin(); it != m_aPrinters.end(); ++it ) { if( ! it->second.m_bModified ) @@ -788,7 +788,7 @@ bool PrinterInfoManager::writePrinterConfig() // write font substitution table pConfig->WriteKey( "PerformFontSubstitution", it->second.m_aInfo.m_bPerformFontSubstitution ? "true" : "false" ); - for( ::std::hash_map< OUString, OUString, OUStringHash >::const_iterator subst = it->second.m_aInfo.m_aFontSubstitutes.begin(); + for( ::boost::unordered_map< OUString, OUString, OUStringHash >::const_iterator subst = it->second.m_aInfo.m_aFontSubstitutes.begin(); subst != it->second.m_aInfo.m_aFontSubstitutes.end(); ++subst ) { ByteString aKey( "SubstFont_" ); @@ -867,7 +867,7 @@ bool PrinterInfoManager::removePrinter( const OUString& rPrinterName, bool bChec { bool bSuccess = true; - ::std::hash_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.find( rPrinterName ); + ::boost::unordered_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.find( rPrinterName ); if( it != m_aPrinters.end() ) { if( it->second.m_aFile.getLength() ) @@ -921,7 +921,7 @@ bool PrinterInfoManager::setDefaultPrinter( const OUString& rPrinterName ) { bool bSuccess = false; - ::std::hash_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.find( rPrinterName ); + ::boost::unordered_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.find( rPrinterName ); if( it != m_aPrinters.end() ) { bSuccess = true; @@ -952,7 +952,7 @@ void PrinterInfoManager::fillFontSubstitutions( PrinterInfo& rInfo ) const return; ::std::list< FastPrintFontInfo > aFonts; - ::std::hash_map< OUString, ::std::list< FastPrintFontInfo >, OUStringHash > aPrinterFonts; + ::boost::unordered_map< OUString, ::std::list< FastPrintFontInfo >, OUStringHash > aPrinterFonts; rFontManager.getFontListWithFastInfo( aFonts, rInfo.m_pParser ); // get builtin fonts @@ -962,8 +962,8 @@ void PrinterInfoManager::fillFontSubstitutions( PrinterInfo& rInfo ) const aPrinterFonts[ it->m_aFamilyName.toAsciiLowerCase() ].push_back( *it ); // map lower case, so build a local copy of the font substitutions - ::std::hash_map< OUString, OUString, OUStringHash > aSubstitutions; - ::std::hash_map< OUString, OUString, OUStringHash >::const_iterator subst; + ::boost::unordered_map< OUString, OUString, OUStringHash > aSubstitutions; + ::boost::unordered_map< OUString, OUString, OUStringHash >::const_iterator subst; for( subst = rInfo.m_aFontSubstitutes.begin(); subst != rInfo.m_aFontSubstitutes.end(); ++subst ) { OUString aFamily( subst->first.toAsciiLowerCase() ); @@ -1104,7 +1104,7 @@ int PrinterInfoManager::endSpool( const OUString& /*rPrintername*/, const OUStri void PrinterInfoManager::setupJobContextData( JobData& rData ) { - std::hash_map< OUString, Printer, OUStringHash >::iterator it = + boost::unordered_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.find( rData.m_aPrinterName ); if( it != m_aPrinters.end() ) { @@ -1214,8 +1214,8 @@ static void lpgetSysQueueTokenHandler( const SystemCommandParameters* ) { rtl_TextEncoding aEncoding = osl_getThreadTextEncoding(); - std::hash_set< OUString, OUStringHash > aUniqueSet; - std::hash_set< OUString, OUStringHash > aOnlySet; + boost::unordered_set< OUString, OUStringHash > aUniqueSet; + boost::unordered_set< OUString, OUStringHash > aOnlySet; aUniqueSet.insert( OUString( RTL_CONSTASCII_USTRINGPARAM( "_all" ) ) ); aUniqueSet.insert( OUString( RTL_CONSTASCII_USTRINGPARAM( "_default" ) ) ); @@ -1311,7 +1311,7 @@ static void standardSysQueueTokenHandler( const SystemCommandParameters* i_pParms) { rtl_TextEncoding aEncoding = osl_getThreadTextEncoding(); - std::hash_set< OUString, OUStringHash > aUniqueSet; + boost::unordered_set< OUString, OUStringHash > aUniqueSet; rtl::OString aForeToken( i_pParms->pForeToken ); rtl::OString aAftToken( i_pParms->pAftToken ); /* Normal Unix print queue discovery, also used for Darwin 5 LPR printing diff --git a/vcl/unx/source/printergfx/common_gfx.cxx b/vcl/unx/source/printergfx/common_gfx.cxx index 78e0461c774f..6e926087f881 100644 --- a/vcl/unx/source/printergfx/common_gfx.cxx +++ b/vcl/unx/source/printergfx/common_gfx.cxx @@ -72,9 +72,9 @@ PrinterGfx::Init (PrinterJob &rPrinterJob) rPrinterJob.GetScale (mfScaleX, mfScaleY); const PrinterInfo& rInfo( PrinterInfoManager::get().getPrinterInfo( rPrinterJob.GetPrinterName() ) ); if( mpFontSubstitutes ) - delete const_cast< ::std::hash_map<fontID,fontID>* >(mpFontSubstitutes); + delete const_cast< ::boost::unordered_map<fontID,fontID>* >(mpFontSubstitutes); if( rInfo.m_bPerformFontSubstitution ) - mpFontSubstitutes = new ::std::hash_map< fontID, fontID >( rInfo.m_aFontSubstitutions ); + mpFontSubstitutes = new ::boost::unordered_map< fontID, fontID >( rInfo.m_aFontSubstitutions ); else mpFontSubstitutes = NULL; mbUploadPS42Fonts = rInfo.m_pParser ? ( rInfo.m_pParser->isType42Capable() ? sal_True : sal_False ) : sal_False; @@ -96,9 +96,9 @@ PrinterGfx::Init (const JobData& rData) mfScaleY = (double)72.0 / (double)mnDpi; const PrinterInfo& rInfo( PrinterInfoManager::get().getPrinterInfo( rData.m_aPrinterName ) ); if( mpFontSubstitutes ) - delete const_cast< ::std::hash_map<fontID,fontID>* >(mpFontSubstitutes); + delete const_cast< ::boost::unordered_map<fontID,fontID>* >(mpFontSubstitutes); if( rInfo.m_bPerformFontSubstitution ) - mpFontSubstitutes = new ::std::hash_map< fontID, fontID >( rInfo.m_aFontSubstitutions ); + mpFontSubstitutes = new ::boost::unordered_map< fontID, fontID >( rInfo.m_aFontSubstitutions ); else mpFontSubstitutes = NULL; mbUploadPS42Fonts = rInfo.m_pParser ? ( rInfo.m_pParser->isType42Capable() ? sal_True : sal_False ) : sal_False; @@ -152,7 +152,7 @@ PrinterGfx::~PrinterGfx() * Alas, this is not always done real time. So we keep a local copy of * the font substitutes now in case of bad timing. */ - delete const_cast< ::std::hash_map<fontID,fontID>* >(mpFontSubstitutes); + delete const_cast< ::boost::unordered_map<fontID,fontID>* >(mpFontSubstitutes); } void diff --git a/vcl/unx/source/printergfx/glyphset.hxx b/vcl/unx/source/printergfx/glyphset.hxx index f1dee2a08641..c8b009c91155 100644 --- a/vcl/unx/source/printergfx/glyphset.hxx +++ b/vcl/unx/source/printergfx/glyphset.hxx @@ -38,7 +38,7 @@ #include "tools/gen.hxx" #include <list> -#include <hash_map> +#include <boost/unordered_map.hpp> namespace psp { @@ -56,9 +56,9 @@ private: rtl_TextEncoding mnBaseEncoding; bool mbUseFontEncoding; - typedef std::hash_map< sal_Unicode, sal_uInt8 > char_map_t; + typedef boost::unordered_map< sal_Unicode, sal_uInt8 > char_map_t; typedef std::list< char_map_t > char_list_t; - typedef std::hash_map< sal_uInt32, sal_uInt8 > glyph_map_t; + typedef boost::unordered_map< sal_uInt32, sal_uInt8 > glyph_map_t; typedef std::list< glyph_map_t > glyph_list_t; char_list_t maCharList; diff --git a/vcl/unx/source/printergfx/text_gfx.cxx b/vcl/unx/source/printergfx/text_gfx.cxx index e963d4ed74c9..0b170565de75 100644 --- a/vcl/unx/source/printergfx/text_gfx.cxx +++ b/vcl/unx/source/printergfx/text_gfx.cxx @@ -703,7 +703,7 @@ PrinterGfx::getFontSubstitute () const { if( mpFontSubstitutes ) { - ::std::hash_map< fontID, fontID >::const_iterator it = + ::boost::unordered_map< fontID, fontID >::const_iterator it = mpFontSubstitutes->find( mnFontID ); if( it != mpFontSubstitutes->end() ) return it->second; @@ -747,7 +747,7 @@ const ::std::list< KernPair >& PrinterGfx::getKernPairs( bool bVertical ) const fontID nFont = mnFontID; if( mpFontSubstitutes ) { - ::std::hash_map< fontID, fontID >::const_iterator it = + ::boost::unordered_map< fontID, fontID >::const_iterator it = mpFontSubstitutes->find( mnFontID ); if( it != mpFontSubstitutes->end() ) nFont = it->second; diff --git a/vcl/win/inc/salgdi.h b/vcl/win/inc/salgdi.h index 488ef2b1074e..c99a24d33d60 100644 --- a/vcl/win/inc/salgdi.h +++ b/vcl/win/inc/salgdi.h @@ -36,7 +36,7 @@ #include <vcl/impfont.hxx> #include "boost/scoped_ptr.hpp" -#include <hash_set> +#include <boost/unordered_set.hpp> class ImplFontSelectData; class ImplWinFontEntry; @@ -119,7 +119,7 @@ private: #ifdef GNG_VERT_HACK void ReadGsubTable( HDC ) const; - typedef std::hash_set<sal_UCS4> UcsHashSet; + typedef boost::unordered_set<sal_UCS4> UcsHashSet; mutable UcsHashSet maGsubTable; mutable bool mbGsubRead; public: diff --git a/vcl/win/source/app/salinfo.cxx b/vcl/win/source/app/salinfo.cxx index 2280fd6e0ddf..e25d1b8a52e4 100644 --- a/vcl/win/source/app/salinfo.cxx +++ b/vcl/win/source/app/salinfo.cxx @@ -58,7 +58,7 @@ #include "rtl/ustrbuf.hxx" -#include <hash_map> +#include <boost/unordered_map.hpp> SalSystem* WinSalInstance::CreateSalSystem() { @@ -143,7 +143,7 @@ bool WinSalSystem::initMonitors() DISPLAY_DEVICEW aDev; aDev.cb = sizeof( aDev ); DWORD nDevice = 0; - std::hash_map< rtl::OUString, int, rtl::OUStringHash > aDeviceStringCount; + boost::unordered_map< rtl::OUString, int, rtl::OUStringHash > aDeviceStringCount; while( EnumDisplayDevicesW( NULL, nDevice++, &aDev, 0 ) ) { if( (aDev.StateFlags & DISPLAY_DEVICE_ACTIVE) @@ -169,7 +169,7 @@ bool WinSalSystem::initMonitors() EnumDisplayMonitors( aDesktopRC, NULL, ImplEnumMonitorProc, reinterpret_cast<LPARAM>(this) ); // append monitor numbers to name strings - std::hash_map< rtl::OUString, int, rtl::OUStringHash > aDevCount( aDeviceStringCount ); + boost::unordered_map< rtl::OUString, int, rtl::OUStringHash > aDevCount( aDeviceStringCount ); unsigned int nMonitors = m_aMonitors.size(); for( unsigned int i = 0; i < nMonitors; i++ ) { diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx index c4e85bb17de8..cd15389af818 100644 --- a/vcl/win/source/gdi/winlayout.cxx +++ b/vcl/win/source/gdi/winlayout.cxx @@ -65,10 +65,10 @@ #undef ULONG #endif // USE_UNISCRIBE -#include <hash_map> +#include <boost/unordered_map.hpp> #include <set> -typedef std::hash_map<int,int> IntMap; +typedef boost::unordered_map<int,int> IntMap; typedef std::set<int> IntSet; // Graphite headers |