diff options
| -rw-r--r-- | include/svl/stringpool.hxx | 5 | ||||
| -rw-r--r-- | svl/qa/unit/svl.cxx | 4 | ||||
| -rw-r--r-- | svl/source/misc/stringpool.cxx | 8 |
3 files changed, 8 insertions, 9 deletions
diff --git a/include/svl/stringpool.hxx b/include/svl/stringpool.hxx index cac7637d9a92..fbcff1e58b7c 100644 --- a/include/svl/stringpool.hxx +++ b/include/svl/stringpool.hxx @@ -37,7 +37,6 @@ class SVL_DLLPUBLIC StringPool const CharClass* mpCharClass; public: - typedef sal_uIntPtr StrIdType; StringPool(); StringPool( const CharClass* pCharClass ); @@ -61,7 +60,7 @@ public: * * @return unique ID of the string object. */ - StrIdType getIdentifier( const OUString& rStr ) const; + sal_uIntPtr getIdentifier( const OUString& rStr ) const; /** * Get a unique ID of string object for case insensitive comparison. The @@ -72,7 +71,7 @@ public: * @return unique ID of the string object usable for case insensitive * comparison. */ - StrIdType getIdentifierIgnoreCase( const OUString& rStr ) const; + sal_uIntPtr getIdentifierIgnoreCase( const OUString& rStr ) const; /** * Go through all string objects in the pool, and clear those that are no diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx index 11a52e6f2a2f..a34bb47caec7 100644 --- a/svl/qa/unit/svl.cxx +++ b/svl/qa/unit/svl.cxx @@ -309,8 +309,8 @@ void Test::testStringPool() CPPUNIT_ASSERT_MESSAGE("They must differ.", p1 != p2); OUString aAndy("Andy"); - svl::StringPool::StrIdType si1 = aPool.getIdentifier("Andy"); - svl::StringPool::StrIdType si2 = aPool.getIdentifier(aAndy); + sal_uIntPtr si1 = aPool.getIdentifier("Andy"); + sal_uIntPtr si2 = aPool.getIdentifier(aAndy); CPPUNIT_ASSERT_MESSAGE("Identifier shouldn't be 0.", si1); CPPUNIT_ASSERT_MESSAGE("Identifier shouldn't be 0.", si2); CPPUNIT_ASSERT_EQUAL(si1, si2); diff --git a/svl/source/misc/stringpool.cxx b/svl/source/misc/stringpool.cxx index 4760348571a0..7ebc207b2907 100644 --- a/svl/source/misc/stringpool.cxx +++ b/svl/source/misc/stringpool.cxx @@ -45,13 +45,13 @@ rtl_uString* StringPool::intern( const OUString& rStr ) return pOrig; } -StringPool::StrIdType StringPool::getIdentifier( const OUString& rStr ) const +sal_uIntPtr StringPool::getIdentifier( const OUString& rStr ) const { StrHashType::const_iterator it = maStrPool.find(rStr); - return (it == maStrPool.end()) ? 0 : reinterpret_cast<StrIdType>(it->pData); + return (it == maStrPool.end()) ? 0 : reinterpret_cast<sal_uIntPtr>(it->pData); } -StringPool::StrIdType StringPool::getIdentifierIgnoreCase( const OUString& rStr ) const +sal_uIntPtr StringPool::getIdentifierIgnoreCase( const OUString& rStr ) const { StrHashType::const_iterator itOrig = maStrPool.find(rStr); if (itOrig == maStrPool.end()) @@ -64,7 +64,7 @@ StringPool::StrIdType StringPool::getIdentifierIgnoreCase( const OUString& rStr return 0; const rtl_uString* pUpper = itUpper->second.pData; - return reinterpret_cast<StrIdType>(pUpper); + return reinterpret_cast<sal_uIntPtr>(pUpper); } namespace { |