3 files changed, 14 insertions, 14 deletions
diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk
index eddabf0a259d..dc2bf4134780 100644
--- a/svl/Library_svl.mk
+++ b/svl/Library_svl.mk
@@ -110,7 +110,7 @@ $(eval $(call gb_Library_add_exception_objects,svl,\
     svl/source/misc/lockfilecommon \
     svl/source/misc/ownlist \
     svl/source/misc/sharecontrolfile \
-    svl/source/misc/stringpool \
+    svl/source/misc/sharedstringpool \
     svl/source/misc/strmadpt \
     svl/source/misc/urihelper \
     svl/source/notify/brdcst \
diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx
index a34bb47caec7..fe987ec2d5e9 100644
--- a/svl/qa/unit/svl.cxx
+++ b/svl/qa/unit/svl.cxx
@@ -33,7 +33,7 @@
 
 #include "svl/zforlist.hxx"
 #include "svl/zformat.hxx"
-#include "svl/stringpool.hxx"
+#include "svl/sharedstringpool.hxx"
 #include "unotools/syslocale.hxx"
 
 #include <boost/scoped_ptr.hpp>
@@ -299,7 +299,7 @@ void Test::testNumberFormat()
 void Test::testStringPool()
 {
     SvtSysLocale aSysLocale;
-    svl::StringPool aPool(aSysLocale.GetCharClassPtr());
+    svl::SharedStringPool aPool(aSysLocale.GetCharClassPtr());
 
     const rtl_uString* p1 = aPool.intern("Andy");
     const rtl_uString* p2 = aPool.intern("Andy");
@@ -342,7 +342,7 @@ void Test::testStringPool()
 void Test::testStringPoolPurge()
 {
     SvtSysLocale aSysLocale;
-    svl::StringPool aPool(aSysLocale.GetCharClassPtr());
+    svl::SharedStringPool aPool(aSysLocale.GetCharClassPtr());
     aPool.intern("Andy");
     aPool.intern("andy");
     aPool.intern("ANDY");
diff --git a/svl/source/misc/stringpool.cxx b/svl/source/misc/sharedstringpool.cxx
index 7ebc207b2907..805a6fc75576 100644
--- a/svl/source/misc/stringpool.cxx
+++ b/svl/source/misc/sharedstringpool.cxx
@@ -7,15 +7,15 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "svl/stringpool.hxx"
+#include "svl/sharedstringpool.hxx"
 #include "unotools/charclass.hxx"
 
 namespace svl {
 
-StringPool::StringPool() : mpCharClass(NULL) {}
-StringPool::StringPool( const CharClass* pCharClass ) : mpCharClass(pCharClass) {}
+SharedStringPool::SharedStringPool() : mpCharClass(NULL) {}
+SharedStringPool::SharedStringPool( const CharClass* pCharClass ) : mpCharClass(pCharClass) {}
 
-rtl_uString* StringPool::intern( const OUString& rStr )
+rtl_uString* SharedStringPool::intern( const OUString& rStr )
 {
     InsertResultType aRes = findOrInsert(maStrPool, rStr);
     if (aRes.first == maStrPool.end())
@@ -45,13 +45,13 @@ rtl_uString* StringPool::intern( const OUString& rStr )
     return pOrig;
 }
 
-sal_uIntPtr StringPool::getIdentifier( const OUString& rStr ) const
+sal_uIntPtr SharedStringPool::getIdentifier( const OUString& rStr ) const
 {
     StrHashType::const_iterator it = maStrPool.find(rStr);
     return (it == maStrPool.end()) ? 0 : reinterpret_cast<sal_uIntPtr>(it->pData);
 }
 
-sal_uIntPtr StringPool::getIdentifierIgnoreCase( const OUString& rStr ) const
+sal_uIntPtr SharedStringPool::getIdentifierIgnoreCase( const OUString& rStr ) const
 {
     StrHashType::const_iterator itOrig = maStrPool.find(rStr);
     if (itOrig == maStrPool.end())
@@ -76,7 +76,7 @@ inline sal_Int32 getRefCount( const rtl_uString* p )
 
 }
 
-void StringPool::purge()
+void SharedStringPool::purge()
 {
     StrHashType aNewStrPool;
     StrHashType::iterator it = maStrPool.begin(), itEnd = maStrPool.end();
@@ -111,17 +111,17 @@ void StringPool::purge()
     maStrPoolUpper.swap(aNewStrPool);
 }
 
-size_t StringPool::getCount() const
+size_t SharedStringPool::getCount() const
 {
     return maStrPool.size();
 }
 
-size_t StringPool::getCountIgnoreCase() const
+size_t SharedStringPool::getCountIgnoreCase() const
 {
     return maStrPoolUpper.size();
 }
 
-StringPool::InsertResultType StringPool::findOrInsert( StrHashType& rPool, const OUString& rStr ) const
+SharedStringPool::InsertResultType SharedStringPool::findOrInsert( StrHashType& rPool, const OUString& rStr ) const
 {
     StrHashType::iterator it = rPool.find(rStr);
     bool bInserted = false;