diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-01-03 21:24:08 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-01-04 11:07:58 +0000 |
commit | 0be5d2b2f6366b295a47a3b9d4e87091b6fd446b (patch) | |
tree | 093a35526d927b073640783b41ef23f44a6af221 /svx | |
parent | fdo#79738: Test case for patch that fixes 79738 (diff) | |
download | core-0be5d2b2f6366b295a47a3b9d4e87091b6fd446b.tar.gz core-0be5d2b2f6366b295a47a3b9d4e87091b6fd446b.zip |
boost::unordered_map->std::unordered_map
Change-Id: I82f668ef72e916d2ff11df5cda2a02653999f66f
Diffstat (limited to 'svx')
-rw-r--r-- | svx/inc/pch/precompiled_svx.hxx | 2 | ||||
-rw-r--r-- | svx/inc/pch/precompiled_svxcore.hxx | 2 | ||||
-rw-r--r-- | svx/source/accessibility/lookupcolorname.cxx | 4 | ||||
-rw-r--r-- | svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx | 6 | ||||
-rw-r--r-- | svx/source/table/propertyset.hxx | 8 | ||||
-rw-r--r-- | svx/source/unodraw/shapepropertynotifier.cxx | 4 | ||||
-rw-r--r-- | svx/source/unodraw/unoprov.cxx | 4 |
7 files changed, 13 insertions, 17 deletions
diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx index 15bb62690109..a9ae9bec5d8f 100644 --- a/svx/inc/pch/precompiled_svx.hxx +++ b/svx/inc/pch/precompiled_svx.hxx @@ -20,7 +20,6 @@ #endif #include "boost/noncopyable.hpp" -#include "boost/unordered_map.hpp" #include "com/sun/star/container/XNameAccess.hpp" #include "com/sun/star/container/XNameContainer.hpp" #include "com/sun/star/drawing/ColorTable.hpp" @@ -519,6 +518,7 @@ #include <vcl/window.hxx> #include <vcl/wrkwin.hxx> #include <vcl/xtextedt.hxx> +#include <unordered_map> #include <vector> /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/pch/precompiled_svxcore.hxx b/svx/inc/pch/precompiled_svxcore.hxx index 9bb07229cfbd..53958f79ba9f 100644 --- a/svx/inc/pch/precompiled_svxcore.hxx +++ b/svx/inc/pch/precompiled_svxcore.hxx @@ -100,7 +100,6 @@ #include <boost/scoped_ptr.hpp> #include <boost/shared_ptr.hpp> #include <boost/spirit/include/classic_core.hpp> -#include <boost/unordered_map.hpp> #include <cassert> #include <cmath> #include <com/sun/star/accessibility/XAccessible.hpp> @@ -816,6 +815,7 @@ #include <vcl/window.hxx> #include <vcl/wmf.hxx> #include <vcl/wrkwin.hxx> +#include <unordered_map> #include <vector> #include <xmloff/xmlictxt.hxx> diff --git a/svx/source/accessibility/lookupcolorname.cxx b/svx/source/accessibility/lookupcolorname.cxx index d6567e07b2be..1e941b069a81 100644 --- a/svx/source/accessibility/lookupcolorname.cxx +++ b/svx/source/accessibility/lookupcolorname.cxx @@ -20,7 +20,6 @@ #include "sal/config.h" #include "boost/noncopyable.hpp" -#include "boost/unordered_map.hpp" #include "com/sun/star/container/XNameAccess.hpp" #include "com/sun/star/container/XNameContainer.hpp" #include "com/sun/star/drawing/ColorTable.hpp" @@ -35,6 +34,7 @@ #include "vcl/svapp.hxx" #include <lookupcolorname.hxx> +#include <unordered_map> namespace { @@ -45,7 +45,7 @@ public: OUString lookUp(long color) const; private: - typedef boost::unordered_map< long, OUString > Map; + typedef std::unordered_map< long, OUString > Map; Map map_; }; diff --git a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx index 68bdd3200cf0..15a6aa529ba0 100644 --- a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx @@ -19,9 +19,9 @@ #include "svx/EnhancedCustomShapeTypeNames.hxx" #include <osl/mutex.hxx> -#include <boost/unordered_map.hpp> +#include <unordered_map> -typedef boost::unordered_map< const char*, MSO_SPT, rtl::CStringHash, rtl::CStringEqual> TypeNameHashMap; +typedef std::unordered_map< const char*, MSO_SPT, rtl::CStringHash, rtl::CStringEqual> TypeNameHashMap; static TypeNameHashMap* pHashMap = NULL; static ::osl::Mutex& getHashMapMutex() @@ -306,7 +306,7 @@ OUString EnhancedCustomShapeTypeNames::Get( const MSO_SPT eShapeType ) : OUString(); } -typedef boost::unordered_map< const char*, const char*, rtl::CStringHash, rtl::CStringEqual> TypeACCNameHashMap; +typedef std::unordered_map< const char*, const char*, rtl::CStringHash, rtl::CStringEqual> TypeACCNameHashMap; static TypeACCNameHashMap* pACCHashMap = NULL; struct ACCNameTypeTable diff --git a/svx/source/table/propertyset.hxx b/svx/source/table/propertyset.hxx index 772770ea8c1d..001212b7bfff 100644 --- a/svx/source/table/propertyset.hxx +++ b/svx/source/table/propertyset.hxx @@ -25,7 +25,7 @@ #include <com/sun/star/beans/XFastPropertySet.hpp> #include <rtl/ref.hxx> #include <functional> -#include <boost/unordered_map.hpp> +#include <unordered_map> #include <vector> #include <cppuhelper/implbase1.hxx> @@ -33,12 +33,8 @@ namespace sdr { namespace table { - - typedef std::vector< ::com::sun::star::beans::Property > PropertyVector; -typedef boost::unordered_map< OUString, ::sal_uInt32, OUStringHash, ::std::equal_to< OUString > > PropertyMap; - - +typedef std::unordered_map< OUString, ::sal_uInt32, OUStringHash, std::equal_to< OUString > > PropertyMap; class FastPropertySetInfo : public ::cppu::WeakAggImplHelper1< ::com::sun::star::beans::XPropertySetInfo > { diff --git a/svx/source/unodraw/shapepropertynotifier.cxx b/svx/source/unodraw/shapepropertynotifier.cxx index 26b537e830f4..19bd256ece08 100644 --- a/svx/source/unodraw/shapepropertynotifier.cxx +++ b/svx/source/unodraw/shapepropertynotifier.cxx @@ -26,7 +26,7 @@ #include <cppuhelper/weak.hxx> #include <tools/diagnose_ex.h> -#include <boost/unordered_map.hpp> +#include <unordered_map> namespace { @@ -61,7 +61,7 @@ namespace svx using ::com::sun::star::lang::EventObject; using ::com::sun::star::beans::XPropertySet; - typedef ::boost::unordered_map< ShapeProperty, PPropertyValueProvider, ShapePropertyHash > PropertyProviders; + typedef std::unordered_map< ShapeProperty, PPropertyValueProvider, ShapePropertyHash > PropertyProviders; typedef cppu::OMultiTypeInterfaceContainerHelperVar<OUString> PropertyChangeListenerContainer; diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index 4bd415154f34..cd97bb3aa84a 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -27,7 +27,6 @@ #include <com/sun/star/media/ZoomLevel.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> -#include <boost/unordered_map.hpp> #include <tools/fldunit.hxx> #include <osl/mutex.hxx> #include <vcl/svapp.hxx> @@ -43,6 +42,7 @@ #include <svx/svdobj.hxx> #include <shapeimpl.hxx> +#include <unordered_map> using namespace ::com::sun::star; using namespace ::com::sun::star::beans::PropertyAttribute; @@ -801,7 +801,7 @@ comphelper::PropertyMapEntry const * ImplGetAdditionalWriterDrawingDefaultsPrope return aSvxAdditionalDefaultsPropertyMap_Impl; } -typedef ::boost::unordered_map< OUString, sal_uInt32, OUStringHash > UHashMapImpl; +typedef std::unordered_map< OUString, sal_uInt32, OUStringHash > UHashMapImpl; namespace { |