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 /vcl/generic | |
| 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 'vcl/generic')
| -rw-r--r-- | vcl/generic/glyphs/gcach_ftyp.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx index 75564d18b999..13e6aa98dd49 100644 --- a/vcl/generic/glyphs/gcach_ftyp.cxx +++ b/vcl/generic/glyphs/gcach_ftyp.cxx @@ -135,9 +135,8 @@ void (*pFTEmbolden)(FT_GlyphSlot); static FT_UInt (*pFT_Face_GetCharVariantIndex)(FT_Face, FT_ULong, FT_ULong); static bool bEnableSizeFT = false; -struct EqStr{ bool operator()(const char* a, const char* b) const { return !strcmp(a,b); } }; -struct HashStr { size_t operator()( const char* s ) const { return rtl_str_hashCode(s); } }; -typedef ::boost::unordered_map<const char*,boost::shared_ptr<FtFontFile>,HashStr, EqStr> FontFileList; +typedef ::boost::unordered_map<const char*, boost::shared_ptr<FtFontFile>, rtl::CStringHash, rtl::CStringEqual> FontFileList; + namespace { struct vclFontFileList : public rtl::Static< FontFileList, vclFontFileList > {}; } // ----------------------------------------------------------------------- |