diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2013-10-02 18:54:28 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2013-10-04 19:15:23 -0400 |
| commit | 00d08001da8dceeb77f16dca523979aa8ccc3755 (patch) | |
| tree | 73378cddeaa824b831a296cbcedd5f207927a0bb /svl | |
| parent | 5f5876e5c395808006daef3456a961d9e6756791 (diff) | |
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
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/qa/unit/svl.cxx | 2 | ||||
| -rw-r--r-- | svl/source/misc/stringpool.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx index 26cad83d96b4..90f4c44571ad 100644 --- a/svl/qa/unit/svl.cxx +++ b/svl/qa/unit/svl.cxx @@ -75,7 +75,7 @@ public: CPPUNIT_TEST_SUITE(Test); CPPUNIT_TEST(testNumberFormat); CPPUNIT_TEST(testStringPool); -// CPPUNIT_TEST(testStringPoolPurge); // FIXME: String pool's life cycle needs more work. + CPPUNIT_TEST(testStringPoolPurge); CPPUNIT_TEST(testFdo60915); CPPUNIT_TEST(testI116701); CPPUNIT_TEST_SUITE_END(); diff --git a/svl/source/misc/stringpool.cxx b/svl/source/misc/stringpool.cxx index f4d9996d2dee..4760348571a0 100644 --- a/svl/source/misc/stringpool.cxx +++ b/svl/source/misc/stringpool.cxx @@ -128,7 +128,7 @@ StringPool::InsertResultType StringPool::findOrInsert( StrHashType& rPool, const if (it == rPool.end()) { // 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) // Insertion failed. return InsertResultType(rPool.end(), false); |