diff options
Diffstat (limited to 'sc/inc')
-rw-r--r-- | sc/inc/addincol.hxx | 4 | ||||
-rw-r--r-- | sc/inc/autonamecache.hxx | 4 | ||||
-rw-r--r-- | sc/inc/chart2uno.hxx | 6 | ||||
-rw-r--r-- | sc/inc/chartlis.hxx | 6 | ||||
-rw-r--r-- | sc/inc/compiler.hxx | 2 | ||||
-rw-r--r-- | sc/inc/dpcachetable.hxx | 9 | ||||
-rw-r--r-- | sc/inc/dpglobal.hxx | 2 | ||||
-rw-r--r-- | sc/inc/dpgroup.hxx | 8 | ||||
-rw-r--r-- | sc/inc/dpsave.hxx | 6 | ||||
-rw-r--r-- | sc/inc/dpsdbtab.hxx | 6 | ||||
-rw-r--r-- | sc/inc/dpshttab.hxx | 5 | ||||
-rw-r--r-- | sc/inc/dptabdat.hxx | 8 | ||||
-rw-r--r-- | sc/inc/dptabres.hxx | 10 | ||||
-rw-r--r-- | sc/inc/dptabsrc.hxx | 7 | ||||
-rw-r--r-- | sc/inc/externalrefmgr.hxx | 30 | ||||
-rw-r--r-- | sc/inc/formulaparserpool.hxx | 4 | ||||
-rw-r--r-- | sc/inc/global.hxx | 2 | ||||
-rw-r--r-- | sc/inc/linkuno.hxx | 2 | ||||
-rw-r--r-- | sc/inc/lookupcache.hxx | 6 | ||||
-rw-r--r-- | sc/inc/macromgr.hxx | 5 | ||||
-rw-r--r-- | sc/inc/sheetdata.hxx | 4 | ||||
-rw-r--r-- | sc/inc/table.hxx | 2 |
22 files changed, 70 insertions, 68 deletions
diff --git a/sc/inc/addincol.hxx b/sc/inc/addincol.hxx index 5cc1e046b459..8da49f17c659 100644 --- a/sc/inc/addincol.hxx +++ b/sc/inc/addincol.hxx @@ -44,7 +44,7 @@ #include "scmatrix.hxx" -#include <hash_map> +#include <boost/unordered_map.hpp> class String; @@ -54,7 +54,7 @@ class ScMatrix; class ScFuncDesc; -typedef ::std::hash_map< String, const ScUnoAddInFuncData*, ScStringHashCode, ::std::equal_to< String > > ScAddInHashMap; +typedef ::boost::unordered_map< String, const ScUnoAddInFuncData*, ScStringHashCode, ::std::equal_to< String > > ScAddInHashMap; enum ScAddInArgumentType diff --git a/sc/inc/autonamecache.hxx b/sc/inc/autonamecache.hxx index ed0bc1383913..76804adc1361 100644 --- a/sc/inc/autonamecache.hxx +++ b/sc/inc/autonamecache.hxx @@ -30,12 +30,12 @@ #define SC_AUTONAMECACHE_HXX #include <vector> -#include <hash_map> +#include <boost/unordered_map.hpp> #include "address.hxx" #include "global.hxx" typedef ::std::vector< ScAddress > ScAutoNameAddresses; -typedef ::std::hash_map< String, ScAutoNameAddresses, ScStringHashCode, ::std::equal_to< String > > ScAutoNameHashMap; +typedef ::boost::unordered_map< String, ScAutoNameAddresses, ScStringHashCode, ::std::equal_to< String > > ScAutoNameHashMap; // // Cache for faster lookup of automatic names during CompileXML diff --git a/sc/inc/chart2uno.hxx b/sc/inc/chart2uno.hxx index cf1971f0531a..83e7de7a8d1f 100644 --- a/sc/inc/chart2uno.hxx +++ b/sc/inc/chart2uno.hxx @@ -56,7 +56,7 @@ #include <rtl/ustring.hxx> #include <svl/itemprop.hxx> -#include <hash_set> +#include <boost/unordered_set.hpp> #include <list> #include <vector> #include <memory> @@ -444,14 +444,14 @@ private: virtual void notify(sal_uInt16 nFileId, ScExternalRefManager::LinkUpdateType eType); void addFileId(sal_uInt16 nFileId); void removeFileId(sal_uInt16 nFileId); - const ::std::hash_set<sal_uInt16>& getAllFileIds(); + const ::boost::unordered_set<sal_uInt16>& getAllFileIds(); private: ExternalRefListener(); ExternalRefListener(const ExternalRefListener& r); ScChart2DataSequence& mrParent; - ::std::hash_set<sal_uInt16> maFileIds; + ::boost::unordered_set<sal_uInt16> maFileIds; ScDocument* mpDoc; }; diff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx index 68209d960a5c..2fed42309ed1 100644 --- a/sc/inc/chartlis.hxx +++ b/sc/inc/chartlis.hxx @@ -40,7 +40,7 @@ #include <memory> #include <vector> #include <list> -#include <hash_set> +#include <boost/unordered_set.hpp> class ScDocument; class ScChartUnoData; @@ -58,14 +58,14 @@ public: virtual void notify(sal_uInt16 nFileId, ScExternalRefManager::LinkUpdateType eType); void addFileId(sal_uInt16 nFileId); void removeFileId(sal_uInt16 nFileId); - ::std::hash_set<sal_uInt16>& getAllFileIds(); + ::boost::unordered_set<sal_uInt16>& getAllFileIds(); private: ExternalRefListener(); ExternalRefListener(const ExternalRefListener& r); ScChartListener& mrParent; - ::std::hash_set<sal_uInt16> maFileIds; + ::boost::unordered_set<sal_uInt16> maFileIds; ScDocument* mpDoc; }; diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx index f38abc562d4f..8a25ede25c98 100644 --- a/sc/inc/compiler.hxx +++ b/sc/inc/compiler.hxx @@ -49,7 +49,7 @@ #include <boost/intrusive_ptr.hpp> #ifndef INCLUDED_HASH_MAP -#include <hash_map> +#include <boost/unordered_map.hpp> #define INCLUDED_HASH_MAP #endif diff --git a/sc/inc/dpcachetable.hxx b/sc/inc/dpcachetable.hxx index b8fb00a0bcec..06eecef19763 100644 --- a/sc/inc/dpcachetable.hxx +++ b/sc/inc/dpcachetable.hxx @@ -35,8 +35,7 @@ #include "collect.hxx" #include <vector> -#include <hash_map> -#include <hash_set> +#include <boost/unordered_set.hpp> #include <boost/shared_ptr.hpp> #include <com/sun/star/uno/Reference.hxx> @@ -153,7 +152,7 @@ public: /** Set filter on/off flag to each row to control visibility. The caller must ensure that the table is filled before calling this function. */ - void filterByPageDimension(const ::std::vector<Criterion>& rCriteria, const ::std::hash_set<sal_Int32>& rRepeatIfEmptyDims); + void filterByPageDimension(const ::std::vector<Criterion>& rCriteria, const ::boost::unordered_set<sal_Int32>& rRepeatIfEmptyDims); /** Get the cell instance at specified location within the data grid. Note that the data grid doesn't include the header row. Don't delete the @@ -172,7 +171,7 @@ public: a drill-down data table. */ void filterTable(const ::std::vector<Criterion>& rCriteria, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& rTabData, - const ::std::hash_set<sal_Int32>& rRepeatIfEmptyDims); + const ::boost::unordered_set<sal_Int32>& rRepeatIfEmptyDims); void clear(); bool empty() const; @@ -187,7 +186,7 @@ private: * @param nRow index of row to be tested. * @param rCriteria a list of criteria */ - bool isRowQualified(sal_Int32 nRow, const ::std::vector<Criterion>& rCriteria, const ::std::hash_set<sal_Int32>& rRepeatIfEmptyDims) const; + bool isRowQualified(sal_Int32 nRow, const ::std::vector<Criterion>& rCriteria, const ::boost::unordered_set<sal_Int32>& rRepeatIfEmptyDims) const; void getValueData(ScDocument* pDoc, const ScAddress& rPos, ScDPCacheCell& rCell); void initNoneCache( ScDocument* pDoc ); diff --git a/sc/inc/dpglobal.hxx b/sc/inc/dpglobal.hxx index 56cec236a617..2b7a8a1f416b 100644 --- a/sc/inc/dpglobal.hxx +++ b/sc/inc/dpglobal.hxx @@ -180,7 +180,7 @@ protected: size_t operator() (const ScDPItemData &rData) const { return rData.Hash(); } }; - typedef ::std::hash_multimap< ScDPItemData, sal_Int32, DataHashFunc > DataHash; + typedef ::boost::unordered_multimap< ScDPItemData, sal_Int32, DataHashFunc > DataHash; ::std::vector< ScDPItemData > maItems; DataHash maItemIds; diff --git a/sc/inc/dpgroup.hxx b/sc/inc/dpgroup.hxx index 2f710339a8ef..223425b5e23f 100644 --- a/sc/inc/dpgroup.hxx +++ b/sc/inc/dpgroup.hxx @@ -30,7 +30,7 @@ #define SC_DPGROUP_HXX #include <vector> -#include <hash_set> +#include <boost/unordered_set.hpp> #include <boost/shared_ptr.hpp> #include "dptabdat.hxx" @@ -179,7 +179,7 @@ public: class ScDPGroupTableData : public ScDPTableData { - typedef ::std::hash_set< ::rtl::OUString, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > StringHashSet; + typedef ::boost::unordered_set< ::rtl::OUString, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > StringHashSet; ::boost::shared_ptr<ScDPTableData> pSourceData; long nSourceCount; @@ -224,9 +224,9 @@ public: virtual bool IsRepeatIfEmpty(); virtual void CreateCacheTable(); - virtual void FilterCacheTable(const ::std::vector<ScDPCacheTable::Criterion>& rCriteria, const ::std::hash_set<sal_Int32>& rDataDims); + virtual void FilterCacheTable(const ::std::vector<ScDPCacheTable::Criterion>& rCriteria, const ::boost::unordered_set<sal_Int32>& rDataDims); virtual void GetDrillDownData(const ::std::vector<ScDPCacheTable::Criterion>& rCriteria, - const ::std::hash_set<sal_Int32>& rCatDims, + const ::boost::unordered_set<sal_Int32>& rCatDims, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& rData); virtual void CalcResults(CalcInfo& rInfo, bool bAutoShow); virtual const ScDPCacheTable& GetCacheTable() const; diff --git a/sc/inc/dpsave.hxx b/sc/inc/dpsave.hxx index d7efb16cde75..931f828616ac 100644 --- a/sc/inc/dpsave.hxx +++ b/sc/inc/dpsave.hxx @@ -36,7 +36,7 @@ #include <com/sun/star/sheet/XDimensionsSupplier.hpp> #include <com/sun/star/sheet/DataPilotFieldOrientation.hpp> #include "scdllapi.h" -#include <hash_map> +#include <boost/unordered_map.hpp> #include <list> #include <memory> @@ -121,7 +121,7 @@ private: ::com::sun::star::sheet::DataPilotFieldLayoutInfo* pLayoutInfo; // (level) public: - typedef std::hash_map <rtl::OUString, ScDPSaveMember*, rtl::OUStringHash> MemberHash; + typedef boost::unordered_map <rtl::OUString, ScDPSaveMember*, rtl::OUStringHash> MemberHash; typedef std::list <ScDPSaveMember*> MemberList; private: @@ -227,7 +227,7 @@ public: void Refresh( const com::sun::star::uno::Reference<com::sun::star::sheet::XDimensionsSupplier>& xSource , const std::list<rtl::OUString> & deletedDims); - void UpdateMemberVisibility(const ::std::hash_map< ::rtl::OUString, bool, ::rtl::OUStringHash>& rData); + void UpdateMemberVisibility(const ::boost::unordered_map< ::rtl::OUString, bool, ::rtl::OUStringHash>& rData); bool HasInvisibleMember() const; }; diff --git a/sc/inc/dpsdbtab.hxx b/sc/inc/dpsdbtab.hxx index 799700762e5b..ac49e4a642c6 100644 --- a/sc/inc/dpsdbtab.hxx +++ b/sc/inc/dpsdbtab.hxx @@ -34,7 +34,7 @@ #include "dptabdat.hxx" #include <vector> -#include <set> +#include <boost/unordered_set.hpp> class ScDPCacheTable; class ScDocument; @@ -81,9 +81,9 @@ public: virtual void SetEmptyFlags( BOOL bIgnoreEmptyRows, BOOL bRepeatIfEmpty ); virtual void CreateCacheTable(); - virtual void FilterCacheTable(const ::std::vector<ScDPCacheTable::Criterion>& rCriteria, const ::std::hash_set<sal_Int32>& rDataDims); + virtual void FilterCacheTable(const ::std::vector<ScDPCacheTable::Criterion>& rCriteria, const ::boost::unordered_set<sal_Int32>& rDataDims); virtual void GetDrillDownData(const ::std::vector<ScDPCacheTable::Criterion>& rCriteria, - const ::std::hash_set<sal_Int32>& rCatDims, + const ::boost::unordered_set<sal_Int32>& rCatDims, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& rData); virtual void CalcResults(CalcInfo& rInfo, bool bAutoShow); virtual const ScDPCacheTable& GetCacheTable() const; diff --git a/sc/inc/dpshttab.hxx b/sc/inc/dpshttab.hxx index f52aed4bd5a2..7cb899d8b168 100644 --- a/sc/inc/dpshttab.hxx +++ b/sc/inc/dpshttab.hxx @@ -35,6 +35,7 @@ #include "scdllapi.h" #include "queryparam.hxx" +#include <boost/unordered_set.hpp> #include <vector> namespace com { namespace sun { namespace star { namespace sheet { @@ -128,9 +129,9 @@ public: virtual bool IsRepeatIfEmpty(); virtual void CreateCacheTable(); - virtual void FilterCacheTable(const ::std::vector<ScDPCacheTable::Criterion>& rCriteria, const ::std::hash_set<sal_Int32>& rCatDims); + virtual void FilterCacheTable(const ::std::vector<ScDPCacheTable::Criterion>& rCriteria, const ::boost::unordered_set<sal_Int32>& rCatDims); virtual void GetDrillDownData(const ::std::vector<ScDPCacheTable::Criterion>& rCriteria, - const ::std::hash_set<sal_Int32>& rCatDims, + const ::boost::unordered_set<sal_Int32>& rCatDims, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& rData); virtual void CalcResults(CalcInfo& rInfo, bool bAutoShow); virtual const ScDPCacheTable& GetCacheTable() const; diff --git a/sc/inc/dptabdat.hxx b/sc/inc/dptabdat.hxx index d4ba8562e539..82672202a91b 100644 --- a/sc/inc/dptabdat.hxx +++ b/sc/inc/dptabdat.hxx @@ -37,8 +37,8 @@ #include <vector> #include <set> -#include <hash_map> -#include <hash_set> +#include <boost/unordered_set.hpp> +#include <boost/unordered_map.hpp> namespace com { namespace sun { namespace star { namespace sheet { struct DataPilotFieldFilter; @@ -146,9 +146,9 @@ public: virtual bool IsRepeatIfEmpty(); virtual void CreateCacheTable() = 0; - virtual void FilterCacheTable(const ::std::vector<ScDPCacheTable::Criterion>& rCriteria, const ::std::hash_set<sal_Int32>& rDataDims) = 0; + virtual void FilterCacheTable(const ::std::vector<ScDPCacheTable::Criterion>& rCriteria, const ::boost::unordered_set<sal_Int32>& rDataDims) = 0; virtual void GetDrillDownData(const ::std::vector<ScDPCacheTable::Criterion>& rCriteria, - const ::std::hash_set<sal_Int32>& rCatDims, + const ::boost::unordered_set<sal_Int32>& rCatDims, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& rData) = 0; virtual void CalcResults(CalcInfo& rInfo, bool bAutoShow) = 0; virtual const ScDPCacheTable& GetCacheTable() const = 0; diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx index 37e989da9b41..4c0a2f93b6e5 100644 --- a/sc/inc/dptabres.hxx +++ b/sc/inc/dptabres.hxx @@ -36,8 +36,8 @@ #include <com/sun/star/uno/Sequence.hxx> #include "global.hxx" // enum ScSubTotalFunc #include "dpcachetable.hxx" -#include <hash_map> -#include <hash_set> +#include <boost/unordered_map.hpp> +#include <boost/unordered_set.hpp> #include <vector> #include <memory> @@ -248,7 +248,7 @@ public: }; typedef std::vector <ScDPParentDimData *> DimMemberArray; -typedef std::hash_map < SCROW, ScDPParentDimData *, MemberHashIndexFunc> DimMemberHash; +typedef boost::unordered_map < SCROW, ScDPParentDimData *, MemberHashIndexFunc> DimMemberHash; class ResultMembers { @@ -669,8 +669,8 @@ private: { size_t operator()(const ScDPItemData& r) const; }; - typedef ::std::hash_set<ScDPItemData, MemberHash> VisibleMemberType; - typedef ::std::hash_map<String, VisibleMemberType, ScStringHashCode> DimMemberType; + typedef ::boost::unordered_set<ScDPItemData, MemberHash> VisibleMemberType; + typedef ::boost::unordered_map<String, VisibleMemberType, ScStringHashCode> DimMemberType; DimMemberType maDimensions; ScDPSource* mpSource; diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx index afc5925891d3..c9791445d8a0 100644 --- a/sc/inc/dptabsrc.hxx +++ b/sc/inc/dptabsrc.hxx @@ -30,7 +30,8 @@ #define SC_DPTABSRC_HXX #include <vector> -#include <hash_map> +#include <boost/unordered_map.hpp> +#include <boost/unordered_set.hpp> #include <list> #include <memory> #include <tools/string.hxx> @@ -147,7 +148,7 @@ private: * Compile a list of dimension indices that are either, column, row or * page dimensions (i.e. all but data dimensions). */ - void GetCategoryDimensionIndices(::std::hash_set<sal_Int32>& rCatDims); + void GetCategoryDimensionIndices(::boost::unordered_set<sal_Int32>& rCatDims); /** * Set visibilities of individual rows in the cache table based on the @@ -685,7 +686,7 @@ public: }; // hash map from name to index in the member array, for fast name access -typedef ::std::hash_map< ::rtl::OUString, sal_Int32, ::rtl::OUStringHash > ScDPMembersHashMap; +typedef ::boost::unordered_map< ::rtl::OUString, sal_Int32, ::rtl::OUStringHash > ScDPMembersHashMap; class ScDPMembers : public cppu::WeakImplHelper2< com::sun::star::container::XNameAccess, diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx index 478fb519d4e5..1f155b250162 100644 --- a/sc/inc/externalrefmgr.hxx +++ b/sc/inc/externalrefmgr.hxx @@ -40,8 +40,8 @@ #include "rangelst.hxx" #include "formula/token.hxx" -#include <hash_map> -#include <hash_set> +#include <boost/unordered_map.hpp> +#include <boost/unordered_set.hpp> #include <boost/shared_ptr.hpp> #include <vector> #include <list> @@ -122,8 +122,8 @@ private: TokenRef mxToken; sal_uInt32 mnFmtIndex; }; - typedef ::std::hash_map<SCCOL, Cell> RowDataType; - typedef ::std::hash_map<SCROW, RowDataType> RowsDataType; + typedef ::boost::unordered_map<SCCOL, Cell> RowDataType; + typedef ::boost::unordered_map<SCROW, RowDataType> RowsDataType; public: // SUNWS needs a forward declared friend, otherwise types and members @@ -207,7 +207,7 @@ public: }; typedef ::boost::shared_ptr<Table> TableTypeRef; - typedef ::std::hash_map<String, size_t, ScStringHashCode> TableNameIndexMap; + typedef ::boost::unordered_map<String, size_t, ScStringHashCode> TableNameIndexMap; ScExternalRefCache(); ~ScExternalRefCache(); @@ -322,9 +322,9 @@ private: } }; - typedef ::std::hash_map<String, TokenArrayRef, ScStringHashCode> RangeNameMap; - typedef ::std::hash_map<ScRange, TokenArrayRef, RangeHash> RangeArrayMap; - typedef ::std::hash_map<String, String, ScStringHashCode> NamePairMap; + typedef ::boost::unordered_map<String, TokenArrayRef, ScStringHashCode> RangeNameMap; + typedef ::boost::unordered_map<ScRange, TokenArrayRef, RangeHash> RangeArrayMap; + typedef ::boost::unordered_map<String, String, ScStringHashCode> NamePairMap; // SUNWS needs a forward declared friend, otherwise types and members // of the outer class are not accessible. @@ -351,7 +351,7 @@ private: DocItem() : mbInitFromSource(false) {} }; - typedef ::std::hash_map<sal_uInt16, DocItem> DocDataType; + typedef ::boost::unordered_map<sal_uInt16, DocItem> DocDataType; DocItem* getDocItem(sal_uInt16 nFileId) const; private: @@ -365,7 +365,7 @@ class SC_DLLPUBLIC ScExternalRefManager : public formula::ExternalReferenceHelpe public: typedef ::std::set<ScFormulaCell*> RefCellSet; - typedef ::std::hash_map<sal_uInt16, RefCellSet> RefCellMap; + typedef ::boost::unordered_map<sal_uInt16, RefCellSet> RefCellMap; enum LinkUpdateType { LINK_MODIFIED, LINK_BROKEN }; @@ -413,14 +413,14 @@ private: Time maLastAccess; }; - typedef ::std::hash_map<sal_uInt16, SrcShell> DocShellMap; - typedef ::std::hash_map<sal_uInt16, bool> LinkedDocMap; + typedef ::boost::unordered_map<sal_uInt16, SrcShell> DocShellMap; + typedef ::boost::unordered_map<sal_uInt16, bool> LinkedDocMap; - typedef ::std::hash_map<sal_uInt16, SvNumberFormatterMergeMap> NumFmtMap; + typedef ::boost::unordered_map<sal_uInt16, SvNumberFormatterMergeMap> NumFmtMap; - typedef ::std::hash_set<LinkListener*, LinkListener::Hash> LinkListeners; - typedef ::std::hash_map<sal_uInt16, LinkListeners> LinkListenerMap; + typedef ::boost::unordered_set<LinkListener*, LinkListener::Hash> LinkListeners; + typedef ::boost::unordered_map<sal_uInt16, LinkListeners> LinkListenerMap; public: /** Source document meta-data container. */ diff --git a/sc/inc/formulaparserpool.hxx b/sc/inc/formulaparserpool.hxx index 3d5b96fbecaf..56d1ac0c9a7b 100644 --- a/sc/inc/formulaparserpool.hxx +++ b/sc/inc/formulaparserpool.hxx @@ -29,7 +29,7 @@ #ifndef SC_FORMULAPARSERPOOL_HXX #define SC_FORMULAPARSERPOOL_HXX -#include <hash_map> +#include <boost/unordered_map.hpp> #include <com/sun/star/sheet/XFormulaParser.hpp> class ScDocument; @@ -52,7 +52,7 @@ public: getFormulaParser( const ::rtl::OUString& rNamespace ); private: - typedef ::std::hash_map< + typedef ::boost::unordered_map< ::rtl::OUString, ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaParser >, ::rtl::OUStringHash, diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx index ee816025e3da..f1034448748e 100644 --- a/sc/inc/global.hxx +++ b/sc/inc/global.hxx @@ -36,7 +36,7 @@ #include <com/sun/star/uno/Reference.hxx> #include "scdllapi.h" -#include <hash_map> +#include <boost/unordered_map.hpp> class ImageList; class Bitmap; diff --git a/sc/inc/linkuno.hxx b/sc/inc/linkuno.hxx index a64d64b48c5e..feeaaea56d0f 100644 --- a/sc/inc/linkuno.hxx +++ b/sc/inc/linkuno.hxx @@ -53,7 +53,7 @@ #include "externalrefmgr.hxx" -#include <hash_map> +#include <boost/unordered_map.hpp> #include <vector> class ScAreaLink; diff --git a/sc/inc/lookupcache.hxx b/sc/inc/lookupcache.hxx index 1cf5bc2797b1..829e3a952e2b 100644 --- a/sc/inc/lookupcache.hxx +++ b/sc/inc/lookupcache.hxx @@ -35,7 +35,7 @@ #include <svl/listener.hxx> #include <tools/string.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> class ScDocument; @@ -241,7 +241,7 @@ private: } }; - typedef ::std::hash_map< QueryKey, QueryCriteriaAndResult, QueryKey::Hash, ::std::equal_to< QueryKey > > QueryMap; + typedef ::boost::unordered_map< QueryKey, QueryCriteriaAndResult, QueryKey::Hash, ::std::equal_to< QueryKey > > QueryMap; QueryMap maQueryMap; ScRange maRange; ScDocument * mpDoc; @@ -253,7 +253,7 @@ private: }; -typedef ::std::hash_map< ScRange, ScLookupCache*, ScLookupCache::Hash, ::std::equal_to< ScRange > > ScLookupCacheMap; +typedef ::boost::unordered_map< ScRange, ScLookupCache*, ScLookupCache::Hash, ::std::equal_to< ScRange > > ScLookupCacheMap; #endif diff --git a/sc/inc/macromgr.hxx b/sc/inc/macromgr.hxx index 800dc877adce..4c8bad9e3ff8 100644 --- a/sc/inc/macromgr.hxx +++ b/sc/inc/macromgr.hxx @@ -34,7 +34,8 @@ #include "rtl/ustring.hxx" #include "scdllapi.h" -#include <hash_map> +#include <boost/unordered_map.hpp> +#include <boost/unordered_set.hpp> #include <memory> class ScDocument; @@ -56,7 +57,7 @@ public: void BroadcastModuleUpdate(const ::rtl::OUString& aModuleName); private: - typedef std::hash_map< ::rtl::OUString, bool, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > NameBoolMap; + typedef boost::unordered_map< ::rtl::OUString, bool, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > NameBoolMap; NameBoolMap mhFuncToVolatile; com::sun::star::uno::Reference< com::sun::star::container::XContainerListener > mxContainerListener; diff --git a/sc/inc/sheetdata.hxx b/sc/inc/sheetdata.hxx index 5d305462146e..b4790684ba05 100644 --- a/sc/inc/sheetdata.hxx +++ b/sc/inc/sheetdata.hxx @@ -32,7 +32,7 @@ #include <xmloff/maptype.hxx> #include <editeng/editdata.hxx> #include <vector> -#include <hash_set> +#include <boost/unordered_set.hpp> #include "address.hxx" @@ -114,7 +114,7 @@ struct ScLoadedNamespaceEntry class ScSheetSaveData { - std::hash_set<rtl::OUString, rtl::OUStringHash> maInitialPrefixes; + boost::unordered_set<rtl::OUString, rtl::OUStringHash> maInitialPrefixes; std::vector<ScLoadedNamespaceEntry> maLoadedNamespaces; std::vector<ScCellStyleEntry> maCellStyles; diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx index 8caf881d0506..27514d8968a7 100644 --- a/sc/inc/table.hxx +++ b/sc/inc/table.hxx @@ -90,7 +90,7 @@ struct ScSetStringParam; struct ScColWidthParam; struct ScColWidthParam; -typedef std::hash_map< ::rtl::OUString, rtl::OUString, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > NameToNameMap; +typedef boost::unordered_map< ::rtl::OUString, rtl::OUString, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > NameToNameMap; class ScTable { |