diff options
author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-02-05 13:18:52 +0100 |
---|---|---|
committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-02-05 13:18:52 +0100 |
commit | 9b64ddded6e9bc4ba06c215f94c9e27def16ffe9 (patch) | |
tree | 5ff1ca8273f8a4e678a6cf021e77baf860bf59bd /framework | |
parent | 97b0dbbde926d6b22068c3b69468adba98fe941e (diff) |
migrate to use boost unordered containers
Diffstat (limited to 'framework')
45 files changed, 80 insertions, 80 deletions
diff --git a/framework/inc/classes/filtercachedata.hxx b/framework/inc/classes/filtercachedata.hxx index 3df41f9f78..317bbd2d11 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 8832ea1100..f6404c5360 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 ec4799d16b..7ffd86374e 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 , // Struct for ri 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 88750b0a89..3df7d18add 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 f6fa590cba..9dd454fd91 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 1577f1f38f..8bb5508061 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 e5f0ff6d44..04257f0450 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 11990108e2..bc9848f8c8 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 760dd4baff..2e385e5fcd 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 0fcae9365f..48eb9cf5e1 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 2e1c96880f..374194f43b 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 4c75eb29d0..1225a84ca9 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 6d8d8e1c92..2d8d64264d 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 dab58825fd..6cb52b68f7 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 , // Struct for ri 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 55fe00a430..319272a0dc 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 26291bfe83..ac7db06f05 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 70dd4561e1..211ba10052 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 e0cfa75829..6e31f0472a 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 870cb97b30..b03770d4ce 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 47b999d545..3e3676008e 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 ee5a5f5ae8..0331069d80 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 4030155e11..4ec38b4e3d 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 55eeda62e1..f10368a534 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 fcd01a6f7f..7a8400c0be 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 i 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 dad1275e91..616dc587a5 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 i 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 797c308f48..2c7674102d 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 righ 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 1bf1c53709..683a79c839 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 7b78d98649..217a447d14 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 286b74e8fc..b998fd1e30 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 42148068b1..3e70d16497 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 c85f915b98..2beb83664f 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 d0a4a8e8bb..9547123905 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 5562cf69ed..0c76fec11a 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 768f32a4fe..20cfd5d471 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 1043a26510..1174c604be 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 be93db9a59..3245495607 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 1bc66fc77d..9ac42e5a70 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 5ba910d2b1..93f9e9c62b 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 be669d2761..a60cd01308 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 d7673e02cb..540bc3f7e8 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 600e9cfefd..4d9c39af57 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 77fa03d86f..f9d69202a8 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 fcf575b8ee..3bca816e77 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 8a9ec117b1..4594f3a07f 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 5aad6e182b..bbad8a374f 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> |