diff options
author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-02-05 13:18:52 +0100 |
---|---|---|
committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-02-05 13:18:52 +0100 |
commit | bb564bec137f76dfa099a1cdda3cf39367a6fe50 (patch) | |
tree | e444279823cc1fc9dd07196ea8008720db49248a /xmloff | |
parent | 5ace73b0896ce36a1ea86fb1c3cb9040f12a3e17 (diff) |
migrate to use boost unordered containers
Diffstat (limited to 'xmloff')
-rw-r--r-- | xmloff/inc/StyleMap.hxx | 4 | ||||
-rw-r--r-- | xmloff/inc/xmloff/SinglePropertySetInfoCache.hxx | 4 | ||||
-rw-r--r-- | xmloff/inc/xmloff/nmspmap.hxx | 6 | ||||
-rw-r--r-- | xmloff/source/core/nmspmap.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/draw/EnhancedCustomShapeToken.cxx | 4 | ||||
-rw-r--r-- | xmloff/source/draw/ximpcustomshape.cxx | 4 | ||||
-rw-r--r-- | xmloff/source/style/xmlexppr.cxx | 4 | ||||
-rw-r--r-- | xmloff/source/text/txtparae.cxx | 4 | ||||
-rw-r--r-- | xmloff/source/transform/EventOASISTContext.cxx | 4 | ||||
-rw-r--r-- | xmloff/source/transform/EventOOoTContext.cxx | 4 | ||||
-rw-r--r-- | xmloff/source/transform/TransformerActions.hxx | 4 | ||||
-rw-r--r-- | xmloff/source/transform/TransformerTokenMap.hxx | 4 |
12 files changed, 24 insertions, 24 deletions
diff --git a/xmloff/inc/StyleMap.hxx b/xmloff/inc/StyleMap.hxx index f33434650e67..da11f0a33e03 100644 --- a/xmloff/inc/StyleMap.hxx +++ b/xmloff/inc/StyleMap.hxx @@ -31,7 +31,7 @@ #include <com/sun/star/lang/XUnoTunnel.hpp> #include <cppuhelper/implbase1.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> struct StyleNameKey_Impl { @@ -73,7 +73,7 @@ inline bool StyleNameHash_Impl::operator()( class StyleMap : public ::cppu::WeakImplHelper1< ::com::sun::star::lang::XUnoTunnel>, - public ::std::hash_map< StyleNameKey_Impl, ::rtl::OUString, + public ::boost::unordered_map< StyleNameKey_Impl, ::rtl::OUString, StyleNameHash_Impl, StyleNameHash_Impl > { diff --git a/xmloff/inc/xmloff/SinglePropertySetInfoCache.hxx b/xmloff/inc/xmloff/SinglePropertySetInfoCache.hxx index 17593a1a5138..4458417a125b 100644 --- a/xmloff/inc/xmloff/SinglePropertySetInfoCache.hxx +++ b/xmloff/inc/xmloff/SinglePropertySetInfoCache.hxx @@ -31,10 +31,10 @@ #include <com/sun/star/beans/XPropertySet.hpp> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <xmloff/PropertySetInfoHash.hxx> -typedef std::hash_map +typedef boost::unordered_map < PropertySetInfoKey, sal_Bool, diff --git a/xmloff/inc/xmloff/nmspmap.hxx b/xmloff/inc/xmloff/nmspmap.hxx index 27967549b40e..e56983a58df8 100644 --- a/xmloff/inc/xmloff/nmspmap.hxx +++ b/xmloff/inc/xmloff/nmspmap.hxx @@ -33,7 +33,7 @@ #include "xmloff/dllapi.h" #include "sal/types.h" #include <rtl/ustring.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <map> #include <rtl/ref.hxx> #include <cppuhelper/weak.hxx> @@ -91,8 +91,8 @@ struct QNamePairEq } }; -typedef ::std::hash_map < QNamePair, ::rtl::OUString, QNamePairHash, QNamePairEq > QNameCache; -typedef ::std::hash_map < ::rtl::OUString, ::rtl::Reference <NameSpaceEntry >, rtl::OUStringHash, OUStringEqFunc > NameSpaceHash; +typedef ::boost::unordered_map < QNamePair, ::rtl::OUString, QNamePairHash, QNamePairEq > QNameCache; +typedef ::boost::unordered_map < ::rtl::OUString, ::rtl::Reference <NameSpaceEntry >, rtl::OUStringHash, OUStringEqFunc > NameSpaceHash; typedef ::std::map < sal_uInt16, ::rtl::Reference < NameSpaceEntry >, uInt32lt > NameSpaceMap; class XMLOFF_DLLPUBLIC SvXMLNamespaceMap diff --git a/xmloff/source/core/nmspmap.cxx b/xmloff/source/core/nmspmap.cxx index 03f7ad036894..7115e9cea2a1 100644 --- a/xmloff/source/core/nmspmap.cxx +++ b/xmloff/source/core/nmspmap.cxx @@ -43,7 +43,7 @@ using ::rtl::OUStringBuffer; using namespace ::xmloff::token; /* The basic idea of this class is that we have two two ways to search our - * data...by prefix and by key. We use an STL hash_map for fast prefix + * data...by prefix and by key. We use an STL boost::unordered_map for fast prefix * searching and an STL map for fast key searching. * * The references to an 'Index' refer to an earlier implementation of the diff --git a/xmloff/source/draw/EnhancedCustomShapeToken.cxx b/xmloff/source/draw/EnhancedCustomShapeToken.cxx index 15c248f3fcf1..2c0184f515f4 100644 --- a/xmloff/source/draw/EnhancedCustomShapeToken.cxx +++ b/xmloff/source/draw/EnhancedCustomShapeToken.cxx @@ -30,7 +30,7 @@ #include "precompiled_xmloff.hxx" #include "EnhancedCustomShapeToken.hxx" #include <osl/mutex.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <string.h> namespace xmloff { namespace EnhancedCustomShapeToken { @@ -42,7 +42,7 @@ struct TCheck return strcmp( s1, s2 ) == 0; } }; -typedef std::hash_map< const char*, EnhancedCustomShapeTokenEnum, std::hash<const char*>, TCheck> TypeNameHashMap; +typedef boost::unordered_map< const char*, EnhancedCustomShapeTokenEnum, std::hash<const char*>, TCheck> TypeNameHashMap; static TypeNameHashMap* pHashMap = NULL; static ::osl::Mutex& getHashMapMutex() { diff --git a/xmloff/source/draw/ximpcustomshape.cxx b/xmloff/source/draw/ximpcustomshape.cxx index fab4c37d8862..297532638677 100644 --- a/xmloff/source/draw/ximpcustomshape.cxx +++ b/xmloff/source/draw/ximpcustomshape.cxx @@ -57,7 +57,7 @@ #include <com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeTextPathMode.hpp> #include <com/sun/star/drawing/ProjectionMode.hpp> -#include <hash_map> +#include <boost/unordered_map.hpp> using namespace ::com::sun::star; using namespace ::xmloff::token; @@ -1145,7 +1145,7 @@ void SdXMLCustomShapePropertyMerge( std::vector< com::sun::star::beans::Property } } -typedef std::hash_map< rtl::OUString, sal_Int32, rtl::OUStringHash, OUStringEqFunc> EquationHashMap; +typedef boost::unordered_map< rtl::OUString, sal_Int32, rtl::OUStringHash, OUStringEqFunc> EquationHashMap; /* if rPara.Type is from type EnhancedCustomShapeParameterType::EQUATION, the name of the equation will be converted from rtl::OUString to index */ diff --git a/xmloff/source/style/xmlexppr.cxx b/xmloff/source/style/xmlexppr.cxx index 472fe3dded5b..51f62b9f69cc 100644 --- a/xmloff/source/style/xmlexppr.cxx +++ b/xmloff/source/style/xmlexppr.cxx @@ -38,7 +38,7 @@ #include <com/sun/star/beans/TolerantPropertySetResultType.hpp> #include <rtl/ustrbuf.hxx> #include <list> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <xmloff/xmlexppr.hxx> #include <xmloff/xmltoken.hxx> @@ -234,7 +234,7 @@ public: // ---------------------------------------------------------------------------- -typedef std::hash_map +typedef boost::unordered_map < PropertySetInfoKey, FilterPropertiesInfo_Impl *, diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index 510f5fc91472..0137ccbae5f9 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -40,7 +40,7 @@ #include <vector> #include <list> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> @@ -220,7 +220,7 @@ namespace }; private: - typedef hash_map< + typedef boost::unordered_map< Reference<XTextFrame>, TextContentSet, FrameRefHash> framebound_map_t; diff --git a/xmloff/source/transform/EventOASISTContext.cxx b/xmloff/source/transform/EventOASISTContext.cxx index c8a708e1a8c6..0031d1f4efb2 100644 --- a/xmloff/source/transform/EventOASISTContext.cxx +++ b/xmloff/source/transform/EventOASISTContext.cxx @@ -44,7 +44,7 @@ #include <comphelper/processfactory.hxx> #endif -#include <hash_map> +#include <boost/unordered_map.hpp> using ::rtl::OUString; @@ -53,7 +53,7 @@ using namespace ::com::sun::star::xml::sax; using namespace ::xmloff::token; class XMLTransformerOASISEventMap_Impl: - public ::std::hash_map< NameKey_Impl, ::rtl::OUString, + public ::boost::unordered_map< NameKey_Impl, ::rtl::OUString, NameHash_Impl, NameHash_Impl > { public: diff --git a/xmloff/source/transform/EventOOoTContext.cxx b/xmloff/source/transform/EventOOoTContext.cxx index d1ad39c58811..4fcb1674e4de 100644 --- a/xmloff/source/transform/EventOOoTContext.cxx +++ b/xmloff/source/transform/EventOOoTContext.cxx @@ -39,7 +39,7 @@ #include <comphelper/stl_types.hxx> #include <rtl/ustrbuf.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> using ::rtl::OUString; using ::rtl::OUStringBuffer; @@ -48,7 +48,7 @@ using namespace ::com::sun::star::xml::sax; using namespace ::xmloff::token; class XMLTransformerOOoEventMap_Impl: - public ::std::hash_map< ::rtl::OUString, NameKey_Impl, + public ::boost::unordered_map< ::rtl::OUString, NameKey_Impl, ::rtl::OUStringHash, ::comphelper::UStringEqual > { public: diff --git a/xmloff/source/transform/TransformerActions.hxx b/xmloff/source/transform/TransformerActions.hxx index 23b8de1c8870..1fd68e006b6f 100644 --- a/xmloff/source/transform/TransformerActions.hxx +++ b/xmloff/source/transform/TransformerActions.hxx @@ -32,7 +32,7 @@ #include <rtl/ustring.hxx> #include <xmloff/nmspmap.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> #include "TransformerActionInit.hxx" #include "TransformerAction.hxx" @@ -149,7 +149,7 @@ struct TransformerAction_Impl // ----------------------------------------------------------------------------- class XMLTransformerActions : - public ::std::hash_map< NameKey_Impl, TransformerAction_Impl, + public ::boost::unordered_map< NameKey_Impl, TransformerAction_Impl, NameHash_Impl, NameHash_Impl > { public: diff --git a/xmloff/source/transform/TransformerTokenMap.hxx b/xmloff/source/transform/TransformerTokenMap.hxx index 47ca05542eaf..d5963cc0082f 100644 --- a/xmloff/source/transform/TransformerTokenMap.hxx +++ b/xmloff/source/transform/TransformerTokenMap.hxx @@ -31,14 +31,14 @@ #include <rtl/ustring.hxx> #include <comphelper/stl_types.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <xmloff/xmltoken.hxx> #include "TransformerTokenMap.hxx" class XMLTransformerTokenMap : - public ::std::hash_map< ::rtl::OUString, ::xmloff::token::XMLTokenEnum, + public ::boost::unordered_map< ::rtl::OUString, ::xmloff::token::XMLTokenEnum, ::rtl::OUStringHash, ::comphelper::UStringEqual > { public: |