diff options
author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2013-10-04 19:13:26 -0400 |
---|---|---|
committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2013-10-04 19:15:26 -0400 |
commit | 3ff650d5659ed050e33074355ee2384f1569b21e (patch) | |
tree | 32ffee5777a40bd95b1b2abca0e7d7d33d349943 /editeng | |
parent | 200b4539677b51cb7161a5dd4697778dbfc693e3 (diff) |
Rename StringPool to SharedStringPool because that's what it is.
Change-Id: I2fc3ce4f0c2291d402cb470346d5561373fb51e7
Diffstat (limited to 'editeng')
-rw-r--r-- | editeng/source/editeng/editobj.cxx | 20 | ||||
-rw-r--r-- | editeng/source/editeng/editobj2.hxx | 14 |
2 files changed, 17 insertions, 17 deletions
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx index 4e6af473b38d..3a5d41c47257 100644 --- a/editeng/source/editeng/editobj.cxx +++ b/editeng/source/editeng/editobj.cxx @@ -44,7 +44,7 @@ #include <vcl/graph.hxx> #include <svl/intitem.hxx> -#include "svl/stringpool.hxx" +#include "svl/sharedstringpool.hxx" #include <unotools/fontcvt.hxx> #include <tools/tenccvt.hxx> @@ -149,17 +149,17 @@ ContentInfo::~ContentInfo() aAttribs.clear(); } -void ContentInfo::NormalizeString( svl::StringPool& rPool ) +void ContentInfo::NormalizeString( svl::SharedStringPool& rPool ) { aText = OUString(rPool.intern(aText)); } -sal_uIntPtr ContentInfo::GetStringID( const svl::StringPool& rPool ) const +sal_uIntPtr ContentInfo::GetStringID( const svl::SharedStringPool& rPool ) const { return rPool.getIdentifier(aText); } -sal_uIntPtr ContentInfo::GetStringIDIgnoreCase( const svl::StringPool& rPool ) const +sal_uIntPtr ContentInfo::GetStringIDIgnoreCase( const svl::SharedStringPool& rPool ) const { return rPool.getIdentifierIgnoreCase(aText); } @@ -332,17 +332,17 @@ editeng::FieldUpdater EditTextObject::GetFieldUpdater() return mpImpl->GetFieldUpdater(); } -void EditTextObject::NormalizeString( svl::StringPool& rPool ) +void EditTextObject::NormalizeString( svl::SharedStringPool& rPool ) { mpImpl->NormalizeString(rPool); } -bool EditTextObject::GetStringIDs( const svl::StringPool& rPool, std::vector<sal_uIntPtr>& rIDs ) const +bool EditTextObject::GetStringIDs( const svl::SharedStringPool& rPool, std::vector<sal_uIntPtr>& rIDs ) const { return mpImpl->GetStringIDs(rPool, rIDs); } -bool EditTextObject::GetStringIDsIgnoreCase( const svl::StringPool& rPool, std::vector<sal_uIntPtr>& rIDs ) const +bool EditTextObject::GetStringIDsIgnoreCase( const svl::SharedStringPool& rPool, std::vector<sal_uIntPtr>& rIDs ) const { return mpImpl->GetStringIDsIgnoreCase(rPool, rIDs); } @@ -633,7 +633,7 @@ void EditTextObjectImpl::SetUserType( sal_uInt16 n ) nUserType = n; } -void EditTextObjectImpl::NormalizeString( svl::StringPool& rPool ) +void EditTextObjectImpl::NormalizeString( svl::SharedStringPool& rPool ) { ContentInfosType::iterator it = aContents.begin(), itEnd = aContents.end(); for (; it != itEnd; ++it) @@ -643,7 +643,7 @@ void EditTextObjectImpl::NormalizeString( svl::StringPool& rPool ) } } -bool EditTextObjectImpl::GetStringIDs( const svl::StringPool& rPool, std::vector<sal_uIntPtr>& rIDs ) const +bool EditTextObjectImpl::GetStringIDs( const svl::SharedStringPool& rPool, std::vector<sal_uIntPtr>& rIDs ) const { std::vector<sal_uIntPtr> aIDs; aIDs.reserve(aContents.size()); @@ -662,7 +662,7 @@ bool EditTextObjectImpl::GetStringIDs( const svl::StringPool& rPool, std::vector return true; } -bool EditTextObjectImpl::GetStringIDsIgnoreCase( const svl::StringPool& rPool, std::vector<sal_uIntPtr>& rIDs ) const +bool EditTextObjectImpl::GetStringIDsIgnoreCase( const svl::SharedStringPool& rPool, std::vector<sal_uIntPtr>& rIDs ) const { std::vector<sal_uIntPtr> aIDs; aIDs.reserve(aContents.size()); diff --git a/editeng/source/editeng/editobj2.hxx b/editeng/source/editeng/editobj2.hxx index d2118d79c318..20dafe929db5 100644 --- a/editeng/source/editeng/editobj2.hxx +++ b/editeng/source/editeng/editobj2.hxx @@ -37,7 +37,7 @@ struct Section; namespace svl { -class StringPool; +class SharedStringPool; } @@ -142,9 +142,9 @@ private: public: ~ContentInfo(); - void NormalizeString( svl::StringPool& rPool ); - sal_uIntPtr GetStringID( const svl::StringPool& rPool ) const; - sal_uIntPtr GetStringIDIgnoreCase( const svl::StringPool& rPool ) const; + void NormalizeString( svl::SharedStringPool& rPool ); + sal_uIntPtr GetStringID( const svl::SharedStringPool& rPool ) const; + sal_uIntPtr GetStringIDIgnoreCase( const svl::SharedStringPool& rPool ) const; const XEditAttributesType& GetAttribs() const { return aAttribs; } XEditAttributesType& GetAttribs() { return aAttribs; } @@ -208,9 +208,9 @@ public: sal_uInt16 GetUserType() const; void SetUserType( sal_uInt16 n ); - void NormalizeString( svl::StringPool& rPool ); - bool GetStringIDs( const svl::StringPool& rPool, std::vector<sal_uIntPtr>& rIDs ) const; - bool GetStringIDsIgnoreCase( const svl::StringPool& rPool, std::vector<sal_uIntPtr>& rIDs ) const; + void NormalizeString( svl::SharedStringPool& rPool ); + bool GetStringIDs( const svl::SharedStringPool& rPool, std::vector<sal_uIntPtr>& rIDs ) const; + bool GetStringIDsIgnoreCase( const svl::SharedStringPool& rPool, std::vector<sal_uIntPtr>& rIDs ) const; bool IsVertical() const; void SetVertical( bool b ); |