diff options
| author | Herbert Dürr <hdu@apache.org> | 2013-05-08 15:17:19 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-10 12:36:33 +0100 |
| commit | 1857688e1f4ba982d147a9cac69fad948361d1c0 (patch) | |
| tree | e3a78ed3e6341ed5f968e4fb3b63b135b4933ccc /svx/source/customshapes | |
| parent | 54a1feb9b9bd654774b9aa60cda7ef9a1cd11064 (diff) | |
Resolves: #i122208# introduce rtl::CStringHash and rtl::CStringEqual
unify the various c-string compares and hashes.
(cherry picked from commit b7e3470a154538a92f0a21b14e726d75723f4a92)
Conflicts:
oox/inc/oox/export/shapes.hxx
oox/source/export/shapes.cxx
sal/inc/rtl/string.hxx
sdext/source/minimizer/pppoptimizertoken.cxx
svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
vcl/source/glyphs/gcach_ftyp.cxx
writerfilter/source/resourcemodel/TagLogger.cxx
xmloff/source/draw/EnhancedCustomShapeToken.cxx
Change-Id: Ib742744077bfb4d38a462d88b44bdef45601b4ae
Diffstat (limited to 'svx/source/customshapes')
| -rw-r--r-- | svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx index 9c06dab28a9f..ca8dfdea2415 100644 --- a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx @@ -21,21 +21,8 @@ #include <osl/mutex.hxx> #include <boost/unordered_map.hpp> -struct THash -{ - size_t operator()( const char* s ) const - { - return rtl_str_hashCode(s); - } -}; -struct TCheck -{ - bool operator()( const char* s1, const char* s2 ) const - { - return strcmp( s1, s2 ) == 0; - } -}; -typedef boost::unordered_map< const char*, MSO_SPT, THash, TCheck> TypeNameHashMap; +typedef boost::unordered_map< const char*, MSO_SPT, rtl::CStringHash, rtl::CStringEqual> TypeNameHashMap; + static TypeNameHashMap* pHashMap = NULL; static ::osl::Mutex& getHashMapMutex() { |