summaryrefslogtreecommitdiff
path: root/cppuhelper/qa
diff options
context:
space:
mode:
authorHerbert Dürr <hdu@apache.org>2013-05-08 15:17:19 +0000
committerCaolán McNamara <caolanm@redhat.com>2013-05-10 12:36:33 +0100
commit1857688e1f4ba982d147a9cac69fad948361d1c0 (patch)
treee3a78ed3e6341ed5f968e4fb3b63b135b4933ccc /cppuhelper/qa
parent54a1feb9b9bd654774b9aa60cda7ef9a1cd11064 (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 'cppuhelper/qa')
-rw-r--r--cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx18
1 files changed, 1 insertions, 17 deletions
diff --git a/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx b/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx
index 5f6467eeb856..3a5c8cf1ea20 100644
--- a/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx
+++ b/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx
@@ -34,22 +34,6 @@ using namespace com::sun::star;
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
-
-struct equalStr
-{
- bool operator()(
- const char * const &rA,
- const char * const &rB) const
- { return !strcmp(rA, rB); }
-};
-struct hashStr
-{
- size_t operator()( const char * &rName ) const
- {
- return rtl::OString(rName).hashCode();
- }
-};
-
class ContainerListener;
struct ContainerStats {
@@ -254,7 +238,7 @@ namespace cppu_ifcontainer
void testOMultiTypeInterfaceContainerHelperVar()
{
typedef ::cppu::OMultiTypeInterfaceContainerHelperVar<
- const char *,hashStr,equalStr> StrContainer;
+ const char*, rtl::CStringHash, rtl::CStringEqual> StrContainer;
const char *pTypes[nTests] =
{