diff options
| author | Noel Grandin <noel@peralex.com> | 2012-04-15 00:28:11 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-04-18 15:30:04 +0200 |
| commit | f36861d4a367672e1ec6fc44e9367996c7cc6405 (patch) | |
| tree | e92dbf9ab73a1ae180f61fd0d8ec97d4ad76a5ca /xmloff | |
| parent | b06d5cc4c234e3495833263192e694c0e9fc0533 (diff) | |
Convert SV_DECL_PTRARR_SORT_DEL to boost::ptr_set
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/core/xmltkmap.cxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/xmloff/source/core/xmltkmap.cxx b/xmloff/source/core/xmltkmap.cxx index d9f291a96321..f85ba871097a 100644 --- a/xmloff/source/core/xmltkmap.cxx +++ b/xmloff/source/core/xmltkmap.cxx @@ -30,6 +30,7 @@ #include <svl/svarray.hxx> #include <xmloff/xmltkmap.hxx> #include <xmloff/xmltoken.hxx> +#include <boost/ptr_container/ptr_set.hpp> using namespace ::xmloff::token; @@ -72,9 +73,7 @@ public: } }; -typedef SvXMLTokenMapEntry_Impl *SvXMLTokenMapEntry_ImplPtr; -SV_DECL_PTRARR_SORT_DEL( SvXMLTokenMap_Impl, SvXMLTokenMapEntry_ImplPtr, 5 ) -SV_IMPL_OP_PTRARR_SORT( SvXMLTokenMap_Impl, SvXMLTokenMapEntry_ImplPtr ) +class SvXMLTokenMap_Impl : public boost::ptr_set<SvXMLTokenMapEntry_Impl> {}; // --------------------------------------------------------------------- @@ -84,10 +83,10 @@ SvXMLTokenMapEntry_Impl *SvXMLTokenMap::_Find( sal_uInt16 nKeyPrefix, SvXMLTokenMapEntry_Impl *pRet = 0; SvXMLTokenMapEntry_Impl aTst( nKeyPrefix, rLName ); - sal_uInt16 nPos; - if( pImpl->Seek_Entry( &aTst, &nPos ) ) + SvXMLTokenMap_Impl::iterator it = pImpl->find( aTst ); + if( it != pImpl->end() ) { - pRet = (*pImpl)[nPos]; + pRet = &*it; } return pRet; @@ -98,7 +97,7 @@ SvXMLTokenMap::SvXMLTokenMap( const SvXMLTokenMapEntry *pMap ) : { while( pMap->eLocalName != XML_TOKEN_INVALID ) { - pImpl->Insert( new SvXMLTokenMapEntry_Impl( *pMap ) ); + pImpl->insert( new SvXMLTokenMapEntry_Impl( *pMap ) ); pMap++; } } |