diff options
Diffstat (limited to 'sw/inc')
-rw-r--r-- | sw/inc/IDocumentExternalData.hxx | 4 | ||||
-rw-r--r-- | sw/inc/SwStyleNameMapper.hxx | 6 | ||||
-rw-r--r-- | sw/inc/dbgoutsw.hxx | 8 | ||||
-rw-r--r-- | sw/inc/doc.hxx | 10 | ||||
-rw-r--r-- | sw/inc/docstyle.hxx | 4 | ||||
-rw-r--r-- | sw/inc/numrule.hxx | 8 | ||||
-rw-r--r-- | sw/inc/pch/precompiled_msword.hxx | 2 | ||||
-rw-r--r-- | sw/inc/pch/precompiled_sw.hxx | 4 | ||||
-rw-r--r-- | sw/inc/pch/precompiled_vbaswobj.hxx | 2 | ||||
-rw-r--r-- | sw/inc/swwait.hxx | 4 |
10 files changed, 25 insertions, 27 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 |