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 /filter/source | |
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 'filter/source')
-rw-r--r-- | filter/source/config/cache/cacheitem.hxx | 18 | ||||
-rw-r--r-- | filter/source/config/cache/querytokenizer.hxx | 10 | ||||
-rw-r--r-- | filter/source/msfilter/util.cxx | 6 | ||||
-rw-r--r-- | filter/source/svg/gfxtypes.hxx | 9 | ||||
-rw-r--r-- | filter/source/svg/svgfilter.hxx | 20 | ||||
-rw-r--r-- | filter/source/svg/svgreader.cxx | 1 | ||||
-rw-r--r-- | filter/source/svg/svgwriter.hxx | 6 |
7 files changed, 33 insertions, 37 deletions
diff --git a/filter/source/config/cache/cacheitem.hxx b/filter/source/config/cache/cacheitem.hxx index 7aac754451b9..06214e6d662c 100644 --- a/filter/source/config/cache/cacheitem.hxx +++ b/filter/source/config/cache/cacheitem.hxx @@ -20,9 +20,9 @@ #ifndef INCLUDED_FILTER_SOURCE_CONFIG_CACHE_CACHEITEM_HXX #define INCLUDED_FILTER_SOURCE_CONFIG_CACHE_CACHEITEM_HXX -#include <boost/unordered_map.hpp> #include <deque> #include <list> +#include <unordered_map> #include <com/sun/star/uno/Any.h> #include <com/sun/star/uno/Sequence.h> #include <com/sun/star/beans/PropertyValue.hpp> @@ -172,10 +172,10 @@ class CacheItem : public ::comphelper::SequenceAsHashMap /** @short represent an item list of a FilterCache instance. */ -typedef ::boost::unordered_map< OUString , - CacheItem , - OUStringHash , - ::std::equal_to< OUString > > CacheItemList; +typedef std::unordered_map< OUString , + CacheItem , + OUStringHash , + std::equal_to< OUString > > CacheItemList; @@ -191,10 +191,10 @@ typedef ::boost::unordered_map< OUString , there we need key-value pairs too, which can't be provided by a pure vector! */ -typedef ::boost::unordered_map< OUString , - OUStringList , - OUStringHash , - ::std::equal_to< OUString > > CacheItemRegistration; +typedef std::unordered_map< OUString , + OUStringList , + OUStringHash , + std::equal_to< OUString > > CacheItemRegistration; diff --git a/filter/source/config/cache/querytokenizer.hxx b/filter/source/config/cache/querytokenizer.hxx index 914700cc62e3..2ad810cfefb1 100644 --- a/filter/source/config/cache/querytokenizer.hxx +++ b/filter/source/config/cache/querytokenizer.hxx @@ -20,8 +20,8 @@ #ifndef INCLUDED_FILTER_SOURCE_CONFIG_CACHE_QUERYTOKENIZER_HXX #define INCLUDED_FILTER_SOURCE_CONFIG_CACHE_QUERYTOKENIZER_HXX -#include <boost/unordered_map.hpp> #include <rtl/ustring.hxx> +#include <unordered_map> namespace filter{ @@ -45,10 +45,10 @@ namespace filter{ @attention This class is not threadsafe implemented. Because its not necessary. But you have to make sure, that ist not used as such :-) */ -class QueryTokenizer : public ::boost::unordered_map< OUString , - OUString , - OUStringHash , - ::std::equal_to< OUString > > +class QueryTokenizer : public std::unordered_map< OUString , + OUString , + OUStringHash , + std::equal_to< OUString > > { // member diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx index fcb4a51de059..686eee4f5369 100644 --- a/filter/source/msfilter/util.cxx +++ b/filter/source/msfilter/util.cxx @@ -14,7 +14,7 @@ #include <vcl/svapp.hxx> #include <filter/msfilter/util.hxx> #include <boost/scoped_ptr.hpp> -#include <boost/unordered_map.hpp> +#include <unordered_map> namespace msfilter { namespace util { @@ -1301,7 +1301,7 @@ static struct { {"textBox", mso_sptTextBox}, }; -typedef boost::unordered_map< const char*, const char*, rtl::CStringHash, rtl::CStringEqual> CustomShapeTypeTranslationHashMap; +typedef std::unordered_map< const char*, const char*, rtl::CStringHash, rtl::CStringEqual> CustomShapeTypeTranslationHashMap; static CustomShapeTypeTranslationHashMap* pCustomShapeTypeTranslationHashMap = NULL; const char* GetOOXMLPresetGeometry( const char* sShapeType ) @@ -1319,7 +1319,7 @@ const char* GetOOXMLPresetGeometry( const char* sShapeType ) return i == pCustomShapeTypeTranslationHashMap->end() ? "rect" : i->second; } -typedef boost::unordered_map< const char*, MSO_SPT, rtl::CStringHash, rtl::CStringEqual> DMLToVMLTranslationHashMap; +typedef std::unordered_map< const char*, MSO_SPT, rtl::CStringHash, rtl::CStringEqual> DMLToVMLTranslationHashMap; static DMLToVMLTranslationHashMap* pDMLToVMLMap; MSO_SPT GETVMLShapeType(const OString& aType) diff --git a/filter/source/svg/gfxtypes.hxx b/filter/source/svg/gfxtypes.hxx index 01aa9e189490..d93df82ea77d 100644 --- a/filter/source/svg/gfxtypes.hxx +++ b/filter/source/svg/gfxtypes.hxx @@ -12,10 +12,9 @@ #include <basegfx/range/b2drange.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/polygon/b2dlinegeometry.hxx> - -#include <boost/unordered_set.hpp> -#include <boost/unordered_map.hpp> #include <rtl/ustring.hxx> +#include <unordered_set> +#include <unordered_map> namespace svgi { @@ -336,8 +335,8 @@ struct StateHash } }; -typedef boost::unordered_set<State, StateHash> StatePool; -typedef boost::unordered_map<sal_Int32, State> StateMap; +typedef std::unordered_set<State, StateHash> StatePool; +typedef std::unordered_map<sal_Int32, State> StateMap; } // namespace svgi diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx index c0df48b51567..e42fbb1f4605 100644 --- a/filter/source/svg/svgfilter.hxx +++ b/filter/source/svg/svgfilter.hxx @@ -43,8 +43,6 @@ #include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/xml/sax/XWriter.hpp> -#include <boost/unordered_set.hpp> -#include <boost/unordered_map.hpp> #include <osl/diagnose.h> #include <sal/log.hxx> #include <rtl/process.h> @@ -63,9 +61,9 @@ #include <svx/svdxcgv.hxx> #include <svx/svdobj.hxx> #include <xmloff/xmlexp.hxx> - #include <cstdio> - +#include <unordered_set> +#include <unordered_map> using namespace ::com::sun::star::animations; using namespace ::com::sun::star::beans; @@ -201,18 +199,18 @@ class SVGFilter : public cppu::WeakImplHelper4 < XFilter, XExtendedFilterDetection > { public: - typedef ::boost::unordered_map< Reference< XInterface >, ObjectRepresentation, HashReferenceXInterface > ObjectMap; - typedef ::boost::unordered_set< Reference< XInterface >, HashReferenceXInterface > ObjectSet; + typedef std::unordered_map< Reference< XInterface >, ObjectRepresentation, HashReferenceXInterface > ObjectMap; + typedef std::unordered_set< Reference< XInterface >, HashReferenceXInterface > ObjectSet; typedef Sequence< Reference< XInterface > > ObjectSequence; typedef Sequence< Reference< XDrawPage > > XDrawPageSequence; - typedef ::boost::unordered_set< sal_Unicode, HashUChar > UCharSet; - typedef ::boost::unordered_map< OUString, UCharSet, OUStringHash > UCharSetMap; - typedef ::boost::unordered_map< Reference< XInterface >, UCharSetMap, HashReferenceXInterface > UCharSetMapMap; + typedef std::unordered_set< sal_Unicode, HashUChar > UCharSet; + typedef std::unordered_map< OUString, UCharSet, OUStringHash > UCharSetMap; + typedef std::unordered_map< Reference< XInterface >, UCharSetMap, HashReferenceXInterface > UCharSetMapMap; - typedef ::boost::unordered_map< Reference< XInterface >, OUString, HashReferenceXInterface > UOStringMap; + typedef std::unordered_map< Reference< XInterface >, OUString, HashReferenceXInterface > UOStringMap; - typedef ::boost::unordered_set< ObjectRepresentation, HashBitmap, EqualityBitmap > MetaBitmapActionSet; + typedef std::unordered_set< ObjectRepresentation, HashBitmap, EqualityBitmap > MetaBitmapActionSet; private: diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx index db506e11616b..41cdd984ce94 100644 --- a/filter/source/svg/svgreader.cxx +++ b/filter/source/svg/svgreader.cxx @@ -43,7 +43,6 @@ #include <tools/zcodec.hxx> #include <boost/bind.hpp> -#include <boost/unordered_set.hpp> #include <map> #include <string.h> diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx index 459978caf6d1..0a77dd765711 100644 --- a/filter/source/svg/svgwriter.hxx +++ b/filter/source/svg/svgwriter.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_FILTER_SOURCE_SVG_SVGWRITER_HXX #define INCLUDED_FILTER_SOURCE_SVG_SVGWRITER_HXX -#include <stack> #include <cppuhelper/implbase1.hxx> #include <rtl/ustring.hxx> #include <tools/stream.hxx> @@ -59,7 +58,8 @@ #include <com/sun/star/style/NumberingType.hpp> #include <com/sun/star/svg/XSVGWriter.hpp> - +#include <stack> +#include <unordered_map> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::container; @@ -175,7 +175,7 @@ struct BulletListItemInfo class SVGTextWriter { public: - typedef ::boost::unordered_map< OUString, BulletListItemInfo, OUStringHash > BulletListItemInfoMap; + typedef std::unordered_map< OUString, BulletListItemInfo, OUStringHash > BulletListItemInfoMap; private: SVGExport& mrExport; |