diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-09-03 23:11:50 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-09-04 11:55:48 +0200 |
| commit | 15a439dacf77bfcd7cc47bd1c360945375a24141 (patch) | |
| tree | b1c238dcab195bd528534c87f69f9790c9c37062 /sw | |
| parent | 9b5d96d7e074dd9ea26f835351ac6d36fe01b086 (diff) | |
sw: replace boost::ptr_map with std::map
Change-Id: I8cf906b7f3f9647a60b20a977ea11c8698438ec2
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/unocrsrhelper.hxx | 8 | ||||
| -rw-r--r-- | sw/source/core/unocore/unocrsrhelper.cxx | 14 |
2 files changed, 12 insertions, 10 deletions
diff --git a/sw/inc/unocrsrhelper.hxx b/sw/inc/unocrsrhelper.hxx index 96926392ac99..4dc6ffd12acb 100644 --- a/sw/inc/unocrsrhelper.hxx +++ b/sw/inc/unocrsrhelper.hxx @@ -19,8 +19,6 @@ #ifndef INCLUDED_SW_INC_UNOCRSRHELPER_HXX #define INCLUDED_SW_INC_UNOCRSRHELPER_HXX -#include <boost/ptr_container/ptr_map.hpp> - #include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/uno/DeploymentException.hpp> @@ -29,6 +27,8 @@ #include <flyenum.hxx> #include <pam.hxx> +#include <map> + class SfxItemSet; class SfxItemPropertySet; struct SfxItemPropertySimpleEntry; @@ -68,8 +68,10 @@ namespace SwUnoCursorHelper { class SwAnyMapHelper { + private: // keep Any's mapped by (WhichId << 16 ) + (MemberId) - boost::ptr_map<sal_uInt32,com::sun::star::uno::Any> maMap; + std::map<sal_uInt32, com::sun::star::uno::Any> m_Map; + public: void SetValue( sal_uInt16 nWhichId, sal_uInt16 nMemberId, const com::sun::star::uno::Any& rAny ); bool FillValue( sal_uInt16 nWhichId, sal_uInt16 nMemberId, const com::sun::star::uno::Any*& pAny ); diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx index 983b5ed9c612..c6dcb508c2e5 100644 --- a/sw/source/core/unocore/unocrsrhelper.cxx +++ b/sw/source/core/unocore/unocrsrhelper.cxx @@ -1402,21 +1402,21 @@ void makeTableCellRedline( SwTableBox& rTableBox, void SwAnyMapHelper::SetValue( sal_uInt16 nWhichId, sal_uInt16 nMemberId, const uno::Any& rAny ) { sal_uInt32 nKey = (nWhichId << 16) + nMemberId; - auto aIt = maMap.find( nKey ); - if( aIt != maMap.end() ) - *(aIt->second) = rAny; + auto aIt = m_Map.find( nKey ); + if (aIt != m_Map.end()) + aIt->second = rAny; else - maMap.insert( nKey, new uno::Any(rAny) ); + m_Map.insert(std::make_pair(nKey, rAny)); } bool SwAnyMapHelper::FillValue( sal_uInt16 nWhichId, sal_uInt16 nMemberId, const uno::Any*& pAny ) { bool bRet = false; sal_uInt32 nKey = (nWhichId << 16) + nMemberId; - auto aIt = maMap.find( nKey ); - if( aIt != maMap.end() ) + auto aIt = m_Map.find( nKey ); + if (aIt != m_Map.end()) { - pAny = aIt->second; + pAny = & aIt->second; bRet = true; } return bRet; |