diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-07-25 15:18:40 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-07-25 15:54:12 -0400 |
| commit | 690f7ff8839c66c29f71f681b9e78cc51923c6b6 (patch) | |
| tree | b114f42f3b36f7402b8ddc72842d71d3b49256ad | |
| parent | dbf84a3574dd3524fcb8d89c3dcb91182656e1ce (diff) | |
Store the handler as a const pointer.
Handlers are conceptually stateless; we can keep them as const objects.
Change-Id: I3d35ab0695037632e82f67f901c9795adf9bdd8d
| -rw-r--r-- | include/xmloff/prhdlfac.hxx | 4 | ||||
| -rw-r--r-- | xmloff/source/style/prhdlfac.cxx | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/xmloff/prhdlfac.hxx b/include/xmloff/prhdlfac.hxx index 3b045831c49a..aca1469fabd0 100644 --- a/include/xmloff/prhdlfac.hxx +++ b/include/xmloff/prhdlfac.hxx @@ -84,7 +84,7 @@ public: protected: /** Retrieves a PropertyHandler from the internal cache */ - XMLPropertyHandler* GetHdlCache( sal_Int32 nType ) const; + const XMLPropertyHandler* GetHdlCache( sal_Int32 nType ) const; /** Puts a PropertyHandler into the internal cache */ void PutHdlCache( sal_Int32 nType, const XMLPropertyHandler* pHdl ) const; @@ -94,7 +94,7 @@ private: SAL_DLLPRIVATE const XMLPropertyHandler* GetBasicHandler( sal_Int32 nType ) const; - typedef ::std::map< sal_Int32, XMLPropertyHandler* > CacheMap; + typedef ::std::map<sal_Int32, const XMLPropertyHandler*> CacheMap; mutable CacheMap maHandlerCache; }; diff --git a/xmloff/source/style/prhdlfac.cxx b/xmloff/source/style/prhdlfac.cxx index 5607585264a0..2829fe6a5152 100644 --- a/xmloff/source/style/prhdlfac.cxx +++ b/xmloff/source/style/prhdlfac.cxx @@ -110,9 +110,9 @@ const XMLPropertyHandler* XMLPropertyHandlerFactory::GetPropertyHandler( sal_Int } // Helper-methods to create and cache PropertyHandler -XMLPropertyHandler* XMLPropertyHandlerFactory::GetHdlCache( sal_Int32 nType ) const +const XMLPropertyHandler* XMLPropertyHandlerFactory::GetHdlCache( sal_Int32 nType ) const { - XMLPropertyHandler* pRet = NULL; + const XMLPropertyHandler* pRet = NULL; if( maHandlerCache.find( nType ) != maHandlerCache.end() ) pRet = maHandlerCache.find( nType )->second; @@ -122,7 +122,7 @@ XMLPropertyHandler* XMLPropertyHandlerFactory::GetHdlCache( sal_Int32 nType ) co void XMLPropertyHandlerFactory::PutHdlCache( sal_Int32 nType, const XMLPropertyHandler* pHdl ) const { - maHandlerCache[nType] = (XMLPropertyHandler*)pHdl; + maHandlerCache[nType] = pHdl; } const XMLPropertyHandler* XMLPropertyHandlerFactory::GetBasicHandler( sal_Int32 nType ) const |