From 84ae8fd53c7e18d7a803ca3616a8370d17dc5219 Mon Sep 17 00:00:00 2001
From: sb <sb@openoffice.org>
Date: Fri, 29 Jan 2010 11:13:17 +0100
Subject: sb119: #i108560# avoid never-released StringHashTableImpl; simplified
 code

---
 sal/rtl/source/hash.cxx | 70 ++++++++++++++++++++++++-------------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

(limited to 'sal/rtl/source/hash.cxx')

diff --git a/sal/rtl/source/hash.cxx b/sal/rtl/source/hash.cxx
index 5bb428434722..6d2ae3fee435 100644
--- a/sal/rtl/source/hash.cxx
+++ b/sal/rtl/source/hash.cxx
@@ -39,52 +39,51 @@
 #include <hash_set>
 
 namespace {
-    struct UStringHash
-    {
-        size_t operator()(rtl_uString * const &rString) const
-            { return (size_t)rtl_ustr_hashCode_WithLength( rString->buffer, rString->length ); }
-    };
-    struct UStringEqual
-    {
-        sal_Bool operator() ( rtl_uString * const &pStringA,
-                              rtl_uString * const &pStringB) const
-        {
-            if (pStringA == pStringB)
-                return true;
-            if (pStringA->length != pStringB->length)
-                return false;
-            return !rtl_ustr_compare_WithLength( pStringA->buffer, pStringA->length,
-                                                 pStringB->buffer, pStringB->length);
-        }
-    };
-}
 
-typedef std::hash_set< rtl_uString *, UStringHash, UStringEqual,
-                       rtl::Allocator<rtl_uString *> > UniqueHash;
+struct UStringHash
+{
+    size_t operator()(rtl_uString * const &rString) const
+    { return (size_t)rtl_ustr_hashCode_WithLength( rString->buffer, rString->length ); }
+};
 
-struct StringHashTableImpl : public UniqueHash
+struct UStringEqual
 {
-    StringHashTableImpl(sal_uInt32 nSize) : UniqueHash( nSize ) {}
+    sal_Bool operator() ( rtl_uString * const &pStringA,
+                          rtl_uString * const &pStringB) const
+    {
+        if (pStringA == pStringB)
+            return true;
+        if (pStringA->length != pStringB->length)
+            return false;
+        return !rtl_ustr_compare_WithLength( pStringA->buffer, pStringA->length,
+                                             pStringB->buffer, pStringB->length);
+    }
 };
 
+typedef std::hash_set< rtl_uString *, UStringHash, UStringEqual,
+                       rtl::Allocator<rtl_uString *> > StringHashTable;
+
 StringHashTable *
-rtl_str_hash_new (sal_uInt32 nSize)
+getHashTable ()
 {
-    return new StringHashTableImpl (nSize);
+    static StringHashTable *pInternPool = NULL;
+    if (pInternPool == NULL) {
+        static StringHashTable aImpl(1024);
+        pInternPool = &aImpl;
+    }
+    return pInternPool;
 }
 
-void
-rtl_str_hash_free (StringHashTable *pHash)
-{
-    delete pHash;
 }
 
+extern "C" {
+
 rtl_uString *
-rtl_str_hash_intern (StringHashTable   *pHash,
-                     rtl_uString       *pString,
+rtl_str_hash_intern (rtl_uString       *pString,
                      int                can_return)
 {
-    UniqueHash::iterator aIter;
+    StringHashTable *pHash = getHashTable();
+    StringHashTable::iterator aIter;
     aIter = pHash->find(pString);
     if (aIter != pHash->end())
     {
@@ -109,8 +108,9 @@ rtl_str_hash_intern (StringHashTable   *pHash,
 }
 
 void
-rtl_str_hash_remove (StringHashTable   *pHash,
-                     rtl_uString       *pString)
+rtl_str_hash_remove (rtl_uString       *pString)
 {
-    pHash->erase(pString);
+    getHashTable()->erase(pString);
+}
+
 }
-- 
cgit v1.2.3