diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-01-01 19:58:59 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-01-02 16:14:36 +0000 |
| commit | fd1372ba8b1c3eb3c7fad6d9c623176c8071f31b (patch) | |
| tree | 448f0d04f780007b3eeeb76b7c4c8c54cbfd6d9b /include/svtools | |
| parent | iss is unordered_multimap, so can't rely on order (diff) | |
| download | core-fd1372ba8b1c3eb3c7fad6d9c623176c8071f31b.tar.gz core-fd1372ba8b1c3eb3c7fad6d9c623176c8071f31b.zip | |
boost::unordered_map->std::unordered_map
you can get debug stl this way
Change-Id: Ia70a3e7c7c452390e8bee34975d296c9318e4a19
Diffstat (limited to 'include/svtools')
| -rw-r--r-- | include/svtools/framestatuslistener.hxx | 10 | ||||
| -rw-r--r-- | include/svtools/statusbarcontroller.hxx | 12 | ||||
| -rw-r--r-- | include/svtools/toolboxcontroller.hxx | 10 |
3 files changed, 15 insertions, 17 deletions
diff --git a/include/svtools/framestatuslistener.hxx b/include/svtools/framestatuslistener.hxx index 22babad68288..d585ec4b82c9 100644 --- a/include/svtools/framestatuslistener.hxx +++ b/include/svtools/framestatuslistener.hxx @@ -31,7 +31,7 @@ #include <cppuhelper/interfacecontainer.hxx> #include <comphelper/broadcasthelper.hxx> -#include <boost/unordered_map.hpp> +#include <unordered_map> namespace svt { @@ -82,10 +82,10 @@ class SVT_DLLPUBLIC FrameStatusListener : public ::com::sun::star::frame::XStatu ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch; }; - typedef ::boost::unordered_map< OUString, - com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >, - OUStringHash, - ::std::equal_to< OUString > > URLToDispatchMap; + typedef std::unordered_map< OUString, + css::uno::Reference< css::frame::XDispatch >, + OUStringHash, + std::equal_to< OUString > > URLToDispatchMap; bool m_bInitialized : 1, m_bDisposed : 1; diff --git a/include/svtools/statusbarcontroller.hxx b/include/svtools/statusbarcontroller.hxx index 1101d2c3750b..ece18a315129 100644 --- a/include/svtools/statusbarcontroller.hxx +++ b/include/svtools/statusbarcontroller.hxx @@ -31,10 +31,8 @@ #include <cppuhelper/weak.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <comphelper/broadcasthelper.hxx> - -#include <boost/unordered_map.hpp> - #include <tools/gen.hxx> +#include <unordered_map> namespace svt { @@ -103,10 +101,10 @@ class SVT_DLLPUBLIC StatusbarController : ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch; }; - typedef ::boost::unordered_map< OUString, - com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >, - OUStringHash, - ::std::equal_to< OUString > > URLToDispatchMap; + typedef std::unordered_map< OUString, + css::uno::Reference< css::frame::XDispatch >, + OUStringHash, + std::equal_to< OUString > > URLToDispatchMap; // methods to support status forwarder, known by the old sfx2 toolbox controller implementation void addStatusListener( const OUString& aCommandURL ); diff --git a/include/svtools/toolboxcontroller.hxx b/include/svtools/toolboxcontroller.hxx index 352a645ed0e1..fb61f2171756 100644 --- a/include/svtools/toolboxcontroller.hxx +++ b/include/svtools/toolboxcontroller.hxx @@ -39,7 +39,7 @@ #include <cppuhelper/propshlp.hxx> #include <tools/link.hxx> -#include <boost/unordered_map.hpp> +#include <unordered_map> class ToolBox; @@ -151,10 +151,10 @@ class SVT_DLLPUBLIC ToolboxController : DECL_STATIC_LINK( ToolboxController, ExecuteHdl_Impl, DispatchInfo* ); - typedef ::boost::unordered_map< OUString, - com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >, - OUStringHash, - ::std::equal_to< OUString > > URLToDispatchMap; + typedef std::unordered_map< OUString, + css::uno::Reference< css::frame::XDispatch >, + OUStringHash, + std::equal_to< OUString > > URLToDispatchMap; // methods to support status forwarder, known by the old sfx2 toolbox controller implementation void addStatusListener( const OUString& aCommandURL ); |