diff options
author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-02-05 13:18:52 +0100 |
---|---|---|
committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-02-05 13:18:52 +0100 |
commit | bb564bec137f76dfa099a1cdda3cf39367a6fe50 (patch) | |
tree | e444279823cc1fc9dd07196ea8008720db49248a /sfx2 | |
parent | 5ace73b0896ce36a1ea86fb1c3cb9040f12a3e17 (diff) |
migrate to use boost unordered containers
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/source/appl/imagemgr.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/appl/newhelp.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/appl/workwin.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/control/bindings.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/doc/Metadatable.cxx | 14 | ||||
-rw-r--r-- | sfx2/source/toolbox/imgmgr.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/view/sfxbasecontroller.cxx | 4 |
7 files changed, 19 insertions, 19 deletions
diff --git a/sfx2/source/appl/imagemgr.cxx b/sfx2/source/appl/imagemgr.cxx index 569c14c8154e..c9c52342a139 100644 --- a/sfx2/source/appl/imagemgr.cxx +++ b/sfx2/source/appl/imagemgr.cxx @@ -53,7 +53,7 @@ #include <sfx2/objsh.hxx> #include <sfx2/docfac.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; @@ -62,7 +62,7 @@ using namespace ::com::sun::star::util; using namespace ::com::sun::star::ui; using namespace ::com::sun::star::frame; -typedef std::hash_map< ::rtl::OUString, +typedef boost::unordered_map< ::rtl::OUString, WeakReference< XImageManager >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ModuleIdToImagegMgr; diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index eb6021f9cdf4..66871240d742 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -46,7 +46,7 @@ #include "newhelp.hrc" #include "helpid.hrc" -#include <hash_map> +#include <boost/unordered_map.hpp> #include <rtl/ustrbuf.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/configurationhelper.hxx> @@ -605,7 +605,7 @@ namespace sfx2 { } }; - typedef ::std::hash_map< ::rtl::OUString, int, hashOUString, equalOUString > KeywordInfo; + typedef ::boost::unordered_map< ::rtl::OUString, int, hashOUString, equalOUString > KeywordInfo; } #define UNIFY_AND_INSERT_TOKEN( aToken ) \ diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index ee1593c40863..155f739b7fa1 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -30,7 +30,7 @@ #include "precompiled_sfx2.hxx" #include <stdio.h> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <sfx2/docfile.hxx> #include <sfx2/objsh.hxx> @@ -325,7 +325,7 @@ throw (css::uno::RuntimeException) //==================================================================== -typedef std::hash_map< sal_Int32, rtl::OUString > ToolBarResIdToResourceURLMap; +typedef boost::unordered_map< sal_Int32, rtl::OUString > ToolBarResIdToResourceURLMap; static sal_Bool bMapInitialized = sal_False; static ToolBarResIdToResourceURLMap aResIdToResourceURLMap; diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index 0cf096e5fc98..0fad38057e86 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sfx2.hxx" -#include <hash_map> +#include <boost/unordered_map.hpp> #include <svl/itempool.hxx> #include <svl/itemiter.hxx> #include <svl/eitem.hxx> @@ -99,7 +99,7 @@ static USHORT nTimeOut = 300; static sal_uInt32 nCache1 = 0; static sal_uInt32 nCache2 = 0; -typedef std::hash_map< USHORT, bool > InvalidateSlotMap; +typedef boost::unordered_map< USHORT, bool > InvalidateSlotMap; //==================================================================== diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx index 39129a427ec7..386c33643065 100644 --- a/sfx2/source/doc/Metadatable.cxx +++ b/sfx2/source/doc/Metadatable.cxx @@ -39,7 +39,7 @@ #include <boost/bind.hpp> #include <memory> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <list> #include <algorithm> #if OSL_DEBUG_LEVEL > 0 @@ -402,11 +402,11 @@ XmlIdRegistry::GetXmlIdForElement(const Metadatable& i_rObject) const /// generate unique xml:id template< typename T > /*static*/ ::rtl::OUString create_id(const - ::std::hash_map< ::rtl::OUString, T, ::rtl::OUStringHash > & i_rXmlIdMap) + ::boost::unordered_map< ::rtl::OUString, T, ::rtl::OUStringHash > & i_rXmlIdMap) { static rtlRandomPool s_Pool( rtl_random_createPool() ); const ::rtl::OUString prefix(RTL_CONSTASCII_USTRINGPARAM(s_prefix)); - typename ::std::hash_map< ::rtl::OUString, T, ::rtl::OUStringHash > + typename ::boost::unordered_map< ::rtl::OUString, T, ::rtl::OUStringHash > ::const_iterator iter; ::rtl::OUString id; do @@ -427,7 +427,7 @@ template< typename T > typedef ::std::list< Metadatable* > XmlIdList_t; /// Idref -> (content.xml element list, styles.xml element list) -typedef ::std::hash_map< ::rtl::OUString, +typedef ::boost::unordered_map< ::rtl::OUString, ::std::pair< XmlIdList_t, XmlIdList_t >, ::rtl::OUStringHash > XmlIdMap_t; /// pointer hash template @@ -440,7 +440,7 @@ template<typename T> struct PtrHash }; /// element -> (stream name, idref) -typedef ::std::hash_map< const Metadatable*, +typedef ::boost::unordered_map< const Metadatable*, ::std::pair< ::rtl::OUString, ::rtl::OUString>, PtrHash<Metadatable> > XmlIdReverseMap_t; @@ -923,13 +923,13 @@ struct RMapEntry }; /// element -> (stream name, idref, source) -typedef ::std::hash_map< const Metadatable*, +typedef ::boost::unordered_map< const Metadatable*, struct RMapEntry, PtrHash<Metadatable> > ClipboardXmlIdReverseMap_t; /// Idref -> (content.xml element, styles.xml element) -typedef ::std::hash_map< ::rtl::OUString, +typedef ::boost::unordered_map< ::rtl::OUString, ::std::pair< Metadatable*, Metadatable* >, ::rtl::OUStringHash > ClipboardXmlIdMap_t; diff --git a/sfx2/source/toolbox/imgmgr.cxx b/sfx2/source/toolbox/imgmgr.cxx index efad5bdf43fd..3f5c21a264bc 100644 --- a/sfx2/source/toolbox/imgmgr.cxx +++ b/sfx2/source/toolbox/imgmgr.cxx @@ -30,7 +30,7 @@ #include "precompiled_sfx2.hxx" #include <stdio.h> -#include <hash_map> +#include <boost/unordered_map.hpp> #include "imgmgr.hxx" #include <sfx2/sfx.hrc> @@ -78,7 +78,7 @@ public: ~SfxImageManager_Impl(); }; -typedef std::hash_map< sal_Int64, sal_Int64 > SfxImageManagerMap; +typedef boost::unordered_map< sal_Int64, sal_Int64 > SfxImageManagerMap; // global image lists static SfxImageManager_Impl* pGlobalImageManager = 0; diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index 376935b4a7a7..f6cca14f3a38 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -91,7 +91,7 @@ #include <comphelper/processfactory.hxx> #include <tools/diagnose_ex.h> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <sfx2/event.hxx> #include "viewfac.hxx" @@ -178,7 +178,7 @@ static GroupIDToCommandGroup GroupIDCommandGroupMap[] = { 0 , 0 } }; -typedef std::hash_map< sal_Int16, sal_Int16 > GroupHashMap; +typedef boost::unordered_map< sal_Int16, sal_Int16 > GroupHashMap; sal_Int16 MapGroupIDToCommandGroup( sal_Int16 nGroupID ) |