summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@novell.com>2010-10-01 12:01:46 +0100
committerMichael Meeks <michael.meeks@novell.com>2010-10-01 14:46:19 +0100
commit2fbd515c917918fdccd68369b29d1d237682fce3 (patch)
tree2972059491c9a6902246d3d35ca1c7a9d01a1faa
parente3125cbef6876f6b567a34cc2e29ec8217bbcc69 (diff)
cleanup UHashMap fix.
-rw-r--r--svx/source/unodraw/unoprov.cxx47
-rw-r--r--svx/source/unodraw/unoshape.cxx2
2 files changed, 3 insertions, 46 deletions
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index 07582c80b8..d1b0a5b30d 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -921,55 +921,12 @@ UINT32 UHashMap::getId( const OUString& rCompareString )
return it->second;
}
-
-
-
-UHashMapEntry pSdrShapeIdentifierMap[] =
-{
- { RTL_CONSTASCII_STRINGPARAM(""), 0 )
-};
-
-// ---------------------------------------------------------------------
-
-UHashMap aSdrShapeIdentifierMap( pSdrShapeIdentifierMap );
-
-UHashMap::UHashMap( UHashMapEntry* pMap )
-{
- while( pMap->aIdentifier.getLength() )
- {
- OUString aStr( pMap->aIdentifier );
- size_t nHash = aStr.hashCode() & (HASHARRAYSIZE-1);
-
- m_aHashList[nHash].Insert(pMap);
- pMap++;
- }
-}
-
-// ---------------------------------------------------------------------
-
-UINT32 UHashMap::getId( const OUString& rCompareString )
-{
- size_t nHash = rCompareString.hashCode() & (HASHARRAYSIZE-1);
-
- UHashMapEntryList& rList = m_aHashList[nHash];
-
- UHashMapEntry * pMap = rList.First();
-
- while(pMap)
- {
- if( rCompareString == pMap->aIdentifier )
- return pMap->nId;
-
- pMap = rList.Next();
- }
-
- return UHASHMAP_NOTFOUND;
-}
-
/***********************************************************************
* class SvxUnoPropertyMapProvider *
***********************************************************************/
+SvxUnoPropertyMapProvider aSvxMapProvider;
+
EXTERN_C
#if defined( PM2 ) && (!defined( CSET ) && !defined ( MTW ) && !defined( WTC ))
int _stdcall
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 0a048f9e70..816709ac87 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -1385,7 +1385,7 @@ void SAL_CALL SvxShape::setName( const ::rtl::OUString& aName ) throw(::com::sun
//----------------------------------------------------------------------
OUString SAL_CALL SvxShape::getShapeType() throw(uno::RuntimeException)
{
- if( !aShapeType.getLength() )
+ if( !maShapeType.getLength() )
return UHashMap::getNameFromId( mpImpl->mnObjId );
else
return maShapeType;