summaryrefslogtreecommitdiff
path: root/toolkit
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 /toolkit
parentc48b928acab9f226ad5ad816fe773c21051431e8 (diff)
boost::unordered_map->std::unordered_map
you can get debug stl this way Change-Id: Ia70a3e7c7c452390e8bee34975d296c9318e4a19
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/source/controls/dialogcontrol.cxx8
-rw-r--r--toolkit/source/controls/geometrycontrolmodel.cxx6
2 files changed, 7 insertions, 7 deletions
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx
index eae95dab7ed7..5d84922ac517 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -42,11 +42,11 @@
#include <unotools/ucbstreamhelper.hxx>
#include <vcl/graph.hxx>
#include <vcl/image.hxx>
-#include <map>
-#include <boost/unordered_map.hpp>
#include <cppuhelper/implbase1.hxx>
#include <algorithm>
#include <functional>
+#include <map>
+#include <unordered_map>
#include "osl/file.hxx"
#include <vcl/tabctrl.hxx>
@@ -77,8 +77,8 @@ typedef ::cppu::WeakImplHelper1< container::XNameContainer > SimpleNameContainer
template< typename T >
class SimpleNamedThingContainer : public SimpleNameContainer_BASE
{
- typedef boost::unordered_map< OUString, Reference< T >, OUStringHash,
- ::std::equal_to< OUString > > NamedThingsHash;
+ typedef std::unordered_map< OUString, Reference< T >, OUStringHash,
+ std::equal_to< OUString > > NamedThingsHash;
NamedThingsHash things;
::osl::Mutex m_aMutex;
public:
diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx b/toolkit/source/controls/geometrycontrolmodel.cxx
index 43d410faa9a0..64faae381c91 100644
--- a/toolkit/source/controls/geometrycontrolmodel.cxx
+++ b/toolkit/source/controls/geometrycontrolmodel.cxx
@@ -440,9 +440,9 @@
- typedef ::boost::unordered_map< OUString, sal_Int32, OUStringHash > HashMapString2Int;
- typedef ::std::vector< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > > PropSeqArray;
- typedef ::std::vector< ::std::vector< sal_Int32 > > IntArrayArray;
+ typedef std::unordered_map< OUString, sal_Int32, OUStringHash > HashMapString2Int;
+ typedef std::vector< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > > PropSeqArray;
+ typedef std::vector< ::std::vector< sal_Int32 > > IntArrayArray;
// for creating class-unique PropertySetInfo's, we need some info:
namespace { struct ServiceSpecifierMap : public rtl::Static< HashMapString2Int, ServiceSpecifierMap > {}; }