diff options
Diffstat (limited to 'framework/inc/uielement')
| -rw-r--r-- | framework/inc/uielement/controlmenucontroller.hxx | 2 | ||||
| -rw-r--r-- | framework/inc/uielement/menubarmanager.hxx | 2 | ||||
| -rw-r--r-- | framework/inc/uielement/menubarwrapper.hxx | 2 | ||||
| -rw-r--r-- | framework/inc/uielement/newmenucontroller.hxx | 4 | ||||
| -rw-r--r-- | framework/inc/uielement/simpletextstatusbarcontroller.hxx | 2 | ||||
| -rw-r--r-- | framework/inc/uielement/toolbarmanager.hxx | 4 | ||||
| -rw-r--r-- | framework/inc/uielement/uicommanddescription.hxx | 6 |
7 files changed, 11 insertions, 11 deletions
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; |