[Libreoffice-commits] .: chart2/source sccomp/source sc/inc sc/source
Fridrich Strba
fridrich at kemper.freedesktop.org
Sat Feb 5 16:03:41 PST 2011
chart2/source/inc/DataSeriesHelper.hxx | 2 +-
sc/inc/addincol.hxx | 4 ++--
sc/inc/autonamecache.hxx | 4 ++--
sc/inc/chart2uno.hxx | 6 +++---
sc/inc/chartlis.hxx | 6 +++---
sc/inc/compiler.hxx | 2 +-
sc/inc/dpcachetable.hxx | 9 ++++-----
sc/inc/dpglobal.hxx | 2 +-
sc/inc/dpgroup.hxx | 8 ++++----
sc/inc/dpsave.hxx | 6 +++---
sc/inc/dpsdbtab.hxx | 6 +++---
sc/inc/dpshttab.hxx | 5 +++--
sc/inc/dptabdat.hxx | 8 ++++----
sc/inc/dptabres.hxx | 10 +++++-----
sc/inc/dptabsrc.hxx | 7 ++++---
sc/inc/externalrefmgr.hxx | 30 +++++++++++++++---------------
sc/inc/formulaparserpool.hxx | 4 ++--
sc/inc/global.hxx | 2 +-
sc/inc/linkuno.hxx | 2 +-
sc/inc/lookupcache.hxx | 6 +++---
sc/inc/macromgr.hxx | 5 +++--
sc/inc/sheetdata.hxx | 4 ++--
sc/inc/table.hxx | 2 +-
sc/source/core/data/bcaslot.cxx | 2 +-
sc/source/core/data/dpcachetable.cxx | 8 +++-----
sc/source/core/data/dpgroup.cxx | 14 ++++++--------
sc/source/core/data/dpsave.cxx | 10 +++++-----
sc/source/core/data/dpsdbtab.cxx | 10 ++++------
sc/source/core/data/dpshttab.cxx | 10 ++++------
sc/source/core/data/dptabres.cxx | 5 ++---
sc/source/core/data/dptabsrc.cxx | 16 +++++++---------
sc/source/core/inc/bcaslot.hxx | 6 +++---
sc/source/core/inc/cellkeytranslator.hxx | 4 ++--
sc/source/core/tool/cellkeytranslator.cxx | 2 +-
sc/source/core/tool/chartlis.cxx | 11 +++++------
sc/source/core/tool/formulaparserpool.cxx | 2 +-
sc/source/filter/excel/excimp8.cxx | 2 +-
sc/source/filter/inc/namebuff.hxx | 4 ++--
sc/source/filter/inc/xiescher.hxx | 1 -
sc/source/filter/xml/sheetdata.cxx | 2 +-
sc/source/filter/xml/xmldpimp.hxx | 4 ++--
sc/source/filter/xml/xmlexprt.hxx | 4 ++--
sc/source/filter/xml/xmlimprt.hxx | 4 ++--
sc/source/ui/cctrl/dpcontrol.cxx | 6 +++---
sc/source/ui/docshell/macromgr.cxx | 6 +++---
sc/source/ui/inc/crnrdlg.hxx | 4 ++--
sc/source/ui/inc/docsh.hxx | 4 ++--
sc/source/ui/inc/dpcontrol.hxx | 4 ++--
sc/source/ui/inc/pvfundlg.hxx | 8 ++++----
sc/source/ui/unoobj/cellsuno.cxx | 4 ++--
sc/source/ui/unoobj/chart2uno.cxx | 11 +++++------
sc/source/ui/vba/vbachartobjects.hxx | 4 ++--
sc/source/ui/vba/vbacharts.hxx | 2 +-
sc/source/ui/vba/vbawindow.cxx | 4 ++--
sc/source/ui/vba/vbawindows.cxx | 4 ++--
sc/source/ui/vba/vbaworkbooks.cxx | 2 +-
sc/source/ui/view/dbfunc3.cxx | 12 +++++-------
sc/source/ui/view/gridwin2.cxx | 8 ++++----
sccomp/source/solver/solver.cxx | 4 ++--
59 files changed, 167 insertions(+), 181 deletions(-)
New commits:
commit b2a3c38abae7a14aeed795066c157421d57724d8
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Sun Feb 6 00:56:21 2011 +0100
port repository calc to boost unordered containers
diff --git a/chart2/source/inc/DataSeriesHelper.hxx b/chart2/source/inc/DataSeriesHelper.hxx
index cd59543..e85c156 100644
--- a/chart2/source/inc/DataSeriesHelper.hxx
+++ b/chart2/source/inc/DataSeriesHelper.hxx
@@ -40,7 +40,7 @@
#include <vector>
#include <functional>
-#include <hash_set>
+#include <boost/unordered_map.hpp>
namespace chart
{
diff --git a/sc/inc/addincol.hxx b/sc/inc/addincol.hxx
index d67df1e..c6e379b 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 e01a3f9..6514157 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 cf09f9c..0d0885f 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 df92f9f..6b93791 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 a1870d0..53d9a71 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 04e1fa3..bcd1a56 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 da9fa56..3dc1fb3 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 6dcaa67..4494dba 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 f5e5f37..16f1798 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 0bfc6b1..420acab 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 8125a04..cf0de65 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 c583427..8d38475 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 b423839..917d3ca 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 4f7defe..cc5658d 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 478fb51..1f155b2 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 2d65f42..d3965db 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 90f9cb8..86163ad 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 9a4c082..e51fd51 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 eef0395..b4e1cdd 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 800dc87..4c8bad9 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 3669c8b..7a17b50 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 45abc7c..db5d893 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
{
diff --git a/sc/source/core/data/bcaslot.cxx b/sc/source/core/data/bcaslot.cxx
index 59e88eb..f86e4a7 100644
--- a/sc/source/core/data/bcaslot.cxx
+++ b/sc/source/core/data/bcaslot.cxx
@@ -140,7 +140,7 @@ ScBroadcastAreaSlot::~ScBroadcastAreaSlot()
// deleted.
ScBroadcastArea* pArea = *aIter;
// Erase all so no hash will be accessed upon destruction of the
- // hash_set.
+ // boost::unordered_map.
aBroadcastAreaTbl.erase( aIter++);
if (!pArea->DecRef())
delete pArea;
diff --git a/sc/source/core/data/dpcachetable.cxx b/sc/source/core/data/dpcachetable.cxx
index fb29e6c..f14354e 100644
--- a/sc/source/core/data/dpcachetable.cxx
+++ b/sc/source/core/data/dpcachetable.cxx
@@ -54,8 +54,6 @@ using namespace ::com::sun::star;
using ::rtl::OUString;
using ::std::vector;
using ::std::pair;
-using ::std::hash_map;
-using ::std::hash_set;
using ::std::auto_ptr;
using ::com::sun::star::i18n::LocaleDataItem;
using ::com::sun::star::uno::Exception;
@@ -299,7 +297,7 @@ bool ScDPCacheTable::isRowActive(sal_Int32 nRow) const
return maRowsVisible[nRow];
}
-void ScDPCacheTable::filterByPageDimension(const vector<Criterion>& rCriteria, const hash_set<sal_Int32>& rRepeatIfEmptyDims)
+void ScDPCacheTable::filterByPageDimension(const vector<Criterion>& rCriteria, const boost::unordered_set<sal_Int32>& rRepeatIfEmptyDims)
{
sal_Int32 nRowSize = getRowSize();
if (nRowSize != static_cast<sal_Int32>(maRowsVisible.size()))
@@ -347,7 +345,7 @@ const ::std::vector<SCROW>& ScDPCacheTable::getFieldEntries( sal_Int32 nColumn
}
void ScDPCacheTable::filterTable(const vector<Criterion>& rCriteria, Sequence< Sequence<Any> >& rTabData,
- const hash_set<sal_Int32>& rRepeatIfEmptyDims)
+ const boost::unordered_set<sal_Int32>& rRepeatIfEmptyDims)
{
sal_Int32 nRowSize = getRowSize();
sal_Int32 nColSize = getColSize();
@@ -421,7 +419,7 @@ bool ScDPCacheTable::empty() const
}
bool ScDPCacheTable::isRowQualified(sal_Int32 nRow, const vector<Criterion>& rCriteria,
- const hash_set<sal_Int32>& rRepeatIfEmptyDims) const
+ const boost::unordered_set<sal_Int32>& rRepeatIfEmptyDims) const
{
sal_Int32 nColSize = getColSize();
vector<Criterion>::const_iterator itrEnd = rCriteria.end();
diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx
index 6ad127f..b321b87 100644
--- a/sc/source/core/data/dpgroup.cxx
+++ b/sc/source/core/data/dpgroup.cxx
@@ -54,8 +54,8 @@
#include <com/sun/star/sheet/DataPilotFieldFilter.hpp>
#include <vector>
-#include <hash_set>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
+#include <boost/unordered_set.hpp>
using namespace ::com::sun::star;
using ::com::sun::star::uno::Any;
@@ -67,8 +67,6 @@ using ::rtl::OUString;
using ::rtl::OUStringHash;
using ::std::vector;
-using ::std::hash_set;
-using ::std::hash_map;
using ::boost::shared_ptr;
#define D_TIMEFACTOR 86400.0
@@ -1191,12 +1189,12 @@ void ScDPGroupTableData::CreateCacheTable()
void ScDPGroupTableData::ModifyFilterCriteria(vector<ScDPCacheTable::Criterion>& rCriteria)
{
- typedef hash_map<long, const ScDPGroupDimension*> GroupFieldMapType;
+ typedef boost::unordered_map<long, const ScDPGroupDimension*> GroupFieldMapType;
GroupFieldMapType aGroupFieldIds;
{
ScDPGroupDimensionVec::const_iterator itr = aGroups.begin(), itrEnd = aGroups.end();
for (; itr != itrEnd; ++itr)
- aGroupFieldIds.insert( hash_map<long, const ScDPGroupDimension*>::value_type(itr->GetGroupDim(), &(*itr)) );
+ aGroupFieldIds.insert( boost::unordered_map<long, const ScDPGroupDimension*>::value_type(itr->GetGroupDim(), &(*itr)) );
}
vector<ScDPCacheTable::Criterion> aNewCriteria;
@@ -1289,14 +1287,14 @@ void ScDPGroupTableData::ModifyFilterCriteria(vector<ScDPCacheTable::Criterion>&
rCriteria.swap(aNewCriteria);
}
-void ScDPGroupTableData::FilterCacheTable(const vector<ScDPCacheTable::Criterion>& rCriteria, const hash_set<sal_Int32>& rCatDims)
+void ScDPGroupTableData::FilterCacheTable(const vector<ScDPCacheTable::Criterion>& rCriteria, const boost::unordered_set<sal_Int32>& rCatDims)
{
vector<ScDPCacheTable::Criterion> aNewCriteria(rCriteria);
ModifyFilterCriteria(aNewCriteria);
pSourceData->FilterCacheTable(aNewCriteria, rCatDims);
}
-void ScDPGroupTableData::GetDrillDownData(const vector<ScDPCacheTable::Criterion>& rCriteria, const hash_set<sal_Int32>& rCatDims, Sequence< Sequence<Any> >& rData)
+void ScDPGroupTableData::GetDrillDownData(const vector<ScDPCacheTable::Criterion>& rCriteria, const boost::unordered_set<sal_Int32>& rCatDims, Sequence< Sequence<Any> >& rData)
{
vector<ScDPCacheTable::Criterion> aNewCriteria(rCriteria);
ModifyFilterCriteria(aNewCriteria);
diff --git a/sc/source/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxx
index 5333c4f..e1cecdd 100644
--- a/sc/source/core/data/dpsave.cxx
+++ b/sc/source/core/data/dpsave.cxx
@@ -61,7 +61,8 @@ using namespace ScDPGlobal;
#include <com/sun/star/sheet/DataPilotFieldReferenceItemType.hpp>
using namespace com::sun::star::sheet;
-#include <hash_map>
+#include <boost/unordered_map.hpp>
+#include <boost/unordered_set.hpp>
using namespace com::sun::star;
using ::com::sun::star::uno::Reference;
@@ -69,7 +70,6 @@ using ::com::sun::star::uno::Any;
using ::rtl::OUString;
using ::rtl::OUStringBuffer;
using ::rtl::OUStringHash;
-using ::std::hash_map;
using ::std::auto_ptr;
#define SC_DPSAVEMODE_NO 0
@@ -703,9 +703,9 @@ void ScDPSaveDimension::WriteToSource( const uno::Reference<uno::XInterface>& xD
ScUnoHelpFunctions::SetOptionalPropertyValue(xDimProp, SC_UNO_HAS_HIDDEN_MEMBER, bHasHiddenMember);
}
-void ScDPSaveDimension::UpdateMemberVisibility(const hash_map<OUString, bool, OUStringHash>& rData)
+void ScDPSaveDimension::UpdateMemberVisibility(const boost::unordered_map<OUString, bool, OUStringHash>& rData)
{
- typedef hash_map<OUString, bool, OUStringHash> DataMap;
+ typedef boost::unordered_map<OUString, bool, OUStringHash> DataMap;
MemberList::iterator itrMem = maMemberList.begin(), itrMemEnd = maMemberList.end();
for (; itrMem != itrMemEnd; ++itrMem)
{
@@ -1208,7 +1208,7 @@ void ScDPSaveData::BuildAllDimensionMembers(ScDPTableData* pData)
return;
// First, build a dimension name-to-index map.
- typedef hash_map<OUString, long, ::rtl::OUStringHash> NameIndexMap;
+ typedef boost::unordered_map<OUString, long, ::rtl::OUStringHash> NameIndexMap;
NameIndexMap aMap;
long nColCount = pData->GetColumnCount();
for (long i = 0; i < nColCount; ++i)
diff --git a/sc/source/core/data/dpsdbtab.cxx b/sc/source/core/data/dpsdbtab.cxx
index 3a99f97..ab6e16e 100644
--- a/sc/source/core/data/dpsdbtab.cxx
+++ b/sc/source/core/data/dpsdbtab.cxx
@@ -62,8 +62,6 @@
using namespace com::sun::star;
using ::std::vector;
-using ::std::hash_map;
-using ::std::hash_set;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Any;
@@ -272,14 +270,14 @@ void ScDatabaseDPData::CreateCacheTable()
aCacheTable.fillTable();
}
-void ScDatabaseDPData::FilterCacheTable(const vector<ScDPCacheTable::Criterion>& rCriteria, const hash_set<sal_Int32>& rCatDims)
+void ScDatabaseDPData::FilterCacheTable(const vector<ScDPCacheTable::Criterion>& rCriteria, const boost::unordered_set<sal_Int32>& rCatDims)
{
CreateCacheTable();
aCacheTable.filterByPageDimension(
- rCriteria, (IsRepeatIfEmpty() ? rCatDims : hash_set<sal_Int32>()));
+ rCriteria, (IsRepeatIfEmpty() ? rCatDims : boost::unordered_set<sal_Int32>()));
}
-void ScDatabaseDPData::GetDrillDownData(const vector<ScDPCacheTable::Criterion>& rCriteria, const hash_set<sal_Int32>& rCatDims, Sequence< Sequence<Any> >& rData)
+void ScDatabaseDPData::GetDrillDownData(const vector<ScDPCacheTable::Criterion>& rCriteria, const boost::unordered_set<sal_Int32>& rCatDims, Sequence< Sequence<Any> >& rData)
{
CreateCacheTable();
sal_Int32 nRowSize = aCacheTable.getRowSize();
@@ -287,7 +285,7 @@ void ScDatabaseDPData::GetDrillDownData(const vector<ScDPCacheTable::Criterion>&
return;
aCacheTable.filterTable(
- rCriteria, rData, IsRepeatIfEmpty() ? rCatDims : hash_set<sal_Int32>());
+ rCriteria, rData, IsRepeatIfEmpty() ? rCatDims : boost::unordered_set<sal_Int32>());
}
void ScDatabaseDPData::CalcResults(CalcInfo& rInfo, bool bAutoShow)
diff --git a/sc/source/core/data/dpshttab.cxx b/sc/source/core/data/dpshttab.cxx
index dae4266..5aef6c3 100644
--- a/sc/source/core/data/dpshttab.cxx
+++ b/sc/source/core/data/dpshttab.cxx
@@ -57,8 +57,6 @@ using ::com::sun::star::uno::Any;
using ::com::sun::star::uno::Sequence;
using ::rtl::OUString;
using ::std::vector;
-using ::std::hash_map;
-using ::std::hash_set;
// -----------------------------------------------------------------------
@@ -206,14 +204,14 @@ void ScSheetDPData::CreateCacheTable()
bIgnoreEmptyRows, bRepeatIfEmpty );
}
-void ScSheetDPData::FilterCacheTable(const vector<ScDPCacheTable::Criterion>& rCriteria, const hash_set<sal_Int32>& rCatDims)
+void ScSheetDPData::FilterCacheTable(const vector<ScDPCacheTable::Criterion>& rCriteria, const boost::unordered_set<sal_Int32>& rCatDims)
{
CreateCacheTable();
aCacheTable.filterByPageDimension(
- rCriteria, (IsRepeatIfEmpty() ? rCatDims : hash_set<sal_Int32>()));
+ rCriteria, (IsRepeatIfEmpty() ? rCatDims : boost::unordered_set<sal_Int32>()));
}
-void ScSheetDPData::GetDrillDownData(const vector<ScDPCacheTable::Criterion>& rCriteria, const hash_set<sal_Int32>& rCatDims, Sequence< Sequence<Any> >& rData)
+void ScSheetDPData::GetDrillDownData(const vector<ScDPCacheTable::Criterion>& rCriteria, const boost::unordered_set<sal_Int32>& rCatDims, Sequence< Sequence<Any> >& rData)
{
CreateCacheTable();
sal_Int32 nRowSize = aCacheTable.getRowSize();
@@ -221,7 +219,7 @@ void ScSheetDPData::GetDrillDownData(const vector<ScDPCacheTable::Criterion>& rC
return;
aCacheTable.filterTable(
- rCriteria, rData, IsRepeatIfEmpty() ? rCatDims : hash_set<sal_Int32>());
+ rCriteria, rData, IsRepeatIfEmpty() ? rCatDims : boost::unordered_set<sal_Int32>());
}
void ScSheetDPData::CalcResults(CalcInfo& rInfo, bool bAutoShow)
diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx
index 3315574..560237b 100644
--- a/sc/source/core/data/dptabres.cxx
+++ b/sc/source/core/data/dptabres.cxx
@@ -49,7 +49,7 @@
#include <math.h>
#include <float.h> //! Test !!!
#include <algorithm>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <com/sun/star/sheet/DataResultFlags.hpp>
#include <com/sun/star/sheet/MemberResultFlags.hpp>
@@ -63,7 +63,6 @@
using namespace com::sun::star;
using ::std::vector;
using ::std::pair;
-using ::std::hash_map;
using ::com::sun::star::uno::Sequence;
using ::rtl::OUString;
@@ -3856,7 +3855,7 @@ void ScDPResultVisibilityData::addVisibleMember(const String& rDimName, const Sc
void ScDPResultVisibilityData::fillFieldFilters(vector<ScDPCacheTable::Criterion>& rFilters) const
{
- typedef hash_map<String, long, ScStringHashCode> FieldNameMapType;
+ typedef boost::unordered_map<String, long, ScStringHashCode> FieldNameMapType;
FieldNameMapType aFieldNames;
ScDPTableData* pData = mpSource->GetData();
long nColumnCount = pData->GetColumnCount();
diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx
index a0031c5..ab82904 100644
--- a/sc/source/core/data/dptabsrc.cxx
+++ b/sc/source/core/data/dptabsrc.cxx
@@ -37,8 +37,8 @@
#include <algorithm>
#include <vector>
#include <set>
-#include <hash_map>
-#include <hash_set>
+#include <boost/unordered_set.hpp>
+#include <boost/unordered_map.hpp>
#include <tools/debug.hxx>
#include <rtl/math.hxx>
@@ -77,8 +77,6 @@
using namespace com::sun::star;
using ::std::vector;
using ::std::set;
-using ::std::hash_map;
-using ::std::hash_set;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Any;
@@ -438,7 +436,7 @@ Sequence< Sequence<Any> > SAL_CALL ScDPSource::getDrillDownData(const Sequence<s
{
long nColumnCount = GetData()->GetColumnCount();
- typedef hash_map<String, long, ScStringHashCode> FieldNameMapType;
+ typedef boost::unordered_map<String, long, ScStringHashCode> FieldNameMapType;
FieldNameMapType aFieldNames;
for (long i = 0; i < nColumnCount; ++i)
{
@@ -481,7 +479,7 @@ Sequence< Sequence<Any> > SAL_CALL ScDPSource::getDrillDownData(const Sequence<s
aResVisData.fillFieldFilters(aFilterCriteria);
Sequence< Sequence<Any> > aTabData;
- hash_set<sal_Int32> aCatDims;
+ boost::unordered_set<sal_Int32> aCatDims;
GetCategoryDimensionIndices(aCatDims);
pData->GetDrillDownData(aFilterCriteria, aCatDims, aTabData);
return aTabData;
@@ -701,9 +699,9 @@ void ScDPSource::FillCalcInfo(bool bIsRow, ScDPTableData::CalcInfo& rInfo, bool
}
}
-void ScDPSource::GetCategoryDimensionIndices(hash_set<sal_Int32>& rCatDims)
+void ScDPSource::GetCategoryDimensionIndices(boost::unordered_set<sal_Int32>& rCatDims)
{
- hash_set<sal_Int32> aCatDims;
+ boost::unordered_set<sal_Int32> aCatDims;
for (long i = 0; i < nColDimCount; ++i)
{
sal_Int32 nDim = static_cast<sal_Int32>(nColDims[i]);
@@ -773,7 +771,7 @@ void ScDPSource::FilterCacheTableByPageDimensions()
}
if (!aCriteria.empty())
{
- hash_set<sal_Int32> aCatDims;
+ boost::unordered_set<sal_Int32> aCatDims;
GetCategoryDimensionIndices(aCatDims);
pData->FilterCacheTable(aCriteria, aCatDims);
}
diff --git a/sc/source/core/inc/bcaslot.hxx b/sc/source/core/inc/bcaslot.hxx
index 9fd9206..c78fa20 100644
--- a/sc/source/core/inc/bcaslot.hxx
+++ b/sc/source/core/inc/bcaslot.hxx
@@ -30,7 +30,7 @@
#define SC_BCASLOT_HXX
#include <set>
-#include <hash_set>
+#include <boost/unordered_set.hpp>
#include <functional>
#include <svl/broadcast.hxx>
#include <svl/svarray.hxx>
@@ -97,7 +97,7 @@ struct ScBroadcastAreaEqual
}
};
-typedef ::std::hash_set< ScBroadcastArea*, ScBroadcastAreaHash, ScBroadcastAreaEqual > ScBroadcastAreas;
+typedef ::boost::unordered_set< ScBroadcastArea*, ScBroadcastAreaHash, ScBroadcastAreaEqual > ScBroadcastAreas;
//=============================================================================
@@ -117,7 +117,7 @@ struct ScBroadcastAreaBulkEqual
}
};
-typedef ::std::hash_set< const ScBroadcastArea*, ScBroadcastAreaBulkHash,
+typedef ::boost::unordered_set< const ScBroadcastArea*, ScBroadcastAreaBulkHash,
ScBroadcastAreaBulkEqual > ScBroadcastAreasBulk;
//=============================================================================
diff --git a/sc/source/core/inc/cellkeytranslator.hxx b/sc/source/core/inc/cellkeytranslator.hxx
index 3b5d3cb..82dcb85 100644
--- a/sc/source/core/inc/cellkeytranslator.hxx
+++ b/sc/source/core/inc/cellkeytranslator.hxx
@@ -32,7 +32,7 @@
#include "global.hxx"
#include "formula/opcode.hxx"
#include "unotools/transliterationwrapper.hxx"
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <list>
#include <memory>
@@ -49,7 +49,7 @@ struct ScCellKeyword
ScCellKeyword(const sal_Char* pName, OpCode eOpCode, const ::com::sun::star::lang::Locale& rLocale);
};
-typedef ::std::hash_map< String, ::std::list<ScCellKeyword>, ScStringHashCode, ::std::equal_to<String> > ScCellKeywordHashMap;
+typedef ::boost::unordered_map< String, ::std::list<ScCellKeyword>, ScStringHashCode, ::std::equal_to<String> > ScCellKeywordHashMap;
/** Translate cell function keywords.
diff --git a/sc/source/core/tool/cellkeytranslator.cxx b/sc/source/core/tool/cellkeytranslator.cxx
index f201dc4..73a1810 100644
--- a/sc/source/core/tool/cellkeytranslator.cxx
+++ b/sc/source/core/tool/cellkeytranslator.cxx
@@ -40,7 +40,7 @@
using ::com::sun::star::lang::Locale;
using ::com::sun::star::uno::Sequence;
using ::std::list;
-using ::std::hash_map;
+using ::boost::unordered_map;
using ::rtl::OUString;
using namespace ::com::sun::star;
diff --git a/sc/source/core/tool/chartlis.cxx b/sc/source/core/tool/chartlis.cxx
index 6fb34ff..60e5dd9 100644
--- a/sc/source/core/tool/chartlis.cxx
+++ b/sc/source/core/tool/chartlis.cxx
@@ -41,7 +41,6 @@
using namespace com::sun::star;
using ::std::vector;
using ::std::list;
-using ::std::hash_set;
using ::std::auto_ptr;
using ::std::unary_function;
using ::std::for_each;
@@ -114,7 +113,7 @@ void ScChartListener::ExternalRefListener::removeFileId(sal_uInt16 nFileId)
maFileIds.erase(nFileId);
}
-hash_set<sal_uInt16>& ScChartListener::ExternalRefListener::getAllFileIds()
+boost::unordered_set<sal_uInt16>& ScChartListener::ExternalRefListener::getAllFileIds()
{
return maFileIds;
}
@@ -184,9 +183,9 @@ ScChartListener::ScChartListener( const ScChartListener& r ) :
// was listening to.
ScExternalRefManager* pRefMgr = pDoc->GetExternalRefManager();
- const hash_set<sal_uInt16>& rFileIds = r.mpExtRefListener->getAllFileIds();
+ const boost::unordered_set<sal_uInt16>& rFileIds = r.mpExtRefListener->getAllFileIds();
mpExtRefListener.reset(new ExternalRefListener(*this, pDoc));
- hash_set<sal_uInt16>::const_iterator itr = rFileIds.begin(), itrEnd = rFileIds.end();
+ boost::unordered_set<sal_uInt16>::const_iterator itr = rFileIds.begin(), itrEnd = rFileIds.end();
for (; itr != itrEnd; ++itr)
{
pRefMgr->addLinkListener(*itr, mpExtRefListener.get());
@@ -205,8 +204,8 @@ ScChartListener::~ScChartListener()
{
// Stop listening to all external files.
ScExternalRefManager* pRefMgr = pDoc->GetExternalRefManager();
- const hash_set<sal_uInt16>& rFileIds = mpExtRefListener->getAllFileIds();
- hash_set<sal_uInt16>::const_iterator itr = rFileIds.begin(), itrEnd = rFileIds.end();
+ const boost::unordered_set<sal_uInt16>& rFileIds = mpExtRefListener->getAllFileIds();
+ boost::unordered_set<sal_uInt16>::const_iterator itr = rFileIds.begin(), itrEnd = rFileIds.end();
for (; itr != itrEnd; ++itr)
pRefMgr->removeLinkListener(*itr, mpExtRefListener.get());
}
diff --git a/sc/source/core/tool/formulaparserpool.cxx b/sc/source/core/tool/formulaparserpool.cxx
index b62d3e0..da31025 100644
--- a/sc/source/core/tool/formulaparserpool.cxx
+++ b/sc/source/core/tool/formulaparserpool.cxx
@@ -63,7 +63,7 @@ public:
const OUString& rNamespace );
private:
- typedef ::std::hash_map<
+ typedef ::boost::unordered_map<
OUString,
Reference< XSingleComponentFactory >,
OUStringHash,
diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx
index 4104070..d1c0864 100644
--- a/sc/source/filter/excel/excimp8.cxx
+++ b/sc/source/filter/excel/excimp8.cxx
@@ -125,7 +125,7 @@ typedef ::cppu::WeakImplHelper1< container::XNameContainer > OleNameOverrideCont
class OleNameOverrideContainer : public OleNameOverrideContainer_BASE
{
private:
- typedef std::hash_map< rtl::OUString, uno::Reference< container::XIndexContainer >, ::rtl::OUStringHash,
+ typedef boost::unordered_map< rtl::OUString, uno::Reference< container::XIndexContainer >, ::rtl::OUStringHash,
::std::equal_to< ::rtl::OUString > > NamedIndexToOleName;
NamedIndexToOleName IdToOleNameHash;
::osl::Mutex m_aMutex;
diff --git a/sc/source/filter/inc/namebuff.hxx b/sc/source/filter/inc/namebuff.hxx
index ecac34b..fdad176 100644
--- a/sc/source/filter/inc/namebuff.hxx
+++ b/sc/source/filter/inc/namebuff.hxx
@@ -36,7 +36,7 @@
#include "xiroot.hxx"
#include "rangenam.hxx"
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <list>
class ScDocument;
@@ -176,7 +176,7 @@ class ShrfmlaBuffer : public ExcRoot
{
size_t operator() (const ScAddress &addr) const;
};
- typedef std::hash_map <ScAddress, USHORT, ScAddressHashFunc> ShrfmlaHash;
+ typedef boost::unordered_map <ScAddress, USHORT, ScAddressHashFunc> ShrfmlaHash;
typedef std::list <ScRange> ShrfmlaList;
ShrfmlaHash index_hash;
diff --git a/sc/source/filter/inc/xiescher.hxx b/sc/source/filter/inc/xiescher.hxx
index a41d39c..667ba63 100644
--- a/sc/source/filter/inc/xiescher.hxx
+++ b/sc/source/filter/inc/xiescher.hxx
@@ -31,7 +31,6 @@
#include <vector>
#include <map>
-#include <hash_map>
#include <filter/msfilter/msdffimp.hxx>
#include <filter/msfilter/msocximex.hxx>
#include <vcl/graph.hxx>
diff --git a/sc/source/filter/xml/sheetdata.cxx b/sc/source/filter/xml/sheetdata.cxx
index e81ddae..5d36ef0 100644
--- a/sc/source/filter/xml/sheetdata.cxx
+++ b/sc/source/filter/xml/sheetdata.cxx
@@ -187,7 +187,7 @@ void ScSheetSaveData::UseSaveEntries()
void ScSheetSaveData::StoreInitialNamespaces( const SvXMLNamespaceMap& rNamespaces )
{
// the initial namespaces are just removed from the list of loaded namespaces,
- // so only a hash_set of the prefixes is needed.
+ // so only a boost::unordered_map of the prefixes is needed.
const NameSpaceHash& rNameHash = rNamespaces.GetAllEntries();
NameSpaceHash::const_iterator aIter = rNameHash.begin(), aEnd = rNameHash.end();
diff --git a/sc/source/filter/xml/xmldpimp.hxx b/sc/source/filter/xml/xmldpimp.hxx
index 311c82e..11a6f9c 100644
--- a/sc/source/filter/xml/xmldpimp.hxx
+++ b/sc/source/filter/xml/xmldpimp.hxx
@@ -40,7 +40,7 @@
#include "dpsave.hxx"
#include "queryparam.hxx"
-#include <hash_set>
+#include <boost/unordered_set.hpp>
class ScXMLImport;
class ScDPSaveNumGroupDimension;
@@ -80,7 +80,7 @@ public:
class ScXMLDataPilotTableContext : public SvXMLImportContext
{
- typedef ::std::hash_set< ::rtl::OUString, ::rtl::OUStringHash > StringSet;
+ typedef ::boost::unordered_set< ::rtl::OUString, ::rtl::OUStringHash > StringSet;
StringSet maHiddenMemberFields;
struct GrandTotalItem
diff --git a/sc/source/filter/xml/xmlexprt.hxx b/sc/source/filter/xml/xmlexprt.hxx
index 797b8ee..49bc92e 100644
--- a/sc/source/filter/xml/xmlexprt.hxx
+++ b/sc/source/filter/xml/xmlexprt.hxx
@@ -40,7 +40,7 @@ namespace com { namespace sun { namespace star {
namespace beans { class XPropertySet; }
} } }
-#include <hash_map>
+#include <boost/unordered_map.hpp>
class ScOutlineArray;
class SvXMLExportPropertyMapper;
@@ -88,7 +88,7 @@ class ScXMLExport : public SvXMLExport
UniReference < SvXMLExportPropertyMapper > xRowStylesExportPropertySetMapper;
UniReference < SvXMLExportPropertyMapper > xTableStylesExportPropertySetMapper;
XMLNumberFormatAttributesExportHelper* pNumberFormatAttributesExportHelper;
- typedef ::std::hash_map<sal_Int32, sal_Int32> NumberFormatIndexMap;
+ typedef ::boost::unordered_map<sal_Int32, sal_Int32> NumberFormatIndexMap;
NumberFormatIndexMap aNumFmtIndexMap;
ScMySharedData* pSharedData;
ScColumnStyles* pColumnStyles;
diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx
index b69986a..b377967 100644
--- a/sc/source/filter/xml/xmlimprt.hxx
+++ b/sc/source/filter/xml/xmlimprt.hxx
@@ -53,7 +53,7 @@
#include <com/sun/star/sheet/XSheetCellRangeContainer.hpp>
#include <vector>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
class ScRangeList;
class ScMyStyleNumberFormats;
@@ -671,7 +671,7 @@ class ScMyStylesImportHelper;
class ScXMLImport: public SvXMLImport
{
- typedef ::std::hash_map< ::rtl::OUString, sal_Int16, ::rtl::OUStringHash > CellTypeMap;
+ typedef ::boost::unordered_map< ::rtl::OUString, sal_Int16, ::rtl::OUStringHash > CellTypeMap;
CellTypeMap aCellTypeMap;
ScDocument* pDoc;
diff --git a/sc/source/ui/cctrl/dpcontrol.cxx b/sc/source/ui/cctrl/dpcontrol.cxx
index 829ad7f..7bd9f50 100644
--- a/sc/source/ui/cctrl/dpcontrol.cxx
+++ b/sc/source/ui/cctrl/dpcontrol.cxx
@@ -57,7 +57,7 @@ using ::com::sun::star::accessibility::XAccessibleContext;
using ::rtl::OUString;
using ::rtl::OUStringHash;
using ::std::vector;
-using ::std::hash_map;
+using ::boost::unordered_map;
using ::std::auto_ptr;
ScDPFieldButton::ScDPFieldButton(OutputDevice* pOutDev, const StyleSettings* pStyle, const Fraction* pZoomX, const Fraction* pZoomY, ScDocument* pDoc) :
@@ -1384,9 +1384,9 @@ const Size& ScDPFieldPopupWindow::getWindowSize() const
return maWndSize;
}
-void ScDPFieldPopupWindow::getResult(hash_map<OUString, bool, OUStringHash>& rResult)
+void ScDPFieldPopupWindow::getResult(boost::unordered_map<OUString, bool, OUStringHash>& rResult)
{
- typedef hash_map<OUString, bool, OUStringHash> ResultMap;
+ typedef boost::unordered_map<OUString, bool, OUStringHash> ResultMap;
ResultMap aResult;
size_t n = maMembers.size();
for (size_t i = 0; i < n; ++i)
diff --git a/sc/source/ui/docshell/macromgr.cxx b/sc/source/ui/docshell/macromgr.cxx
index b51d17d..fdc837d 100644
--- a/sc/source/ui/docshell/macromgr.cxx
+++ b/sc/source/ui/docshell/macromgr.cxx
@@ -47,7 +47,7 @@ using ::com::sun::star::uno::RuntimeException;
using ::com::sun::star::uno::Reference;
using ::rtl::OUString;
using ::rtl::OUStringHash;
-using ::std::hash_map;
+using ::boost::unordered_map;
using ::std::list;
using ::std::for_each;
using ::std::pair;
@@ -103,7 +103,7 @@ public:
}
private:
- typedef hash_map<OUString, list<ScFormulaCell*>, OUStringHash> ModuleCellMap;
+ typedef boost::unordered_map<OUString, list<ScFormulaCell*>, OUStringHash> ModuleCellMap;
ModuleCellMap maCells;
};
@@ -146,7 +146,7 @@ public:
void ScMacroManager::InitUserFuncData()
{
- // Clear hash_map
+ // Clear boost::unordered_map
mhFuncToVolatile.clear();
String sProjectName( RTL_CONSTASCII_USTRINGPARAM("Standard") );
diff --git a/sc/source/ui/inc/crnrdlg.hxx b/sc/source/ui/inc/crnrdlg.hxx
index f09d05e..8a76799 100644
--- a/sc/source/ui/inc/crnrdlg.hxx
+++ b/sc/source/ui/inc/crnrdlg.hxx
@@ -34,7 +34,7 @@
#include <vcl/fixed.hxx>
#include <vcl/lstbox.hxx>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
class ScViewData;
class ScDocument;
@@ -79,7 +79,7 @@ private:
ScRangePairListRef xColNameRanges;
ScRangePairListRef xRowNameRanges;
- typedef ::std::hash_map< String, ScRange, ScStringHashCode, ::std::equal_to<String> > NameRangeMap;
+ typedef ::boost::unordered_map< String, ScRange, ScStringHashCode, ::std::equal_to<String> > NameRangeMap;
NameRangeMap aRangeMap;
ScViewData* pViewData;
ScDocument* pDoc;
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index ade83b8..ea2dfc2 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -43,7 +43,7 @@
#include "refreshtimer.hxx"
#include "optutil.hxx"
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <cppuhelper/implbase1.hxx>
class ScEditEngineDefaulter;
@@ -77,7 +77,7 @@ struct ScColWidthParam;
namespace sfx2 { class FileDialogHelper; }
struct DocShell_Impl;
-typedef ::std::hash_map< ULONG, ULONG > ScChangeActionMergeMap;
+typedef ::boost::unordered_map< ULONG, ULONG > ScChangeActionMergeMap;
//==================================================================
diff --git a/sc/source/ui/inc/dpcontrol.hxx b/sc/source/ui/inc/dpcontrol.hxx
index 912f050..29e098d 100644
--- a/sc/source/ui/inc/dpcontrol.hxx
+++ b/sc/source/ui/inc/dpcontrol.hxx
@@ -40,7 +40,7 @@
#include <boost/shared_ptr.hpp>
#include <memory>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
namespace com { namespace sun { namespace star {
@@ -282,7 +282,7 @@ public:
const Size& getWindowSize() const;
- void getResult(::std::hash_map< ::rtl::OUString, bool, ::rtl::OUStringHash>& rResult);
+ void getResult(::boost::unordered_map< ::rtl::OUString, bool, ::rtl::OUStringHash>& rResult);
void close(bool bOK);
/**
diff --git a/sc/source/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx
index c85eb1b..45ccba4 100644
--- a/sc/source/ui/inc/pvfundlg.hxx
+++ b/sc/source/ui/inc/pvfundlg.hxx
@@ -43,7 +43,7 @@
#include <sfx2/itemconnect.hxx>
#include "pivot.hxx"
-#include <hash_map>
+#include <boost/unordered_map.hpp>
// ============================================================================
@@ -69,7 +69,7 @@ private:
class ScDPFunctionDlg : public ModalDialog
{
- typedef ::std::hash_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash > NameMapType;
+ typedef ::boost::unordered_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash > NameMapType;
public:
explicit ScDPFunctionDlg( Window* pParent, const ScDPLabelDataVec& rLabelVec,
const ScDPLabelData& rLabelData, const ScDPFuncData& rFuncData );
@@ -212,7 +212,7 @@ private:
ScDPObject& mrDPObj; /// The DataPilot object (for member names).
ScDPLabelData maLabelData; /// Cache for members data.
- typedef ::std::hash_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash > NameMapType;
+ typedef ::boost::unordered_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash > NameMapType;
NameMapType maDataFieldNameMap; /// Cache for displayed name to field name mapping.
};
@@ -242,7 +242,7 @@ private:
CancelButton maBtnCancel;
HelpButton maBtnHelp;
- typedef ::std::hash_map<String, long, ScStringHashCode> DimNameIndexMap;
+ typedef ::boost::unordered_map<String, long, ScStringHashCode> DimNameIndexMap;
DimNameIndexMap maNameIndexMap;
ScDPObject& mrDPObj;
};
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 986b5d4..cdb2015 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -9572,7 +9572,7 @@ struct ScPatternHashCode
};
// Hash map to find a range by its start row
-typedef ::std::hash_map< SCROW, ScRange > ScRowRangeHashMap;
+typedef ::boost::unordered_map< SCROW, ScRange > ScRowRangeHashMap;
typedef ::std::vector<ScRange> ScRangeVector;
@@ -9691,7 +9691,7 @@ const ScRangeList& ScUniqueFormatsEntry::GetRanges()
return *aReturnRanges;
}
-typedef ::std::hash_map< const ScPatternAttr*, ScUniqueFormatsEntry, ScPatternHashCode > ScUniqueFormatsHashMap;
+typedef ::boost::unordered_map< const ScPatternAttr*, ScUniqueFormatsEntry, ScPatternHashCode > ScUniqueFormatsHashMap;
// function object to sort the range lists by start of first range
struct ScUniqueFormatsOrder
diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index b3a0140..23035b5 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -83,7 +83,6 @@ using ::std::vector;
using ::std::list;
using ::std::distance;
using ::std::unary_function;
-using ::std::hash_set;
using ::boost::shared_ptr;
namespace
@@ -2666,8 +2665,8 @@ void ScChart2DataSequence::StopListeningToAllExternalRefs()
if (!m_pExtRefListener.get())
return;
- const hash_set<sal_uInt16>& rFileIds = m_pExtRefListener->getAllFileIds();
- hash_set<sal_uInt16>::const_iterator itr = rFileIds.begin(), itrEnd = rFileIds.end();
+ const boost::unordered_set<sal_uInt16>& rFileIds = m_pExtRefListener->getAllFileIds();
+ boost::unordered_set<sal_uInt16>::const_iterator itr = rFileIds.begin(), itrEnd = rFileIds.end();
ScExternalRefManager* pRefMgr = m_pDocument->GetExternalRefManager();
for (; itr != itrEnd; ++itr)
pRefMgr->removeLinkListener(*itr, m_pExtRefListener.get());
@@ -2699,8 +2698,8 @@ void ScChart2DataSequence::CopyData(const ScChart2DataSequence& r)
ScExternalRefManager* pRefMgr = m_pDocument->GetExternalRefManager();
m_pExtRefListener.reset(new ExternalRefListener(*this, m_pDocument));
- const hash_set<sal_uInt16>& rFileIds = r.m_pExtRefListener->getAllFileIds();
- hash_set<sal_uInt16>::const_iterator itr = rFileIds.begin(), itrEnd = rFileIds.end();
+ const boost::unordered_set<sal_uInt16>& rFileIds = r.m_pExtRefListener->getAllFileIds();
+ boost::unordered_set<sal_uInt16>::const_iterator itr = rFileIds.begin(), itrEnd = rFileIds.end();
for (; itr != itrEnd; ++itr)
{
pRefMgr->addLinkListener(*itr, m_pExtRefListener.get());
@@ -2884,7 +2883,7 @@ void ScChart2DataSequence::ExternalRefListener::removeFileId(sal_uInt16 nFileId)
maFileIds.erase(nFileId);
}
-const hash_set<sal_uInt16>& ScChart2DataSequence::ExternalRefListener::getAllFileIds()
+const boost::unordered_set<sal_uInt16>& ScChart2DataSequence::ExternalRefListener::getAllFileIds()
{
return maFileIds;
}
diff --git a/sc/source/ui/vba/vbachartobjects.hxx b/sc/source/ui/vba/vbachartobjects.hxx
index 232b074..a303552 100644
--- a/sc/source/ui/vba/vbachartobjects.hxx
+++ b/sc/source/ui/vba/vbachartobjects.hxx
@@ -36,11 +36,11 @@
#include <com/sun/star/container/XEnumerationAccess.hpp>
#include <vbahelper/vbacollectionimpl.hxx>
#include "excelvbahelper.hxx"
-#include <hash_map>
+#include <boost/unordered_map.hpp>
typedef CollTestImplHelper< ov::excel::XChartObjects > ChartObjects_BASE;
/* #TODO see if this hash table is 'really' necessary
-typedef ::std::hash_map< ::rtl::OUString,
+typedef ::boost::unordered_map< ::rtl::OUString,
css::uno::Reference< ov::excel::XChartObject >,
::rtl::OUStringHash,
::std::equal_to< ::rtl::OUString > > aHashTable;
diff --git a/sc/source/ui/vba/vbacharts.hxx b/sc/source/ui/vba/vbacharts.hxx
index 399910a..b2101c6 100644
--- a/sc/source/ui/vba/vbacharts.hxx
+++ b/sc/source/ui/vba/vbacharts.hxx
@@ -31,7 +31,7 @@
#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
#include <vbahelper/vbacollectionimpl.hxx>
#include "excelvbahelper.hxx"
-#include <hash_map>
+#include <boost/unordered_map.hpp>
typedef CollTestImplHelper< ov::excel::XCharts > Charts_BASE;
diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx
index 080e377..39277e0 100644
--- a/sc/source/ui/vba/vbawindow.cxx
+++ b/sc/source/ui/vba/vbawindow.cxx
@@ -47,7 +47,7 @@
#include <tabvwsh.hxx>
#include <docuno.hxx>
#include <sc.hrc>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <sfx2/viewfrm.hxx>
#include <vcl/wrkwin.hxx>
#include "unonames.hxx"
@@ -56,7 +56,7 @@ using namespace ::com::sun::star;
using namespace ::ooo::vba;
using namespace ::ooo::vba::excel::XlWindowState;
-typedef std::hash_map< rtl::OUString,
+typedef boost::unordered_map< rtl::OUString,
SCTAB, ::rtl::OUStringHash,
::std::equal_to< ::rtl::OUString > > NameIndexHash;
diff --git a/sc/source/ui/vba/vbawindows.cxx b/sc/source/ui/vba/vbawindows.cxx
index 4a49ff9..ef66185 100644
--- a/sc/source/ui/vba/vbawindows.cxx
+++ b/sc/source/ui/vba/vbawindows.cxx
@@ -27,7 +27,7 @@
************************************************************************/
#include "vbawindows.hxx"
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
#include <com/sun/star/frame/XDesktop.hpp>
@@ -40,7 +40,7 @@
using namespace ::com::sun::star;
using namespace ::ooo::vba;
-typedef std::hash_map< rtl::OUString,
+typedef boost::unordered_map< rtl::OUString,
sal_Int32, ::rtl::OUStringHash,
::std::equal_to< ::rtl::OUString > > NameIndexHash;
diff --git a/sc/source/ui/vba/vbaworkbooks.cxx b/sc/source/ui/vba/vbaworkbooks.cxx
index 36af1a0..361842c 100644
--- a/sc/source/ui/vba/vbaworkbooks.cxx
+++ b/sc/source/ui/vba/vbaworkbooks.cxx
@@ -60,7 +60,7 @@
#include "vbaworkbooks.hxx"
#include <vbahelper/vbahelper.hxx>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <vector>
#include <osl/file.hxx>
using namespace ::ooo::vba;
diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx
index f5c3978..35bcc3a 100644
--- a/sc/source/ui/view/dbfunc3.cxx
+++ b/sc/source/ui/view/dbfunc3.cxx
@@ -79,8 +79,8 @@
#include "cell.hxx"
#include "userlist.hxx"
-#include <hash_set>
-#include <hash_map>
+#include <boost/unordered_set.hpp>
+#include <boost/unordered_map.hpp>
#include <memory>
#include <list>
#include <vector>
@@ -99,8 +99,6 @@ using ::rtl::OUStringBuffer;
using ::std::auto_ptr;
using ::std::list;
using ::std::vector;
-using ::std::hash_map;
-using ::std::hash_set;
// STATIC DATA -----------------------------------------------------------
@@ -1779,7 +1777,7 @@ bool ScDBFunc::DataPilotSort( const ScAddress& rPos, bool bAscending, sal_uInt16
typedef ScDPSaveDimension::MemberList MemList;
const MemList& rDimMembers = pSaveDim->GetMembers();
list<OUString> aMembers;
- hash_set<OUString, ::rtl::OUStringHash> aMemberSet;
+ boost::unordered_set<OUString, ::rtl::OUStringHash> aMemberSet;
size_t nMemberCount = 0;
for (MemList::const_iterator itr = rDimMembers.begin(), itrEnd = rDimMembers.end();
itr != itrEnd; ++itr)
@@ -1796,7 +1794,7 @@ bool ScDBFunc::DataPilotSort( const ScAddress& rPos, bool bAscending, sal_uInt16
// Collect and rank those custom sort strings that also exist in the member name list.
- typedef hash_map<OUString, sal_uInt16, OUStringHash> UserSortMap;
+ typedef boost::unordered_map<OUString, sal_uInt16, OUStringHash> UserSortMap;
UserSortMap aSubStrs;
sal_uInt16 nSubCount = 0;
if (pUserListId)
@@ -1900,7 +1898,7 @@ BOOL ScDBFunc::DataPilotMove( const ScRange& rSource, const ScAddress& rDest )
bool bValid = ( aDestData.Dimension >= 0 ); // dropping onto a field
// look through the source range
- std::hash_set< rtl::OUString, rtl::OUStringHash, std::equal_to<rtl::OUString> > aMembersSet; // for lookup
+ boost::unordered_set< rtl::OUString, rtl::OUStringHash, std::equal_to<rtl::OUString> > aMembersSet; // for lookup
std::vector< rtl::OUString > aMembersVector; // members in original order, for inserting
aMembersVector.reserve( std::max( static_cast<SCSIZE>( rSource.aEnd.Col() - rSource.aStart.Col() + 1 ),
static_cast<SCSIZE>( rSource.aEnd.Row() - rSource.aStart.Row() + 1 ) ) );
diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx
index 6a2a161..63c94d8 100644
--- a/sc/source/ui/view/gridwin2.cxx
+++ b/sc/source/ui/view/gridwin2.cxx
@@ -61,13 +61,13 @@
#include "scabstdlg.hxx"
#include <vector>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
using namespace com::sun::star;
using ::com::sun::star::sheet::DataPilotFieldOrientation;
using ::std::vector;
using ::std::auto_ptr;
-using ::std::hash_map;
+using ::boost::unordered_map;
using ::rtl::OUString;
using ::rtl::OUStringHash;
@@ -543,8 +543,8 @@ void ScGridWindow::DPLaunchFieldPopupMenu(
void ScGridWindow::UpdateDPFromFieldPopupMenu()
{
- typedef hash_map<OUString, OUString, OUStringHash> MemNameMapType;
- typedef hash_map<OUString, bool, OUStringHash> MemVisibilityType;
+ typedef boost::unordered_map<OUString, OUString, OUStringHash> MemNameMapType;
+ typedef boost::unordered_map<OUString, bool, OUStringHash> MemVisibilityType;
if (!mpDPFieldPopup.get())
return;
diff --git a/sccomp/source/solver/solver.cxx b/sccomp/source/solver/solver.cxx
index fff803e..30de925 100644
--- a/sccomp/source/solver/solver.cxx
+++ b/sccomp/source/solver/solver.cxx
@@ -50,7 +50,7 @@
#include <rtl/ustrbuf.hxx>
#include <cppuhelper/factory.hxx>
#include <vector>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <tools/resmgr.hxx>
@@ -119,7 +119,7 @@ struct ScSolverCellEqual
}
};
-typedef std::hash_map< table::CellAddress, std::vector<double>, ScSolverCellHash, ScSolverCellEqual > ScSolverCellHashMap;
+typedef boost::unordered_map< table::CellAddress, std::vector<double>, ScSolverCellHash, ScSolverCellEqual > ScSolverCellHashMap;
// -----------------------------------------------------------------------
More information about the Libreoffice-commits
mailing list