diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-01-02 16:22:46 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-01-03 21:11:20 +0000 |
commit | 79f115b91e5ad4d9038e127bf0b57843e157eac9 (patch) | |
tree | 704dee023dca3144f78613c41ba528ed65b1d80f /sw | |
parent | 05dcb073d60579a142e3074fb1b137f36840ee9e (diff) |
boost::unordered_map->std::unordered_map
Change-Id: I2c65709cda6f10810452dfb8aa1a247cb3a5564f
Diffstat (limited to 'sw')
29 files changed, 71 insertions, 72 deletions
diff --git a/sw/inc/IDocumentExternalData.hxx b/sw/inc/IDocumentExternalData.hxx index b9a8e10ea0d6..adbaebc5ea18 100644 --- a/sw/inc/IDocumentExternalData.hxx +++ b/sw/inc/IDocumentExternalData.hxx @@ -19,8 +19,8 @@ #ifndef INCLUDED_SW_INC_IDOCUMENTEXTERNALDATA_HXX #define INCLUDED_SW_INC_IDOCUMENTEXTERNALDATA_HXX -#include <boost/unordered_map.hpp> #include <boost/shared_ptr.hpp> +#include <unordered_map> namespace sw { @@ -44,7 +44,7 @@ typedef ::boost::shared_ptr<ExternalData> tExternalDataPointer; class IDocumentExternalData { protected: - typedef ::boost::unordered_map<sw::tExternalDataType, sw::tExternalDataPointer, sw::ExternalDataTypeHash> + typedef std::unordered_map<sw::tExternalDataType, sw::tExternalDataPointer, sw::ExternalDataTypeHash> tExternalData; tExternalData m_externalData; diff --git a/sw/inc/SwStyleNameMapper.hxx b/sw/inc/SwStyleNameMapper.hxx index 1159d7a5b3e9..3a27cbc28479 100644 --- a/sw/inc/SwStyleNameMapper.hxx +++ b/sw/inc/SwStyleNameMapper.hxx @@ -24,8 +24,7 @@ #include <SwGetPoolIdFromName.hxx> #include "swdllapi.h" -#include <boost/unordered_map.hpp> - +#include <unordered_map> #include <vector> /** This class holds all data about the names of styles used in the user @@ -74,8 +73,7 @@ struct SwTableEntry; -typedef ::boost::unordered_map<const OUString, sal_uInt16, OUStringHash> - NameToIdHash; +typedef std::unordered_map<OUString, sal_uInt16, OUStringHash> NameToIdHash; class SwStyleNameMapper { diff --git a/sw/inc/dbgoutsw.hxx b/sw/inc/dbgoutsw.hxx index 77f0255db456..6b98c528b2a8 100644 --- a/sw/inc/dbgoutsw.hxx +++ b/sw/inc/dbgoutsw.hxx @@ -21,10 +21,10 @@ #ifdef DBG_UTIL -#include <boost/unordered_map.hpp> #include <rtl/ustring.hxx> #include <tox.hxx> #include <cstdio> +#include <unordered_map> class SwCntntNode; class SwNode; @@ -78,11 +78,11 @@ SW_DLLPUBLIC const char * dbg_out(const SwNumRuleTbl & rTbl); SW_DLLPUBLIC const char * dbg_out(const SwNodeRange & rRange); template<typename tKey, typename tMember, typename fHashFunction> -OUString lcl_dbg_out(const boost::unordered_map<tKey, tMember, fHashFunction> & rMap) +OUString lcl_dbg_out(const std::unordered_map<tKey, tMember, fHashFunction> & rMap) { OUString aResult("["); - typename boost::unordered_map<tKey, tMember, fHashFunction>::const_iterator aIt; + typename std::unordered_map<tKey, tMember, fHashFunction>::const_iterator aIt; for (aIt = rMap.begin(); aIt != rMap.end(); aIt++) { @@ -102,7 +102,7 @@ OUString lcl_dbg_out(const boost::unordered_map<tKey, tMember, fHashFunction> & } template<typename tKey, typename tMember, typename fHashFunction> -const char * dbg_out(const boost::unordered_map<tKey, tMember, fHashFunction> & rMap) +const char * dbg_out(const std::unordered_map<tKey, tMember, fHashFunction> & rMap) { return dbg_out(lcl_dbg_out(rMap)); } diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index c99118565a17..bcc89eaa79ed 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -47,12 +47,12 @@ #include <charfmt.hxx> #include <docary.hxx> -#include <boost/unordered_map.hpp> - #include <svtools/embedhlp.hxx> -#include <vector> -#include <set> + #include <memory> +#include <set> +#include <unordered_map> +#include <vector> #include <boost/scoped_ptr.hpp> #include <boost/ptr_container/ptr_vector.hpp> @@ -339,7 +339,7 @@ class SW_DLLPUBLIC SwDoc : mutable SwNumRuleTbl *mpNumRuleTbl; //< List of all named NumRules. // Hash map to find numrules by name - mutable boost::unordered_map<OUString, SwNumRule *, OUStringHash> maNumRuleMap; + mutable std::unordered_map<OUString, SwNumRule *, OUStringHash> maNumRuleMap; SwUnoCrsrTbl *mpUnoCrsrTbl; diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx index 1aad77bebbf4..448f486febeb 100644 --- a/sw/inc/docstyle.hxx +++ b/sw/inc/docstyle.hxx @@ -25,8 +25,8 @@ #include <svl/style.hxx> #include <svl/itemset.hxx> #include "swdllapi.h" -#include <boost/unordered_map.hpp> +#include <unordered_map> #include <vector> class SwDoc; @@ -142,7 +142,7 @@ class SwStyleSheetIterator : public SfxStyleSheetIterator, public SfxListener class SwPoolFmtList { std::vector<OUString> maImpl; - typedef boost::unordered_map<OUString, sal_uInt32, OUStringHash> UniqueHash; + typedef std::unordered_map<OUString, sal_uInt32, OUStringHash> UniqueHash; UniqueHash maUnique; void rehash(); public: diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx index 2dc755e6c5e5..771b727f5534 100644 --- a/sw/inc/numrule.hxx +++ b/sw/inc/numrule.hxx @@ -27,9 +27,9 @@ #include <swtypes.hxx> #include <calbck.hxx> #include <hints.hxx> -#include <boost/unordered_map.hpp> #include <SwNumberTreeTypes.hxx> #include <ndarr.hxx> +#include <unordered_map> #include <vector> #include <charfmt.hxx> @@ -125,8 +125,8 @@ private: /** container for associated paragraph styles */ tParagraphStyleList maParagraphStyleList; - /** boost::unordered_map containing "name->rule" relation */ - boost::unordered_map<OUString, SwNumRule *, OUStringHash> * mpNumRuleMap; + /** unordered_map containing "name->rule" relation */ + std::unordered_map<OUString, SwNumRule *, OUStringHash> * mpNumRuleMap; OUString msName; SwNumRuleType meRuleType; @@ -207,7 +207,7 @@ public: @param pNumRuleMap map to register in */ void SetNumRuleMap( - boost::unordered_map<OUString, SwNumRule *, OUStringHash>* pNumRuleMap ); + std::unordered_map<OUString, SwNumRule *, OUStringHash>* pNumRuleMap ); static OUString GetOutlineRuleName(); diff --git a/sw/inc/pch/precompiled_msword.hxx b/sw/inc/pch/precompiled_msword.hxx index 203906522a8f..a717e12582b8 100644 --- a/sw/inc/pch/precompiled_msword.hxx +++ b/sw/inc/pch/precompiled_msword.hxx @@ -23,7 +23,6 @@ #include <boost/scoped_array.hpp> #include <boost/scoped_ptr.hpp> #include <boost/static_assert.hpp> -#include <boost/unordered_set.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertyContainer.hpp> @@ -263,6 +262,7 @@ #include <tools/urlobj.hxx> #include <ucbhelper/content.hxx> #include <unicode/ubidi.h> +#include <unordered_set> #include <unotools/configmgr.hxx> #include <unotools/docinfohelper.hxx> #include <unotools/fltrcfg.hxx> diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx index f6c74f92bf27..c52354d3288b 100644 --- a/sw/inc/pch/precompiled_sw.hxx +++ b/sw/inc/pch/precompiled_sw.hxx @@ -56,8 +56,6 @@ #include <boost/scoped_ptr.hpp> #include <boost/shared_ptr.hpp> #include <boost/tuple/tuple.hpp> -#include <boost/unordered_map.hpp> -#include <boost/unordered_set.hpp> #include <cassert> #include <cctype> #include <cfloat> @@ -1047,6 +1045,8 @@ #include <ucbhelper/contentidentifier.hxx> #include <unicode/ubidi.h> #include <unicode/uchar.h> +#include <unordered_map> +#include <unordered_set> #include <unotools/accessiblerelationsethelper.hxx> #include <unotools/accessiblestatesethelper.hxx> #include <unotools/charclass.hxx> diff --git a/sw/inc/pch/precompiled_vbaswobj.hxx b/sw/inc/pch/precompiled_vbaswobj.hxx index 5d7a32a54f0e..e3bce36df0a0 100644 --- a/sw/inc/pch/precompiled_vbaswobj.hxx +++ b/sw/inc/pch/precompiled_vbaswobj.hxx @@ -16,7 +16,6 @@ #include <basic/sbuno.hxx> #include <boost/shared_ptr.hpp> -#include <boost/unordered_map.hpp> #include <com/sun/star/awt/FontUnderline.hpp> #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> @@ -181,6 +180,7 @@ #include <tools/config.hxx> #include <tools/diagnose_ex.h> #include <tools/urlobj.hxx> +#include <unordered_map> #include <unotools/pathoptions.hxx> #include <vbahelper/helperdecl.hxx> #include <vbahelper/vbahelper.hxx> diff --git a/sw/inc/swwait.hxx b/sw/inc/swwait.hxx index ca5cad51fab4..71c25d7cc15d 100644 --- a/sw/inc/swwait.hxx +++ b/sw/inc/swwait.hxx @@ -22,7 +22,7 @@ #include <tools/solar.h> #include "swdllapi.h" -#include <boost/unordered_set.hpp> +#include <unordered_set> class SwDocShell; class SfxDispatcher; @@ -43,7 +43,7 @@ private: SwDocShell& mrDoc; const bool mbLockUnlockDispatcher; - boost::unordered_set< SfxDispatcher* > mpLockedDispatchers; + std::unordered_set< SfxDispatcher* > mpLockedDispatchers; }; #endif diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx index fec85f191c58..315b62d28886 100644 --- a/sw/source/core/access/accpara.hxx +++ b/sw/source/core/access/accpara.hxx @@ -29,9 +29,9 @@ #include <txmsrt.hxx> #include <com/sun/star/accessibility/XAccessibleExtendedAttributes.hpp> #include <com/sun/star/accessibility/XAccessibleTextAttributes.hpp> -#include <boost/unordered_map.hpp> #include <accselectionhelper.hxx> #include <calbck.hxx> +#include <unordered_map> class SwField; class SwTxtFrm; @@ -49,7 +49,7 @@ namespace com { namespace sun { namespace star { namespace style { struct TabStop; } } } } -typedef ::boost::unordered_map< OUString, +typedef std::unordered_map< OUString, ::com::sun::star::beans::PropertyValue, OUStringHash, ::std::equal_to< OUString > > tAccParaPropValMap; diff --git a/sw/source/core/doc/DocumentListsManager.cxx b/sw/source/core/doc/DocumentListsManager.cxx index 784b38f6043c..c4ba23fb1290 100644 --- a/sw/source/core/doc/DocumentListsManager.cxx +++ b/sw/source/core/doc/DocumentListsManager.cxx @@ -73,7 +73,7 @@ SwList* DocumentListsManager::getListByName( const OUString& sListId ) const { SwList* pList = 0; - boost::unordered_map< OUString, SwList*, OUStringHash >::const_iterator + std::unordered_map< OUString, SwList*, OUStringHash >::const_iterator aListIter = maLists.find( sListId ); if ( aListIter != maLists.end() ) { @@ -120,7 +120,7 @@ SwList* DocumentListsManager::getListForListStyle( const OUString& sListStyleNam { SwList* pList = 0; - boost::unordered_map< OUString, SwList*, OUStringHash >::const_iterator + std::unordered_map< OUString, SwList*, OUStringHash >::const_iterator aListIter = maListStyleLists.find( sListStyleName ); if ( aListIter != maListStyleLists.end() ) { @@ -189,7 +189,7 @@ void DocumentListsManager::trackChangeOfListStyleName( const OUString& sListStyl DocumentListsManager::~DocumentListsManager() { - for ( boost::unordered_map< OUString, SwList*, OUStringHash >::iterator + for ( std::unordered_map< OUString, SwList*, OUStringHash >::iterator aListIter = maLists.begin(); aListIter != maLists.end(); ++aListIter ) diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx index 0667e4684be4..c48ffd7f7486 100644 --- a/sw/source/core/doc/number.cxx +++ b/sw/source/core/doc/number.cxx @@ -42,10 +42,10 @@ #include <numrule.hxx> #include <SwNodeNum.hxx> -#include <boost/unordered_map.hpp> - #include <list.hxx> + #include <algorithm> +#include <unordered_map> #include <unotools/saveopt.hxx> @@ -149,7 +149,7 @@ void SwNumRule::RemoveTxtNode( SwTxtNode& rTxtNode ) } } -void SwNumRule::SetNumRuleMap(boost::unordered_map<OUString, SwNumRule *, OUStringHash> * +void SwNumRule::SetNumRuleMap(std::unordered_map<OUString, SwNumRule *, OUStringHash> * pNumRuleMap) { mpNumRuleMap = pNumRuleMap; diff --git a/sw/source/core/doc/swstylemanager.cxx b/sw/source/core/doc/swstylemanager.cxx index cbca9bdb4bd0..af8e6d224d8e 100644 --- a/sw/source/core/doc/swstylemanager.cxx +++ b/sw/source/core/doc/swstylemanager.cxx @@ -18,18 +18,18 @@ */ #include "swstylemanager.hxx" -#include <boost/unordered_map.hpp> #include <svl/stylepool.hxx> #include <doc.hxx> #include <charfmt.hxx> #include <docary.hxx> #include <swtypes.hxx> #include <istyleaccess.hxx> +#include <unordered_map> -typedef ::boost::unordered_map< const OUString, - StylePool::SfxItemSet_Pointer_t, - OUStringHash, - ::std::equal_to< OUString > > SwStyleNameCache; +typedef std::unordered_map< OUString, + StylePool::SfxItemSet_Pointer_t, + OUStringHash, + std::equal_to< OUString > > SwStyleNameCache; class SwStyleCache { diff --git a/sw/source/core/inc/DocumentListsManager.hxx b/sw/source/core/inc/DocumentListsManager.hxx index 37bdfaee68e3..83bfdd41e94a 100644 --- a/sw/source/core/inc/DocumentListsManager.hxx +++ b/sw/source/core/inc/DocumentListsManager.hxx @@ -22,7 +22,7 @@ #include <IDocumentListsAccess.hxx> #include <boost/utility.hpp> -#include <boost/unordered_map.hpp> +#include <unordered_map> class SwList; class SwDoc; @@ -56,7 +56,7 @@ class DocumentListsManager : public IDocumentListsAccess, SwDoc& m_rDoc; - typedef boost::unordered_map<OUString, SwList*, OUStringHash> tHashMapForLists; + typedef std::unordered_map<OUString, SwList*, OUStringHash> tHashMapForLists; // container to hold the lists of the text document tHashMapForLists maLists; // relation between list style and its default list diff --git a/sw/source/core/inc/MarkManager.hxx b/sw/source/core/inc/MarkManager.hxx index 52fea0a07d91..4e820b5efbc4 100644 --- a/sw/source/core/inc/MarkManager.hxx +++ b/sw/source/core/inc/MarkManager.hxx @@ -22,8 +22,8 @@ #include <IMark.hxx> #include <IDocumentMarkAccess.hxx> -#include <boost/unordered_set.hpp> -#include <boost/unordered_map.hpp> +#include <unordered_set> +#include <unordered_map> namespace sw { namespace mark { @@ -109,7 +109,7 @@ namespace sw { // additional container for fieldmarks container_t m_vFieldmarks; - boost::unordered_set<OUString, OUStringHash> m_aMarkNamesSet; + std::unordered_set<OUString, OUStringHash> m_aMarkNamesSet; // container for annotation marks container_t m_vAnnotationMarks; diff --git a/sw/source/core/inc/layouter.hxx b/sw/source/core/inc/layouter.hxx index c961bd8a72fa..0287c3b8ad22 100644 --- a/sw/source/core/inc/layouter.hxx +++ b/sw/source/core/inc/layouter.hxx @@ -20,6 +20,7 @@ #define INCLUDED_SW_SOURCE_CORE_INC_LAYOUTER_HXX #include "swtypes.hxx" +#include <unordered_map> class SwEndnoter; class SwDoc; @@ -33,7 +34,6 @@ class SwTxtFrm; class SwRowFrm; class SwObjsMarkedAsTmpConsiderWrapInfluence; class SwAnchoredObject; -#include <boost/unordered_map.hpp> class SwFlowFrm; class SwLayoutFrm; @@ -89,7 +89,7 @@ private: p_key1.mnFreeSpaceInNewUpper == p_key2.mnFreeSpaceInNewUpper; } }; - boost::unordered_map< const tMoveBwdLayoutInfoKey, sal_uInt16, + std::unordered_map< const tMoveBwdLayoutInfoKey, sal_uInt16, fMoveBwdLayoutInfoKeyHash, fMoveBwdLayoutInfoKeyEq > maMoveBwdLayoutInfo; public: diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx index 72b93371d4e7..d4fe261d74d4 100644 --- a/sw/source/core/unocore/unocoll.cxx +++ b/sw/source/core/unocore/unocoll.cxx @@ -175,7 +175,8 @@ public: } }; -typedef boost::unordered_map< OUString, OUString, OUStringHash > StringHashMap; +typedef std::unordered_map< OUString, OUString, OUStringHash > StringHashMap; + class SwVbaProjectNameProvider : public ::cppu::WeakImplHelper1< container::XNameContainer > { StringHashMap mTemplateToProject; diff --git a/sw/source/filter/ww8/WW8TableInfo.hxx b/sw/source/filter/ww8/WW8TableInfo.hxx index d91798d3da38..2f9da2689d62 100644 --- a/sw/source/filter/ww8/WW8TableInfo.hxx +++ b/sw/source/filter/ww8/WW8TableInfo.hxx @@ -19,12 +19,12 @@ #ifndef INCLUDED_SW_SOURCE_FILTER_WW8_WW8TABLEINFO_HXX #define INCLUDED_SW_SOURCE_FILTER_WW8_WW8TABLEINFO_HXX -#include <boost/unordered_map.hpp> #include <string> #include <map> #include <set> #include <functional> #include <boost/shared_ptr.hpp> +#include <unordered_map> #include <vector> #include <sal/types.h> #include <swrect.hxx> @@ -293,13 +293,13 @@ public: class WW8TableInfo { friend class WW8TableNodeInfoInner; - typedef boost::unordered_map<const SwNode *, WW8TableNodeInfo::Pointer_t, hashNode > Map_t; + typedef std::unordered_map<const SwNode *, WW8TableNodeInfo::Pointer_t, hashNode > Map_t; Map_t mMap; - typedef boost::unordered_map<const SwTable *, WW8TableCellGrid::Pointer_t, hashTable > CellGridMap_t; + typedef std::unordered_map<const SwTable *, WW8TableCellGrid::Pointer_t, hashTable > CellGridMap_t; CellGridMap_t mCellGridMap; - typedef boost::unordered_map<const SwTable *, const SwNode *, hashTable > FirstInTableMap_t; + typedef std::unordered_map<const SwTable *, const SwNode *, hashTable > FirstInTableMap_t; FirstInTableMap_t mFirstInTableMap; WW8TableNodeInfo * diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index 3c84833e5ef5..74134b364c4e 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -22,7 +22,6 @@ #include <boost/noncopyable.hpp> #include <boost/scoped_array.hpp> -#include <boost/unordered_set.hpp> #include <com/sun/star/i18n/ScriptType.hpp> #include <rtl/tencinfo.h> @@ -71,6 +70,8 @@ #include "docxattributeoutput.hxx" #include "rtfattributeoutput.hxx" +#include <unordered_set> + using namespace css; using namespace sw::util; using namespace nsHdFtFlags; @@ -306,7 +307,7 @@ void MSWordStyles::BuildStylesTable() void MSWordStyles::BuildStyleIds() { - boost::unordered_set<OString, OStringHash> aUsed; + std::unordered_set<OString, OStringHash> aUsed; m_aStyleIds.push_back("Normal"); aUsed.insert("normal"); diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 67aa9ab0e93f..f94ecbddfec9 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -22,7 +22,6 @@ #include <sal/config.h> #include <boost/noncopyable.hpp> -#include <boost/unordered_set.hpp> #include <com/sun/star/embed/ElementModes.hpp> #include <i18nlangtag/languagetag.hxx> @@ -128,6 +127,8 @@ #include "WW8Sttbf.hxx" #include "WW8FibData.hxx" +#include <unordered_set> + using namespace ::com::sun::star; using namespace sw::util; using namespace sw::types; @@ -1730,7 +1731,7 @@ void SwWW8ImplReader::Read_Tab(sal_uInt16 , const sal_uInt8* pData, short nLen) } bool bFound = false; - ::boost::unordered_set<size_t> aLoopWatch; + std::unordered_set<size_t> aLoopWatch; while (pSty && !bFound) { const SfxPoolItem* pTabs; diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx index 28b941990403..fb08c8ebad14 100644 --- a/sw/source/filter/ww8/ww8scan.hxx +++ b/sw/source/filter/ww8/ww8scan.hxx @@ -23,14 +23,14 @@ #ifndef LONG_MAX #include <limits.h> #endif +#include <algorithm> #include <cassert> #include <cstddef> +#include <list> #include <stack> +#include <unordered_map> #include <vector> -#include <list> -#include <algorithm> -#include <boost/unordered_map.hpp> #include <tools/solar.h> #include <tools/stream.hxx> #include <rtl/ustring.hxx> @@ -85,7 +85,7 @@ public: } private: - typedef boost::unordered_map<sal_uInt16, SprmInfo> Map; + typedef std::unordered_map<sal_uInt16, SprmInfo> Map; Map map_; }; diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index b7aa423c2c03..ae2cbc3e4798 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -63,7 +63,6 @@ #include <xmloff/xmluconv.hxx> #include <unotools/saveopt.hxx> #include <tools/diagnose_ex.h> -#include <boost/unordered_set.hpp> #include <vcl/svapp.hxx> #include <osl/mutex.hxx> @@ -74,6 +73,8 @@ #include <comphelper/servicehelper.hxx> #include <comphelper/processfactory.hxx> +#include <unordered_set> + using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::text; @@ -1084,7 +1085,7 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC if( !xInfo.is() ) return; - boost::unordered_set< OUString, OUStringHash > aSet; + std::unordered_set< OUString, OUStringHash > aSet; aSet.insert("ForbiddenCharacters"); aSet.insert("IsKernAsianPunctuation"); aSet.insert("CharacterCompressionType"); diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index 0d33b7426acf..0d27fb4bda8e 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -67,7 +67,6 @@ using namespace ::com::sun::star::frame; using namespace ::com::sun::star::table; using namespace ::com::sun::star::xml::sax; using namespace ::xmloff::token; -using ::boost::unordered_map; enum SwXMLTableElemTokens { diff --git a/sw/source/filter/xml/xmltbli.hxx b/sw/source/filter/xml/xmltbli.hxx index c3d303556193..f5017fbaf909 100644 --- a/sw/source/filter/xml/xmltbli.hxx +++ b/sw/source/filter/xml/xmltbli.hxx @@ -23,8 +23,8 @@ #include <xmloff/XMLTextTableContext.hxx> // STL include -#include <boost/unordered_map.hpp> #include <boost/ptr_container/ptr_vector.hpp> +#include <unordered_map> #include <vector> class SwXMLImport; @@ -76,7 +76,7 @@ class SwXMLTableContext : public XMLTextTableContext // hash map of shared format, indexed by the (XML) style name, // the column width, and protection flag - typedef boost::unordered_map<TableBoxIndex,SwTableBoxFmt*, + typedef std::unordered_map<TableBoxIndex,SwTableBoxFmt*, TableBoxIndexHasher> map_BoxFmt; map_BoxFmt* pSharedBoxFormats; diff --git a/sw/source/ui/vba/vbadocumentproperties.cxx b/sw/source/ui/vba/vbadocumentproperties.cxx index eec6963b1d8f..701ea4d1ac12 100644 --- a/sw/source/ui/vba/vbadocumentproperties.cxx +++ b/sw/source/ui/vba/vbadocumentproperties.cxx @@ -393,7 +393,7 @@ public: } }; -typedef boost::unordered_map< sal_Int32, DocPropInfo > MSOIndexToOODocPropInfo; +typedef std::unordered_map< sal_Int32, DocPropInfo > MSOIndexToOODocPropInfo; class BuiltInIndexHelper { @@ -637,7 +637,7 @@ typedef ::cppu::WeakImplHelper3< com::sun::star::container::XIndexAccess ,com::sun::star::container::XEnumerationAccess > PropertiesImpl_BASE; -typedef boost::unordered_map< sal_Int32, uno::Reference< XDocumentProperty > > DocProps; +typedef std::unordered_map< sal_Int32, uno::Reference< XDocumentProperty > > DocProps; typedef ::cppu::WeakImplHelper1< com::sun::star::container::XEnumeration > DocPropEnumeration_BASE; class DocPropEnumeration : public DocPropEnumeration_BASE @@ -659,7 +659,7 @@ public: } }; -typedef boost::unordered_map< OUString, uno::Reference< XDocumentProperty >, OUStringHash, ::std::equal_to< OUString > > DocPropsByName; +typedef std::unordered_map< OUString, uno::Reference< XDocumentProperty >, OUStringHash, ::std::equal_to< OUString > > DocPropsByName; class BuiltInPropertiesImpl : public PropertiesImpl_BASE { diff --git a/sw/source/ui/vba/vbadocumentproperties.hxx b/sw/source/ui/vba/vbadocumentproperties.hxx index 259856f9b293..7619eb3e813d 100644 --- a/sw/source/ui/vba/vbadocumentproperties.hxx +++ b/sw/source/ui/vba/vbadocumentproperties.hxx @@ -22,7 +22,6 @@ #include <ooo/vba/XDocumentProperties.hpp> #include <com/sun/star/frame/XModel.hpp> #include <vbahelper/vbacollectionimpl.hxx> -#include <boost/unordered_map.hpp> typedef CollTestImplHelper< ov::XDocumentProperties > SwVbaDocumentproperties_BASE; diff --git a/sw/source/ui/vba/vbadocuments.cxx b/sw/source/ui/vba/vbadocuments.cxx index 670aa93ccfbc..00f4d2a422cb 100644 --- a/sw/source/ui/vba/vbadocuments.cxx +++ b/sw/source/ui/vba/vbadocuments.cxx @@ -47,7 +47,6 @@ #include "vbadocuments.hxx" #include <vbahelper/vbahelper.hxx> -#include <boost/unordered_map.hpp> #include <osl/file.hxx> using namespace ::ooo::vba; using namespace ::com::sun::star; diff --git a/sw/source/ui/vba/vbafont.cxx b/sw/source/ui/vba/vbafont.cxx index 3abfbbe6687d..b9b75ab9dd9f 100644 --- a/sw/source/ui/vba/vbafont.cxx +++ b/sw/source/ui/vba/vbafont.cxx @@ -20,9 +20,9 @@ #include "vbafont.hxx" #include <com/sun/star/awt/FontUnderline.hpp> #include <ooo/vba/word/WdUnderline.hpp> -#include <boost/unordered_map.hpp> #include <sal/macros.h> #include <ooo/vba/word/WdColorIndex.hpp> +#include <unordered_map> using namespace ::ooo::vba; using namespace ::com::sun::star; @@ -57,7 +57,7 @@ static MapPair UnderLineTable[] = { { word::WdUnderline::wdUnderlineDashLongHeavy, com::sun::star::awt::FontUnderline::BOLDLONGDASH }, }; -typedef boost::unordered_map< sal_Int32, sal_Int32 > ConstToConst; +typedef std::unordered_map< sal_Int32, sal_Int32 > ConstToConst; class UnderLineMapper { ConstToConst MSO2OOO; |