diff options
125 files changed, 261 insertions, 264 deletions
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index 07c429769df0..ed2de2533c6f 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -56,7 +56,7 @@ #include <osl/mutex.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include "errobject.hxx" -#include <hash_map> +#include <boost/unordered_map.hpp> #include <com/sun/star/script/ModuleType.hpp> #include <com/sun/star/script/ModuleInfo.hpp> @@ -946,7 +946,7 @@ struct ClassModuleRunInitItem {} }; -typedef std::hash_map< ::rtl::OUString, ClassModuleRunInitItem, +typedef boost::unordered_map< ::rtl::OUString, ClassModuleRunInitItem, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ModuleInitDependencyMap; static ModuleInitDependencyMap* GpMIDMap = NULL; diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index c80bc992349f..256af0aa47af 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -94,7 +94,7 @@ using namespace cppu; #include<runtime.hxx> #include<math.h> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <com/sun/star/reflection/XTypeDescriptionEnumerationAccess.hpp> #include <com/sun/star/reflection/XConstantsTypeDescription.hpp> @@ -3218,7 +3218,7 @@ void RTL_Impl_EqualUnoObjects( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite ) refVar->PutBool( TRUE ); } -typedef std::hash_map< ::rtl::OUString, std::vector< ::rtl::OUString >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ModuleHash; +typedef boost::unordered_map< ::rtl::OUString, std::vector< ::rtl::OUString >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ModuleHash; // helper wrapper function to interact with TypeProvider and @@ -3245,7 +3245,7 @@ getTypeDescriptorEnumeration( const ::rtl::OUString& sSearchRoot, return xEnum; } -typedef std::hash_map< ::rtl::OUString, Any, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > VBAConstantsHash; +typedef boost::unordered_map< ::rtl::OUString, Any, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > VBAConstantsHash; VBAConstantHelper& VBAConstantHelper::instance() diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx index 3b253952fb67..419230c1c2b6 100644 --- a/basic/source/inc/namecont.hxx +++ b/basic/source/inc/namecont.hxx @@ -29,7 +29,7 @@ #ifndef BASIC_NAMECONTAINER_HXX #define BASIC_NAMECONTAINER_HXX -#include <hash_map> +#include <boost/unordered_map.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/lang/XInitialization.hpp> @@ -101,7 +101,7 @@ struct eqName_Impl } }; -typedef std::hash_map +typedef boost::unordered_map < ::rtl::OUString, sal_Int32, diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx index 011ffb9a7e02..3f00fb9e8048 100644 --- a/basic/source/inc/sbunoobj.hxx +++ b/basic/source/inc/sbunoobj.hxx @@ -42,7 +42,7 @@ #include <com/sun/star/reflection/XServiceTypeDescription2.hpp> #include <com/sun/star/reflection/XSingletonTypeDescription.hpp> #include <rtl/ustring.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> class SbUnoObject: public SbxObject { @@ -321,7 +321,7 @@ public: virtual void Clear(); }; -typedef std::hash_map< ::rtl::OUString, ::com::sun::star::uno::Any, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > VBAConstantsHash; +typedef boost::unordered_map< ::rtl::OUString, ::com::sun::star::uno::Any, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > VBAConstantsHash; typedef std::vector< rtl::OUString > VBAConstantsVector; diff --git a/basic/source/inc/scriptcont.hxx b/basic/source/inc/scriptcont.hxx index 1b68e089c451..f7f948bd0b31 100644 --- a/basic/source/inc/scriptcont.hxx +++ b/basic/source/inc/scriptcont.hxx @@ -142,7 +142,7 @@ public: }; //============================================================================ -typedef std::hash_map< ::rtl::OUString, ::com::sun::star::script::ModuleInfo, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ModuleInfoMap; +typedef boost::unordered_map< ::rtl::OUString, ::com::sun::star::script::ModuleInfo, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ModuleInfoMap; typedef ::cppu::ImplHelper1 < ::com::sun::star::script::vba::XVBAModuleInfo > SfxScriptLibrary_BASE; diff --git a/basic/source/runtime/stdobj.cxx b/basic/source/runtime/stdobj.cxx index f5f54dad8515..f2f51c4406c7 100644 --- a/basic/source/runtime/stdobj.cxx +++ b/basic/source/runtime/stdobj.cxx @@ -35,7 +35,7 @@ #include <sal/macros.h> #include "rtlproto.hxx" #include "sbintern.hxx" -#include <hash_map> +#include <boost/unordered_map.hpp> // Das nArgs-Feld eines Tabelleneintrags ist wie folgt verschluesselt: // Zur Zeit wird davon ausgegangen, dass Properties keine Parameter // benoetigen! @@ -82,7 +82,7 @@ struct StringHashCode class VBABlacklist { friend class VBABlackListQuery; - std::hash_map< String, bool, StringHashCode > mBlackList; + boost::unordered_map< String, bool, StringHashCode > mBlackList; VBABlacklist() { const char* list[] = { "Red" }; diff --git a/connectivity/source/drivers/mozab/MColumnAlias.hxx b/connectivity/source/drivers/mozab/MColumnAlias.hxx index 5e4858062aaa..1508ae53c2b6 100644 --- a/connectivity/source/drivers/mozab/MColumnAlias.hxx +++ b/connectivity/source/drivers/mozab/MColumnAlias.hxx @@ -34,7 +34,7 @@ #include <osl/mutex.hxx> #include <vector> -#include <hash_map> +#include <boost/unordered_map.hpp> namespace connectivity { @@ -59,7 +59,7 @@ namespace connectivity { } }; - typedef ::std::hash_map< ::rtl::OUString, AliasEntry, ::rtl::OUStringHash > AliasMap; + typedef ::boost::unordered_map< ::rtl::OUString, AliasEntry, ::rtl::OUStringHash > AliasMap; private: AliasMap m_aAliasMap; diff --git a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx index 2719c72dd98e..4af7668e4ec2 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx @@ -39,7 +39,7 @@ #include <tools/diagnose_ex.h> -#include <hash_map> +#include <boost/unordered_map.hpp> //........................................................................ namespace connectivity { namespace mozab { @@ -72,7 +72,7 @@ namespace connectivity { namespace mozab { } }; - typedef ::std::hash_map< ::rtl::OString, CardPropertyData, ::rtl::OStringHash > MapPropertiesToAttributes; + typedef ::boost::unordered_map< ::rtl::OString, CardPropertyData, ::rtl::OStringHash > MapPropertiesToAttributes; #define DEF_CARD_ACCESS( PropertyName ) \ &nsIAbCard::Get##PropertyName, &nsIAbCard::Set##PropertyName diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx index 7fd63616841b..daeed173ea20 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx @@ -38,7 +38,7 @@ #include <comphelper/stl_types.hxx> #include <osl/thread.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> namespace connectivity { @@ -47,7 +47,7 @@ namespace connectivity class MQueryHelperResultEntry { private: - typedef ::std::hash_map< ::rtl::OString, ::rtl::OUString, ::rtl::OStringHash > FieldMap; + typedef ::boost::unordered_map< ::rtl::OString, ::rtl::OUString, ::rtl::OStringHash > FieldMap; mutable ::osl::Mutex m_aMutex; FieldMap m_Fields; diff --git a/connectivity/source/inc/TSkipDeletedSet.hxx b/connectivity/source/inc/TSkipDeletedSet.hxx index e07d24e3ae96..8b9b49d75f22 100644 --- a/connectivity/source/inc/TSkipDeletedSet.hxx +++ b/connectivity/source/inc/TSkipDeletedSet.hxx @@ -30,7 +30,7 @@ #include "TResultSetHelper.hxx" #include <rtl/alloc.h> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <vector> #include "connectivity/dbtoolsdllapi.hxx" diff --git a/desktop/source/app/dispatchwatcher.hxx b/desktop/source/app/dispatchwatcher.hxx index d8b08747dd45..0fde60da603f 100644 --- a/desktop/source/app/dispatchwatcher.hxx +++ b/desktop/source/app/dispatchwatcher.hxx @@ -34,7 +34,7 @@ #include <com/sun/star/frame/XDispatchResultListener.hpp> #include "officeipcthread.hxx" -#include <hash_map> +#include <boost/unordered_map.hpp> #include <vector> namespace desktop @@ -56,7 +56,7 @@ struct OUStringHashCode } }; -class DispatchWatcherHashMap : public ::std::hash_map< ::rtl::OUString, sal_Int32, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > +class DispatchWatcherHashMap : public ::boost::unordered_map< ::rtl::OUString, sal_Int32, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > { public: inline void free() diff --git a/desktop/source/deployment/inc/dp_persmap.h b/desktop/source/deployment/inc/dp_persmap.h index 16392c464bf1..c078cf902ec5 100644 --- a/desktop/source/deployment/inc/dp_persmap.h +++ b/desktop/source/deployment/inc/dp_persmap.h @@ -31,14 +31,14 @@ #include "rtl/ustring.hxx" #include "db.hxx" -#include <hash_map> +#include <boost/unordered_map.hpp> using namespace berkeleydbproxy; namespace dp_misc { -typedef ::std::hash_map< +typedef ::boost::unordered_map< ::rtl::OString, ::rtl::OString, ::rtl::OStringHash > t_string2string_map; //============================================================================== diff --git a/desktop/source/deployment/manager/dp_activepackages.cxx b/desktop/source/deployment/manager/dp_activepackages.cxx index dabc1e37cf24..f220aaf40daa 100644 --- a/desktop/source/deployment/manager/dp_activepackages.cxx +++ b/desktop/source/deployment/manager/dp_activepackages.cxx @@ -41,7 +41,7 @@ #include "rtl/uri.h" #include "rtl/uri.hxx" #include "rtl/ustring.hxx" -#include <hash_map> +#include <boost/unordered_map.hpp> #include "dp_identifier.hxx" #include "dp_persmap.h" diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx index 0f8498877f77..fac52892f450 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.cxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx @@ -65,7 +65,7 @@ #include "boost/bind.hpp" #include <list> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <algorithm> namespace deploy = com::sun::star::deployment; diff --git a/desktop/source/deployment/manager/dp_extensionmanager.hxx b/desktop/source/deployment/manager/dp_extensionmanager.hxx index 8677f960ef91..6bb8fa6e6377 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.hxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.hxx @@ -45,7 +45,7 @@ namespace css = ::com::sun::star; namespace dp_manager { -typedef ::std::hash_map< +typedef ::boost::unordered_map< ::rtl::OUString, ::std::vector<css::uno::Reference<css::deployment::XPackage> >, ::rtl::OUStringHash > id2extensions; diff --git a/desktop/source/deployment/manager/dp_managerfac.cxx b/desktop/source/deployment/manager/dp_managerfac.cxx index 55bd259a276d..cb2f3b7f4387 100644 --- a/desktop/source/deployment/manager/dp_managerfac.cxx +++ b/desktop/source/deployment/manager/dp_managerfac.cxx @@ -55,7 +55,7 @@ class PackageManagerFactoryImpl : private MutexHolder, public t_pmfac_helper Reference<deployment::XPackageManager> m_xUserMgr; Reference<deployment::XPackageManager> m_xSharedMgr; Reference<deployment::XPackageManager> m_xBundledMgr; - typedef ::std::hash_map< + typedef ::boost::unordered_map< OUString, WeakReference<deployment::XPackageManager>, ::rtl::OUStringHash > t_string2weakref; t_string2weakref m_managers; diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx index 1cda30d69297..9d3be045123c 100644 --- a/desktop/source/deployment/registry/component/dp_component.cxx +++ b/desktop/source/deployment/registry/component/dp_component.cxx @@ -55,7 +55,7 @@ #include "com/sun/star/ucb/NameClash.hpp" #include "com/sun/star/util/XMacroExpander.hpp" #include <list> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <vector> #include <memory> #include <algorithm> @@ -203,7 +203,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend bool m_unorc_modified; bool bSwitchedRdbFiles; - typedef ::std::hash_map< OUString, Reference<XInterface>, + typedef ::boost::unordered_map< OUString, Reference<XInterface>, ::rtl::OUStringHash > t_string2object; t_string2object m_backendObjects; diff --git a/desktop/source/deployment/registry/dp_registry.cxx b/desktop/source/deployment/registry/dp_registry.cxx index bffdaeae1924..2c7cb4c2168d 100644 --- a/desktop/source/deployment/registry/dp_registry.cxx +++ b/desktop/source/deployment/registry/dp_registry.cxx @@ -50,9 +50,9 @@ #include "com/sun/star/util/XUpdatable.hpp" #include "com/sun/star/container/XContentEnumerationAccess.hpp" #include "com/sun/star/deployment/PackageRegistryBackend.hpp" -#include <hash_map> +#include <boost/unordered_map.hpp> #include <set> -#include <hash_set> +#include <boost/unordered_set.hpp> #include <memory> using namespace ::dp_misc; @@ -91,10 +91,10 @@ class PackageRegistryImpl : private MutexHolder, public t_helper return str1.equalsIgnoreAsciiCase( str2 ); } }; - typedef ::std::hash_map< + typedef ::boost::unordered_map< OUString, Reference<deployment::XPackageRegistry>, ci_string_hash, ci_string_equals > t_string2registry; - typedef ::std::hash_map< + typedef ::boost::unordered_map< OUString, OUString, ci_string_hash, ci_string_equals > t_string2string; typedef ::std::set< @@ -190,7 +190,7 @@ void PackageRegistryImpl::insertBackend( Reference<deployment::XPackageRegistry> const & xBackend ) { m_allBackends.insert( xBackend ); - typedef ::std::hash_set<OUString, ::rtl::OUStringHash> t_stringset; + typedef ::boost::unordered_set<OUString, ::rtl::OUStringHash> t_stringset; t_stringset ambiguousFilters; const Sequence< Reference<deployment::XPackageTypeInfo> > packageTypes( diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx b/desktop/source/deployment/registry/executable/dp_executable.cxx index 1b05a3fae184..1af6fb0f2240 100644 --- a/desktop/source/deployment/registry/executable/dp_executable.cxx +++ b/desktop/source/deployment/registry/executable/dp_executable.cxx @@ -84,7 +84,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend }; friend class ExecutablePackageImpl; - typedef ::std::hash_map< OUString, Reference<XInterface>, + typedef ::boost::unordered_map< OUString, Reference<XInterface>, ::rtl::OUStringHash > t_string2object; // PackageRegistryBackend diff --git a/desktop/source/deployment/registry/inc/dp_backend.h b/desktop/source/deployment/registry/inc/dp_backend.h index 4e97689e253f..984b17efae66 100644 --- a/desktop/source/deployment/registry/inc/dp_backend.h +++ b/desktop/source/deployment/registry/inc/dp_backend.h @@ -43,7 +43,7 @@ #include "com/sun/star/deployment/XPackageManager.hpp" #include "com/sun/star/deployment/InvalidRemovedParameterException.hpp" #include <memory> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <list> #include "dp_registry.hrc" @@ -283,7 +283,7 @@ class PackageRegistryBackend // XPackageManager::getDeployedPackages is called often. This results in a lot //of bindPackage calls which are costly. Therefore we keep hard references in //the map now. - typedef ::std::hash_map< + typedef ::boost::unordered_map< ::rtl::OUString, css::uno::Reference<css::deployment::XPackage>, ::rtl::OUStringHash > t_string2ref; t_string2ref m_bound; diff --git a/desktop/source/migration/migration_impl.hxx b/desktop/source/migration/migration_impl.hxx index ebb7c96c620c..2d079aeb99a5 100644 --- a/desktop/source/migration/migration_impl.hxx +++ b/desktop/source/migration/migration_impl.hxx @@ -31,7 +31,7 @@ #include <vector> #include <algorithm> #include <memory> -#include <hash_map> +#include <boost/unordered_map.hpp> #include "migration.hxx" @@ -138,7 +138,7 @@ struct MigrationItem ::rtl::OUString GetPrevSibling() const { return m_sPrevSibling; } }; -typedef ::std::hash_map< ::rtl::OUString, +typedef ::boost::unordered_map< ::rtl::OUString, ::std::vector< MigrationItem >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > MigrationHashMap; diff --git a/editeng/source/uno/unoipset.cxx b/editeng/source/uno/unoipset.cxx index 3778a07add0b..fbef5bbaa12e 100644 --- a/editeng/source/uno/unoipset.cxx +++ b/editeng/source/uno/unoipset.cxx @@ -32,7 +32,7 @@ #include <svl/eitem.hxx> #include <tools/list.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <svl/itemprop.hxx> #include <editeng/unoipset.hxx> diff --git a/formula/inc/formula/FormulaCompiler.hxx b/formula/inc/formula/FormulaCompiler.hxx index eca20bcc4120..2a8881e4226f 100644 --- a/formula/inc/formula/FormulaCompiler.hxx +++ b/formula/inc/formula/FormulaCompiler.hxx @@ -35,7 +35,7 @@ #include <rtl/ustrbuf.hxx> #include <boost/shared_ptr.hpp> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <com/sun/star/uno/Sequence.hxx> @@ -77,8 +77,8 @@ struct FORMULA_DLLPUBLIC StringHashCode } }; -typedef ::std::hash_map< String, OpCode, StringHashCode, ::std::equal_to< String > > OpCodeHashMap; -typedef ::std::hash_map< String, String, StringHashCode, ::std::equal_to< String > > ExternalHashMap; +typedef ::boost::unordered_map< String, OpCode, StringHashCode, ::std::equal_to< String > > OpCodeHashMap; +typedef ::boost::unordered_map< String, String, StringHashCode, ::std::equal_to< String > > ExternalHashMap; class FORMULA_DLLPUBLIC FormulaCompiler { diff --git a/fpicker/source/win32/filepicker/propmap.hxx b/fpicker/source/win32/filepicker/propmap.hxx index a37cfefd0fcd..0e8ffd78425a 100644 --- a/fpicker/source/win32/filepicker/propmap.hxx +++ b/fpicker/source/win32/filepicker/propmap.hxx @@ -29,11 +29,11 @@ #ifndef _PROPMAP_HXX_ #define _PROPMAP_HXX_ -#include <hash_map> +#include <boost/unordered_map.hpp> #include <rtl/ustring.hxx> #include <sal/types.h> -typedef ::std::hash_map< ::rtl::OUString , +typedef ::boost::unordered_map< ::rtl::OUString , void* , ::rtl::OUStringHash , ::std::equal_to< ::rtl::OUString > > TPropMapBase; diff --git a/framework/inc/classes/filtercachedata.hxx b/framework/inc/classes/filtercachedata.hxx index dcd449db0266..f92da9cae2d1 100644 --- a/framework/inc/classes/filtercachedata.hxx +++ b/framework/inc/classes/filtercachedata.hxx @@ -32,7 +32,7 @@ /** Attention: stl headers must(!) be included at first. Otherwhise it can make trouble with solaris headers ... */ -#include <hash_map> +#include <boost/unordered_map.hpp> #include <vector> #include <iterator> @@ -470,7 +470,7 @@ struct ContentHandler // and could be used in a generic way //***************************************************************************************************************** template< class HashType > -class SetNodeHash : public ::std::hash_map< ::rtl::OUString , +class SetNodeHash : public ::boost::unordered_map< ::rtl::OUString , HashType , OUStringHashCode , ::std::equal_to< ::rtl::OUString > > @@ -511,7 +511,7 @@ class SetNodeHash : public ::std::hash_map< ::rtl::OUString , // It's an optimism to find registered services faster! // The preferred hash maps file extensions to preferred types to find these ones faster. //***************************************************************************************************************** -class PerformanceHash : public ::std::hash_map< ::rtl::OUString , +class PerformanceHash : public ::boost::unordered_map< ::rtl::OUString , OUStringList , OUStringHashCode , ::std::equal_to< ::rtl::OUString > > diff --git a/framework/inc/helper/titlehelper.hxx b/framework/inc/helper/titlehelper.hxx index 1a61422466df..f9bd3f089e9c 100644 --- a/framework/inc/helper/titlehelper.hxx +++ b/framework/inc/helper/titlehelper.hxx @@ -51,7 +51,7 @@ #include <rtl/ustrbuf.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> //_______________________________________________ // namespace diff --git a/framework/inc/services/substitutepathvars.hxx b/framework/inc/services/substitutepathvars.hxx index e575ff7ee469..be65a5e54041 100644 --- a/framework/inc/services/substitutepathvars.hxx +++ b/framework/inc/services/substitutepathvars.hxx @@ -34,7 +34,7 @@ */ #include <vector> #include <list> -#include <hash_map> +#include <boost/unordered_map.hpp> //_________________________________________________________________________________________________________________ // my own includes @@ -110,7 +110,7 @@ struct SubstitutePathNotify const com::sun::star::uno::Sequence<rtl::OUString> aPropertyNames; }; -class SubstituteVariables : public ::std::hash_map< ::rtl::OUString, +class SubstituteVariables : public ::boost::unordered_map< ::rtl::OUString, SubstituteRule, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > @@ -277,7 +277,7 @@ class SubstitutePathVariables : private ThreadHelpBase throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); private: - class VarNameToIndexMap : public std::hash_map< ::rtl::OUString, + class VarNameToIndexMap : public boost::unordered_map< ::rtl::OUString, PreDefVariable, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > diff --git a/framework/inc/services/tabwindowservice.hxx b/framework/inc/services/tabwindowservice.hxx index 21977c666aef..2c5f6968d726 100644 --- a/framework/inc/services/tabwindowservice.hxx +++ b/framework/inc/services/tabwindowservice.hxx @@ -104,7 +104,7 @@ struct TTabPageInfo css::uno::Sequence< css::beans::NamedValue > m_lProperties; }; -typedef ::std::hash_map< ::sal_Int32 , +typedef ::boost::unordered_map< ::sal_Int32 , TTabPageInfo , Int32HashCode , ::std::equal_to< ::sal_Int32 > > TTabPageInfoHash; diff --git a/framework/inc/stdtypes.h b/framework/inc/stdtypes.h index 432744e1dea6..83754a884c28 100644 --- a/framework/inc/stdtypes.h +++ b/framework/inc/stdtypes.h @@ -31,7 +31,7 @@ #include <vector> #include <queue> -#include <hash_map> +#include <boost/unordered_map.hpp> //_________________________________________________________________________________________________________________ // own includes @@ -162,12 +162,12 @@ typedef ::std::queue< ::rtl::OUString > OUStringQueue; //_________________________________________________________________________________________________________________ /** - Basic hash based on a std::hash_map() which provides key=[OUString] and value=[template type] pairs + Basic hash based on a boost::unordered_map() which provides key=[OUString] and value=[template type] pairs It implements some additional funtionality which can be usefull but is missing at the normal hash implementation. */ template< class TType > -class BaseHash : public ::std::hash_map< ::rtl::OUString , +class BaseHash : public ::boost::unordered_map< ::rtl::OUString , TType , OUStringHashCode , ::std::equal_to< ::rtl::OUString > > diff --git a/framework/inc/uiconfiguration/globalsettings.hxx b/framework/inc/uiconfiguration/globalsettings.hxx index ec0ca269c966..77489515b822 100644 --- a/framework/inc/uiconfiguration/globalsettings.hxx +++ b/framework/inc/uiconfiguration/globalsettings.hxx @@ -34,7 +34,7 @@ */ #include <vector> #include <list> -#include <hash_map> +#include <boost/unordered_map.hpp> //_________________________________________________________________________________________________________________ // my own includes diff --git a/framework/inc/uiconfiguration/imagemanager.hxx b/framework/inc/uiconfiguration/imagemanager.hxx index 1b5a653dbc93..1719070aa038 100644 --- a/framework/inc/uiconfiguration/imagemanager.hxx +++ b/framework/inc/uiconfiguration/imagemanager.hxx @@ -35,7 +35,7 @@ */ #include <vector> #include <list> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <memory> //_________________________________________________________________________________________________________________ diff --git a/framework/inc/uiconfiguration/imagetype.hxx b/framework/inc/uiconfiguration/imagetype.hxx index 4c2b2b687321..7d0a31cb2e44 100644 --- a/framework/inc/uiconfiguration/imagetype.hxx +++ b/framework/inc/uiconfiguration/imagetype.hxx @@ -29,7 +29,7 @@ #ifndef __FRAMEWORK_UICONFIGURATION_IMAGETYPE_HXX_ #define __FRAMEWORK_UICONFIGURATION_IMAGETYPE_HXX_ -#include <hash_map> +#include <boost/unordered_map.hpp> #include <rtl/ustring.hxx> namespace framework @@ -42,11 +42,11 @@ enum ImageType ImageType_COUNT }; -typedef std::hash_map< rtl::OUString, +typedef boost::unordered_map< rtl::OUString, rtl::OUString, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > CommandToImageNameMap; -typedef std::hash_map< rtl::OUString, +typedef boost::unordered_map< rtl::OUString, bool, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > CommandMap; diff --git a/framework/inc/uiconfiguration/moduleimagemanager.hxx b/framework/inc/uiconfiguration/moduleimagemanager.hxx index 1a0657771839..97d8446875e6 100644 --- a/framework/inc/uiconfiguration/moduleimagemanager.hxx +++ b/framework/inc/uiconfiguration/moduleimagemanager.hxx @@ -35,7 +35,7 @@ */ #include <vector> #include <list> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <memory> //_________________________________________________________________________________________________________________ diff --git a/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx b/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx index 94c3a06c8452..26c3347f9a80 100644 --- a/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx +++ b/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx @@ -35,7 +35,7 @@ */ #include <vector> #include <list> -#include <hash_map> +#include <boost/unordered_map.hpp> //_________________________________________________________________________________________________________________ // my own includes @@ -98,7 +98,7 @@ namespace framework throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); private: - typedef ::std::hash_map< rtl::OUString, com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager >, OUStringHashCode, ::std::equal_to< rtl::OUString > > ModuleToModuleCfgMgr; + typedef ::boost::unordered_map< rtl::OUString, com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager >, OUStringHashCode, ::std::equal_to< rtl::OUString > > ModuleToModuleCfgMgr; //TODO_AS void impl_initStorages(); diff --git a/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx b/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx index 9b7a95c65b44..86be656196d1 100644 --- a/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx +++ b/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx @@ -35,7 +35,7 @@ */ #include <vector> #include <list> -#include <hash_map> +#include <boost/unordered_map.hpp> //_________________________________________________________________________________________________________________ // my own includes @@ -169,7 +169,7 @@ namespace framework struct UIElementType; friend struct UIElementType; - typedef ::std::hash_map< rtl::OUString, UIElementData, OUStringHashCode, ::std::equal_to< rtl::OUString > > UIElementDataHashMap; + typedef ::boost::unordered_map< rtl::OUString, UIElementData, OUStringHashCode, ::std::equal_to< rtl::OUString > > UIElementDataHashMap; struct UIElementType { @@ -189,7 +189,7 @@ namespace framework typedef ::std::vector< UIElementType > UIElementTypesVector; typedef ::std::vector< ::com::sun::star::ui::ConfigurationEvent > ConfigEventNotifyContainer; - typedef ::std::hash_map< rtl::OUString, UIElementInfo, OUStringHashCode, ::std::equal_to< rtl::OUString > > UIElementInfoHashMap; + typedef ::boost::unordered_map< rtl::OUString, UIElementInfo, OUStringHashCode, ::std::equal_to< rtl::OUString > > UIElementInfoHashMap; // private methods void impl_Initialize(); diff --git a/framework/inc/uiconfiguration/uicategorydescription.hxx b/framework/inc/uiconfiguration/uicategorydescription.hxx index 1310ffb1f43e..822b0c8a6ae4 100644 --- a/framework/inc/uiconfiguration/uicategorydescription.hxx +++ b/framework/inc/uiconfiguration/uicategorydescription.hxx @@ -34,7 +34,7 @@ */ #include <vector> #include <list> -#include <hash_map> +#include <boost/unordered_map.hpp> //_________________________________________________________________________________________________________________ // my own includes diff --git a/framework/inc/uiconfiguration/uiconfigurationmanager.hxx b/framework/inc/uiconfiguration/uiconfigurationmanager.hxx index 9c497b0af41f..ccb2eaeaeb0d 100644 --- a/framework/inc/uiconfiguration/uiconfigurationmanager.hxx +++ b/framework/inc/uiconfiguration/uiconfigurationmanager.hxx @@ -35,7 +35,7 @@ */ #include <vector> #include <list> -#include <hash_map> +#include <boost/unordered_map.hpp> //_________________________________________________________________________________________________________________ // my own includes @@ -155,7 +155,7 @@ namespace framework struct UIElementType; friend struct UIElementType; - typedef ::std::hash_map< rtl::OUString, UIElementData, OUStringHashCode, ::std::equal_to< rtl::OUString > > UIElementDataHashMap; + typedef ::boost::unordered_map< rtl::OUString, UIElementData, OUStringHashCode, ::std::equal_to< rtl::OUString > > UIElementDataHashMap; struct UIElementType { @@ -175,7 +175,7 @@ namespace framework typedef ::std::vector< UIElementType > UIElementTypesVector; typedef ::std::vector< ::com::sun::star::ui::ConfigurationEvent > ConfigEventNotifyContainer; - typedef ::std::hash_map< rtl::OUString, UIElementInfo, OUStringHashCode, ::std::equal_to< rtl::OUString > > UIElementInfoHashMap; + typedef ::boost::unordered_map< rtl::OUString, UIElementInfo, OUStringHashCode, ::std::equal_to< rtl::OUString > > UIElementInfoHashMap; // private methods void impl_Initialize(); diff --git a/framework/inc/uiconfiguration/windowstateconfiguration.hxx b/framework/inc/uiconfiguration/windowstateconfiguration.hxx index ce491064e385..6ddee64905e4 100644 --- a/framework/inc/uiconfiguration/windowstateconfiguration.hxx +++ b/framework/inc/uiconfiguration/windowstateconfiguration.hxx @@ -34,7 +34,7 @@ */ #include <vector> #include <list> -#include <hash_map> +#include <boost/unordered_map.hpp> //_________________________________________________________________________________________________________________ // my own includes @@ -109,12 +109,12 @@ class WindowStateConfiguration : private ThreadHelpBase virtual sal_Bool SAL_CALL hasElements() throw (::com::sun::star::uno::RuntimeException); - typedef ::std::hash_map< ::rtl::OUString, + typedef ::boost::unordered_map< ::rtl::OUString, ::rtl::OUString, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > ModuleToWindowStateFileMap; - typedef ::std::hash_map< ::rtl::OUString, + typedef ::boost::unordered_map< ::rtl::OUString, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > ModuleToWindowStateConfigHashMap; diff --git a/framework/inc/uielement/controlmenucontroller.hxx b/framework/inc/uielement/controlmenucontroller.hxx index 9d307bba4af5..3f877f3bafc6 100644 --- a/framework/inc/uielement/controlmenucontroller.hxx +++ b/framework/inc/uielement/controlmenucontroller.hxx @@ -91,7 +91,7 @@ namespace framework virtual void impl_setPopupMenu(); virtual void impl_select(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aURL); - class UrlToDispatchMap : public ::std::hash_map< ::rtl::OUString, + class UrlToDispatchMap : public ::boost::unordered_map< ::rtl::OUString, com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx index bc9c422dd24d..ba444052f8d1 100644 --- a/framework/inc/uielement/menubarmanager.hxx +++ b/framework/inc/uielement/menubarmanager.hxx @@ -83,7 +83,7 @@ struct PopupControllerEntry ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XDispatchProvider > m_xDispatchProvider; }; -typedef std::hash_map< rtl::OUString, PopupControllerEntry, OUStringHashCode, ::std::equal_to< rtl::OUString > > PopupControllerCache; +typedef boost::unordered_map< rtl::OUString, PopupControllerEntry, OUStringHashCode, ::std::equal_to< rtl::OUString > > PopupControllerCache; class BmkMenu; class AddonMenu; diff --git a/framework/inc/uielement/menubarwrapper.hxx b/framework/inc/uielement/menubarwrapper.hxx index 847971c8f586..81fcb23deed2 100644 --- a/framework/inc/uielement/menubarwrapper.hxx +++ b/framework/inc/uielement/menubarwrapper.hxx @@ -49,7 +49,7 @@ // other includes //_________________________________________________________________________________________________________________ -#include <hash_map> +#include <boost/unordered_map.hpp> namespace framework { diff --git a/framework/inc/uielement/newmenucontroller.hxx b/framework/inc/uielement/newmenucontroller.hxx index e89002ff19ae..f3c7b1b926ea 100644 --- a/framework/inc/uielement/newmenucontroller.hxx +++ b/framework/inc/uielement/newmenucontroller.hxx @@ -60,7 +60,7 @@ #include <rtl/ustring.hxx> #include <vcl/accel.hxx> #include <vcl/menu.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> namespace framework { @@ -105,7 +105,7 @@ namespace framework rtl::OUString aImageId; }; - typedef ::std::hash_map< int, AddInfo > AddInfoForId; + typedef ::boost::unordered_map< int, AddInfo > AddInfoForId; void fillPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu ); void retrieveShortcutsFromConfiguration( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration >& rAccelCfg, diff --git a/framework/inc/uielement/simpletextstatusbarcontroller.hxx b/framework/inc/uielement/simpletextstatusbarcontroller.hxx index 5285e0fa92a7..1b538390aa15 100644 --- a/framework/inc/uielement/simpletextstatusbarcontroller.hxx +++ b/framework/inc/uielement/simpletextstatusbarcontroller.hxx @@ -35,7 +35,7 @@ #include <macros/xserviceinfo.hxx> #include <stdtypes.h> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <svtools/statusbarcontroller.hxx> #include <vcl/image.hxx> diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx index 0fbd7b6d3e6b..d42c40ad9eb7 100644 --- a/framework/inc/uielement/toolbarmanager.hxx +++ b/framework/inc/uielement/toolbarmanager.hxx @@ -209,11 +209,11 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener bool RetrieveShortcut( const rtl::OUString& rCommandURL, rtl::OUString& rShortCut ); protected: - typedef ::std::hash_map< sal_uInt16, ::com::sun::star::uno::Reference< com::sun::star::frame::XStatusListener > > ToolBarControllerMap; + typedef ::boost::unordered_map< sal_uInt16, ::com::sun::star::uno::Reference< com::sun::star::frame::XStatusListener > > ToolBarControllerMap; typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XSubToolbarController > > SubToolBarControllerVector; typedef BaseHash< SubToolBarControllerVector > SubToolBarToSubToolBarControllerMap; - typedef ::std::hash_map< sal_uInt16, ::com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > > MenuDescriptionMap; + typedef ::boost::unordered_map< sal_uInt16, ::com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > > MenuDescriptionMap; sal_Bool m_bDisposed : 1, m_bSmallSymbols : 1, m_bModuleIdentified : 1, diff --git a/framework/inc/uielement/uicommanddescription.hxx b/framework/inc/uielement/uicommanddescription.hxx index 3ebbe7d0c343..65eb2b724bfd 100644 --- a/framework/inc/uielement/uicommanddescription.hxx +++ b/framework/inc/uielement/uicommanddescription.hxx @@ -34,7 +34,7 @@ */ #include <vector> #include <list> -#include <hash_map> +#include <boost/unordered_map.hpp> //_________________________________________________________________________________________________________________ // my own includes @@ -90,12 +90,12 @@ private: throw (::com::sun::star::uno::RuntimeException); public: - typedef ::std::hash_map< ::rtl::OUString, + typedef ::boost::unordered_map< ::rtl::OUString, ::rtl::OUString, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > ModuleToCommandFileMap; - typedef ::std::hash_map< ::rtl::OUString, + typedef ::boost::unordered_map< ::rtl::OUString, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > UICommandsHashMap; diff --git a/framework/inc/uifactory/factoryconfiguration.hxx b/framework/inc/uifactory/factoryconfiguration.hxx index d3943014ecbb..46ff30b544d0 100644 --- a/framework/inc/uifactory/factoryconfiguration.hxx +++ b/framework/inc/uifactory/factoryconfiguration.hxx @@ -95,7 +95,7 @@ private: ControllerInfo(const ::rtl::OUString& _aImplementationName,const ::rtl::OUString& _aValue) : m_aImplementationName(_aImplementationName),m_aValue(_aValue){} ControllerInfo(){} }; - class MenuControllerMap : public std::hash_map< rtl::OUString, + class MenuControllerMap : public boost::unordered_map< rtl::OUString, ControllerInfo, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > diff --git a/framework/inc/uifactory/uielementfactorymanager.hxx b/framework/inc/uifactory/uielementfactorymanager.hxx index 6be5da8fcb97..8c7d1a02f436 100644 --- a/framework/inc/uifactory/uielementfactorymanager.hxx +++ b/framework/inc/uifactory/uielementfactorymanager.hxx @@ -91,7 +91,7 @@ namespace framework virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); private: - class FactoryManagerMap : public std::hash_map< rtl::OUString, + class FactoryManagerMap : public boost::unordered_map< rtl::OUString, rtl::OUString, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > diff --git a/framework/inc/xml/eventsdocumenthandler.hxx b/framework/inc/xml/eventsdocumenthandler.hxx index c335c525e64e..607d3c2fca60 100644 --- a/framework/inc/xml/eventsdocumenthandler.hxx +++ b/framework/inc/xml/eventsdocumenthandler.hxx @@ -44,7 +44,7 @@ #include <rtl/ustring.hxx> #include <cppuhelper/implbase1.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <stdtypes.h> //_________________________________________________________________________________________________________________ @@ -126,7 +126,7 @@ class OReadEventsDocumentHandler : private ThreadHelpBase, // Struct for right private: ::rtl::OUString getErrorLineString(); - class EventsHashMap : public ::std::hash_map< ::rtl::OUString , + class EventsHashMap : public ::boost::unordered_map< ::rtl::OUString , Events_XML_Entry , OUStringHashCode , ::std::equal_to< ::rtl::OUString > > diff --git a/framework/inc/xml/imagesdocumenthandler.hxx b/framework/inc/xml/imagesdocumenthandler.hxx index 609d88413d80..6f73b52207af 100644 --- a/framework/inc/xml/imagesdocumenthandler.hxx +++ b/framework/inc/xml/imagesdocumenthandler.hxx @@ -43,7 +43,7 @@ #include <rtl/ustring.hxx> #include <cppuhelper/implbase1.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <stdtypes.h> //_________________________________________________________________________________________________________________ @@ -127,7 +127,7 @@ class OReadImagesDocumentHandler : private ThreadHelpBase, // Struct for right private: ::rtl::OUString getErrorLineString(); - class ImageHashMap : public ::std::hash_map< ::rtl::OUString , + class ImageHashMap : public ::boost::unordered_map< ::rtl::OUString , Image_XML_Entry , OUStringHashCode , ::std::equal_to< ::rtl::OUString > > diff --git a/framework/inc/xml/statusbardocumenthandler.hxx b/framework/inc/xml/statusbardocumenthandler.hxx index e6330e6eecdd..bec28624593b 100644 --- a/framework/inc/xml/statusbardocumenthandler.hxx +++ b/framework/inc/xml/statusbardocumenthandler.hxx @@ -44,7 +44,7 @@ #include <rtl/ustring.hxx> #include <cppuhelper/implbase1.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <stdtypes.h> //_________________________________________________________________________________________________________________ @@ -125,7 +125,7 @@ class OReadStatusBarDocumentHandler : private ThreadHelpBase, // Struct for ri private: ::rtl::OUString getErrorLineString(); - class StatusBarHashMap : public ::std::hash_map< ::rtl::OUString , + class StatusBarHashMap : public ::boost::unordered_map< ::rtl::OUString , StatusBar_XML_Entry , OUStringHashCode , ::std::equal_to< ::rtl::OUString > > diff --git a/framework/inc/xml/toolboxdocumenthandler.hxx b/framework/inc/xml/toolboxdocumenthandler.hxx index c298ecdd4f72..e23935047d1b 100644 --- a/framework/inc/xml/toolboxdocumenthandler.hxx +++ b/framework/inc/xml/toolboxdocumenthandler.hxx @@ -129,7 +129,7 @@ class OReadToolBoxDocumentHandler : private ThreadHelpBase, // Struct for right private: ::rtl::OUString getErrorLineString(); - class ToolBoxHashMap : public ::std::hash_map< ::rtl::OUString , + class ToolBoxHashMap : public ::boost::unordered_map< ::rtl::OUString , ToolBox_XML_Entry , OUStringHashCode , ::std::equal_to< ::rtl::OUString > > diff --git a/framework/source/classes/addonsoptions.cxx b/framework/source/classes/addonsoptions.cxx index ae1a7553f28a..593928552a4e 100644 --- a/framework/source/classes/addonsoptions.cxx +++ b/framework/source/classes/addonsoptions.cxx @@ -50,7 +50,7 @@ #include <vcl/graph.hxx> #include <svtools/filter.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <algorithm> #include <vector> @@ -297,10 +297,10 @@ class AddonsOptions_Impl : public ConfigItem Image aImageBigNoScale; }; - typedef std::hash_map< ::rtl::OUString, ImageEntry, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > ImageManager; - typedef std::hash_map< ::rtl::OUString, sal_uInt32, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > StringToIndexMap; + typedef boost::unordered_map< ::rtl::OUString, ImageEntry, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > ImageManager; + typedef boost::unordered_map< ::rtl::OUString, sal_uInt32, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > StringToIndexMap; typedef std::vector< Sequence< Sequence< PropertyValue > > > AddonToolBars; - typedef ::std::hash_map< ::rtl::OUString, MergeToolbarInstructionContainer, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > ToolbarMergingInstructions; + typedef ::boost::unordered_map< ::rtl::OUString, MergeToolbarInstructionContainer, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > ToolbarMergingInstructions; enum ImageSize { diff --git a/framework/source/inc/accelerators/acceleratorcache.hxx b/framework/source/inc/accelerators/acceleratorcache.hxx index 8ac776b5c108..775288a9e7d1 100644 --- a/framework/source/inc/accelerators/acceleratorcache.hxx +++ b/framework/source/inc/accelerators/acceleratorcache.hxx @@ -79,7 +79,7 @@ class AcceleratorCache : public ThreadHelpBase // attention! Must be the first b /** TODO document me keys -> commands */ - typedef ::std::hash_map< css::awt::KeyEvent , + typedef ::boost::unordered_map< css::awt::KeyEvent , ::rtl::OUString , KeyEventHashCode , KeyEventEqualsFunc > TKey2Commands; diff --git a/framework/source/inc/accelerators/keymapping.hxx b/framework/source/inc/accelerators/keymapping.hxx index 5f05b7148ad4..722893094c6d 100644 --- a/framework/source/inc/accelerators/keymapping.hxx +++ b/framework/source/inc/accelerators/keymapping.hxx @@ -77,7 +77,7 @@ class KeyMapping //--------------------------------------- /** @short hash structure to map key codes to identifier. */ - typedef ::std::hash_map< sal_Int16 , + typedef ::boost::unordered_map< sal_Int16 , ::rtl::OUString , ShortHashCode , ::std::equal_to< sal_Int16 > > Code2IdentifierHash; diff --git a/framework/source/inc/accelerators/storageholder.hxx b/framework/source/inc/accelerators/storageholder.hxx index 2fcc37bf643c..8b8994cdc8f7 100644 --- a/framework/source/inc/accelerators/storageholder.hxx +++ b/framework/source/inc/accelerators/storageholder.hxx @@ -91,7 +91,7 @@ class StorageHolder : private ThreadHelpBase // attention! Must be the first bas }; /** @short TODO */ - typedef ::std::hash_map< ::rtl::OUString , + typedef ::boost::unordered_map< ::rtl::OUString , TStorageInfo , ::rtl::OUStringHash , ::std::equal_to< ::rtl::OUString > > TPath2StorageInfo; diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index 1c862faf36bf..4d4bb7475e68 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -750,7 +750,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL Desktop::queryDispatch( co if ( aURL.Protocol.equalsIgnoreAsciiCaseAsciiL( UNO_PROTOCOL, sizeof( UNO_PROTOCOL )-1 )) aCommand = aURL.Path; - // Make hash_map lookup if the current URL is in the disabled list + // Make boost::unordered_map lookup if the current URL is in the disabled list if ( m_aCommandOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, aCommand ) ) return css::uno::Reference< css::frame::XDispatch >(); else diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index 12e44e57cb1f..e0caad6991eb 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -2089,7 +2089,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL Frame::queryDispatch( cons if ( aURL.Protocol.equalsIgnoreAsciiCaseAsciiL( UNO_PROTOCOL, sizeof( UNO_PROTOCOL )-1 )) aCommand = aURL.Path; - // Make hash_map lookup if the current URL is in the disabled list + // Make boost::unordered_map lookup if the current URL is in the disabled list if ( m_aCommandOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, aCommand ) ) return css::uno::Reference< css::frame::XDispatch >(); else diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx b/framework/source/uiconfiguration/imagemanagerimpl.hxx index aa10b763ad3b..46582fbf19c6 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.hxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx @@ -35,7 +35,7 @@ */ #include <vector> #include <list> -#include <hash_map> +#include <boost/unordered_map.hpp> //_________________________________________________________________________________________________________________ // my own includes @@ -162,7 +162,7 @@ namespace framework void clear(); - typedef std::hash_map< rtl::OUString, + typedef boost::unordered_map< rtl::OUString, sal_Bool, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > ImageNameMap; diff --git a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx index 608214d1d656..59cb3b531e2b 100644 --- a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx +++ b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx @@ -122,7 +122,7 @@ ModuleUIConfigurationManagerSupplier::ModuleUIConfigurationManagerSupplier( cons , m_aListenerContainer( m_aLock.getShareableOslMutex() ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ModuleUIConfigurationManagerSupplier::ModuleUIConfigurationManagerSupplier" ); - // Retrieve known modules and insert them into our hash_map to speed-up access time. + // Retrieve known modules and insert them into our boost::unordered_map to speed-up access time. Reference< XNameAccess > xNameAccess( m_xModuleMgr, UNO_QUERY ); const Sequence< ::rtl::OUString > aNameSeq = xNameAccess->getElementNames(); const ::rtl::OUString* pNameSeq = aNameSeq.getConstArray(); diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx index 817eb969a16a..64756c1cf298 100644 --- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx @@ -287,7 +287,7 @@ void ModuleUIConfigurationManager::impl_preloadUIElementTypeList( Layer eLayer, aUIElementData.bDefaultNode = false; } - // Create hash_map entries for all user interface elements inside the storage. We don't load the + // Create boost::unordered_map entries for all user interface elements inside the storage. We don't load the // settings to speed up the process. rHashMap.insert( UIElementDataHashMap::value_type( aUIElementData.aResourceURL, aUIElementData )); } @@ -408,7 +408,7 @@ ModuleUIConfigurationManager::UIElementData* ModuleUIConfigurationManager::impl impl_preloadUIElementTypeList( LAYER_USERDEFINED, nElementType ); impl_preloadUIElementTypeList( LAYER_DEFAULT, nElementType ); - // first try to look into our user-defined vector/hash_map combination + // first try to look into our user-defined vector/boost::unordered_map combination UIElementDataHashMap& rUserHashMap = m_aUIElements[LAYER_USERDEFINED][nElementType].aElementsHashMap; UIElementDataHashMap::iterator pIter = rUserHashMap.find( aResourceURL ); if ( pIter != rUserHashMap.end() ) @@ -422,7 +422,7 @@ ModuleUIConfigurationManager::UIElementData* ModuleUIConfigurationManager::impl } } - // Not successfull, we have to look into our default vector/hash_map combination + // Not successfull, we have to look into our default vector/boost::unordered_map combination UIElementDataHashMap& rDefaultHashMap = m_aUIElements[LAYER_DEFAULT][nElementType].aElementsHashMap; pIter = rDefaultHashMap.find( aResourceURL ); if ( pIter != rDefaultHashMap.end() ) @@ -1446,7 +1446,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la // preload list of element types on demand impl_preloadUIElementTypeList( LAYER_DEFAULT, nElementType ); - // Look into our default vector/hash_map combination + // Look into our default vector/boost::unordered_map combination UIElementDataHashMap& rDefaultHashMap = m_aUIElements[LAYER_DEFAULT][nElementType].aElementsHashMap; UIElementDataHashMap::iterator pIter = rDefaultHashMap.find( ResourceURL ); if ( pIter != rDefaultHashMap.end() ) diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx index ec60d680475f..49d415b7655f 100644 --- a/framework/source/uiconfiguration/uicategorydescription.cxx +++ b/framework/source/uiconfiguration/uicategorydescription.cxx @@ -137,7 +137,7 @@ class ConfigurationAccess_UICategory : // Order is neccessary for right initiali sal_Bool fillCache(); private: - typedef ::std::hash_map< ::rtl::OUString, + typedef ::boost::unordered_map< ::rtl::OUString, ::rtl::OUString, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > IdToInfoCache; diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx index 06bec8c814f3..df7505460265 100644 --- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx @@ -225,7 +225,7 @@ void UIConfigurationManager::impl_preloadUIElementTypeList( sal_Int16 nElementTy aUIElementData.bModified = false; aUIElementData.bDefault = false; - // Create hash_map entries for all user interface elements inside the storage. We don't load the + // Create boost::unordered_map entries for all user interface elements inside the storage. We don't load the // settings to speed up the process. rHashMap.insert( UIElementDataHashMap::value_type( aUIElementData.aResourceURL, aUIElementData )); } @@ -344,7 +344,7 @@ UIConfigurationManager::UIElementData* UIConfigurationManager::impl_findUIElemen // preload list of element types on demand impl_preloadUIElementTypeList( nElementType ); - // try to look into our document vector/hash_map combination + // try to look into our document vector/boost::unordered_map combination UIElementDataHashMap& rUserHashMap = m_aUIElements[nElementType].aElementsHashMap; UIElementDataHashMap::iterator pIter = rUserHashMap.find( aResourceURL ); if ( pIter != rUserHashMap.end() ) diff --git a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx index f9926f5635d1..313d07734995 100644 --- a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx +++ b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx @@ -257,7 +257,7 @@ void UIConfigurationManagerImpl::impl_preloadUIElementTypeList( Layer eLayer, sa aUIElementData.bDefaultNode = false; } - // Create hash_map entries for all user interface elements inside the storage. We don't load the + // Create boost::unordered_map entries for all user interface elements inside the storage. We don't load the // settings to speed up the process. rHashMap.insert( UIElementDataHashMap::value_type( aUIElementData.aResourceURL, aUIElementData )); } @@ -378,7 +378,7 @@ UIConfigurationManagerImpl::UIElementData* UIConfigurationManagerImpl::impl_fin if ( m_bUseDefault ) impl_preloadUIElementTypeList( LAYER_DEFAULT, nElementType ); - // first try to look into our user-defined vector/hash_map combination + // first try to look into our user-defined vector/boost::unordered_map combination UIElementDataHashMap& rUserHashMap = m_aUIElements[LAYER_USERDEFINED][nElementType].aElementsHashMap; UIElementDataHashMap::iterator pIter = rUserHashMap.find( aResourceURL ); if ( pIter != rUserHashMap.end() ) @@ -394,7 +394,7 @@ UIConfigurationManagerImpl::UIElementData* UIConfigurationManagerImpl::impl_fin if ( m_bUseDefault ) { - // Not successfull, we have to look into our default vector/hash_map combination + // Not successfull, we have to look into our default vector/boost::unordered_map combination UIElementDataHashMap& rDefaultHashMap = m_aUIElements[LAYER_DEFAULT][nElementType].aElementsHashMap; pIter = rDefaultHashMap.find( aResourceURL ); if ( pIter != rDefaultHashMap.end() ) @@ -1536,7 +1536,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la // preload list of element types on demand impl_preloadUIElementTypeList( LAYER_DEFAULT, nElementType ); - // Look into our default vector/hash_map combination + // Look into our default vector/boost::unordered_map combination UIElementDataHashMap& rDefaultHashMap = m_aUIElements[LAYER_DEFAULT][nElementType].aElementsHashMap; UIElementDataHashMap::iterator pIter = rDefaultHashMap.find( ResourceURL ); if ( pIter != rDefaultHashMap.end() ) diff --git a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx index 4483693804bf..a2be907122d0 100644 --- a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx +++ b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx @@ -35,7 +35,7 @@ */ #include <vector> #include <list> -#include <hash_map> +#include <boost/unordered_map.hpp> //_________________________________________________________________________________________________________________ // my own includes @@ -159,7 +159,7 @@ namespace framework struct UIElementType; friend struct UIElementType; - typedef ::std::hash_map< rtl::OUString, UIElementData, OUStringHashCode, ::std::equal_to< rtl::OUString > > UIElementDataHashMap; + typedef ::boost::unordered_map< rtl::OUString, UIElementData, OUStringHashCode, ::std::equal_to< rtl::OUString > > UIElementDataHashMap; struct UIElementType { @@ -179,7 +179,7 @@ namespace framework typedef ::std::vector< UIElementType > UIElementTypesVector; typedef ::std::vector< ::com::sun::star::ui::ConfigurationEvent > ConfigEventNotifyContainer; - typedef ::std::hash_map< rtl::OUString, UIElementInfo, OUStringHashCode, ::std::equal_to< rtl::OUString > > UIElementInfoHashMap; + typedef ::boost::unordered_map< rtl::OUString, UIElementInfo, OUStringHashCode, ::std::equal_to< rtl::OUString > > UIElementInfoHashMap; // private methods void impl_Initialize(); diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx index 8936f88ce9f6..7b081b335bde 100644 --- a/framework/source/uiconfiguration/windowstateconfiguration.cxx +++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx @@ -257,7 +257,7 @@ class ConfigurationAccess_WindowState : // interfaces sal_Bool impl_initializeConfigAccess(); private: - typedef ::std::hash_map< ::rtl::OUString, + typedef ::boost::unordered_map< ::rtl::OUString, WindowStateInfo, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > ResourceURLToInfoCache; diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx index e391ead2f04d..f7011398f069 100644 --- a/framework/source/uielement/newmenucontroller.cxx +++ b/framework/source/uielement/newmenucontroller.cxx @@ -368,7 +368,7 @@ void NewMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopup AddInfo aAddInfo; // retrieve additional parameters from bookmark menu and - // store it in a hash_map. + // store it in a boost::unordered_map. for ( USHORT i = 0; i < pSubMenu->GetItemCount(); i++ ) { USHORT nItemId = pSubMenu->GetItemId( sal::static_int_cast<USHORT>( i ) ); diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index 9371ea007f92..cfada4c9f4e1 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -108,7 +108,7 @@ static const char STATIC_INTERNAL_CMD_PART[] = ".cmd:"; namespace framework { -typedef std::hash_map< rtl::OUString, rtl::OUString, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > ToolbarHashMap; +typedef boost::unordered_map< rtl::OUString, rtl::OUString, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > ToolbarHashMap; struct ToolBarEntry { diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx index d8e9b27c1588..073c08302959 100644 --- a/framework/source/uielement/uicommanddescription.cxx +++ b/framework/source/uielement/uicommanddescription.cxx @@ -172,7 +172,7 @@ class ConfigurationAccess_UICommand : // Order is neccessary for right initializ std::vector< ::rtl::OUString >& aImageMirrorVector); private: - typedef ::std::hash_map< ::rtl::OUString, + typedef ::boost::unordered_map< ::rtl::OUString, CmdToInfoMap, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > CommandToInfoCache; diff --git a/framework/test/typecfg/cfgview.cxx b/framework/test/typecfg/cfgview.cxx index 8d000666191a..3fbd4913fb08 100644 --- a/framework/test/typecfg/cfgview.cxx +++ b/framework/test/typecfg/cfgview.cxx @@ -55,7 +55,7 @@ #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <vcl/event.hxx> #include <vcl/svapp.hxx> diff --git a/linguistic/source/convdic.hxx b/linguistic/source/convdic.hxx index 487c66898de9..d3ef70feb386 100644 --- a/linguistic/source/convdic.hxx +++ b/linguistic/source/convdic.hxx @@ -36,7 +36,7 @@ #include <cppuhelper/interfacecontainer.h> #include <tools/string.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <set> #include <memory> #include "misc.hxx" @@ -73,12 +73,12 @@ struct StrEQ } }; -typedef std::hash_multimap< const rtl::OUString, rtl::OUString, +typedef boost::unordered_multimap< const rtl::OUString, rtl::OUString, const rtl::OUStringHash, StrEQ > ConvMap; typedef std::set< rtl::OUString, StrLT > ConvMapKeySet; -typedef std::hash_multimap< const rtl::OUString, sal_Int16, +typedef boost::unordered_multimap< const rtl::OUString, sal_Int16, rtl::OUStringHash, StrEQ > PropTypeMap; /////////////////////////////////////////////////////////////////////////// diff --git a/scripting/source/dlgprov/dlgevtatt.hxx b/scripting/source/dlgprov/dlgevtatt.hxx index dc24f1410a2f..2096aa41097d 100644 --- a/scripting/source/dlgprov/dlgevtatt.hxx +++ b/scripting/source/dlgprov/dlgevtatt.hxx @@ -41,7 +41,7 @@ #include <com/sun/star/script/XScriptEventsSupplier.hpp> -#include <hash_map> +#include <boost/unordered_map.hpp> //......................................................................... namespace dlgprov @@ -51,7 +51,7 @@ namespace dlgprov // ============================================================================= // class DialogEventsAttacherImpl // ============================================================================= - typedef std::hash_map< rtl::OUString, + typedef boost::unordered_map< rtl::OUString, ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptListener >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ListenerHash; diff --git a/scripting/source/provider/ActiveMSPList.hxx b/scripting/source/provider/ActiveMSPList.hxx index 22f7409c2280..42964cd0b4fd 100644 --- a/scripting/source/provider/ActiveMSPList.hxx +++ b/scripting/source/provider/ActiveMSPList.hxx @@ -28,7 +28,7 @@ #ifndef _FRAMEWORK_SCRIPT_PROVIDER_OPENDOCUMENTLIST_HXX_ #define _FRAMEWORK_SCRIPT_PROVIDER_OPENDOCUMENTLIST_HXX_ -#include <hash_map> +#include <boost/unordered_map.hpp> #include <map> #include <osl/mutex.hxx> @@ -59,7 +59,7 @@ typedef ::std::map < css::uno::Reference< css::uno::XInterface > , ::comphelper::OInterfaceCompare< css::uno::XInterface > > ScriptComponent_map; -typedef ::std::hash_map< ::rtl::OUString, +typedef ::boost::unordered_map< ::rtl::OUString, css::uno::Reference< css::script::provider::XScriptProvider >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > Msp_hash; diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.cxx b/scripting/source/provider/BrowseNodeFactoryImpl.cxx index 8123ec2c9611..434e7d962eb4 100644 --- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx +++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx @@ -170,7 +170,7 @@ public: //typedef ::std::map< ::rtl::OUString, Reference< browse::XBrowseNode > > -typedef ::std::hash_map< ::rtl::OUString, Reference< browse::XBrowseNode >, +typedef ::boost::unordered_map< ::rtl::OUString, Reference< browse::XBrowseNode >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > BrowseNodeAggregatorHash; typedef ::std::vector< ::rtl::OUString > vString; diff --git a/scripting/source/provider/ProviderCache.hxx b/scripting/source/provider/ProviderCache.hxx index 694d435d9aab..db1c7d3db70e 100644 --- a/scripting/source/provider/ProviderCache.hxx +++ b/scripting/source/provider/ProviderCache.hxx @@ -29,7 +29,7 @@ #ifndef _FRAMEWORK_SCRIPT_PROVIDER_PROVIDERCACHE_HXX_ #define _FRAMEWORK_SCRIPT_PROVIDER_PROVIDERCACHE_HXX_ -#include <hash_map> +#include <boost/unordered_map.hpp> #include <osl/mutex.hxx> #include <rtl/ustring.hxx> #include <cppuhelper/implbase1.hxx> @@ -58,7 +58,7 @@ struct ProviderDetails css::uno::Reference< css::lang::XSingleComponentFactory > factory; css::uno::Reference< css::script::provider::XScriptProvider > provider; }; -typedef ::std::hash_map < ::rtl::OUString, ProviderDetails , ::rtl::OUStringHash, +typedef ::boost::unordered_map < ::rtl::OUString, ProviderDetails , ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ProviderDetails_hash; diff --git a/scripting/source/storage/ScriptData.hxx b/scripting/source/storage/ScriptData.hxx index 6154b7428c49..f26f7c3149d2 100644 --- a/scripting/source/storage/ScriptData.hxx +++ b/scripting/source/storage/ScriptData.hxx @@ -30,7 +30,7 @@ #define _SCRIPTING_STORAGE_SCRIPTDATA_HXX_ #include <vector> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <cppu/macros.hxx> #include <rtl/ustring.hxx> @@ -42,11 +42,11 @@ namespace scripting_impl typedef ::std::pair< ::rtl::OUString, ::rtl::OUString > str_pair; typedef ::std::vector< str_pair > props_vec; -typedef ::std::hash_map< ::rtl::OUString, props_vec, ::rtl::OUStringHash, +typedef ::boost::unordered_map< ::rtl::OUString, props_vec, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > strpairvec_map; -typedef ::std::hash_map< ::rtl::OUString, ::std::pair< ::rtl::OUString, +typedef ::boost::unordered_map< ::rtl::OUString, ::std::pair< ::rtl::OUString, ::rtl::OUString >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > strpair_map; -typedef ::std::hash_map< ::rtl::OUString, ::std::pair< props_vec, strpairvec_map >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > filesets_map; +typedef ::boost::unordered_map< ::rtl::OUString, ::std::pair< props_vec, strpairvec_map >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > filesets_map; struct ScriptData { diff --git a/scripting/source/storage/ScriptInfo.cxx b/scripting/source/storage/ScriptInfo.cxx index fa41501c4283..d292ecb20224 100644 --- a/scripting/source/storage/ScriptInfo.cxx +++ b/scripting/source/storage/ScriptInfo.cxx @@ -30,7 +30,7 @@ #include "precompiled_scripting.hxx" #include <cppuhelper/implementationentry.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <osl/file.hxx> #include <cppuhelper/implbase1.hxx> @@ -52,7 +52,7 @@ using namespace ::drafts::com::sun::star::script::framework::storage; namespace scripting_impl { -typedef ::std::hash_map < ::rtl::OUString, css::uno::Any, ::rtl::OUStringHash, +typedef ::boost::unordered_map < ::rtl::OUString, css::uno::Any, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > PropertySet_hash; class PropertySetImpl : public ::cppu::WeakImplHelper1< css::beans::XPropertySet > diff --git a/scripting/source/storage/ScriptSecurityManager.hxx b/scripting/source/storage/ScriptSecurityManager.hxx index 525d1a4eb8d9..37dffcadcd42 100644 --- a/scripting/source/storage/ScriptSecurityManager.hxx +++ b/scripting/source/storage/ScriptSecurityManager.hxx @@ -30,7 +30,7 @@ #ifndef _FRAMEWORK_SCRIPT_SCRIPTSECURITYMANAGER_HXX_ #define _FRAMEWORK_SCRIPT_SCRIPTSECURITYMANAGER_HXX_ -#include <hash_map> +#include <boost/unordered_map.hpp> #include <rtl/ustring.hxx> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/uno/RuntimeException.hpp> @@ -50,7 +50,7 @@ struct StoragePerm { sal_Bool execPermission; }; -typedef ::std::hash_map< ::rtl::OUString, StoragePerm, ::rtl::OUStringHash, +typedef ::boost::unordered_map< ::rtl::OUString, StoragePerm, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > Permission_Hash; /** * Class responsible for managing the ScriptSecurity. diff --git a/scripting/source/storage/ScriptStorage.hxx b/scripting/source/storage/ScriptStorage.hxx index 0f19a948bb2c..cb39bbadda06 100644 --- a/scripting/source/storage/ScriptStorage.hxx +++ b/scripting/source/storage/ScriptStorage.hxx @@ -29,7 +29,7 @@ #define __SCRIPTING_STORAGE_SCRIPTSTORAGE_HXX_ #include <vector> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <osl/mutex.hxx> #include <cppuhelper/implbase5.hxx> // helper for component factory @@ -58,20 +58,20 @@ namespace scripting_impl typedef ::std::vector< ScriptData > Datas_vec; //----------------------------------------------------------------------------- // function name -> ScriptData -typedef ::std::hash_map < ::rtl::OUString, ScriptData, ::rtl::OUStringHash, +typedef ::boost::unordered_map < ::rtl::OUString, ScriptData, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ScriptFunction_hash; //----------------------------------------------------------------------------- // language -> hash of function name -> ScriptData -typedef ::std::hash_map < ::rtl::OUString, ScriptFunction_hash, +typedef ::boost::unordered_map < ::rtl::OUString, ScriptFunction_hash, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ScriptData_hash; //----------------------------------------------------------------------------- -typedef ::std::hash_map < ::rtl::OUString, +typedef ::boost::unordered_map < ::rtl::OUString, css::uno::Reference< css::xml::sax::XExtendedDocumentHandler >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ScriptOutput_hash; //----------------------------------------------------------------------------- -typedef ::std::hash_map < ::rtl::OUString, +typedef ::boost::unordered_map < ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ScriptLanguages_hash; diff --git a/scripting/source/storage/ScriptStorageManager.cxx b/scripting/source/storage/ScriptStorageManager.cxx index eee479d0e040..b276e7fb7ff0 100644 --- a/scripting/source/storage/ScriptStorageManager.cxx +++ b/scripting/source/storage/ScriptStorageManager.cxx @@ -171,7 +171,7 @@ SAL_THROW ( ( RuntimeException ) ) validateXRef( xInterface, "ScriptStorageManager:: setupAnyStorage: Can't create ScriptStorage for share" ); - // and place it in the hash_map. Increment the counter + // and place it in the boost::unordered_map. Increment the counter m_ScriptStorageMap[ m_count++ ] = xInterface; sal_Int32 sid = m_count - 1; diff --git a/scripting/source/storage/ScriptStorageManager.hxx b/scripting/source/storage/ScriptStorageManager.hxx index 32d10bb09db0..c5456a58a7eb 100644 --- a/scripting/source/storage/ScriptStorageManager.hxx +++ b/scripting/source/storage/ScriptStorageManager.hxx @@ -30,7 +30,7 @@ #ifndef _DRAFTS_COM_SUN_STAR_SCRIPT_FRAMEWORK_STORAGE_SCRIPTSTORAGEMANAGER_HXX_ #define _DRAFTS_COM_SUN_STAR_SCRIPT_FRAMEWORK_STORAGE_SCRIPTSTORAGEMANAGER_HXX_ -#include <hash_map> +#include <boost/unordered_map.hpp> #include <map> #include <osl/mutex.hxx> @@ -59,7 +59,7 @@ namespace scripting_impl typedef ::std::map < sal_Int32, css::uno::Reference < css::uno::XInterface > > ScriptStorage_map; -typedef ::std::hash_map < ::rtl::OUString, sal_Int32, ::rtl::OUStringHash> +typedef ::boost::unordered_map < ::rtl::OUString, sal_Int32, ::rtl::OUStringHash> StorageId_hash; class ScriptStorageManager : public diff --git a/scripting/source/stringresource/stringresource.hxx b/scripting/source/stringresource/stringresource.hxx index b18ed3cab04d..972d28dbdf5d 100644 --- a/scripting/source/stringresource/stringresource.hxx +++ b/scripting/source/stringresource/stringresource.hxx @@ -43,7 +43,7 @@ #include <osl/mutex.hxx> #include <vector> -#include <hash_map> +#include <boost/unordered_map.hpp> //......................................................................... namespace stringresource @@ -78,7 +78,7 @@ struct eqName_Impl } }; -typedef std::hash_map +typedef boost::unordered_map < ::rtl::OUString, ::rtl::OUString, @@ -87,7 +87,7 @@ typedef std::hash_map > IdToStringMap; -typedef std::hash_map +typedef boost::unordered_map < ::rtl::OUString, sal_Int32, diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx index 25f04283fb76..b9ee8b3216c4 100644 --- a/scripting/source/vbaevents/eventhelper.cxx +++ b/scripting/source/vbaevents/eventhelper.cxx @@ -95,7 +95,7 @@ #include <set> #include <list> -#include <hash_map> +#include <boost/unordered_map.hpp> #define ASYNC 0 // primitive support for asynchronous handling of @@ -250,7 +250,7 @@ struct TranslateInfo }; -typedef std::hash_map< rtl::OUString, +typedef boost::unordered_map< rtl::OUString, std::list< TranslateInfo >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > EventInfoHash; @@ -546,7 +546,7 @@ public: { return ( ( m_hEvents.size() > 0 ? sal_True : sal_False ) ); } private: -typedef std::hash_map< rtl::OUString, Any, ::rtl::OUStringHash, +typedef boost::unordered_map< rtl::OUString, Any, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > EventSupplierHash; EventSupplierHash m_hEvents; 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 ) diff --git a/svx/inc/svx/ShapeTypeHandler.hxx b/svx/inc/svx/ShapeTypeHandler.hxx index ae9d329bb02b..a12351436872 100644 --- a/svx/inc/svx/ShapeTypeHandler.hxx +++ b/svx/inc/svx/ShapeTypeHandler.hxx @@ -41,7 +41,7 @@ #include <rtl/ustring.hxx> #include <vector> -#include <hash_map> +#include <boost/unordered_map.hpp> namespace accessibility { @@ -204,7 +204,7 @@ private: /** This hash map allows the fast look up of a type descriptor for a given service name. */ - typedef ::std::hash_map< + typedef ::boost::unordered_map< ::rtl::OUString,ShapeTypeId, ::rtl::OUStringHash, // ::comphelper::UStringHash, diff --git a/svx/inc/svx/sdasitm.hxx b/svx/inc/svx/sdasitm.hxx index 49fa2e772ef1..e3019ac36fb5 100644 --- a/svx/inc/svx/sdasitm.hxx +++ b/svx/inc/svx/sdasitm.hxx @@ -36,7 +36,7 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/uno/Any.hxx> #include <rtl/ustring.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <map> #include "svx/svxdllapi.h" @@ -72,8 +72,8 @@ private: { size_t operator()( const SdrCustomShapeGeometryItem::PropertyPair &r1 ) const; }; - typedef std::hash_map < PropertyPair, sal_Int32, PropertyPairHash, PropertyPairEq > PropertyPairHashMap; - typedef std::hash_map< rtl::OUString, sal_Int32, rtl::OUStringHash, PropertyEq > PropertyHashMap; + typedef boost::unordered_map < PropertyPair, sal_Int32, PropertyPairHash, PropertyPairEq > PropertyPairHashMap; + typedef boost::unordered_map< rtl::OUString, sal_Int32, rtl::OUStringHash, PropertyEq > PropertyHashMap; PropertyHashMap aPropHashMap; PropertyPairHashMap aPropPairHashMap; diff --git a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx index dd1f0d0b24bd..38099165e5fa 100644 --- a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx @@ -30,7 +30,7 @@ #include "precompiled_svx.hxx" #include "EnhancedCustomShapeTypeNames.hxx" #include <osl/mutex.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> struct TCheck { @@ -39,7 +39,7 @@ struct TCheck return strcmp( s1, s2 ) == 0; } }; -typedef std::hash_map< const char*, MSO_SPT, std::hash<const char*>, TCheck> TypeNameHashMap; +typedef boost::unordered_map< const char*, MSO_SPT, std::hash<const char*>, TCheck> TypeNameHashMap; static TypeNameHashMap* pHashMap = NULL; static ::osl::Mutex& getHashMapMutex() { diff --git a/svx/source/inc/DGColorNameLookUp.hxx b/svx/source/inc/DGColorNameLookUp.hxx index bf23776a0194..9c766d0f9043 100644 --- a/svx/source/inc/DGColorNameLookUp.hxx +++ b/svx/source/inc/DGColorNameLookUp.hxx @@ -30,7 +30,7 @@ #define _SVX_ACCESSIBILITY_DG_COLOR_NAME_LOOK_UP_HXX #include <rtl/ustrbuf.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> namespace accessibility { @@ -71,7 +71,7 @@ public: private: /// Define hash map type to convert numerical color values to names. - typedef std::hash_map<long int, ::rtl::OUString> + typedef boost::unordered_map<long int, ::rtl::OUString> tColorValueToNameMap; /// This ma translates from numerical color values to names. diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx index 94b6030e497b..b3ca15255362 100644 --- a/svx/source/table/accessibletableshape.cxx +++ b/svx/source/table/accessibletableshape.cxx @@ -72,7 +72,7 @@ struct hash } }; -typedef std::hash_map< Reference< XCell >, rtl::Reference< AccessibleCell >, hash > AccessibleCellMap; +typedef boost::unordered_map< Reference< XCell >, rtl::Reference< AccessibleCell >, hash > AccessibleCellMap; //----------------------------------------------------------------------------- // AccessibleTableShapeImpl diff --git a/svx/source/table/propertyset.hxx b/svx/source/table/propertyset.hxx index b74ab4bacece..31cce8511a78 100644 --- a/svx/source/table/propertyset.hxx +++ b/svx/source/table/propertyset.hxx @@ -34,7 +34,7 @@ #include <com/sun/star/beans/XFastPropertySet.hpp> #include <rtl/ref.hxx> #include <functional> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <vector> #include <cppuhelper/implbase1.hxx> @@ -45,7 +45,7 @@ namespace comphelper { // ----------------------------------------------------------------------------- typedef std::vector< ::com::sun::star::beans::Property > PropertyVector; -typedef std::hash_map< ::rtl::OUString, ::sal_uInt32, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > PropertyMap; +typedef boost::unordered_map< ::rtl::OUString, ::sal_uInt32, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > PropertyMap; // ----------------------------------------------------------------------------- diff --git a/svx/source/unodraw/shapepropertynotifier.cxx b/svx/source/unodraw/shapepropertynotifier.cxx index 3ced930aa382..e62df605910d 100644 --- a/svx/source/unodraw/shapepropertynotifier.cxx +++ b/svx/source/unodraw/shapepropertynotifier.cxx @@ -39,7 +39,7 @@ #include <cppuhelper/weak.hxx> #include <tools/diagnose_ex.h> -#include <hash_map> +#include <boost/unordered_map.hpp> namespace { @@ -76,7 +76,7 @@ namespace svx using ::com::sun::star::beans::XPropertySet; /** === end UNO using === **/ - typedef ::std::hash_map< ShapeProperty, PPropertyValueProvider, ShapePropertyHash > PropertyProviders; + typedef ::boost::unordered_map< ShapeProperty, PPropertyValueProvider, ShapePropertyHash > PropertyProviders; typedef ::cppu::OMultiTypeInterfaceContainerHelperVar < ::rtl::OUString , ::comphelper::UStringHash diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index 2e8019b73d80..4f56af5a4b9c 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -42,7 +42,7 @@ #include <com/sun/star/media/ZoomLevel.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <vcl/fldunit.hxx> #include <tools/shl.hxx> #include <osl/mutex.hxx> @@ -839,7 +839,7 @@ comphelper::PropertyMapEntry* ImplGetAdditionalWriterDrawingDefaultsPropertyMap( * class UHashMap * ***********************************************************************/ -typedef ::std::hash_map< rtl::OUString, sal_uInt32, rtl::OUStringHash > UHashMapImpl; +typedef ::boost::unordered_map< rtl::OUString, sal_uInt32, rtl::OUStringHash > UHashMapImpl; namespace { static const UHashMapImpl &GetUHashImpl() diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx index f2c14121e319..6acd923e9306 100644 --- a/ucb/source/core/ucbstore.cxx +++ b/ucb/source/core/ucbstore.cxx @@ -36,7 +36,7 @@ *************************************************************************/ #include <list> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <osl/diagnose.h> #include <rtl/ustrbuf.hxx> #include <cppuhelper/interfacecontainer.hxx> @@ -132,7 +132,7 @@ struct hashString_Impl // //========================================================================= -typedef std::hash_map +typedef boost::unordered_map < OUString, PersistentPropertySet*, diff --git a/ucb/source/ucp/file/filnot.hxx b/ucb/source/ucp/file/filnot.hxx index 1577b199e398..789455af7602 100644 --- a/ucb/source/ucp/file/filnot.hxx +++ b/ucb/source/ucp/file/filnot.hxx @@ -28,7 +28,7 @@ #ifndef _FILNOT_HXX_ #define _FILNOT_HXX_ -#include <hash_map> +#include <boost/unordered_map.hpp> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/beans/PropertyChangeEvent.hpp> @@ -93,7 +93,7 @@ namespace fileaccess { }; - typedef std::hash_map< rtl::OUString, + typedef boost::unordered_map< rtl::OUString, com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::uno::XInterface > >, hashOUString, equalOUString > ListenerMap; diff --git a/ucb/source/ucp/file/filtask.hxx b/ucb/source/ucp/file/filtask.hxx index 38aba3bb4537..3367b60f8bc0 100644 --- a/ucb/source/ucp/file/filtask.hxx +++ b/ucb/source/ucp/file/filtask.hxx @@ -29,7 +29,7 @@ #define _FILTASK_HXX_ #endif -#include <hash_map> +#include <boost/unordered_map.hpp> #include <rtl/ustring.hxx> #include "osl/mutex.hxx" @@ -148,7 +148,7 @@ namespace fileaccess }; // end class TaskHandling - typedef std::hash_map< sal_Int32,TaskHandling,std::hash< sal_Int32 > > TaskMap; + typedef boost::unordered_map< sal_Int32,TaskHandling,std::hash< sal_Int32 > > TaskMap; private: diff --git a/ucb/source/ucp/file/shell.hxx b/ucb/source/ucp/file/shell.hxx index 742dc36ae0d5..2660fa119bfa 100644 --- a/ucb/source/ucp/file/shell.hxx +++ b/ucb/source/ucp/file/shell.hxx @@ -35,8 +35,8 @@ #include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/typeprovider.hxx> #include <vector> -#include <hash_map> -#include <hash_set> +#include <boost/unordered_map.hpp> +#include <boost/unordered_set.hpp> #include <list> #include <osl/file.hxx> @@ -143,7 +143,7 @@ namespace fileaccess { } }; - typedef std::hash_set< MyProperty,hMyProperty,eMyProperty > PropertySet; + typedef boost::unordered_set< MyProperty,hMyProperty,eMyProperty > PropertySet; typedef std::list< Notifier* > NotifierList; @@ -164,7 +164,7 @@ namespace fileaccess { com::sun::star::uno::Reference< com::sun::star::beans::XPropertyAccess > xA; }; - typedef std::hash_map< UniquePath,UnqPathData,hUniquePath,eUniquePath > ContentMap; + typedef boost::unordered_map< UniquePath,UnqPathData,hUniquePath,eUniquePath > ContentMap; public: diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx index bd00a7edd126..e3c0c477512b 100644 --- a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx +++ b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx @@ -29,7 +29,7 @@ #ifndef _HIERARCHYPROVIDER_HXX #define _HIERARCHYPROVIDER_HXX -#include <hash_map> +#include <boost/unordered_map.hpp> #include <ucbhelper/providerhelper.hxx> #include <com/sun/star/lang/XInitialization.hpp> @@ -89,7 +89,7 @@ struct hashString } }; -typedef std::hash_map +typedef boost::unordered_map < rtl::OUString, // servcie specifier ConfigProviderMapEntry, diff --git a/ucb/source/ucp/package/pkgprovider.cxx b/ucb/source/ucp/package/pkgprovider.cxx index 906da6c080e0..27d411233225 100644 --- a/ucb/source/ucp/package/pkgprovider.cxx +++ b/ucb/source/ucp/package/pkgprovider.cxx @@ -35,7 +35,7 @@ *************************************************************************/ -#include <hash_map> +#include <boost/unordered_map.hpp> #include <osl/diagnose.h> #include <cppuhelper/weak.hxx> #include <ucbhelper/contentidentifier.hxx> @@ -117,7 +117,7 @@ struct hashString } }; -typedef std::hash_map +typedef boost::unordered_map < rtl::OUString, Package*, diff --git a/ucb/source/ucp/webdav/ContentProperties.hxx b/ucb/source/ucp/webdav/ContentProperties.hxx index a69a214ffe25..0f58db45db86 100644 --- a/ucb/source/ucp/webdav/ContentProperties.hxx +++ b/ucb/source/ucp/webdav/ContentProperties.hxx @@ -31,7 +31,7 @@ #include <memory> #include <vector> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <rtl/ustring.hxx> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> @@ -89,7 +89,7 @@ public: }; -typedef std::hash_map +typedef boost::unordered_map < rtl::OUString, PropertyValue, diff --git a/ucb/source/ucp/webdav/NeonSession.cxx b/ucb/source/ucp/webdav/NeonSession.cxx index 7943d8a3d540..9d3232b6e91c 100644 --- a/ucb/source/ucp/webdav/NeonSession.cxx +++ b/ucb/source/ucp/webdav/NeonSession.cxx @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_ucb.hxx" -#include <hash_map> +#include <boost/unordered_map.hpp> #include <vector> #include <string.h> #include "osl/diagnose.h" @@ -109,7 +109,7 @@ struct hashPtr } }; -typedef std::hash_map +typedef boost::unordered_map < ne_request*, RequestData, diff --git a/ucb/workben/cachemap/cachemapobjectcontainer2.hxx b/ucb/workben/cachemap/cachemapobjectcontainer2.hxx index e1d9f91b3efb..c875bb3333b7 100644 --- a/ucb/workben/cachemap/cachemapobjectcontainer2.hxx +++ b/ucb/workben/cachemap/cachemapobjectcontainer2.hxx @@ -34,10 +34,7 @@ #include "rtl/ref.hxx" #include "sal/types.h" -#ifndef INCLUDED_HASH_MAP -#include <hash_map> -#define INCLUDED_HASH_MAP -#endif +#include <boost/unordered_map.hpp> namespace rtl { class OUString; @@ -57,7 +54,7 @@ public: rtl::Reference< Object2 > get(rtl::OUString const & rKey); private: - typedef std::hash_map< rtl::OUString, + typedef boost::unordered_map< rtl::OUString, com::sun::star::uno::WeakReference< Object2 >, rtl::OUStringHash > Map; diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx index 64836d3de0f5..044080750b4d 100644 --- a/uui/source/iahndl.hxx +++ b/uui/source/iahndl.hxx @@ -69,7 +69,7 @@ namespace com { namespace sun { namespace star { } } } } -#include <hash_map> +#include <boost/unordered_map.hpp> class Window; @@ -89,7 +89,7 @@ typedef std::vector< InteractionHandlerData > InteractionHandlerDataList; typedef ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > Continuations; -typedef ::std::hash_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash > StringHashMap; +typedef ::boost::unordered_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash > StringHashMap; //============================================================================ class UUIInteractionHelper diff --git a/vbahelper/source/msforms/vbacontrols.cxx b/vbahelper/source/msforms/vbacontrols.cxx index 75688413a57a..52340642fb64 100644 --- a/vbahelper/source/msforms/vbacontrols.cxx +++ b/vbahelper/source/msforms/vbacontrols.cxx @@ -35,7 +35,7 @@ #include "vbacontrols.hxx" #include <cppuhelper/implbase2.hxx> #include <ooo/vba//XControlProvider.hpp> -#include <hash_map> +#include <boost/unordered_map.hpp> using namespace com::sun::star; using namespace ooo::vba; @@ -43,7 +43,7 @@ using namespace ooo::vba; typedef ::cppu::WeakImplHelper2< container::XNameAccess, container::XIndexAccess > ArrayWrapImpl; -typedef std::hash_map< rtl::OUString, sal_Int32, ::rtl::OUStringHash, +typedef boost::unordered_map< rtl::OUString, sal_Int32, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ControlIndexMap; typedef std::vector< uno::Reference< awt::XControl > > ControlVec; diff --git a/vbahelper/source/vbahelper/vbaapplicationbase.cxx b/vbahelper/source/vbahelper/vbaapplicationbase.cxx index 1619ac8eff5e..11ada96629aa 100644 --- a/vbahelper/source/vbahelper/vbaapplicationbase.cxx +++ b/vbahelper/source/vbahelper/vbaapplicationbase.cxx @@ -43,7 +43,7 @@ #include <com/sun/star/document/XEmbeddedScripts.hpp> #include <com/sun/star/awt/XWindow2.hpp> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <filter/msfilter/msvbahelper.hxx> #include <tools/datetime.hxx> @@ -156,7 +156,7 @@ struct VbaTimerInfoHash }; // ====VbaTimerHashMap================================== -typedef ::std::hash_map< VbaTimerInfo, VbaTimer*, VbaTimerInfoHash, ::std::equal_to< VbaTimerInfo > > VbaTimerHashMap; +typedef ::boost::unordered_map< VbaTimerInfo, VbaTimer*, VbaTimerInfoHash, ::std::equal_to< VbaTimerInfo > > VbaTimerHashMap; // ====VbaApplicationBase_Impl================================== struct VbaApplicationBase_Impl diff --git a/vbahelper/source/vbahelper/vbadocumentsbase.cxx b/vbahelper/source/vbahelper/vbadocumentsbase.cxx index 5353a310c2f7..462d93fcfd67 100644 --- a/vbahelper/source/vbahelper/vbadocumentsbase.cxx +++ b/vbahelper/source/vbahelper/vbadocumentsbase.cxx @@ -52,7 +52,7 @@ #include <tools/urlobj.hxx> #include <vbahelper/vbahelper.hxx> #include <vbahelper/vbadocumentbase.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <osl/file.hxx> using namespace ::ooo::vba; @@ -61,7 +61,7 @@ using namespace ::com::sun::star; static const rtl::OUString sSpreadsheetDocument( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadsheetDocument") ); static const rtl::OUString sTextDocument( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextDocument") ); -typedef std::hash_map< rtl::OUString, +typedef boost::unordered_map< rtl::OUString, sal_Int32, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > NameIndexHash; diff --git a/xmlhelp/source/cxxhelp/provider/databases.hxx b/xmlhelp/source/cxxhelp/provider/databases.hxx index bbd050177a79..c9708fbaca9f 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.hxx +++ b/xmlhelp/source/cxxhelp/provider/databases.hxx @@ -37,8 +37,8 @@ #include <vector> #define INCLUDED_STL_VECTOR #endif -#include <hash_map> -#include <hash_set> +#include <boost/unordered_map.hpp> +#include <boost/unordered_set.hpp> #include <osl/mutex.hxx> #include <rtl/ustring.hxx> #include <rtl/string.hxx> @@ -335,20 +335,20 @@ namespace chelp { std::vector< rtl::OUString > m_avModules; - typedef std::hash_map< rtl::OUString,berkeleydbproxy::Db*,ha,eq > DatabasesTable; + typedef boost::unordered_map< rtl::OUString,berkeleydbproxy::Db*,ha,eq > DatabasesTable; DatabasesTable m_aDatabases; // Language and module dependent databases - typedef std::hash_map< rtl::OUString,rtl::OUString,ha,eq > LangSetTable; + typedef boost::unordered_map< rtl::OUString,rtl::OUString,ha,eq > LangSetTable; LangSetTable m_aLangSet; // Mapping to of lang-country to lang - typedef std::hash_map< rtl::OUString,StaticModuleInformation*,ha,eq > ModInfoTable; + typedef boost::unordered_map< rtl::OUString,StaticModuleInformation*,ha,eq > ModInfoTable; ModInfoTable m_aModInfo; // Module information - typedef std::hash_map< rtl::OUString,KeywordInfo*,ha,eq > KeywordInfoTable; + typedef boost::unordered_map< rtl::OUString,KeywordInfo*,ha,eq > KeywordInfoTable; KeywordInfoTable m_aKeywordInfo; // Module information typedef - std::hash_map< + boost::unordered_map< rtl::OUString, ::com::sun::star::uno::Reference< com::sun::star::container::XHierarchicalNameAccess >, ha, @@ -356,7 +356,7 @@ namespace chelp { ZipFileTable m_aZipFileTable; // No closing of an once opened jarfile typedef - std::hash_map< + boost::unordered_map< rtl::OUString, ::com::sun::star::uno::Reference< com::sun::star::i18n::XCollator >, ha, @@ -381,7 +381,7 @@ namespace chelp { }; typedef - std::hash_set< + boost::unordered_set< rtl::OString, ostring_ha, ostring_eq > EmptyActiveTextSet; @@ -407,7 +407,7 @@ namespace chelp { }; // Hashtable to cache extension help status - typedef std::hash_map + typedef boost::unordered_map < ::rtl::OUString, bool, diff --git a/xmlhelp/source/cxxhelp/provider/db.hxx b/xmlhelp/source/cxxhelp/provider/db.hxx index 857145f4aea4..da81a6d63c34 100644 --- a/xmlhelp/source/cxxhelp/provider/db.hxx +++ b/xmlhelp/source/cxxhelp/provider/db.hxx @@ -36,7 +36,7 @@ #include "com/sun/star/ucb/XSimpleFileAccess.hpp" -#include <hash_map> +#include <boost/unordered_map.hpp> #include <rtl/string.hxx> extern "C" { @@ -114,8 +114,8 @@ namespace berkeleydbproxy { { return m_pBuffer; } }; - typedef std::hash_map< rtl::OString,std::pair<int,int>,ha,eq > StringToValPosMap; - typedef std::hash_map< rtl::OString,rtl::OString,ha,eq > StringToDataMap; + typedef boost::unordered_map< rtl::OString,std::pair<int,int>,ha,eq > StringToValPosMap; + typedef boost::unordered_map< rtl::OString,rtl::OString,ha,eq > StringToDataMap; class DBHelp { diff --git a/xmloff/inc/StyleMap.hxx b/xmloff/inc/StyleMap.hxx index f33434650e67..da11f0a33e03 100644 --- a/xmloff/inc/StyleMap.hxx +++ b/xmloff/inc/StyleMap.hxx @@ -31,7 +31,7 @@ #include <com/sun/star/lang/XUnoTunnel.hpp> #include <cppuhelper/implbase1.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> struct StyleNameKey_Impl { @@ -73,7 +73,7 @@ inline bool StyleNameHash_Impl::operator()( class StyleMap : public ::cppu::WeakImplHelper1< ::com::sun::star::lang::XUnoTunnel>, - public ::std::hash_map< StyleNameKey_Impl, ::rtl::OUString, + public ::boost::unordered_map< StyleNameKey_Impl, ::rtl::OUString, StyleNameHash_Impl, StyleNameHash_Impl > { diff --git a/xmloff/inc/xmloff/SinglePropertySetInfoCache.hxx b/xmloff/inc/xmloff/SinglePropertySetInfoCache.hxx index 17593a1a5138..4458417a125b 100644 --- a/xmloff/inc/xmloff/SinglePropertySetInfoCache.hxx +++ b/xmloff/inc/xmloff/SinglePropertySetInfoCache.hxx @@ -31,10 +31,10 @@ #include <com/sun/star/beans/XPropertySet.hpp> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <xmloff/PropertySetInfoHash.hxx> -typedef std::hash_map +typedef boost::unordered_map < PropertySetInfoKey, sal_Bool, diff --git a/xmloff/inc/xmloff/nmspmap.hxx b/xmloff/inc/xmloff/nmspmap.hxx index 27967549b40e..e56983a58df8 100644 --- a/xmloff/inc/xmloff/nmspmap.hxx +++ b/xmloff/inc/xmloff/nmspmap.hxx @@ -33,7 +33,7 @@ #include "xmloff/dllapi.h" #include "sal/types.h" #include <rtl/ustring.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <map> #include <rtl/ref.hxx> #include <cppuhelper/weak.hxx> @@ -91,8 +91,8 @@ struct QNamePairEq } }; -typedef ::std::hash_map < QNamePair, ::rtl::OUString, QNamePairHash, QNamePairEq > QNameCache; -typedef ::std::hash_map < ::rtl::OUString, ::rtl::Reference <NameSpaceEntry >, rtl::OUStringHash, OUStringEqFunc > NameSpaceHash; +typedef ::boost::unordered_map < QNamePair, ::rtl::OUString, QNamePairHash, QNamePairEq > QNameCache; +typedef ::boost::unordered_map < ::rtl::OUString, ::rtl::Reference <NameSpaceEntry >, rtl::OUStringHash, OUStringEqFunc > NameSpaceHash; typedef ::std::map < sal_uInt16, ::rtl::Reference < NameSpaceEntry >, uInt32lt > NameSpaceMap; class XMLOFF_DLLPUBLIC SvXMLNamespaceMap diff --git a/xmloff/source/core/nmspmap.cxx b/xmloff/source/core/nmspmap.cxx index 03f7ad036894..7115e9cea2a1 100644 --- a/xmloff/source/core/nmspmap.cxx +++ b/xmloff/source/core/nmspmap.cxx @@ -43,7 +43,7 @@ using ::rtl::OUStringBuffer; using namespace ::xmloff::token; /* The basic idea of this class is that we have two two ways to search our - * data...by prefix and by key. We use an STL hash_map for fast prefix + * data...by prefix and by key. We use an STL boost::unordered_map for fast prefix * searching and an STL map for fast key searching. * * The references to an 'Index' refer to an earlier implementation of the diff --git a/xmloff/source/draw/EnhancedCustomShapeToken.cxx b/xmloff/source/draw/EnhancedCustomShapeToken.cxx index 15c248f3fcf1..2c0184f515f4 100644 --- a/xmloff/source/draw/EnhancedCustomShapeToken.cxx +++ b/xmloff/source/draw/EnhancedCustomShapeToken.cxx @@ -30,7 +30,7 @@ #include "precompiled_xmloff.hxx" #include "EnhancedCustomShapeToken.hxx" #include <osl/mutex.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <string.h> namespace xmloff { namespace EnhancedCustomShapeToken { @@ -42,7 +42,7 @@ struct TCheck return strcmp( s1, s2 ) == 0; } }; -typedef std::hash_map< const char*, EnhancedCustomShapeTokenEnum, std::hash<const char*>, TCheck> TypeNameHashMap; +typedef boost::unordered_map< const char*, EnhancedCustomShapeTokenEnum, std::hash<const char*>, TCheck> TypeNameHashMap; static TypeNameHashMap* pHashMap = NULL; static ::osl::Mutex& getHashMapMutex() { diff --git a/xmloff/source/draw/ximpcustomshape.cxx b/xmloff/source/draw/ximpcustomshape.cxx index fab4c37d8862..297532638677 100644 --- a/xmloff/source/draw/ximpcustomshape.cxx +++ b/xmloff/source/draw/ximpcustomshape.cxx @@ -57,7 +57,7 @@ #include <com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeTextPathMode.hpp> #include <com/sun/star/drawing/ProjectionMode.hpp> -#include <hash_map> +#include <boost/unordered_map.hpp> using namespace ::com::sun::star; using namespace ::xmloff::token; @@ -1145,7 +1145,7 @@ void SdXMLCustomShapePropertyMerge( std::vector< com::sun::star::beans::Property } } -typedef std::hash_map< rtl::OUString, sal_Int32, rtl::OUStringHash, OUStringEqFunc> EquationHashMap; +typedef boost::unordered_map< rtl::OUString, sal_Int32, rtl::OUStringHash, OUStringEqFunc> EquationHashMap; /* if rPara.Type is from type EnhancedCustomShapeParameterType::EQUATION, the name of the equation will be converted from rtl::OUString to index */ diff --git a/xmloff/source/style/xmlexppr.cxx b/xmloff/source/style/xmlexppr.cxx index 472fe3dded5b..51f62b9f69cc 100644 --- a/xmloff/source/style/xmlexppr.cxx +++ b/xmloff/source/style/xmlexppr.cxx @@ -38,7 +38,7 @@ #include <com/sun/star/beans/TolerantPropertySetResultType.hpp> #include <rtl/ustrbuf.hxx> #include <list> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <xmloff/xmlexppr.hxx> #include <xmloff/xmltoken.hxx> @@ -234,7 +234,7 @@ public: // ---------------------------------------------------------------------------- -typedef std::hash_map +typedef boost::unordered_map < PropertySetInfoKey, FilterPropertiesInfo_Impl *, diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index 510f5fc91472..0137ccbae5f9 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -40,7 +40,7 @@ #include <vector> #include <list> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> @@ -220,7 +220,7 @@ namespace }; private: - typedef hash_map< + typedef boost::unordered_map< Reference<XTextFrame>, TextContentSet, FrameRefHash> framebound_map_t; diff --git a/xmloff/source/transform/EventOASISTContext.cxx b/xmloff/source/transform/EventOASISTContext.cxx index c8a708e1a8c6..0031d1f4efb2 100644 --- a/xmloff/source/transform/EventOASISTContext.cxx +++ b/xmloff/source/transform/EventOASISTContext.cxx @@ -44,7 +44,7 @@ #include <comphelper/processfactory.hxx> #endif -#include <hash_map> +#include <boost/unordered_map.hpp> using ::rtl::OUString; @@ -53,7 +53,7 @@ using namespace ::com::sun::star::xml::sax; using namespace ::xmloff::token; class XMLTransformerOASISEventMap_Impl: - public ::std::hash_map< NameKey_Impl, ::rtl::OUString, + public ::boost::unordered_map< NameKey_Impl, ::rtl::OUString, NameHash_Impl, NameHash_Impl > { public: diff --git a/xmloff/source/transform/EventOOoTContext.cxx b/xmloff/source/transform/EventOOoTContext.cxx index d1ad39c58811..4fcb1674e4de 100644 --- a/xmloff/source/transform/EventOOoTContext.cxx +++ b/xmloff/source/transform/EventOOoTContext.cxx @@ -39,7 +39,7 @@ #include <comphelper/stl_types.hxx> #include <rtl/ustrbuf.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> using ::rtl::OUString; using ::rtl::OUStringBuffer; @@ -48,7 +48,7 @@ using namespace ::com::sun::star::xml::sax; using namespace ::xmloff::token; class XMLTransformerOOoEventMap_Impl: - public ::std::hash_map< ::rtl::OUString, NameKey_Impl, + public ::boost::unordered_map< ::rtl::OUString, NameKey_Impl, ::rtl::OUStringHash, ::comphelper::UStringEqual > { public: diff --git a/xmloff/source/transform/TransformerActions.hxx b/xmloff/source/transform/TransformerActions.hxx index 23b8de1c8870..1fd68e006b6f 100644 --- a/xmloff/source/transform/TransformerActions.hxx +++ b/xmloff/source/transform/TransformerActions.hxx @@ -32,7 +32,7 @@ #include <rtl/ustring.hxx> #include <xmloff/nmspmap.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> #include "TransformerActionInit.hxx" #include "TransformerAction.hxx" @@ -149,7 +149,7 @@ struct TransformerAction_Impl // ----------------------------------------------------------------------------- class XMLTransformerActions : - public ::std::hash_map< NameKey_Impl, TransformerAction_Impl, + public ::boost::unordered_map< NameKey_Impl, TransformerAction_Impl, NameHash_Impl, NameHash_Impl > { public: diff --git a/xmloff/source/transform/TransformerTokenMap.hxx b/xmloff/source/transform/TransformerTokenMap.hxx index 47ca05542eaf..d5963cc0082f 100644 --- a/xmloff/source/transform/TransformerTokenMap.hxx +++ b/xmloff/source/transform/TransformerTokenMap.hxx @@ -31,14 +31,14 @@ #include <rtl/ustring.hxx> #include <comphelper/stl_types.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <xmloff/xmltoken.hxx> #include "TransformerTokenMap.hxx" class XMLTransformerTokenMap : - public ::std::hash_map< ::rtl::OUString, ::xmloff::token::XMLTokenEnum, + public ::boost::unordered_map< ::rtl::OUString, ::xmloff::token::XMLTokenEnum, ::rtl::OUStringHash, ::comphelper::UStringEqual > { public: diff --git a/xmlscript/source/xml_helper/xml_impctx.cxx b/xmlscript/source/xml_helper/xml_impctx.cxx index 9edccbf9bff4..646fadfb1b9f 100644 --- a/xmlscript/source/xml_helper/xml_impctx.cxx +++ b/xmlscript/source/xml_helper/xml_impctx.cxx @@ -43,7 +43,7 @@ #include "com/sun/star/uno/XComponentContext.hpp" #include <vector> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <memory> @@ -71,8 +71,8 @@ OUString getImplementationName_DocumentHandlerImpl() "com.sun.star.comp.xml.input.SaxDocumentHandler") ); } -typedef ::std::hash_map< OUString, sal_Int32, OUStringHash > t_OUString2LongMap; -typedef ::std::hash_map< sal_Int32, OUString > t_Long2OUStringMap; +typedef ::boost::unordered_map< OUString, sal_Int32, OUStringHash > t_OUString2LongMap; +typedef ::boost::unordered_map< sal_Int32, OUString > t_Long2OUStringMap; struct PrefixEntry { @@ -82,7 +82,7 @@ struct PrefixEntry { m_Uids.reserve( 4 ); } }; -typedef ::std::hash_map< +typedef ::boost::unordered_map< OUString, PrefixEntry *, OUStringHash > t_OUString2PrefixMap; struct ElementEntry |