summaryrefslogtreecommitdiff
path: root/sd/inc
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-01-03 21:24:08 +0000
committerCaolán McNamara <caolanm@redhat.com>2015-01-04 11:07:58 +0000
commit0be5d2b2f6366b295a47a3b9d4e87091b6fd446b (patch)
tree093a35526d927b073640783b41ef23f44a6af221 /sd/inc
parent799e07f02dbca97f4dd9cff5b779392b13b9021c (diff)
boost::unordered_map->std::unordered_map
Change-Id: I82f668ef72e916d2ff11df5cda2a02653999f66f
Diffstat (limited to 'sd/inc')
-rw-r--r--sd/inc/CustomAnimationPreset.hxx8
-rw-r--r--sd/inc/TransitionPreset.hxx4
-rw-r--r--sd/inc/pch/precompiled_sd.hxx2
3 files changed, 7 insertions, 7 deletions
diff --git a/sd/inc/CustomAnimationPreset.hxx b/sd/inc/CustomAnimationPreset.hxx
index 26e949550fcd..8aff9a768d4b 100644
--- a/sd/inc/CustomAnimationPreset.hxx
+++ b/sd/inc/CustomAnimationPreset.hxx
@@ -30,12 +30,12 @@
#include <CustomAnimationEffect.hxx>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
namespace sd {
-typedef boost::unordered_map< OUString, CustomAnimationEffectPtr, OUStringHash > EffectsSubTypeMap;
-typedef boost::unordered_map< OUString, OUString, OUStringHash > UStringMap;
+typedef std::unordered_map< OUString, CustomAnimationEffectPtr, OUStringHash > EffectsSubTypeMap;
+typedef std::unordered_map< OUString, OUString, OUStringHash > UStringMap;
typedef std::vector< OUString > UStringList;
class CustomAnimationPreset
@@ -74,7 +74,7 @@ private:
};
typedef boost::shared_ptr< CustomAnimationPreset > CustomAnimationPresetPtr;
-typedef boost::unordered_map<OUString, CustomAnimationPresetPtr, OUStringHash> EffectDescriptorMap;
+typedef std::unordered_map<OUString, CustomAnimationPresetPtr, OUStringHash> EffectDescriptorMap;
typedef std::vector< CustomAnimationPresetPtr > EffectDescriptorList;
struct PresetCategory
diff --git a/sd/inc/TransitionPreset.hxx b/sd/inc/TransitionPreset.hxx
index a15b1d51df6f..7420fc84c163 100644
--- a/sd/inc/TransitionPreset.hxx
+++ b/sd/inc/TransitionPreset.hxx
@@ -24,7 +24,7 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <list>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
namespace com { namespace sun { namespace star {
namespace animations { class XAnimationNode; }
@@ -38,7 +38,7 @@ namespace sd {
class TransitionPreset;
typedef boost::shared_ptr< TransitionPreset > TransitionPresetPtr;
typedef std::list< TransitionPresetPtr > TransitionPresetList;
-typedef boost::unordered_map< OUString, OUString, OUStringHash > UStringMap;
+typedef std::unordered_map< OUString, OUString, OUStringHash > UStringMap;
class TransitionPreset
{
diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index e182a24e77c5..27a55f416e87 100644
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@ -79,7 +79,6 @@
#include <boost/scoped_array.hpp>
#include <boost/scoped_ptr.hpp>
#include <boost/shared_ptr.hpp>
-#include <boost/unordered_map.hpp>
#include <boost/weak_ptr.hpp>
#include <canvas/canvastools.hxx>
#include <canvas/elapsedtime.hxx>
@@ -836,6 +835,7 @@
#include <tools/urlobj.hxx>
#include <tools/wintypes.hxx>
#include <tools/wldcrd.hxx>
+#include <unordered_map>
#include <unotools/accessiblestatesethelper.hxx>
#include <unotools/charclass.hxx>
#include <unotools/confignode.hxx>