diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2013-10-03 11:34:24 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2013-10-04 19:15:24 -0400 |
| commit | 4aa411674224edb5eedd8d6170e8b27c491df851 (patch) | |
| tree | 7f05c427ef14a51b3a205b2ea53382720223aa61 /svl | |
| parent | dc1314d96257845139015ee13edc04af470c18f6 (diff) | |
Let's just use sal_uIntPtr straight.
So that the user of this class won't have to include the header just
to get the string ID type.
Change-Id: I0ccbc18fe02644f69701f57b0b1b9c30fd141d83
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/qa/unit/svl.cxx | 4 | ||||
| -rw-r--r-- | svl/source/misc/stringpool.cxx | 8 |
2 files changed, 6 insertions, 6 deletions
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 { |