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 /oox/inc | |
| parent | c48b928acab9f226ad5ad816fe773c21051431e8 (diff) | |
boost::unordered_map->std::unordered_map
you can get debug stl this way
Change-Id: Ia70a3e7c7c452390e8bee34975d296c9318e4a19
Diffstat (limited to 'oox/inc')
| -rw-r--r-- | oox/inc/drawingml/customshapeproperties.hxx | 4 | ||||
| -rw-r--r-- | oox/inc/pch/precompiled_oox.hxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/oox/inc/drawingml/customshapeproperties.hxx b/oox/inc/drawingml/customshapeproperties.hxx index ff80b5265589..d5fbd88a047d 100644 --- a/oox/inc/drawingml/customshapeproperties.hxx +++ b/oox/inc/drawingml/customshapeproperties.hxx @@ -21,7 +21,7 @@ #define INCLUDED_OOX_DRAWINGML_CUSTOMSHAPEPROPERTIES_HXX #include <boost/shared_ptr.hpp> -#include <boost/unordered_map.hpp> +#include <unordered_map> #include <vector> #include <map> #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp> @@ -154,7 +154,7 @@ private: bool mbMirroredY; sal_Int32 mnTextRotateAngle; - typedef boost::unordered_map< sal_Int32, PropertyMap > PresetDataMap; + typedef std::unordered_map< sal_Int32, PropertyMap > PresetDataMap; static PresetDataMap maPresetDataMap; static void initializePresetDataMap(); diff --git a/oox/inc/pch/precompiled_oox.hxx b/oox/inc/pch/precompiled_oox.hxx index d0acc055bb92..6b6d99129ee9 100644 --- a/oox/inc/pch/precompiled_oox.hxx +++ b/oox/inc/pch/precompiled_oox.hxx @@ -34,8 +34,6 @@ #include <boost/noncopyable.hpp> #include <boost/optional.hpp> #include <boost/scoped_ptr.hpp> -#include <boost/unordered_map.hpp> -#include <boost/unordered_set.hpp> #include <boost/utility.hpp> #include <cassert> #include <com/sun/star/animations/AnimationCalcMode.hpp> @@ -409,6 +407,8 @@ #include <tools/multisel.hxx> #include <tools/stream.hxx> #include <tools/time.hxx> +#include <unordered_map> +#include <unordered_set> #include <unotools/docinfohelper.hxx> #include <unotools/fltrcfg.hxx> #include <unotools/fontcvt.hxx> |