[Libreoffice-commits] .: oox/inc oox/source

[Caolán McNamara]

 oox/inc/oox/export/shapes.hxx |    2 --
 oox/source/export/shapes.cxx  |    2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 72b25b317017cf62802448906888782611f33bbf
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Feb 11 12:41:24 2011 +0000

    (std|boost)::hash on a const char* hashes the pointer not the contents

diff --git a/oox/inc/oox/export/shapes.hxx b/oox/inc/oox/export/shapes.hxx
index abf00a7..b2c165f 100644
--- a/oox/inc/oox/export/shapes.hxx
+++ b/oox/inc/oox/export/shapes.hxx
@@ -61,8 +61,6 @@ private:
 
     struct ShapeHash
     {
-        boost::hash<const char*> maHashFunction;
-
         size_t operator()( const ::com::sun::star::uno::Reference < ::com::sun::star::drawing::XShape > ) const;
     };
 
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index ed43ba3..1d61df3 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -985,7 +985,7 @@ ShapeExport& ShapeExport::WriteUnknownShape( Reference< XShape > )
 
 size_t ShapeExport::ShapeHash::operator()( const ::com::sun::star::uno::Reference < ::com::sun::star::drawing::XShape > rXShape ) const
 {
-    return maHashFunction( USS( rXShape->getShapeType() ) );
+    return rXShape->getShapeType().hashCode();
 }
 
 sal_Int32 ShapeExport::GetNewShapeID( const Reference< XShape > rXShape )