diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2010-10-01 12:01:46 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2010-10-01 14:46:19 +0100 |
| commit | 8d4d17664c9c6207fa35458075559d1fbfbfa2a5 (patch) | |
| tree | df2cd02b8cdb86fa513ffc0e979cc80c162ddcb0 | |
| parent | e89b0abfaa75f48f187565d7f4e6041e2f2ed5b3 (diff) | |
cleanup UHashMap fix.
| -rw-r--r-- | svx/source/unodraw/unoprov.cxx | 47 | ||||
| -rw-r--r-- | svx/source/unodraw/unoshape.cxx | 2 |
2 files changed, 3 insertions, 46 deletions
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index e04a869a7c17..dabe689d12df 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 f261b3d3d62e..defe85216b95 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; |