[Libreoffice-commits] .: comphelper/inc comphelper/source toolkit/source

[Kohei Yoshida]

 comphelper/inc/comphelper/stl_types.hxx           |    6 ------
 comphelper/source/property/genericpropertyset.cxx |    2 +-
 toolkit/source/controls/geometrycontrolmodel.cxx  |    2 +-
 3 files changed, 2 insertions(+), 8 deletions(-)

New commits:
commit aed398e87ac210d08809698b85ddc0cf397e14e7
Author: Kohei Yoshida <kohei.yoshida at suse.com>
Date:   Thu Aug 4 20:52:40 2011 -0400

    Use rtl::OUStringHash.

diff --git a/comphelper/inc/comphelper/stl_types.hxx b/comphelper/inc/comphelper/stl_types.hxx
index 1fc2b06..29a9856 100644
--- a/comphelper/inc/comphelper/stl_types.hxx
+++ b/comphelper/inc/comphelper/stl_types.hxx
@@ -91,12 +91,6 @@ struct UStringIEqual
 };
 
 //------------------------------------------------------------------------
-struct UStringHash
-{
-    size_t operator() (const ::rtl::OUString& rStr) const {return rStr.hashCode();}
-};
-
-//------------------------------------------------------------------------
 class UStringMixEqual
 {
     sal_Bool m_bCaseSensitive;
diff --git a/comphelper/source/property/genericpropertyset.cxx b/comphelper/source/property/genericpropertyset.cxx
index 25a4994..249ce88 100644
--- a/comphelper/source/property/genericpropertyset.cxx
+++ b/comphelper/source/property/genericpropertyset.cxx
@@ -69,7 +69,7 @@ namespace comphelper
     {
     private:
         GenericAnyMapImpl	maAnyMap;
-        ::cppu::OMultiTypeInterfaceContainerHelperVar< ::rtl::OUString,UStringHash,UStringEqual> m_aListener;
+        ::cppu::OMultiTypeInterfaceContainerHelperVar< ::rtl::OUString, ::rtl::OUStringHash,UStringEqual> m_aListener;
 
     protected:
         virtual void _setPropertyValues( const PropertyMapEntry** ppEntries, const  Any* pValues ) throw( UnknownPropertyException,  PropertyVetoException,  IllegalArgumentException,  WrappedTargetException );
diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx b/toolkit/source/controls/geometrycontrolmodel.cxx
index 41c65ed..5517cb2 100644
--- a/toolkit/source/controls/geometrycontrolmodel.cxx
+++ b/toolkit/source/controls/geometrycontrolmodel.cxx
@@ -453,7 +453,7 @@
     //====================================================================
     //--------------------------------------------------------------------
 
-    typedef	::boost::unordered_map< ::rtl::OUString, sal_Int32, ::comphelper::UStringHash > HashMapString2Int;
+    typedef	::boost::unordered_map< ::rtl::OUString, sal_Int32, ::rtl::OUStringHash > HashMapString2Int;
     typedef ::std::vector< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > >	PropSeqArray;
     typedef ::std::vector< ::std::vector< sal_Int32 > > IntArrayArray;