Kaydet (Commit) 00d08001 authored tarafından Kohei Yoshida's avatar Kohei Yoshida

No need to intern strings here; all OUString's are ref-counted.

Calling intern() simply moves it to a global hash storage.  Now
the test passes.

Change-Id: I0a93420abce1c3adaaa61d469dff5f359dd5ada4
üst 5f5876e5
...@@ -75,7 +75,7 @@ public: ...@@ -75,7 +75,7 @@ public:
CPPUNIT_TEST_SUITE(Test); CPPUNIT_TEST_SUITE(Test);
CPPUNIT_TEST(testNumberFormat); CPPUNIT_TEST(testNumberFormat);
CPPUNIT_TEST(testStringPool); CPPUNIT_TEST(testStringPool);
// CPPUNIT_TEST(testStringPoolPurge); // FIXME: String pool's life cycle needs more work. CPPUNIT_TEST(testStringPoolPurge);
CPPUNIT_TEST(testFdo60915); CPPUNIT_TEST(testFdo60915);
CPPUNIT_TEST(testI116701); CPPUNIT_TEST(testI116701);
CPPUNIT_TEST_SUITE_END(); CPPUNIT_TEST_SUITE_END();
......
...@@ -128,7 +128,7 @@ StringPool::InsertResultType StringPool::findOrInsert( StrHashType& rPool, const ...@@ -128,7 +128,7 @@ StringPool::InsertResultType StringPool::findOrInsert( StrHashType& rPool, const
if (it == rPool.end()) if (it == rPool.end())
{ {
// Not yet in the pool. // Not yet in the pool.
std::pair<StrHashType::iterator, bool> r = rPool.insert(rStr.intern()); std::pair<StrHashType::iterator, bool> r = rPool.insert(rStr);
if (!r.second) if (!r.second)
// Insertion failed. // Insertion failed.
return InsertResultType(rPool.end(), false); return InsertResultType(rPool.end(), false);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment