summaryrefslogtreecommitdiff
path: root/framework/inc/uielement
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-01-01 19:58:59 +0000
committerCaolán McNamara <caolanm@redhat.com>2015-01-02 16:14:36 +0000
commitfd1372ba8b1c3eb3c7fad6d9c623176c8071f31b (patch)
tree448f0d04f780007b3eeeb76b7c4c8c54cbfd6d9b /framework/inc/uielement
parentc48b928acab9f226ad5ad816fe773c21051431e8 (diff)
boost::unordered_map->std::unordered_map
you can get debug stl this way Change-Id: Ia70a3e7c7c452390e8bee34975d296c9318e4a19
Diffstat (limited to 'framework/inc/uielement')
-rw-r--r--framework/inc/uielement/menubarmanager.hxx2
-rw-r--r--framework/inc/uielement/menubarwrapper.hxx2
-rw-r--r--framework/inc/uielement/newmenucontroller.hxx4
-rw-r--r--framework/inc/uielement/toolbarmanager.hxx6
-rw-r--r--framework/inc/uielement/uicommanddescription.hxx22
5 files changed, 17 insertions, 19 deletions
diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx
index 4f069bbb9e7b..3f3e362fca0f 100644
--- a/framework/inc/uielement/menubarmanager.hxx
+++ b/framework/inc/uielement/menubarmanager.hxx
@@ -64,7 +64,7 @@ struct PopupControllerEntry
::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XDispatchProvider > m_xDispatchProvider;
};
-typedef boost::unordered_map< OUString, PopupControllerEntry, OUStringHash, ::std::equal_to< OUString > > PopupControllerCache;
+typedef std::unordered_map< OUString, PopupControllerEntry, OUStringHash, std::equal_to< OUString > > PopupControllerCache;
class BmkMenu;
class AddonMenu;
diff --git a/framework/inc/uielement/menubarwrapper.hxx b/framework/inc/uielement/menubarwrapper.hxx
index 58cfe489131c..5d47fc81861a 100644
--- a/framework/inc/uielement/menubarwrapper.hxx
+++ b/framework/inc/uielement/menubarwrapper.hxx
@@ -29,8 +29,6 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
-#include <boost/unordered_map.hpp>
-
namespace framework
{
diff --git a/framework/inc/uielement/newmenucontroller.hxx b/framework/inc/uielement/newmenucontroller.hxx
index c812d0c78029..4f1502a75cf0 100644
--- a/framework/inc/uielement/newmenucontroller.hxx
+++ b/framework/inc/uielement/newmenucontroller.hxx
@@ -41,7 +41,7 @@
#include <rtl/ustring.hxx>
#include <vcl/accel.hxx>
#include <vcl/menu.hxx>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
namespace framework
{
@@ -86,7 +86,7 @@ namespace framework
OUString aImageId;
};
- typedef ::boost::unordered_map< int, AddInfo > AddInfoForId;
+ typedef std::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/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx
index 462f48ee8eb2..90b68ac4a139 100644
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
@@ -52,6 +52,8 @@
#include <vcl/window.hxx>
#include <vcl/timer.hxx>
+#include <unordered_map>
+
class PopupMenu;
class ToolBox;
@@ -170,11 +172,11 @@ class ToolBarManager : public ToolbarManager_Base
bool RetrieveShortcut( const OUString& rCommandURL, OUString& rShortCut );
protected:
- typedef ::boost::unordered_map< sal_uInt16, ::com::sun::star::uno::Reference< com::sun::star::frame::XStatusListener > > ToolBarControllerMap;
+ typedef std::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 ::boost::unordered_map< sal_uInt16, ::com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > > MenuDescriptionMap;
+ typedef std::unordered_map< sal_uInt16, ::com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > > MenuDescriptionMap;
bool m_bDisposed : 1,
m_bSmallSymbols : 1,
diff --git a/framework/inc/uielement/uicommanddescription.hxx b/framework/inc/uielement/uicommanddescription.hxx
index 112a1e8a3cd0..c00507ba8a09 100644
--- a/framework/inc/uielement/uicommanddescription.hxx
+++ b/framework/inc/uielement/uicommanddescription.hxx
@@ -20,10 +20,8 @@
#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_UICOMMANDDESCRIPTION_HXX
#define INCLUDED_FRAMEWORK_INC_UIELEMENT_UICOMMANDDESCRIPTION_HXX
-#include <boost/unordered_map.hpp>
-
+#include <unordered_map>
#include <stdtypes.h>
-
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/frame/XModuleManager2.hpp>
@@ -84,15 +82,15 @@ private:
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
public:
- typedef ::boost::unordered_map< OUString,
- OUString,
- OUStringHash,
- ::std::equal_to< OUString > > ModuleToCommandFileMap;
-
- typedef ::boost::unordered_map< OUString,
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >,
- OUStringHash,
- ::std::equal_to< OUString > > UICommandsHashMap;
+ typedef std::unordered_map< OUString,
+ OUString,
+ OUStringHash,
+ std::equal_to< OUString > > ModuleToCommandFileMap;
+
+ typedef std::unordered_map< OUString,
+ css::uno::Reference< css::container::XNameAccess >,
+ OUStringHash,
+ std::equal_to< OUString > > UICommandsHashMap;
protected:
UICommandDescription( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& rxContext, bool );