diff options
| -rw-r--r-- | comphelper/inc/comphelper/stl_types.hxx | 6 | ||||
| -rw-r--r-- | comphelper/source/property/genericpropertyset.cxx | 2 | ||||
| -rw-r--r-- | toolkit/source/controls/geometrycontrolmodel.cxx | 2 |
3 files changed, 2 insertions, 8 deletions
diff --git a/comphelper/inc/comphelper/stl_types.hxx b/comphelper/inc/comphelper/stl_types.hxx index 4f6583192716..79c4a17de291 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 008646001331..d2ba51ee9954 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 20abfff2654e..3d46daa34739 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; |