[Libreoffice-commits] core.git: sc/inc sc/source sw/inc sw/source
Caolán McNamara
caolanm at redhat.com
Sat Jan 3 13:11:49 PST 2015
sc/inc/addincol.hxx | 4 +--
sc/inc/autonamecache.hxx | 6 ++---
sc/inc/chart2uno.hxx | 6 ++---
sc/inc/chartlis.hxx | 8 +++----
sc/inc/clipcontext.hxx | 1
sc/inc/columnset.hxx | 8 +++----
sc/inc/dpcache.hxx | 4 +--
sc/inc/dpfilteredcache.hxx | 10 ++++----
sc/inc/dpgroup.hxx | 10 ++++----
sc/inc/dpresfilter.hxx | 4 +--
sc/inc/dpsave.hxx | 15 +++++++------
sc/inc/dpsdbtab.hxx | 6 ++---
sc/inc/dpshttab.hxx | 8 +++----
sc/inc/dptabdat.hxx | 15 +++++++------
sc/inc/dptabres.hxx | 12 +++++-----
sc/inc/dptabsrc.hxx | 10 ++++----
sc/inc/dptypes.hxx | 4 +--
sc/inc/externalrefmgr.hxx | 32 ++++++++++++++--------------
sc/inc/formulagroup.hxx | 4 +--
sc/inc/formulaparserpool.hxx | 4 +--
sc/inc/global.hxx | 1
sc/inc/linkuno.hxx | 1
sc/inc/listenerquery.hxx | 6 ++---
sc/inc/lookupcache.hxx | 6 ++---
sc/inc/macromgr.hxx | 6 ++---
sc/inc/mtvelements.hxx | 6 ++---
sc/inc/pch/precompiled_vbaobj.hxx | 2 -
sc/inc/refupdatecontext.hxx | 8 +++----
sc/inc/reordermap.hxx | 4 +--
sc/inc/sheetdata.hxx | 4 +--
sc/inc/spellcheckcontext.hxx | 4 +--
sc/inc/tokenstringcontext.hxx | 8 +++----
sc/source/core/data/bcaslot.cxx | 10 ++++----
sc/source/core/data/columnset.cxx | 1
sc/source/core/data/dpcache.cxx | 2 -
sc/source/core/data/dpfilteredcache.cxx | 6 ++---
sc/source/core/data/dpgroup.cxx | 10 ++++----
sc/source/core/data/dpobject.cxx | 2 -
sc/source/core/data/dpsave.cxx | 12 +++++-----
sc/source/core/data/dpsdbtab.cxx | 8 +++----
sc/source/core/data/dpshttab.cxx | 8 +++----
sc/source/core/data/dptabres.cxx | 4 +--
sc/source/core/data/dptabsrc.cxx | 17 +++++++-------
sc/source/core/data/table3.cxx | 4 +--
sc/source/core/inc/bcaslot.hxx | 18 +++++++--------
sc/source/core/inc/cellkeytranslator.hxx | 4 +--
sc/source/core/tool/cellkeytranslator.cxx | 1
sc/source/core/tool/chartlis.cxx | 8 +++----
sc/source/core/tool/formulagroup.cxx | 6 ++---
sc/source/core/tool/formulaparserpool.cxx | 4 +--
sc/source/filter/excel/excimp8.cxx | 4 +--
sc/source/filter/excel/xepivotxml.cxx | 2 -
sc/source/filter/inc/htmlpars.hxx | 8 +++----
sc/source/filter/inc/imp_op.hxx | 4 +--
sc/source/filter/inc/namebuff.hxx | 4 +--
sc/source/filter/inc/orcusinterface.hxx | 5 +---
sc/source/filter/inc/xepivotxml.hxx | 4 +--
sc/source/filter/inc/xetable.hxx | 8 +++----
sc/source/filter/oox/formulabuffer.cxx | 2 -
sc/source/filter/xml/editattributemap.hxx | 6 ++---
sc/source/filter/xml/pivotsource.hxx | 6 ++---
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/checklistmenu.cxx | 1
sc/source/ui/docshell/docsh6.cxx | 2 -
sc/source/ui/docshell/docsh8.cxx | 4 +--
sc/source/ui/docshell/macromgr.cxx | 5 +---
sc/source/ui/inc/checklistmenu.hxx | 4 +--
sc/source/ui/inc/crnrdlg.hxx | 4 +--
sc/source/ui/inc/docsh.hxx | 5 +---
sc/source/ui/inc/gridwin.hxx | 3 --
sc/source/ui/inc/pvfundlg.hxx | 8 +++----
sc/source/ui/unoobj/cellsuno.cxx | 6 ++---
sc/source/ui/unoobj/chart2uno.cxx | 8 +++----
sc/source/ui/unoobj/linkuno.cxx | 8 ++-----
sc/source/ui/vba/vbachartobjects.hxx | 7 ------
sc/source/ui/vba/vbawindow.cxx | 4 +--
sc/source/ui/vba/vbawindows.cxx | 7 +++---
sc/source/ui/vba/vbaworkbooks.cxx | 1
sc/source/ui/view/dbfunc3.cxx | 10 ++++----
sc/source/ui/view/gridwin.cxx | 6 ++---
sc/source/ui/view/gridwin2.cxx | 5 +---
sw/inc/IDocumentExternalData.hxx | 4 +--
sw/inc/SwStyleNameMapper.hxx | 6 +----
sw/inc/dbgoutsw.hxx | 8 +++----
sw/inc/doc.hxx | 10 ++++----
sw/inc/docstyle.hxx | 4 +--
sw/inc/numrule.hxx | 8 +++----
sw/inc/pch/precompiled_msword.hxx | 2 -
sw/inc/pch/precompiled_sw.hxx | 4 +--
sw/inc/pch/precompiled_vbaswobj.hxx | 2 -
sw/inc/swwait.hxx | 4 +--
sw/source/core/access/accpara.hxx | 4 +--
sw/source/core/doc/DocumentListsManager.cxx | 6 ++---
sw/source/core/doc/number.cxx | 6 ++---
sw/source/core/doc/swstylemanager.cxx | 10 ++++----
sw/source/core/inc/DocumentListsManager.hxx | 4 +--
sw/source/core/inc/MarkManager.hxx | 6 ++---
sw/source/core/inc/layouter.hxx | 4 +--
sw/source/core/unocore/unocoll.cxx | 3 +-
sw/source/filter/ww8/WW8TableInfo.hxx | 8 +++----
sw/source/filter/ww8/wrtw8sty.cxx | 5 ++--
sw/source/filter/ww8/ww8par.cxx | 5 ++--
sw/source/filter/ww8/ww8scan.hxx | 8 +++----
sw/source/filter/xml/xmlimp.cxx | 5 ++--
sw/source/filter/xml/xmltbli.cxx | 1
sw/source/filter/xml/xmltbli.hxx | 4 +--
sw/source/ui/vba/vbadocumentproperties.cxx | 6 ++---
sw/source/ui/vba/vbadocumentproperties.hxx | 1
sw/source/ui/vba/vbadocuments.cxx | 1
sw/source/ui/vba/vbafont.cxx | 4 +--
113 files changed, 320 insertions(+), 340 deletions(-)
New commits:
commit 79f115b91e5ad4d9038e127bf0b57843e157eac9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jan 2 16:22:46 2015 +0000
boost::unordered_map->std::unordered_map
Change-Id: I2c65709cda6f10810452dfb8aa1a247cb3a5564f
diff --git a/sc/inc/addincol.hxx b/sc/inc/addincol.hxx
index c1afbf9..e090e8f 100644
--- a/sc/inc/addincol.hxx
+++ b/sc/inc/addincol.hxx
@@ -35,13 +35,13 @@
#include "types.hxx"
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
class SfxObjectShell;
class ScUnoAddInFuncData;
class ScFuncDesc;
-typedef ::boost::unordered_map< OUString, const ScUnoAddInFuncData*, OUStringHash > ScAddInHashMap;
+typedef std::unordered_map< OUString, const ScUnoAddInFuncData*, OUStringHash > ScAddInHashMap;
enum ScAddInArgumentType
{
diff --git a/sc/inc/autonamecache.hxx b/sc/inc/autonamecache.hxx
index f655076..d0bbc05 100644
--- a/sc/inc/autonamecache.hxx
+++ b/sc/inc/autonamecache.hxx
@@ -20,13 +20,13 @@
#ifndef INCLUDED_SC_INC_AUTONAMECACHE_HXX
#define INCLUDED_SC_INC_AUTONAMECACHE_HXX
+#include <unordered_map>
#include <vector>
-#include <boost/unordered_map.hpp>
#include "address.hxx"
#include "global.hxx"
-typedef ::std::vector< ScAddress > ScAutoNameAddresses;
-typedef ::boost::unordered_map< OUString, ScAutoNameAddresses, OUStringHash > ScAutoNameHashMap;
+typedef std::vector< ScAddress > ScAutoNameAddresses;
+typedef std::unordered_map< OUString, ScAutoNameAddresses, OUStringHash > ScAutoNameHashMap;
/** Cache for faster lookup of automatic names during CompileXML
(during CompileXML, no document content is changed). */
diff --git a/sc/inc/chart2uno.hxx b/sc/inc/chart2uno.hxx
index ab0b7ba..f42f9ba 100644
--- a/sc/inc/chart2uno.hxx
+++ b/sc/inc/chart2uno.hxx
@@ -49,9 +49,9 @@
#include <svl/itemprop.hxx>
#include <list>
+#include <unordered_set>
#include <vector>
#include <boost/shared_ptr.hpp>
-#include <boost/unordered_set.hpp>
#include <boost/noncopyable.hpp>
#include <boost/scoped_ptr.hpp>
@@ -383,14 +383,14 @@ private:
virtual void notify(sal_uInt16 nFileId, ScExternalRefManager::LinkUpdateType eType) SAL_OVERRIDE;
void addFileId(sal_uInt16 nFileId);
void removeFileId(sal_uInt16 nFileId);
- const ::boost::unordered_set<sal_uInt16>& getAllFileIds() { return maFileIds;}
+ const std::unordered_set<sal_uInt16>& getAllFileIds() { return maFileIds;}
private:
ExternalRefListener();
ExternalRefListener(const ExternalRefListener& r);
ScChart2DataSequence& mrParent;
- ::boost::unordered_set<sal_uInt16> maFileIds;
+ std::unordered_set<sal_uInt16> maFileIds;
ScDocument* mpDoc;
};
diff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx
index 0605460..85356ed 100644
--- a/sc/inc/chartlis.hxx
+++ b/sc/inc/chartlis.hxx
@@ -29,9 +29,9 @@
#include <vector>
#include <list>
-#include <boost/unordered_set.hpp>
#include <boost/scoped_ptr.hpp>
#include <boost/ptr_container/ptr_map.hpp>
+#include <unordered_set>
class ScDocument;
class ScChartUnoData;
@@ -49,14 +49,14 @@ public:
virtual void notify(sal_uInt16 nFileId, ScExternalRefManager::LinkUpdateType eType) SAL_OVERRIDE;
void addFileId(sal_uInt16 nFileId);
void removeFileId(sal_uInt16 nFileId);
- ::boost::unordered_set<sal_uInt16>& getAllFileIds() { return maFileIds;}
+ std::unordered_set<sal_uInt16>& getAllFileIds() { return maFileIds;}
private:
ExternalRefListener();
ExternalRefListener(const ExternalRefListener& r);
ScChartListener& mrParent;
- ::boost::unordered_set<sal_uInt16> maFileIds;
+ std::unordered_set<sal_uInt16> maFileIds;
ScDocument* mpDoc;
};
@@ -138,7 +138,7 @@ public:
};
typedef boost::ptr_map<OUString, ScChartListener> ListenersType;
- typedef boost::unordered_set<OUString, OUStringHash> StringSetType;
+ typedef std::unordered_set<OUString, OUStringHash> StringSetType;
private:
ListenersType maListeners;
enum UpdateStatus
diff --git a/sc/inc/clipcontext.hxx b/sc/inc/clipcontext.hxx
index 7848199..787b964 100644
--- a/sc/inc/clipcontext.hxx
+++ b/sc/inc/clipcontext.hxx
@@ -15,7 +15,6 @@
#include <celltextattr.hxx>
#include <vector>
-#include <boost/unordered_map.hpp>
#include <boost/noncopyable.hpp>
#include <boost/scoped_ptr.hpp>
diff --git a/sc/inc/columnset.hxx b/sc/inc/columnset.hxx
index bbee5be3..3ee8fba 100644
--- a/sc/inc/columnset.hxx
+++ b/sc/inc/columnset.hxx
@@ -12,9 +12,9 @@
#include "address.hxx"
+#include <unordered_set>
+#include <unordered_map>
#include <vector>
-#include <boost/unordered_set.hpp>
-#include <boost/unordered_map.hpp>
namespace sc {
@@ -23,8 +23,8 @@ namespace sc {
*/
class ColumnSet
{
- typedef boost::unordered_set<SCCOL> ColsType;
- typedef boost::unordered_map<SCTAB, ColsType> TabsType;
+ typedef std::unordered_set<SCCOL> ColsType;
+ typedef std::unordered_map<SCTAB, ColsType> TabsType;
TabsType maTabs;
public:
diff --git a/sc/inc/dpcache.hxx b/sc/inc/dpcache.hxx
index ecb3514..e97a209 100644
--- a/sc/inc/dpcache.hxx
+++ b/sc/inc/dpcache.hxx
@@ -27,9 +27,9 @@
#include <boost/noncopyable.hpp>
#include <boost/scoped_ptr.hpp>
#include <boost/ptr_container/ptr_vector.hpp>
-#include <boost/unordered_set.hpp>
#include <mdds/flat_segment_tree.hpp>
+#include <unordered_set>
#include <vector>
#include <set>
@@ -44,7 +44,7 @@ struct ScDPNumGroupInfo;
*/
class SC_DLLPUBLIC ScDPCache : boost::noncopyable
{
- typedef boost::unordered_set<OUString, OUStringHash> StringSetType;
+ typedef std::unordered_set<OUString, OUStringHash> StringSetType;
public:
typedef std::vector<ScDPItemData> ItemsType;
diff --git a/sc/inc/dpfilteredcache.hxx b/sc/inc/dpfilteredcache.hxx
index 0587b32..878e98c 100644
--- a/sc/inc/dpfilteredcache.hxx
+++ b/sc/inc/dpfilteredcache.hxx
@@ -26,8 +26,8 @@
#include "dpitemdata.hxx"
#include "calcmacros.hxx"
+#include <unordered_set>
#include <vector>
-#include <boost/unordered_set.hpp>
#include <boost/shared_ptr.hpp>
#include <mdds/flat_segment_tree.hpp>
@@ -119,7 +119,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 ::boost::unordered_set<sal_Int32>& rRepeatIfEmptyDims);
+ void filterByPageDimension(const std::vector<Criterion>& rCriteria, const std::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
@@ -136,9 +136,9 @@ public:
/** Filter the table based on the specified criteria, and copy the
result to rTabData. This method is used, for example, to generate
a drill-down data table. */
- void filterTable(const ::std::vector<Criterion>& rCriteria,
+ void filterTable(const std::vector<Criterion>& rCriteria,
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& rTabData,
- const ::boost::unordered_set<sal_Int32>& rRepeatIfEmptyDims);
+ const std::unordered_set<sal_Int32>& rRepeatIfEmptyDims);
SCROW getOrder(long nDim, SCROW nIndex) const;
void clear();
@@ -159,7 +159,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 ::boost::unordered_set<sal_Int32>& rRepeatIfEmptyDims) const;
+ bool isRowQualified(sal_Int32 nRow, const ::std::vector<Criterion>& rCriteria, const std::unordered_set<sal_Int32>& rRepeatIfEmptyDims) const;
private:
diff --git a/sc/inc/dpgroup.hxx b/sc/inc/dpgroup.hxx
index 1420c2c..c10a9bf 100644
--- a/sc/inc/dpgroup.hxx
+++ b/sc/inc/dpgroup.hxx
@@ -20,8 +20,8 @@
#ifndef INCLUDED_SC_INC_DPGROUP_HXX
#define INCLUDED_SC_INC_DPGROUP_HXX
+#include <unordered_set>
#include <vector>
-#include <boost/unordered_set.hpp>
#include <boost/shared_ptr.hpp>
#include "dptabdat.hxx"
@@ -119,7 +119,7 @@ public:
class ScDPGroupTableData : public ScDPTableData
{
- typedef ::boost::unordered_set< OUString, OUStringHash, ::std::equal_to< OUString > > StringHashSet;
+ typedef std::unordered_set< OUString, OUStringHash, ::std::equal_to< OUString > > StringHashSet;
::boost::shared_ptr<ScDPTableData> pSourceData;
long nSourceCount;
@@ -165,9 +165,9 @@ public:
virtual bool IsRepeatIfEmpty() SAL_OVERRIDE;
virtual void CreateCacheTable() SAL_OVERRIDE;
- virtual void FilterCacheTable(const ::std::vector<ScDPFilteredCache::Criterion>& rCriteria, const ::boost::unordered_set<sal_Int32>& rDataDims) SAL_OVERRIDE;
- virtual void GetDrillDownData(const ::std::vector<ScDPFilteredCache::Criterion>& rCriteria,
- const ::boost::unordered_set<sal_Int32>& rCatDims,
+ virtual void FilterCacheTable(const std::vector<ScDPFilteredCache::Criterion>& rCriteria, const std::unordered_set<sal_Int32>& rDataDims) SAL_OVERRIDE;
+ virtual void GetDrillDownData(const std::vector<ScDPFilteredCache::Criterion>& rCriteria,
+ const std::unordered_set<sal_Int32>& rCatDims,
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& rData) SAL_OVERRIDE;
virtual void CalcResults(CalcInfo& rInfo, bool bAutoShow) SAL_OVERRIDE;
virtual const ScDPFilteredCache& GetCacheTable() const SAL_OVERRIDE;
diff --git a/sc/inc/dpresfilter.hxx b/sc/inc/dpresfilter.hxx
index 059e931..135b78c 100644
--- a/sc/inc/dpresfilter.hxx
+++ b/sc/inc/dpresfilter.hxx
@@ -15,7 +15,7 @@
#include <map>
#include <vector>
#include <boost/noncopyable.hpp>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
namespace com { namespace sun { namespace star { namespace sheet {
struct DataPilotFieldFilter;
@@ -91,7 +91,7 @@ private:
{
size_t operator() (const NamePairType& rPair) const;
};
- typedef boost::unordered_map<NamePairType, double, NamePairHash> LeafValuesType;
+ typedef std::unordered_map<NamePairType, double, NamePairHash> LeafValuesType;
LeafValuesType maLeafValues;
OUString maPrimaryDimName;
diff --git a/sc/inc/dpsave.hxx b/sc/inc/dpsave.hxx
index 39b718e..c9bf960 100644
--- a/sc/inc/dpsave.hxx
+++ b/sc/inc/dpsave.hxx
@@ -23,8 +23,6 @@
#include <list>
#include <boost/ptr_container/ptr_vector.hpp>
-#include <boost/unordered_map.hpp>
-#include <boost/unordered_set.hpp>
#include <boost/scoped_ptr.hpp>
#include <com/sun/star/sheet/XDimensionsSupplier.hpp>
@@ -35,6 +33,9 @@
#include "scdllapi.h"
#include "calcmacros.hxx"
+#include <unordered_map>
+#include <unordered_set>
+
namespace com { namespace sun { namespace star { namespace sheet {
struct DataPilotFieldReference;
struct DataPilotFieldSortInfo;
@@ -114,8 +115,8 @@ private:
::com::sun::star::sheet::DataPilotFieldLayoutInfo* pLayoutInfo; // (level)
public:
- typedef boost::unordered_set<OUString, OUStringHash> MemberSetType;
- typedef boost::unordered_map <OUString, ScDPSaveMember*, OUStringHash> MemberHash;
+ typedef std::unordered_set<OUString, OUStringHash> MemberSetType;
+ typedef std::unordered_map <OUString, ScDPSaveMember*, OUStringHash> MemberHash;
typedef std::list <ScDPSaveMember*> MemberList;
private:
@@ -218,7 +219,7 @@ public:
void WriteToSource( const com::sun::star::uno::Reference<com::sun::star::uno::XInterface>& xDim );
- void UpdateMemberVisibility(const ::boost::unordered_map< OUString, bool, OUStringHash>& rData);
+ void UpdateMemberVisibility(const std::unordered_map< OUString, bool, OUStringHash>& rData);
bool HasInvisibleMember() const;
@@ -231,9 +232,9 @@ public:
class ScDPSaveData
{
- typedef boost::unordered_map<OUString, size_t, OUStringHash> DupNameCountType;
+ typedef std::unordered_map<OUString, size_t, OUStringHash> DupNameCountType;
public:
- typedef boost::unordered_map<OUString, size_t, OUStringHash> DimOrderType;
+ typedef std::unordered_map<OUString, size_t, OUStringHash> DimOrderType;
typedef boost::ptr_vector<ScDPSaveDimension> DimsType;
private:
diff --git a/sc/inc/dpsdbtab.hxx b/sc/inc/dpsdbtab.hxx
index 94c85e4..2119373 100644
--- a/sc/inc/dpsdbtab.hxx
+++ b/sc/inc/dpsdbtab.hxx
@@ -24,8 +24,8 @@
#include "dptabdat.hxx"
+#include <unordered_set>
#include <vector>
-#include <boost/unordered_set.hpp>
class ScDPFilteredCache;
class ScDocument;
@@ -72,9 +72,9 @@ public:
virtual void SetEmptyFlags( bool bIgnoreEmptyRows, bool bRepeatIfEmpty ) SAL_OVERRIDE;
virtual void CreateCacheTable() SAL_OVERRIDE;
- virtual void FilterCacheTable(const ::std::vector<ScDPFilteredCache::Criterion>& rCriteria, const ::boost::unordered_set<sal_Int32>& rDataDims) SAL_OVERRIDE;
+ virtual void FilterCacheTable(const ::std::vector<ScDPFilteredCache::Criterion>& rCriteria, const std::unordered_set<sal_Int32>& rDataDims) SAL_OVERRIDE;
virtual void GetDrillDownData(const ::std::vector<ScDPFilteredCache::Criterion>& rCriteria,
- const ::boost::unordered_set<sal_Int32>& rCatDims,
+ const std::unordered_set<sal_Int32>& rCatDims,
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& rData) SAL_OVERRIDE;
virtual void CalcResults(CalcInfo& rInfo, bool bAutoShow) SAL_OVERRIDE;
virtual const ScDPFilteredCache& GetCacheTable() const SAL_OVERRIDE;
diff --git a/sc/inc/dpshttab.hxx b/sc/inc/dpshttab.hxx
index e591aae..034d082 100644
--- a/sc/inc/dpshttab.hxx
+++ b/sc/inc/dpshttab.hxx
@@ -26,7 +26,7 @@
#include "scdllapi.h"
#include "queryparam.hxx"
-#include <boost/unordered_set.hpp>
+#include <unordered_set>
#include <vector>
namespace com { namespace sun { namespace star { namespace sheet {
@@ -112,9 +112,9 @@ public:
virtual bool IsRepeatIfEmpty() SAL_OVERRIDE;
virtual void CreateCacheTable() SAL_OVERRIDE;
- virtual void FilterCacheTable(const ::std::vector<ScDPFilteredCache::Criterion>& rCriteria, const ::boost::unordered_set<sal_Int32>& rCatDims) SAL_OVERRIDE;
- virtual void GetDrillDownData(const ::std::vector<ScDPFilteredCache::Criterion>& rCriteria,
- const ::boost::unordered_set<sal_Int32>& rCatDims,
+ virtual void FilterCacheTable(const std::vector<ScDPFilteredCache::Criterion>& rCriteria, const std::unordered_set<sal_Int32>& rCatDims) SAL_OVERRIDE;
+ virtual void GetDrillDownData(const std::vector<ScDPFilteredCache::Criterion>& rCriteria,
+ const std::unordered_set<sal_Int32>& rCatDims,
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& rData) SAL_OVERRIDE;
virtual void CalcResults(CalcInfo& rInfo, bool bAutoShow) SAL_OVERRIDE;
virtual const ScDPFilteredCache& GetCacheTable() const SAL_OVERRIDE;
diff --git a/sc/inc/dptabdat.hxx b/sc/inc/dptabdat.hxx
index b0a2464..4be896c 100644
--- a/sc/inc/dptabdat.hxx
+++ b/sc/inc/dptabdat.hxx
@@ -28,12 +28,13 @@
#include <svl/zforlist.hxx>
-#include <vector>
-#include <set>
-#include <boost/unordered_set.hpp>
-#include <boost/unordered_map.hpp>
#include <boost/noncopyable.hpp>
+#include <set>
+#include <unordered_set>
+#include <unordered_map>
+#include <vector>
+
namespace com { namespace sun { namespace star { namespace sheet {
struct DataPilotFieldFilter;
}}}}
@@ -120,9 +121,9 @@ public:
virtual bool IsRepeatIfEmpty();
virtual void CreateCacheTable() = 0;
- virtual void FilterCacheTable(const ::std::vector<ScDPFilteredCache::Criterion>& rCriteria, const ::boost::unordered_set<sal_Int32>& rDataDims) = 0;
- virtual void GetDrillDownData(const ::std::vector<ScDPFilteredCache::Criterion>& rCriteria,
- const ::boost::unordered_set<sal_Int32>& rCatDims,
+ virtual void FilterCacheTable(const std::vector<ScDPFilteredCache::Criterion>& rCriteria, const std::unordered_set<sal_Int32>& rDataDims) = 0;
+ virtual void GetDrillDownData(const std::vector<ScDPFilteredCache::Criterion>& rCriteria,
+ const std::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 ScDPFilteredCache& GetCacheTable() const = 0;
diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx
index 9368ff8..ede43aa 100644
--- a/sc/inc/dptabres.hxx
+++ b/sc/inc/dptabres.hxx
@@ -28,10 +28,10 @@
#include <com/sun/star/sheet/DataResult.hpp>
#include <com/sun/star/uno/Sequence.hxx>
-#include <boost/unordered_map.hpp>
-#include <boost/unordered_set.hpp>
-#include <vector>
#include <map>
+#include <unordered_map>
+#include <unordered_set>
+#include <vector>
namespace com { namespace sun { namespace star { namespace sheet {
struct DataPilotFieldReference;
@@ -235,7 +235,7 @@ struct ScDPParentDimData
};
typedef std::vector <ScDPParentDimData *> DimMemberArray;
-typedef boost::unordered_map < SCROW, ScDPParentDimData *, MemberHashIndexFunc> DimMemberHash;
+typedef std::unordered_map < SCROW, ScDPParentDimData *, MemberHashIndexFunc> DimMemberHash;
class ResultMembers
{
@@ -674,8 +674,8 @@ private:
{
size_t operator()(const ScDPItemData& r) const;
};
- typedef ::boost::unordered_set<ScDPItemData, MemberHash> VisibleMemberType;
- typedef ::boost::unordered_map<OUString, VisibleMemberType, OUStringHash> DimMemberType;
+ typedef std::unordered_set<ScDPItemData, MemberHash> VisibleMemberType;
+ typedef std::unordered_map<OUString, VisibleMemberType, OUStringHash> DimMemberType;
DimMemberType maDimensions;
ScDPSource* mpSource;
diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx
index f57b516..5f0b9eb 100644
--- a/sc/inc/dptabsrc.hxx
+++ b/sc/inc/dptabsrc.hxx
@@ -50,12 +50,12 @@
#include "dpglobal.hxx"
#include "dpresfilter.hxx"
-#include <boost/unordered_map.hpp>
-#include <boost/unordered_set.hpp>
#include <boost/noncopyable.hpp>
#include <boost/scoped_ptr.hpp>
-#include <vector>
#include <list>
+#include <unordered_map>
+#include <unordered_set>
+#include <vector>
namespace com { namespace sun { namespace star {
namespace sheet {
@@ -130,7 +130,7 @@ private:
* Compile a list of dimension indices that are either, column, row or
* page dimensions (i.e. all but data dimensions).
*/
- void GetCategoryDimensionIndices(::boost::unordered_set<sal_Int32>& rCatDims);
+ void GetCategoryDimensionIndices(std::unordered_set<sal_Int32>& rCatDims);
/**
* Set visibilities of individual rows in the cache table based on the
@@ -670,7 +670,7 @@ public:
};
// hash map from name to index in the member array, for fast name access
-typedef ::boost::unordered_map< OUString, sal_Int32, OUStringHash > ScDPMembersHashMap;
+typedef std::unordered_map< OUString, sal_Int32, OUStringHash > ScDPMembersHashMap;
class ScDPMembers : public cppu::WeakImplHelper2<
com::sun::star::container::XNameAccess,
diff --git a/sc/inc/dptypes.hxx b/sc/inc/dptypes.hxx
index 7e272ff..980b559 100644
--- a/sc/inc/dptypes.hxx
+++ b/sc/inc/dptypes.hxx
@@ -12,9 +12,9 @@
#include <rtl/ustring.hxx>
-#include <boost/unordered_set.hpp>
+#include <unordered_set>
-typedef boost::unordered_set<OUString, OUStringHash> ScDPUniqueStringSet;
+typedef std::unordered_set<OUString, OUStringHash> ScDPUniqueStringSet;
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx
index d3f2b1e..0de3654 100644
--- a/sc/inc/externalrefmgr.hxx
+++ b/sc/inc/externalrefmgr.hxx
@@ -34,9 +34,9 @@
#include <formula/token.hxx>
#include <osl/mutex.hxx>
-#include <boost/unordered_map.hpp>
-#include <boost/unordered_set.hpp>
#include <boost/shared_ptr.hpp>
+#include <unordered_map>
+#include <unordered_set>
#include <vector>
#include <list>
#include <set>
@@ -119,8 +119,8 @@ private:
TokenRef mxToken;
sal_uLong mnFmtIndex;
};
- typedef ::boost::unordered_map<SCCOL, Cell> RowDataType;
- typedef ::boost::unordered_map<SCROW, RowDataType> RowsDataType;
+ typedef std::unordered_map<SCCOL, Cell> RowDataType;
+ typedef std::unordered_map<SCROW, RowDataType> RowsDataType;
public:
/**
@@ -201,7 +201,7 @@ public:
};
typedef ::boost::shared_ptr<Table> TableTypeRef;
- typedef ::boost::unordered_map< OUString, size_t, OUStringHash>
+ typedef std::unordered_map< OUString, size_t, OUStringHash>
TableNameIndexMap;
ScExternalRefCache();
@@ -327,9 +327,9 @@ private:
}
};
- typedef ::boost::unordered_map<OUString, TokenArrayRef, OUStringHash> RangeNameMap;
- typedef ::boost::unordered_map<ScRange, TokenArrayRef, RangeHash> RangeArrayMap;
- typedef ::boost::unordered_map<OUString, OUString, OUStringHash> NamePairMap;
+ typedef std::unordered_map<OUString, TokenArrayRef, OUStringHash> RangeNameMap;
+ typedef std::unordered_map<ScRange, TokenArrayRef, RangeHash> RangeArrayMap;
+ typedef std::unordered_map<OUString, OUString, OUStringHash> NamePairMap;
/** Represents data cached for a single external document. */
struct DocItem
@@ -351,7 +351,7 @@ private:
DocItem() : mbInitFromSource(false) {}
};
- typedef ::boost::unordered_map<sal_uInt16, DocItem> DocDataType;
+ typedef std::unordered_map<sal_uInt16, DocItem> DocDataType;
DocItem* getDocItem(sal_uInt16 nFileId) const;
private:
@@ -363,8 +363,8 @@ class SC_DLLPUBLIC ScExternalRefManager : public formula::ExternalReferenceHelpe
{
public:
- typedef ::std::set<ScFormulaCell*> RefCellSet;
- typedef ::boost::unordered_map<sal_uInt16, RefCellSet> RefCellMap;
+ typedef std::set<ScFormulaCell*> RefCellSet;
+ typedef std::unordered_map<sal_uInt16, RefCellSet> RefCellMap;
enum LinkUpdateType { LINK_MODIFIED, LINK_BROKEN };
@@ -414,13 +414,13 @@ private:
SrcShell() : maLastAccess( tools::Time::SYSTEM ) {}
};
- typedef ::boost::unordered_map<sal_uInt16, SrcShell> DocShellMap;
- typedef ::boost::unordered_map<sal_uInt16, bool> LinkedDocMap;
+ typedef std::unordered_map<sal_uInt16, SrcShell> DocShellMap;
+ typedef std::unordered_map<sal_uInt16, bool> LinkedDocMap;
- typedef ::boost::unordered_map<sal_uInt16, SvNumberFormatterMergeMap> NumFmtMap;
+ typedef std::unordered_map<sal_uInt16, SvNumberFormatterMergeMap> NumFmtMap;
- typedef ::boost::unordered_set<LinkListener*, LinkListener::Hash> LinkListeners;
- typedef ::boost::unordered_map<sal_uInt16, LinkListeners> LinkListenerMap;
+ typedef std::unordered_set<LinkListener*, LinkListener::Hash> LinkListeners;
+ typedef std::unordered_map<sal_uInt16, LinkListeners> LinkListenerMap;
public:
/** Source document meta-data container. */
diff --git a/sc/inc/formulagroup.hxx b/sc/inc/formulagroup.hxx
index 691260f..191b78e 100644
--- a/sc/inc/formulagroup.hxx
+++ b/sc/inc/formulagroup.hxx
@@ -23,10 +23,10 @@
#include <svl/sharedstringpool.hxx>
#include <set>
+#include <unordered_map>
#include <vector>
#include <boost/noncopyable.hpp>
#include <boost/ptr_container/ptr_vector.hpp>
-#include <boost/unordered_map.hpp>
class ScDocument;
class ScTokenArray;
@@ -84,7 +84,7 @@ struct FormulaGroupContext : boost::noncopyable
ColArray( NumArrayType* pNumArray, StrArrayType* pStrArray );
};
- typedef boost::unordered_map<ColKey, ColArray, ColKey::Hash> ColArraysType;
+ typedef std::unordered_map<ColKey, ColArray, ColKey::Hash> ColArraysType;
NumArrayStoreType maNumArrays; /// manage life cycle of numeric arrays.
StrArrayStoreType maStrArrays; /// manage life cycle of string arrays.
diff --git a/sc/inc/formulaparserpool.hxx b/sc/inc/formulaparserpool.hxx
index ebe78c0..cc2771b 100644
--- a/sc/inc/formulaparserpool.hxx
+++ b/sc/inc/formulaparserpool.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SC_INC_FORMULAPARSERPOOL_HXX
#define INCLUDED_SC_INC_FORMULAPARSERPOOL_HXX
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
#include <com/sun/star/sheet/XFormulaParser.hpp>
class ScDocument;
@@ -41,7 +41,7 @@ public:
getFormulaParser( const OUString& rNamespace );
private:
- typedef ::boost::unordered_map<
+ typedef std::unordered_map<
OUString,
::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaParser >,
OUStringHash,
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index 143caf8..28eb5e7 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -29,7 +29,6 @@
#include <rtl/ustring.hxx>
#include <boost/static_assert.hpp>
-#include <boost/unordered_map.hpp>
#include <vector>
class ImageList;
diff --git a/sc/inc/linkuno.hxx b/sc/inc/linkuno.hxx
index a6e605d..ca02619 100644
--- a/sc/inc/linkuno.hxx
+++ b/sc/inc/linkuno.hxx
@@ -44,7 +44,6 @@
#include "externalrefmgr.hxx"
-#include <boost/unordered_map.hpp>
#include <boost/ptr_container/ptr_vector.hpp>
class ScDocShell;
diff --git a/sc/inc/listenerquery.hxx b/sc/inc/listenerquery.hxx
index 65fbc0e..129ff0f 100644
--- a/sc/inc/listenerquery.hxx
+++ b/sc/inc/listenerquery.hxx
@@ -13,7 +13,7 @@
#include <address.hxx>
#include <svl/listener.hxx>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
class ScRangeList;
@@ -27,8 +27,8 @@ class RefQueryFormulaGroup : public SvtListener::QueryBase
{
public:
typedef std::vector<SCROW> ColType;
- typedef boost::unordered_map<SCCOL,ColType> ColsType;
- typedef boost::unordered_map<SCTAB,ColsType> TabsType;
+ typedef std::unordered_map<SCCOL,ColType> ColsType;
+ typedef std::unordered_map<SCTAB,ColsType> TabsType;
RefQueryFormulaGroup();
virtual ~RefQueryFormulaGroup();
diff --git a/sc/inc/lookupcache.hxx b/sc/inc/lookupcache.hxx
index 9ea2666..249b794 100644
--- a/sc/inc/lookupcache.hxx
+++ b/sc/inc/lookupcache.hxx
@@ -25,7 +25,7 @@
#include <formula/token.hxx>
#include <svl/listener.hxx>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
class ScDocument;
struct ScQueryEntry;
@@ -195,7 +195,7 @@ private:
}
};
- typedef ::boost::unordered_map< QueryKey, QueryCriteriaAndResult, QueryKey::Hash, ::std::equal_to< QueryKey > > QueryMap;
+ typedef std::unordered_map< QueryKey, QueryCriteriaAndResult, QueryKey::Hash, ::std::equal_to< QueryKey > > QueryMap;
QueryMap maQueryMap;
ScRange maRange;
ScDocument * mpDoc;
@@ -206,7 +206,7 @@ private:
};
-typedef ::boost::unordered_map< ScRange, ScLookupCache*, ScLookupCache::Hash, ::std::equal_to< ScRange > > ScLookupCacheMap;
+typedef std::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 fbf78ae..996ea65 100644
--- a/sc/inc/macromgr.hxx
+++ b/sc/inc/macromgr.hxx
@@ -15,9 +15,9 @@
#include <rtl/ustring.hxx>
#include "scdllapi.h"
-#include <boost/unordered_map.hpp>
-#include <boost/unordered_set.hpp>
#include <memory>
+#include <unordered_map>
+#include <unordered_set>
class ScDocument;
class ScFormulaCell;
@@ -38,7 +38,7 @@ public:
void BroadcastModuleUpdate(const OUString& aModuleName);
private:
- typedef boost::unordered_map< OUString, bool, OUStringHash, ::std::equal_to< OUString > > NameBoolMap;
+ typedef std::unordered_map< OUString, bool, OUStringHash, ::std::equal_to< OUString > > NameBoolMap;
NameBoolMap mhFuncToVolatile;
com::sun::star::uno::Reference< com::sun::star::container::XContainerListener > mxContainerListener;
diff --git a/sc/inc/mtvelements.hxx b/sc/inc/mtvelements.hxx
index 1d303ce..49a1646 100644
--- a/sc/inc/mtvelements.hxx
+++ b/sc/inc/mtvelements.hxx
@@ -32,7 +32,7 @@
#include <mdds/multi_type_vector_custom_func1.hpp>
#include <mdds/multi_type_vector_custom_func3.hpp>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
class ScDocument;
struct ScRefCellValue;
@@ -125,8 +125,8 @@ struct ColumnBlockConstPosition
class ColumnBlockPositionSet
{
- typedef boost::unordered_map<SCCOL, ColumnBlockPosition> ColumnsType;
- typedef boost::unordered_map<SCTAB, ColumnsType> TablesType;
+ typedef std::unordered_map<SCCOL, ColumnBlockPosition> ColumnsType;
+ typedef std::unordered_map<SCTAB, ColumnsType> TablesType;
ScDocument& mrDoc;
TablesType maTables;
diff --git a/sc/inc/pch/precompiled_vbaobj.hxx b/sc/inc/pch/precompiled_vbaobj.hxx
index 84abd83..806cf65 100644
--- a/sc/inc/pch/precompiled_vbaobj.hxx
+++ b/sc/inc/pch/precompiled_vbaobj.hxx
@@ -23,7 +23,6 @@
#include <basic/sbx.hxx>
#include <basic/sbxobj.hxx>
#include <boost/scoped_ptr.hpp>
-#include <boost/unordered_map.hpp>
#include <com/sun/star/awt/FontSlant.hpp>
#include <com/sun/star/awt/FontStrikeout.hpp>
#include <com/sun/star/awt/FontUnderline.hpp>
@@ -315,6 +314,7 @@
#include <toolkit/helper/vclunohelper.hxx>
#include <tools/diagnose_ex.h>
#include <tools/urlobj.hxx>
+#include <unordered_map>
#include <unotools/eventcfg.hxx>
#include <vbahelper/helperdecl.hxx>
#include <vbahelper/vbacollectionimpl.hxx>
diff --git a/sc/inc/refupdatecontext.hxx b/sc/inc/refupdatecontext.hxx
index 393a855..1de44a6 100644
--- a/sc/inc/refupdatecontext.hxx
+++ b/sc/inc/refupdatecontext.hxx
@@ -14,8 +14,8 @@
#include "address.hxx"
#include "columnset.hxx"
-#include <boost/unordered_map.hpp>
-#include <boost/unordered_set.hpp>
+#include <unordered_map>
+#include <unordered_set>
class ScDocument;
@@ -27,8 +27,8 @@ namespace sc {
*/
class UpdatedRangeNames
{
- typedef boost::unordered_set<sal_uInt16> NameIndicesType;
- typedef boost::unordered_map<SCTAB, NameIndicesType> UpdatedNamesType;
+ typedef std::unordered_set<sal_uInt16> NameIndicesType;
+ typedef std::unordered_map<SCTAB, NameIndicesType> UpdatedNamesType;
UpdatedNamesType maUpdatedNames;
diff --git a/sc/inc/reordermap.hxx b/sc/inc/reordermap.hxx
index 8323384..b7c5dfc 100644
--- a/sc/inc/reordermap.hxx
+++ b/sc/inc/reordermap.hxx
@@ -11,13 +11,13 @@
#define INCLUDED_SC_REORDERMAP_HXX
#include <types.hxx>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
namespace sc {
class ColRowReorderMapType
{
- typedef boost::unordered_map<SCCOLROW,SCCOLROW> DataType;
+ typedef std::unordered_map<SCCOLROW,SCCOLROW> DataType;
DataType maData;
public:
typedef DataType::value_type value_type;
diff --git a/sc/inc/sheetdata.hxx b/sc/inc/sheetdata.hxx
index 5df7d72..e57e486 100644
--- a/sc/inc/sheetdata.hxx
+++ b/sc/inc/sheetdata.hxx
@@ -22,8 +22,8 @@
#include <xmloff/maptype.hxx>
#include <editeng/editdata.hxx>
+#include <unordered_set>
#include <vector>
-#include <boost/unordered_set.hpp>
#include "address.hxx"
@@ -104,7 +104,7 @@ struct ScLoadedNamespaceEntry
class ScSheetSaveData
{
- boost::unordered_set<OUString, OUStringHash> maInitialPrefixes;
+ std::unordered_set<OUString, OUStringHash> maInitialPrefixes;
std::vector<ScLoadedNamespaceEntry> maLoadedNamespaces;
std::vector<ScCellStyleEntry> maCellStyles;
diff --git a/sc/inc/spellcheckcontext.hxx b/sc/inc/spellcheckcontext.hxx
index 3804c37..00f5673 100644
--- a/sc/inc/spellcheckcontext.hxx
+++ b/sc/inc/spellcheckcontext.hxx
@@ -13,7 +13,7 @@
#include "address.hxx"
#include <editeng/misspellrange.hxx>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
namespace sc {
@@ -40,7 +40,7 @@ struct SpellCheckContext
bool operator== (const CellPos& r) const;
};
- typedef boost::unordered_map<CellPos, std::vector<editeng::MisspellRanges>, CellPos::Hash> CellMapType;
+ typedef std::unordered_map<CellPos, std::vector<editeng::MisspellRanges>, CellPos::Hash> CellMapType;
CellPos maPos;
CellMapType maMisspellCells;
diff --git a/sc/inc/tokenstringcontext.hxx b/sc/inc/tokenstringcontext.hxx
index 4ccc40b..c33f6da 100644
--- a/sc/inc/tokenstringcontext.hxx
+++ b/sc/inc/tokenstringcontext.hxx
@@ -12,7 +12,7 @@
#include "compiler.hxx"
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
class ScDocument;
@@ -26,9 +26,9 @@ namespace sc {
*/
struct SC_DLLPUBLIC TokenStringContext
{
- typedef boost::unordered_map<sal_uInt16, OUString> IndexNameMapType;
- typedef boost::unordered_map<size_t, std::vector<OUString> > IndexNamesMapType;
- typedef boost::unordered_map<SCTAB, IndexNameMapType> TabIndexMapType;
+ typedef std::unordered_map<sal_uInt16, OUString> IndexNameMapType;
+ typedef std::unordered_map<size_t, std::vector<OUString> > IndexNamesMapType;
+ typedef std::unordered_map<SCTAB, IndexNameMapType> TabIndexMapType;
formula::FormulaGrammar::Grammar meGram;
formula::FormulaCompiler::OpCodeMapPtr mxOpCodeMap;
diff --git a/sc/source/core/data/bcaslot.cxx b/sc/source/core/data/bcaslot.cxx
index 12aeee7..effbc39 100644
--- a/sc/source/core/data/bcaslot.cxx
+++ b/sc/source/core/data/bcaslot.cxx
@@ -159,7 +159,7 @@ ScBroadcastAreaSlot::~ScBroadcastAreaSlot()
// deleted.
ScBroadcastArea* pArea = (*aIter).mpArea;
// Erase all so no hash will be accessed upon destruction of the
- // boost::unordered_map.
+ // unordered_map.
aBroadcastAreaTbl.erase( aIter++);
if (!pArea->DecRef())
delete pArea;
@@ -248,7 +248,7 @@ void ScBroadcastAreaSlot::EndListeningArea(
OSL_ENSURE(pListener, "EndListeningArea: pListener Null");
if ( !rpArea )
{
- ScBroadcastAreas::const_iterator aIter( FindBroadcastArea( rRange, bGroupListening));
+ ScBroadcastAreas::iterator aIter( FindBroadcastArea( rRange, bGroupListening));
if (aIter == aBroadcastAreaTbl.end() || isMarkedErased( aIter))
return;
rpArea = (*aIter).mpArea;
@@ -264,7 +264,7 @@ void ScBroadcastAreaSlot::EndListeningArea(
{
if (rpArea && !rpArea->GetBroadcaster().HasListeners())
{
- ScBroadcastAreas::const_iterator aIter( FindBroadcastArea( rRange, bGroupListening));
+ ScBroadcastAreas::iterator aIter( FindBroadcastArea( rRange, bGroupListening));
if (aIter == aBroadcastAreaTbl.end() || isMarkedErased( aIter))
return;
OSL_ENSURE( (*aIter).mpArea == rpArea, "EndListeningArea: area pointer mismatch");
@@ -275,8 +275,8 @@ void ScBroadcastAreaSlot::EndListeningArea(
}
}
-ScBroadcastAreas::const_iterator ScBroadcastAreaSlot::FindBroadcastArea(
- const ScRange& rRange, bool bGroupListening ) const
+ScBroadcastAreas::iterator ScBroadcastAreaSlot::FindBroadcastArea(
+ const ScRange& rRange, bool bGroupListening )
{
aTmpSeekBroadcastArea.UpdateRange( rRange);
aTmpSeekBroadcastArea.SetGroupListening(bGroupListening);
diff --git a/sc/source/core/data/columnset.cxx b/sc/source/core/data/columnset.cxx
index 62f1ac4..84935e5 100644
--- a/sc/source/core/data/columnset.cxx
+++ b/sc/source/core/data/columnset.cxx
@@ -8,6 +8,7 @@
*/
#include "columnset.hxx"
+#include <algorithm>
namespace sc {
diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index 2dc66d3..c6e8162 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -694,7 +694,7 @@ OUString ScDPCache::GetDimensionName(LabelsType::size_type nDim) const
namespace {
-typedef boost::unordered_set<OUString, OUStringHash> LabelSet;
+typedef std::unordered_set<OUString, OUStringHash> LabelSet;
class InsertLabel : public std::unary_function<OUString, void>
{
diff --git a/sc/source/core/data/dpfilteredcache.cxx b/sc/source/core/data/dpfilteredcache.cxx
index d3e51de..f20b577 100644
--- a/sc/source/core/data/dpfilteredcache.cxx
+++ b/sc/source/core/data/dpfilteredcache.cxx
@@ -257,7 +257,7 @@ bool ScDPFilteredCache::isRowActive(sal_Int32 nRow, sal_Int32* pLastRow) const
return bFilter && bPage;
}
-void ScDPFilteredCache::filterByPageDimension(const vector<Criterion>& rCriteria, const boost::unordered_set<sal_Int32>& rRepeatIfEmptyDims)
+void ScDPFilteredCache::filterByPageDimension(const vector<Criterion>& rCriteria, const std::unordered_set<sal_Int32>& rRepeatIfEmptyDims)
{
SCROW nRowSize = getRowSize();
@@ -308,7 +308,7 @@ const ::std::vector<SCROW>& ScDPFilteredCache::getFieldEntries( sal_Int32 nColu
}
void ScDPFilteredCache::filterTable(const vector<Criterion>& rCriteria, Sequence< Sequence<Any> >& rTabData,
- const boost::unordered_set<sal_Int32>& rRepeatIfEmptyDims)
+ const std::unordered_set<sal_Int32>& rRepeatIfEmptyDims)
{
sal_Int32 nRowSize = getRowSize();
sal_Int32 nColSize = getColSize();
@@ -391,7 +391,7 @@ bool ScDPFilteredCache::empty() const
}
bool ScDPFilteredCache::isRowQualified(sal_Int32 nRow, const vector<Criterion>& rCriteria,
- const boost::unordered_set<sal_Int32>& rRepeatIfEmptyDims) const
+ const std::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 23d06a3..dcfa706 100644
--- a/sc/source/core/data/dpgroup.cxx
+++ b/sc/source/core/data/dpgroup.cxx
@@ -36,9 +36,9 @@
#include <com/sun/star/sheet/DataPilotFieldFilter.hpp>
#include <com/sun/star/i18n/CalendarDisplayIndex.hpp>
+#include <unordered_map>
+#include <unordered_set>
#include <vector>
-#include <boost/unordered_map.hpp>
-#include <boost/unordered_set.hpp>
using namespace ::com::sun::star;
using ::com::sun::star::uno::Any;
@@ -657,7 +657,7 @@ public:
void ScDPGroupTableData::ModifyFilterCriteria(vector<ScDPFilteredCache::Criterion>& rCriteria)
{
// Build dimension ID to object map for group dimensions.
- typedef boost::unordered_map<long, const ScDPGroupDimension*> GroupFieldMapType;
+ typedef std::unordered_map<long, const ScDPGroupDimension*> GroupFieldMapType;
GroupFieldMapType aGroupFieldIds;
{
ScDPGroupDimensionVec::const_iterator itr = aGroups.begin(), itrEnd = aGroups.end();
@@ -772,14 +772,14 @@ void ScDPGroupTableData::ModifyFilterCriteria(vector<ScDPFilteredCache::Criterio
rCriteria.swap(aNewCriteria);
}
-void ScDPGroupTableData::FilterCacheTable(const vector<ScDPFilteredCache::Criterion>& rCriteria, const boost::unordered_set<sal_Int32>& rCatDims)
+void ScDPGroupTableData::FilterCacheTable(const vector<ScDPFilteredCache::Criterion>& rCriteria, const std::unordered_set<sal_Int32>& rCatDims)
{
vector<ScDPFilteredCache::Criterion> aNewCriteria(rCriteria);
ModifyFilterCriteria(aNewCriteria);
pSourceData->FilterCacheTable(aNewCriteria, rCatDims);
}
-void ScDPGroupTableData::GetDrillDownData(const vector<ScDPFilteredCache::Criterion>& rCriteria, const boost::unordered_set<sal_Int32>& rCatDims, Sequence< Sequence<Any> >& rData)
+void ScDPGroupTableData::GetDrillDownData(const vector<ScDPFilteredCache::Criterion>& rCriteria, const std::unordered_set<sal_Int32>& rCatDims, Sequence< Sequence<Any> >& rData)
{
vector<ScDPFilteredCache::Criterion> aNewCriteria(rCriteria);
ModifyFilterCriteria(aNewCriteria);
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index 2435d40..fb8a3b3 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -79,8 +79,6 @@
#include <vector>
#include <memory>
-#include <boost/unordered_map.hpp>
-
using namespace com::sun::star;
using ::std::vector;
using ::std::unary_function;
diff --git a/sc/source/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxx
index 154cc13..949a997 100644
--- a/sc/source/core/data/dpsave.cxx
+++ b/sc/source/core/data/dpsave.cxx
@@ -47,8 +47,8 @@
#include <com/sun/star/sheet/DataPilotFieldReferenceType.hpp>
#include <com/sun/star/sheet/DataPilotFieldReferenceItemType.hpp>
-#include <boost/unordered_map.hpp>
-#include <boost/unordered_set.hpp>
+#include <unordered_map>
+#include <unordered_set>
using namespace com::sun::star;
using namespace com::sun::star::sheet;
@@ -677,9 +677,9 @@ void ScDPSaveDimension::WriteToSource( const uno::Reference<uno::XInterface>& xD
ScUnoHelpFunctions::SetOptionalPropertyValue(xDimProp, SC_UNO_DP_HAS_HIDDEN_MEMBER, bHasHiddenMember);
}
-void ScDPSaveDimension::UpdateMemberVisibility(const boost::unordered_map<OUString, bool, OUStringHash>& rData)
+void ScDPSaveDimension::UpdateMemberVisibility(const std::unordered_map<OUString, bool, OUStringHash>& rData)
{
- typedef boost::unordered_map<OUString, bool, OUStringHash> DataMap;
+ typedef std::unordered_map<OUString, bool, OUStringHash> DataMap;
MemberList::iterator itrMem = maMemberList.begin(), itrMemEnd = maMemberList.end();
for (; itrMem != itrMemEnd; ++itrMem)
{
@@ -1329,7 +1329,7 @@ void ScDPSaveData::BuildAllDimensionMembers(ScDPTableData* pData)
return;
// First, build a dimension name-to-index map.
- typedef boost::unordered_map<OUString, long, OUStringHash> NameIndexMap;
+ typedef std::unordered_map<OUString, long, OUStringHash> NameIndexMap;
NameIndexMap aMap;
long nColCount = pData->GetColumnCount();
for (long i = 0; i < nColCount; ++i)
@@ -1372,7 +1372,7 @@ void ScDPSaveData::BuildAllDimensionMembers(ScDPTableData* pData)
void ScDPSaveData::SyncAllDimensionMembers(ScDPTableData* pData)
{
- typedef boost::unordered_map<OUString, long, OUStringHash> NameIndexMap;
+ typedef std::unordered_map<OUString, long, OUStringHash> NameIndexMap;
// First, build a dimension name-to-index map.
NameIndexMap aMap;
diff --git a/sc/source/core/data/dpsdbtab.cxx b/sc/source/core/data/dpsdbtab.cxx
index 4cc16c5..706357c 100644
--- a/sc/source/core/data/dpsdbtab.cxx
+++ b/sc/source/core/data/dpsdbtab.cxx
@@ -124,14 +124,14 @@ void ScDatabaseDPData::CreateCacheTable()
aCacheTable.fillTable();
}
-void ScDatabaseDPData::FilterCacheTable(const vector<ScDPFilteredCache::Criterion>& rCriteria, const boost::unordered_set<sal_Int32>& rCatDims)
+void ScDatabaseDPData::FilterCacheTable(const vector<ScDPFilteredCache::Criterion>& rCriteria, const std::unordered_set<sal_Int32>& rCatDims)
{
CreateCacheTable();
aCacheTable.filterByPageDimension(
- rCriteria, (IsRepeatIfEmpty() ? rCatDims : boost::unordered_set<sal_Int32>()));
+ rCriteria, (IsRepeatIfEmpty() ? rCatDims : std::unordered_set<sal_Int32>()));
}
-void ScDatabaseDPData::GetDrillDownData(const vector<ScDPFilteredCache::Criterion>& rCriteria, const boost::unordered_set<sal_Int32>& rCatDims, Sequence< Sequence<Any> >& rData)
+void ScDatabaseDPData::GetDrillDownData(const vector<ScDPFilteredCache::Criterion>& rCriteria, const std::unordered_set<sal_Int32>& rCatDims, Sequence< Sequence<Any> >& rData)
{
CreateCacheTable();
sal_Int32 nRowSize = aCacheTable.getRowSize();
@@ -139,7 +139,7 @@ void ScDatabaseDPData::GetDrillDownData(const vector<ScDPFilteredCache::Criterio
return;
aCacheTable.filterTable(
- rCriteria, rData, IsRepeatIfEmpty() ? rCatDims : boost::unordered_set<sal_Int32>());
+ rCriteria, rData, IsRepeatIfEmpty() ? rCatDims : std::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 120175e..64e0fca 100644
--- a/sc/source/core/data/dpshttab.cxx
+++ b/sc/source/core/data/dpshttab.cxx
@@ -174,14 +174,14 @@ void ScSheetDPData::CreateCacheTable()
aCacheTable.fillTable(aQuery, bIgnoreEmptyRows, bRepeatIfEmpty);
}
-void ScSheetDPData::FilterCacheTable(const vector<ScDPFilteredCache::Criterion>& rCriteria, const boost::unordered_set<sal_Int32>& rCatDims)
+void ScSheetDPData::FilterCacheTable(const vector<ScDPFilteredCache::Criterion>& rCriteria, const std::unordered_set<sal_Int32>& rCatDims)
{
CreateCacheTable();
aCacheTable.filterByPageDimension(
- rCriteria, (IsRepeatIfEmpty() ? rCatDims : boost::unordered_set<sal_Int32>()));
+ rCriteria, (IsRepeatIfEmpty() ? rCatDims : std::unordered_set<sal_Int32>()));
}
-void ScSheetDPData::GetDrillDownData(const vector<ScDPFilteredCache::Criterion>& rCriteria, const boost::unordered_set<sal_Int32>& rCatDims, Sequence< Sequence<Any> >& rData)
+void ScSheetDPData::GetDrillDownData(const vector<ScDPFilteredCache::Criterion>& rCriteria, const std::unordered_set<sal_Int32>& rCatDims, Sequence< Sequence<Any> >& rData)
{
CreateCacheTable();
sal_Int32 nRowSize = aCacheTable.getRowSize();
@@ -189,7 +189,7 @@ void ScSheetDPData::GetDrillDownData(const vector<ScDPFilteredCache::Criterion>&
return;
aCacheTable.filterTable(
- rCriteria, rData, IsRepeatIfEmpty() ? rCatDims : boost::unordered_set<sal_Int32>());
+ rCriteria, rData, IsRepeatIfEmpty() ? rCatDims : std::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 e953e48..7d543c0 100644
--- a/sc/source/core/data/dptabres.cxx
+++ b/sc/source/core/data/dptabres.cxx
@@ -37,9 +37,9 @@
#include <math.h>
#include <float.h>
#include <algorithm>
+#include <unordered_map>
#include <boost/checked_delete.hpp>
#include <boost/scoped_ptr.hpp>
-#include <boost/unordered_map.hpp>
#include <com/sun/star/sheet/DataResultFlags.hpp>
#include <com/sun/star/sheet/MemberResultFlags.hpp>
@@ -3884,7 +3884,7 @@ void ScDPResultVisibilityData::addVisibleMember(const OUString& rDimName, const
void ScDPResultVisibilityData::fillFieldFilters(vector<ScDPFilteredCache::Criterion>& rFilters) const
{
- typedef boost::unordered_map<OUString, long, OUStringHash> FieldNameMapType;
+ typedef std::unordered_map<OUString, long, OUStringHash> 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 4833be4..928e110 100644
--- a/sc/source/core/data/dptabsrc.cxx
+++ b/sc/source/core/data/dptabsrc.cxx
@@ -20,10 +20,9 @@
#include "dptabsrc.hxx"
#include <algorithm>
-#include <vector>
#include <set>
-#include <boost/unordered_set.hpp>
-#include <boost/unordered_map.hpp>
+#include <unordered_set>
+#include <vector>
#include <rtl/math.hxx>
#include <svl/itemprop.hxx>
@@ -493,7 +492,7 @@ Sequence< Sequence<Any> > SAL_CALL ScDPSource::getDrillDownData(const Sequence<s
aResVisData.fillFieldFilters(aFilterCriteria);
Sequence< Sequence<Any> > aTabData;
- boost::unordered_set<sal_Int32> aCatDims;
+ std::unordered_set<sal_Int32> aCatDims;
GetCategoryDimensionIndices(aCatDims);
pData->GetDrillDownData(aFilterCriteria, aCatDims, aTabData);
return aTabData;
@@ -687,9 +686,9 @@ namespace {
class CategoryDimInserter : std::unary_function<long, void>
{
ScDPSource& mrSource;
- boost::unordered_set<sal_Int32>& mrCatDims;
+ std::unordered_set<sal_Int32>& mrCatDims;
public:
- CategoryDimInserter(ScDPSource& rSource, boost::unordered_set<sal_Int32>& rCatDims) :
+ CategoryDimInserter(ScDPSource& rSource, std::unordered_set<sal_Int32>& rCatDims) :
mrSource(rSource),
mrCatDims(rCatDims) {}
@@ -702,9 +701,9 @@ public:
}
-void ScDPSource::GetCategoryDimensionIndices(boost::unordered_set<sal_Int32>& rCatDims)
+void ScDPSource::GetCategoryDimensionIndices(std::unordered_set<sal_Int32>& rCatDims)
{
- boost::unordered_set<sal_Int32> aCatDims;
+ std::unordered_set<sal_Int32> aCatDims;
CategoryDimInserter aInserter(*this, aCatDims);
std::for_each(maColDims.begin(), maColDims.end(), aInserter);
@@ -773,7 +772,7 @@ void ScDPSource::FilterCacheByPageDimensions()
}
if (!aCriteria.empty())
{
- boost::unordered_set<sal_Int32> aCatDims;
+ std::unordered_set<sal_Int32> aCatDims;
GetCategoryDimensionIndices(aCatDims);
pData->FilterCacheTable(aCriteria, aCatDims);
bPageFiltered = true;
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index f520cd6..9aca1be 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -67,11 +67,11 @@
#include <svl/sharedstringpool.hxx>
+#include <unordered_set>
#include <vector>
#include <boost/checked_delete.hpp>
#include <boost/scoped_ptr.hpp>
#include <boost/scoped_array.hpp>
-#include <boost/unordered_set.hpp>
#include <boost/noncopyable.hpp>
#include <boost/ptr_container/ptr_vector.hpp>
#include <mdds/flat_segment_tree.hpp>
@@ -2928,7 +2928,7 @@ void lcl_PrepareQuery( const ScDocument* pDoc, ScTable* pTab, ScQueryParam& rPar
SCSIZE ScTable::Query(ScQueryParam& rParamOrg, bool bKeepSub)
{
ScQueryParam aParam( rParamOrg );
- typedef boost::unordered_set<OUString, OUStringHash> StrSetType;
+ typedef std::unordered_set<OUString, OUStringHash> StrSetType;
StrSetType aStrSet;
bool bStarted = false;
diff --git a/sc/source/core/inc/bcaslot.hxx b/sc/source/core/inc/bcaslot.hxx
index a566440..6f5dfe4 100644
--- a/sc/source/core/inc/bcaslot.hxx
+++ b/sc/source/core/inc/bcaslot.hxx
@@ -20,10 +20,10 @@
#ifndef INCLUDED_SC_SOURCE_CORE_INC_BCASLOT_HXX
#define INCLUDED_SC_SOURCE_CORE_INC_BCASLOT_HXX
+#include <functional>
#include <set>
-#include <boost/unordered_set.hpp>
+#include <unordered_set>
#include <boost/ptr_container/ptr_map.hpp>
-#include <functional>
#include <svl/broadcast.hxx>
@@ -118,7 +118,7 @@ struct ScBroadcastAreaEqual
}
};
-typedef ::boost::unordered_set< ScBroadcastAreaEntry, ScBroadcastAreaHash, ScBroadcastAreaEqual > ScBroadcastAreas;
+typedef std::unordered_set< ScBroadcastAreaEntry, ScBroadcastAreaHash, ScBroadcastAreaEqual > ScBroadcastAreas;
struct ScBroadcastAreaBulkHash
{
@@ -136,7 +136,7 @@ struct ScBroadcastAreaBulkEqual
}
};
-typedef ::boost::unordered_set< const ScBroadcastArea*, ScBroadcastAreaBulkHash,
+typedef std::unordered_set< const ScBroadcastArea*, ScBroadcastAreaBulkHash,
ScBroadcastAreaBulkEqual > ScBroadcastAreasBulk;
class ScBroadcastAreaSlotMachine;
@@ -160,7 +160,7 @@ private:
*/
bool mbHasErasedArea;
- ScBroadcastAreas::const_iterator FindBroadcastArea( const ScRange& rRange, bool bGroupListening ) const;
+ ScBroadcastAreas::iterator FindBroadcastArea( const ScRange& rRange, bool bGroupListening );
/**
More hypothetical (memory would probably be doomed anyway) check
@@ -175,10 +175,10 @@ private:
/** Finally erase all areas pushed as to-be-erased. */
void FinallyEraseAreas();
- bool isMarkedErased( const ScBroadcastAreas::iterator& rIter )
- {
- return (*rIter).mbErasure;
- }
+ bool isMarkedErased( const ScBroadcastAreas::const_iterator& rIter ) const
+ {
+ return rIter->mbErasure;
+ }
public:
ScBroadcastAreaSlot( ScDocument* pDoc,
diff --git a/sc/source/core/inc/cellkeytranslator.hxx b/sc/source/core/inc/cellkeytranslator.hxx
index 33a50a6..75b62ec 100644
--- a/sc/source/core/inc/cellkeytranslator.hxx
+++ b/sc/source/core/inc/cellkeytranslator.hxx
@@ -23,9 +23,9 @@
#include "global.hxx"
#include <formula/opcode.hxx>
#include <unotools/transliterationwrapper.hxx>
-#include <boost/unordered_map.hpp>
#include <list>
#include <memory>
+#include <unordered_map>
#include <com/sun/star/lang/Locale.hpp>
@@ -40,7 +40,7 @@ struct ScCellKeyword
ScCellKeyword(const sal_Char* pName, OpCode eOpCode, const ::com::sun::star::lang::Locale& rLocale);
};
-typedef ::boost::unordered_map< OUString, ::std::list<ScCellKeyword>, OUStringHash > ScCellKeywordHashMap;
+typedef std::unordered_map< OUString, ::std::list<ScCellKeyword>, OUStringHash > ScCellKeywordHashMap;
/** Translate cell function keywords.
diff --git a/sc/source/core/tool/cellkeytranslator.cxx b/sc/source/core/tool/cellkeytranslator.cxx
index 6bb3254..cc21ebc 100644
--- a/sc/source/core/tool/cellkeytranslator.cxx
+++ b/sc/source/core/tool/cellkeytranslator.cxx
@@ -27,7 +27,6 @@
using ::com::sun::star::uno::Sequence;
using ::std::list;
-using ::boost::unordered_map;
using namespace ::com::sun::star;
diff --git a/sc/source/core/tool/chartlis.cxx b/sc/source/core/tool/chartlis.cxx
index bf16b3e..1d2ec69 100644
--- a/sc/source/core/tool/chartlis.cxx
+++ b/sc/source/core/tool/chartlis.cxx
@@ -142,9 +142,9 @@ ScChartListener::ScChartListener( const ScChartListener& r ) :
// was listening to.
ScExternalRefManager* pRefMgr = mpDoc->GetExternalRefManager();
- const boost::unordered_set<sal_uInt16>& rFileIds = r.mpExtRefListener->getAllFileIds();
+ const std::unordered_set<sal_uInt16>& rFileIds = r.mpExtRefListener->getAllFileIds();
mpExtRefListener.reset(new ExternalRefListener(*this, mpDoc));
- boost::unordered_set<sal_uInt16>::const_iterator itr = rFileIds.begin(), itrEnd = rFileIds.end();
+ std::unordered_set<sal_uInt16>::const_iterator itr = rFileIds.begin(), itrEnd = rFileIds.end();
for (; itr != itrEnd; ++itr)
{
pRefMgr->addLinkListener(*itr, mpExtRefListener.get());
@@ -163,8 +163,8 @@ ScChartListener::~ScChartListener()
{
// Stop listening to all external files.
ScExternalRefManager* pRefMgr = mpDoc->GetExternalRefManager();
- const boost::unordered_set<sal_uInt16>& rFileIds = mpExtRefListener->getAllFileIds();
- boost::unordered_set<sal_uInt16>::const_iterator itr = rFileIds.begin(), itrEnd = rFileIds.end();
+ const std::unordered_set<sal_uInt16>& rFileIds = mpExtRefListener->getAllFileIds();
+ std::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/formulagroup.cxx b/sc/source/core/tool/formulagroup.cxx
index 31ff652..870c06a 100644
--- a/sc/source/core/tool/formulagroup.cxx
+++ b/sc/source/core/tool/formulagroup.cxx
@@ -26,11 +26,11 @@
#endif
#include <rtl/bootstrap.hxx>
-#include <vector>
#include <boost/scoped_array.hpp>
-#include <boost/unordered_map.hpp>
#include <cstdio>
+#include <unordered_map>
+#include <vector>
#if HAVE_FEATURE_OPENCL
#include <opencl/openclwrapper.hxx>
@@ -312,7 +312,7 @@ bool FormulaGroupInterpreterSoftware::interpret(ScDocument& rDoc, const ScAddres
ScFormulaCellGroupRef& xGroup,
ScTokenArray& rCode)
{
- typedef boost::unordered_map<const formula::FormulaToken*, formula::FormulaTokenRef> CachedTokensType;
+ typedef std::unordered_map<const formula::FormulaToken*, formula::FormulaTokenRef> CachedTokensType;
// Decompose the group into individual cells and calculate them individually.
diff --git a/sc/source/core/tool/formulaparserpool.cxx b/sc/source/core/tool/formulaparserpool.cxx
index 653f4c3..c310279 100644
--- a/sc/source/core/tool/formulaparserpool.cxx
+++ b/sc/source/core/tool/formulaparserpool.cxx
@@ -46,9 +46,9 @@ public:
const OUString& rNamespace );
private:
- typedef ::boost::unordered_map<
+ typedef std::unordered_map<
OUString, Reference< XSingleComponentFactory >,
- OUStringHash, ::std::equal_to< OUString > > FactoryMap;
+ OUStringHash, std::equal_to< OUString > > FactoryMap;
Reference< XComponentContext > mxContext; /// Global component context.
FactoryMap maFactories; /// All parser factories, mapped by formula namespace.
diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx
index 55d4f1f..c1d342e 100644
--- a/sc/source/filter/excel/excimp8.cxx
+++ b/sc/source/filter/excel/excimp8.cxx
@@ -116,8 +116,8 @@ typedef ::cppu::WeakImplHelper1< container::XNameContainer > OleNameOverrideCont
class OleNameOverrideContainer : public OleNameOverrideContainer_BASE
{
private:
- typedef boost::unordered_map< OUString, uno::Reference< container::XIndexContainer >, OUStringHash,
- ::std::equal_to< OUString > > NamedIndexToOleName;
+ typedef std::unordered_map< OUString, uno::Reference< container::XIndexContainer >, OUStringHash,
+ std::equal_to< OUString > > NamedIndexToOleName;
NamedIndexToOleName IdToOleNameHash;
::osl::Mutex m_aMutex;
public:
diff --git a/sc/source/filter/excel/xepivotxml.cxx b/sc/source/filter/excel/xepivotxml.cxx
index 3f7d320..fa04e1f 100644
--- a/sc/source/filter/excel/xepivotxml.cxx
+++ b/sc/source/filter/excel/xepivotxml.cxx
@@ -403,7 +403,7 @@ struct DataField
void XclExpXmlPivotTables::SavePivotTableXml( XclExpXmlStream& rStrm, const ScDPObject& rDPObj, sal_Int32 nCacheId )
{
- typedef boost::unordered_map<OUString, long, OUStringHash> NameToIdMapType;
+ typedef std::unordered_map<OUString, long, OUStringHash> NameToIdMapType;
const XclExpXmlPivotCaches::Entry* pCacheEntry = mrCaches.GetCache(nCacheId);
if (!pCacheEntry)
diff --git a/sc/source/filter/inc/htmlpars.hxx b/sc/source/filter/inc/htmlpars.hxx
index d39737a..b582498 100644
--- a/sc/source/filter/inc/htmlpars.hxx
+++ b/sc/source/filter/inc/htmlpars.hxx
@@ -20,14 +20,14 @@
#ifndef INCLUDED_SC_SOURCE_FILTER_INC_HTMLPARS_HXX
#define INCLUDED_SC_SOURCE_FILTER_INC_HTMLPARS_HXX
+#include <list>
#include <memory>
+#include <map>
#include <stack>
+#include <unordered_map>
#include <vector>
-#include <list>
-#include <map>
#include <o3tl/sorted_vector.hxx>
#include <boost/ptr_container/ptr_map.hpp>
-#include <boost/unordered_map.hpp>
#include "rangelst.hxx"
#include "eeparser.hxx"
@@ -48,7 +48,7 @@ class ScHTMLTable;
*/
class ScHTMLStyles
{
- typedef ::boost::unordered_map<OUString, OUString, OUStringHash> PropsType;
+ typedef std::unordered_map<OUString, OUString, OUStringHash> PropsType;
typedef ::boost::ptr_map<OUString, PropsType> NamePropsType;
typedef ::boost::ptr_map<OUString, NamePropsType> ElemsType;
diff --git a/sc/source/filter/inc/imp_op.hxx b/sc/source/filter/inc/imp_op.hxx
index 241338a..ebbcd40 100644
--- a/sc/source/filter/inc/imp_op.hxx
+++ b/sc/source/filter/inc/imp_op.hxx
@@ -34,7 +34,7 @@
#include <boost/shared_ptr.hpp>
#include <boost/ptr_container/ptr_vector.hpp>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
class SvStream;
@@ -88,7 +88,7 @@ protected:
sal_uInt16 mnXF;
ScFormulaCell* mpCell;
};
- typedef boost::unordered_map<SCCOL, LastFormula> LastFormulaMapType;
+ typedef std::unordered_map<SCCOL, LastFormula> LastFormulaMapType;
static const double fExcToTwips; // translate 1/256 chars -> Twips
diff --git a/sc/source/filter/inc/namebuff.hxx b/sc/source/filter/inc/namebuff.hxx
index 332fef0..520d5fd 100644
--- a/sc/source/filter/inc/namebuff.hxx
+++ b/sc/source/filter/inc/namebuff.hxx
@@ -29,8 +29,8 @@
#include "rangenam.hxx"
#include "formulacell.hxx"
-#include <boost/unordered_map.hpp>
#include <list>
+#include <unordered_map>
class ScTokenArray;
class NameBuffer;
@@ -139,7 +139,7 @@ inline void NameBuffer::SetBase( sal_uInt16 nNewBase )
*/
class SharedFormulaBuffer : public ExcRoot
{
- typedef boost::unordered_map<ScAddress, ScTokenArray*, ScAddressHashFunctor> TokenArraysType;
+ typedef std::unordered_map<ScAddress, ScTokenArray*, ScAddressHashFunctor> TokenArraysType;
TokenArraysType maTokenArrays;
public:
diff --git a/sc/source/filter/inc/orcusinterface.hxx b/sc/source/filter/inc/orcusinterface.hxx
index 9c37aae..a778310 100644
--- a/sc/source/filter/inc/orcusinterface.hxx
+++ b/sc/source/filter/inc/orcusinterface.hxx
@@ -21,9 +21,8 @@
#include <orcus/spreadsheet/import_interface.hpp>
#include <boost/ptr_container/ptr_vector.hpp>
-#include <boost/unordered_map.hpp>
-
#include <map>
+#include <unordered_map>
class ScDocumentImport;
class ScOrcusSheet;
@@ -235,7 +234,7 @@ class ScOrcusFactory : public orcus::spreadsheet::iface::import_factory
StringCellCache(const ScAddress& rPos, size_t nIndex);
};
- typedef boost::unordered_map<OUString, size_t, OUStringHash> StringHashType;
+ typedef std::unordered_map<OUString, size_t, OUStringHash> StringHashType;
typedef std::vector<StringCellCache> StringCellCaches;
ScDocumentImport maDoc;
diff --git a/sc/source/filter/inc/xepivotxml.hxx b/sc/source/filter/inc/xepivotxml.hxx
index b671060..0b34f25 100644
--- a/sc/source/filter/inc/xepivotxml.hxx
+++ b/sc/source/filter/inc/xepivotxml.hxx
@@ -14,7 +14,7 @@
#include <xeroot.hxx>
#include <boost/ptr_container/ptr_map.hpp>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
class ScDPCache;
class ScDPCollection;
@@ -75,7 +75,7 @@ private:
class XclExpXmlPivotTableManager : protected XclExpRoot
{
typedef boost::ptr_map<SCTAB, XclExpXmlPivotTables> TablesType;
- typedef boost::unordered_map<const ScDPObject*, sal_Int32> CacheIdMapType;
+ typedef std::unordered_map<const ScDPObject*, sal_Int32> CacheIdMapType;
public:
XclExpXmlPivotTableManager( const XclExpRoot& rRoot );
diff --git a/sc/source/filter/inc/xetable.hxx b/sc/source/filter/inc/xetable.hxx
index 7fca5e4..12b6ed2 100644
--- a/sc/source/filter/inc/xetable.hxx
+++ b/sc/source/filter/inc/xetable.hxx
@@ -31,10 +31,10 @@
#include "xestyle.hxx"
#include "xeextlst.hxx"
-#include <boost/unordered_set.hpp>
-#include <boost/unordered_map.hpp>
#include <boost/shared_ptr.hpp>
#include <map>
+#include <unordered_set>
+#include <unordered_map>
/* ============================================================================
Export of cell tables including row and column description.
@@ -195,8 +195,8 @@ private:
*/
bool IsValidTokenArray( const ScTokenArray& rArray ) const;
- typedef boost::unordered_map<const ScTokenArray*, XclExpShrfmlaRef> TokensType;
- typedef boost::unordered_set<const ScTokenArray*> BadTokenArraysType;
+ typedef std::unordered_map<const ScTokenArray*, XclExpShrfmlaRef> TokensType;
+ typedef std::unordered_set<const ScTokenArray*> BadTokenArraysType;
TokensType maRecMap; /// Map containing the SHRFMLA records.
BadTokenArraysType maBadTokens; /// shared tokens we should *not* export as SHRFMLA
diff --git a/sc/source/filter/oox/formulabuffer.cxx b/sc/source/filter/oox/formulabuffer.cxx
index c4298e2..189017d 100644
--- a/sc/source/filter/oox/formulabuffer.cxx
+++ b/sc/source/filter/oox/formulabuffer.cxx
@@ -106,7 +106,7 @@ public:
}
private:
- typedef boost::unordered_map<SCCOL, Item*> ColCacheType;
+ typedef std::unordered_map<SCCOL, Item*> ColCacheType;
ColCacheType maCache;
sc::TokenStringContext maCxt;
};
diff --git a/sc/source/filter/xml/editattributemap.hxx b/sc/source/filter/xml/editattributemap.hxx
index 965f43e..031e935 100644
--- a/sc/source/filter/xml/editattributemap.hxx
+++ b/sc/source/filter/xml/editattributemap.hxx
@@ -12,7 +12,7 @@
#include <rtl/ustring.hxx>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
/**
* Provide mapping from ODF text formatting styles to EditEngine's, for
@@ -36,8 +36,8 @@ public:
const Entry* getEntryByItemID(sal_uInt16 nItemID) const;
private:
- typedef boost::unordered_map<OUString, const Entry*, OUStringHash> StrToEntriesType;
- typedef boost::unordered_map<sal_uInt16, const Entry*> IndexToEntriesType;
+ typedef std::unordered_map<OUString, const Entry*, OUStringHash> StrToEntriesType;
+ typedef std::unordered_map<sal_uInt16, const Entry*> IndexToEntriesType;
StrToEntriesType maAPIEntries;
IndexToEntriesType maItemIDEntries;
};
diff --git a/sc/source/filter/xml/pivotsource.hxx b/sc/source/filter/xml/pivotsource.hxx
index 5281a54..8313616 100644
--- a/sc/source/filter/xml/pivotsource.hxx
+++ b/sc/source/filter/xml/pivotsource.hxx
@@ -14,8 +14,8 @@
#include <dpsdbtab.hxx>
#include <dpobject.hxx>
+#include <unordered_map>
#include <vector>
-#include <boost/unordered_map.hpp>
namespace sc {
@@ -25,8 +25,8 @@ namespace sc {
*/
struct PivotTableSources
{
- typedef boost::unordered_map<OUString, OUString, OUStringHash> SelectedPagesType;
- typedef boost::unordered_map<ScDPObject*, SelectedPagesType> SelectedPagesMapType;
+ typedef std::unordered_map<OUString, OUString, OUStringHash> SelectedPagesType;
+ typedef std::unordered_map<ScDPObject*, SelectedPagesType> SelectedPagesMapType;
struct SelectedPages
{
diff --git a/sc/source/filter/xml/sheetdata.cxx b/sc/source/filter/xml/sheetdata.cxx
index dd820f9..e5e771d 100644
--- a/sc/source/filter/xml/sheetdata.cxx
+++ b/sc/source/filter/xml/sheetdata.cxx
@@ -171,7 +171,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 boost::unordered_map of the prefixes is needed.
+ // so only a 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 9a0f1d3..626a053 100644
--- a/sc/source/filter/xml/xmldpimp.hxx
+++ b/sc/source/filter/xml/xmldpimp.hxx
@@ -32,7 +32,7 @@
#include "queryparam.hxx"
#include "xmlimprt.hxx"
-#include <boost/unordered_set.hpp>
+#include <unordered_map>
class ScDPSaveNumGroupDimension;
class ScDPSaveGroupDimension;
@@ -71,7 +71,7 @@ public:
class ScXMLDataPilotTableContext : public SvXMLImportContext
{
- typedef boost::unordered_map<OUString, OUString, OUStringHash> SelectedPagesType;
+ typedef std::unordered_map<OUString, OUString, OUStringHash> SelectedPagesType;
struct GrandTotalItem
{
diff --git a/sc/source/filter/xml/xmlexprt.hxx b/sc/source/filter/xml/xmlexprt.hxx
index d86dd69..135726f 100644
--- a/sc/source/filter/xml/xmlexprt.hxx
+++ b/sc/source/filter/xml/xmlexprt.hxx
@@ -33,8 +33,8 @@ namespace com { namespace sun { namespace star {
namespace beans { class XPropertySet; }
} } }
-#include <boost/unordered_map.hpp>
#include <boost/scoped_ptr.hpp>
+#include <unordered_map>
class ScOutlineArray;
class SvXMLExportPropertyMapper;
@@ -93,7 +93,7 @@ class ScXMLExport : public SvXMLExport
rtl::Reference < SvXMLExportPropertyMapper > xRowStylesExportPropertySetMapper;
rtl::Reference < SvXMLExportPropertyMapper > xTableStylesExportPropertySetMapper;
XMLNumberFormatAttributesExportHelper* pNumberFormatAttributesExportHelper;
- typedef ::boost::unordered_map<sal_Int32, sal_Int32> NumberFormatIndexMap;
+ typedef std::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 7f428e3..39d3a40 100644
--- a/sc/source/filter/xml/xmlimprt.hxx
+++ b/sc/source/filter/xml/xmlimprt.hxx
@@ -42,8 +42,8 @@
#include <com/sun/star/util/XNumberFormatTypes.hpp>
#include <com/sun/star/sheet/XSheetCellRangeContainer.hpp>
+#include <unordered_map>
#include <vector>
-#include <boost/unordered_map.hpp>
#include <boost/ptr_container/ptr_list.hpp>
#include <boost/ptr_container/ptr_map.hpp>
#include <boost/noncopyable.hpp>
@@ -819,7 +819,7 @@ class ScXMLEditAttributeMap;
class ScXMLImport: public SvXMLImport, boost::noncopyable
{
- typedef ::boost::unordered_map< OUString, sal_Int16, OUStringHash > CellTypeMap;
+ typedef std::unordered_map< OUString, sal_Int16, OUStringHash > CellTypeMap;
typedef ::boost::ptr_map<SCTAB, ScMyNamedExpressions> SheetNamedExpMap;
CellTypeMap aCellTypeMap;
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx
index c3ad4d8..3c93225 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -38,7 +38,6 @@ using ::com::sun::star::uno::Reference;
using ::com::sun::star::accessibility::XAccessible;
using ::com::sun::star::accessibility::XAccessibleContext;
using ::std::vector;
-using ::boost::unordered_map;
ScMenuFloatingWindow::MenuItemData::MenuItemData() :
mbEnabled(true), mbSeparator(false),
diff --git a/sc/source/ui/docshell/docsh6.cxx b/sc/source/ui/docshell/docsh6.cxx
index e4cd4b5..92b6e2a 100644
--- a/sc/source/ui/docshell/docsh6.cxx
+++ b/sc/source/ui/docshell/docsh6.cxx
@@ -342,7 +342,7 @@ void ScDocShell::ReconnectDdeLink(SfxObjectShell& rServer)
void ScDocShell::UpdateLinks()
{
- typedef boost::unordered_set<OUString, OUStringHash> StrSetType;
+ typedef std::unordered_set<OUString, OUStringHash> StrSetType;
sfx2::LinkManager* pLinkManager = aDocument.GetLinkManager();
StrSetType aNames;
diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx
index e8e5f46..f7f7f0f 100644
--- a/sc/source/ui/docshell/docsh8.cxx
+++ b/sc/source/ui/docshell/docsh8.cxx
@@ -75,8 +75,8 @@
#include "docparam.hxx"
#include "cellvalue.hxx"
+#include <unordered_set>
#include <vector>
-#include <boost/unordered_set.hpp>
using namespace com::sun::star;
using ::std::vector;
@@ -493,7 +493,7 @@ void lcl_GetColumnTypes(
SCCOL nLastCol = rDataRange.aEnd.Col();
SCROW nLastRow = rDataRange.aEnd.Row();
- typedef boost::unordered_set<OUString, OUStringHash> StrSetType;
+ typedef std::unordered_set<OUString, OUStringHash> StrSetType;
StrSetType aFieldNames;
long nField = 0;
diff --git a/sc/source/ui/docshell/macromgr.cxx b/sc/source/ui/docshell/macromgr.cxx
index 1a6201e..31e205e 100644
--- a/sc/source/ui/docshell/macromgr.cxx
+++ b/sc/source/ui/docshell/macromgr.cxx
@@ -32,7 +32,6 @@
using namespace ::com::sun::star;
using ::com::sun::star::uno::RuntimeException;
using ::com::sun::star::uno::Reference;
-using ::boost::unordered_map;
using ::std::list;
using ::std::for_each;
using ::std::pair;
@@ -86,7 +85,7 @@ public:
}
private:
- typedef boost::unordered_map<OUString, list<ScFormulaCell*>, OUStringHash> ModuleCellMap;
+ typedef std::unordered_map<OUString, list<ScFormulaCell*>, OUStringHash> ModuleCellMap;
ModuleCellMap maCells;
};
@@ -126,7 +125,7 @@ public:
void ScMacroManager::InitUserFuncData()
{
- // Clear boost::unordered_map
+ // Clear unordered_map
mhFuncToVolatile.clear();
OUString sProjectName("Standard");
diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx
index aa2adc0..5e3cc18 100644
--- a/sc/source/ui/inc/checklistmenu.hxx
+++ b/sc/source/ui/inc/checklistmenu.hxx
@@ -16,8 +16,8 @@
#include <vcl/timer.hxx>
#include <svx/checklbx.hxx>
-#include <boost/unordered_map.hpp>
#include <boost/scoped_ptr.hpp>
+#include <unordered_map>
namespace com { namespace sun { namespace star {
@@ -212,7 +212,7 @@ class ScCheckListBox : public SvTreeListBox
class ScCheckListMenuWindow : public ScMenuFloatingWindow
{
public:
- typedef boost::unordered_map<OUString, bool, OUStringHash> ResultType;
+ typedef std::unordered_map<OUString, bool, OUStringHash> ResultType;
/**
* Extended data that the client code may need to store. Create a
diff --git a/sc/source/ui/inc/crnrdlg.hxx b/sc/source/ui/inc/crnrdlg.hxx
index be92e60e..b2d97ab 100644
--- a/sc/source/ui/inc/crnrdlg.hxx
+++ b/sc/source/ui/inc/crnrdlg.hxx
@@ -25,7 +25,7 @@
#include <vcl/fixed.hxx>
#include <vcl/lstbox.hxx>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
class ScViewData;
class ScDocument;
@@ -64,7 +64,7 @@ private:
ScRangePairListRef xColNameRanges;
ScRangePairListRef xRowNameRanges;
- typedef ::boost::unordered_map< OUString, ScRange, OUStringHash > NameRangeMap;
+ typedef std::unordered_map< OUString, ScRange, OUStringHash > NameRangeMap;
NameRangeMap aRangeMap;
ScViewData* pViewData;
ScDocument* pDoc;
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index fc6bccc..1f4793d 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -35,11 +35,10 @@
#include "optutil.hxx"
#include "docuno.hxx"
-#include <boost/unordered_map.hpp>
#include <boost/scoped_ptr.hpp>
#include <cppuhelper/implbase1.hxx>
-
#include <config_telepathy.h>
+#include <unordered_map>
class ScRefreshTimerProtector;
class ScEditEngineDefaulter;
@@ -73,7 +72,7 @@ class ScCollaboration;
namespace sfx2 { class FileDialogHelper; }
struct DocShell_Impl;
-typedef ::boost::unordered_map< sal_uLong, sal_uLong > ScChangeActionMergeMap;
+typedef std::unordered_map< sal_uLong, sal_uLong > ScChangeActionMergeMap;
//enum ScDBFormat { SC_FORMAT_SDF, SC_FORMAT_DBF };
diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index 05f9994..fe43cf2 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -28,11 +28,10 @@
#include <com/sun/star/sheet/DataPilotFieldOrientation.hpp>
#include <basegfx/matrix/b2dhommatrix.hxx>
-#include <vector>
#include <boost/scoped_ptr.hpp>
-#include <boost/unordered_map.hpp>
#include <boost/ptr_container/ptr_map.hpp>
#include <boost/ptr_container/ptr_vector.hpp>
+#include <vector>
namespace editeng {
struct MisspellRanges;
diff --git a/sc/source/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx
index 0db4dfa..8a0fc1b 100644
--- a/sc/source/ui/inc/pvfundlg.hxx
+++ b/sc/source/ui/inc/pvfundlg.hxx
@@ -36,7 +36,7 @@
#include "pivot.hxx"
#include <boost/scoped_ptr.hpp>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
typedef sfx::ListBoxWrapper< sal_Int32 > ScDPListBoxWrapper;
@@ -56,7 +56,7 @@ private:
class ScDPFunctionDlg : public ModalDialog
{
- typedef ::boost::unordered_map< OUString, OUString, OUStringHash > NameMapType;
+ typedef std::unordered_map< OUString, OUString, OUStringHash > NameMapType;
public:
explicit ScDPFunctionDlg( vcl::Window* pParent, const ScDPLabelDataVector& rLabelVec,
const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData );
@@ -178,7 +178,7 @@ private:
ScDPObject& mrDPObj; /// The DataPilot object (for member names).
ScDPLabelData maLabelData; /// Cache for members data.
- typedef ::boost::unordered_map<OUString, ScDPName, OUStringHash> NameMapType;
+ typedef std::unordered_map<OUString, ScDPName, OUStringHash> NameMapType;
NameMapType maDataFieldNameMap; /// Cache for displayed name to field name mapping.
};
@@ -203,7 +203,7 @@ private:
ListBox* mpLbDims;
OKButton* mpBtnOk;
- typedef ::boost::unordered_map<OUString, long, OUStringHash> DimNameIndexMap;
+ typedef std::unordered_map<OUString, long, OUStringHash> DimNameIndexMap;
DimNameIndexMap maNameIndexMap;
ScDPObject& mrDPObj;
};
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index e005375..6ec3abe 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -9478,9 +9478,9 @@ struct ScPatternHashCode
};
// Hash map to find a range by its start row
-typedef ::boost::unordered_map< SCROW, ScRange > ScRowRangeHashMap;
+typedef std::unordered_map< SCROW, ScRange > ScRowRangeHashMap;
-typedef ::std::vector<ScRange> ScRangeVector;
+typedef std::vector<ScRange> ScRangeVector;
// Hash map entry.
// The Join method depends on the column-wise order of ScAttrRectIterator
@@ -9591,7 +9591,7 @@ const ScRangeList& ScUniqueFormatsEntry::GetRanges()
return *aReturnRanges;
}
-typedef ::boost::unordered_map< const ScPatternAttr*, ScUniqueFormatsEntry, ScPatternHashCode > ScUniqueFormatsHashMap;
+typedef std::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 cb944ee..297e956 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -2792,8 +2792,8 @@ void ScChart2DataSequence::StopListeningToAllExternalRefs()
if (!m_pExtRefListener.get())
return;
- const boost::unordered_set<sal_uInt16>& rFileIds = m_pExtRefListener->getAllFileIds();
- boost::unordered_set<sal_uInt16>::const_iterator itr = rFileIds.begin(), itrEnd = rFileIds.end();
+ const std::unordered_set<sal_uInt16>& rFileIds = m_pExtRefListener->getAllFileIds();
+ std::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());
@@ -2825,8 +2825,8 @@ void ScChart2DataSequence::CopyData(const ScChart2DataSequence& r)
ScExternalRefManager* pRefMgr = m_pDocument->GetExternalRefManager();
m_pExtRefListener.reset(new ExternalRefListener(*this, m_pDocument));
- const boost::unordered_set<sal_uInt16>& rFileIds = r.m_pExtRefListener->getAllFileIds();
- boost::unordered_set<sal_uInt16>::const_iterator itr = rFileIds.begin(), itrEnd = rFileIds.end();
+ const std::unordered_set<sal_uInt16>& rFileIds = r.m_pExtRefListener->getAllFileIds();
+ std::unordered_set<sal_uInt16>::const_iterator itr = rFileIds.begin(), itrEnd = rFileIds.end();
for (; itr != itrEnd; ++itr)
{
pRefMgr->addLinkListener(*itr, m_pExtRefListener.get());
diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx
index 5833e33..ce36197 100644
--- a/sc/source/ui/unoobj/linkuno.cxx
+++ b/sc/source/ui/unoobj/linkuno.cxx
@@ -406,7 +406,7 @@ ScSheetLinkObj* ScSheetLinksObj::GetObjectByIndex_Impl(sal_Int32 nIndex)
if (!pDocShell)
return NULL;
- typedef boost::unordered_set<OUString, OUStringHash> StrSetType;
+ typedef std::unordered_set<OUString, OUStringHash> StrSetType;
StrSetType aNames;
ScDocument& rDoc = pDocShell->GetDocument();
SCTAB nTabCount = rDoc.GetTableCount();
@@ -453,7 +453,6 @@ ScSheetLinkObj* ScSheetLinksObj::GetObjectByName_Impl(const OUString& aName)
}
// XEnumerationAccess
-
uno::Reference<container::XEnumeration> SAL_CALL ScSheetLinksObj::createEnumeration()
throw(uno::RuntimeException, std::exception)
{
@@ -462,10 +461,9 @@ uno::Reference<container::XEnumeration> SAL_CALL ScSheetLinksObj::createEnumerat
}
// XIndexAccess
-
sal_Int32 SAL_CALL ScSheetLinksObj::getCount() throw(uno::RuntimeException, std::exception)
{
- typedef boost::unordered_set<OUString, OUStringHash> StrSetType;
+ typedef std::unordered_set<OUString, OUStringHash> StrSetType;
SolarMutexGuard aGuard;
if (!pDocShell)
@@ -551,7 +549,7 @@ sal_Bool SAL_CALL ScSheetLinksObj::hasByName( const OUString& aName )
uno::Sequence<OUString> SAL_CALL ScSheetLinksObj::getElementNames() throw(uno::RuntimeException, std::exception)
{
- typedef boost::unordered_set<OUString, OUStringHash> StrSetType;
+ typedef std::unordered_set<OUString, OUStringHash> StrSetType;
SolarMutexGuard aGuard;
// Name ist der Dateiname
diff --git a/sc/source/ui/vba/vbachartobjects.hxx b/sc/source/ui/vba/vbachartobjects.hxx
index 4ca84fb..810d647 100644
--- a/sc/source/ui/vba/vbachartobjects.hxx
+++ b/sc/source/ui/vba/vbachartobjects.hxx
@@ -29,15 +29,8 @@
#include <com/sun/star/container/XEnumerationAccess.hpp>
#include <vbahelper/vbacollectionimpl.hxx>
#include "excelvbahelper.hxx"
-#include <boost/unordered_map.hpp>
typedef CollTestImplHelper< ov::excel::XChartObjects > ChartObjects_BASE;
-/* #TODO see if this hash table is 'really' necessary
-typedef ::boost::unordered_map< OUString,
-css::uno::Reference< ov::excel::XChartObject >,
- OUStringHash,
- ::std::equal_to< OUString > > aHashTable;
-*/
class ScVbaChartObjects : public ChartObjects_BASE
{
diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx
index 53942a7..8f0168e 100644
--- a/sc/source/ui/vba/vbawindow.cxx
+++ b/sc/source/ui/vba/vbawindow.cxx
@@ -38,17 +38,17 @@
#include <tabvwsh.hxx>
#include <docuno.hxx>
#include <sc.hrc>
-#include <boost/unordered_map.hpp>
#include <sfx2/viewfrm.hxx>
#include <vcl/wrkwin.hxx>
#include "unonames.hxx"
#include "markdata.hxx"
+#include <unordered_map>
using namespace ::com::sun::star;
using namespace ::ooo::vba;
using namespace ::ooo::vba::excel::XlWindowState;
-typedef boost::unordered_map< OUString,
+typedef std::unordered_map< OUString,
SCTAB, OUStringHash,
::std::equal_to< OUString > > NameIndexHash;
diff --git a/sc/source/ui/vba/vbawindows.cxx b/sc/source/ui/vba/vbawindows.cxx
index 25928ac..e70809a 100644
--- a/sc/source/ui/vba/vbawindows.cxx
+++ b/sc/source/ui/vba/vbawindows.cxx
@@ -18,7 +18,6 @@
*/
#include "vbawindows.hxx"
-#include <boost/unordered_map.hpp>
#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
#include <com/sun/star/frame/Desktop.hpp>
@@ -27,12 +26,14 @@
#include "vbawindow.hxx"
#include "vbaglobals.hxx"
+#include <unordered_map>
+
using namespace ::com::sun::star;
using namespace ::ooo::vba;
-typedef boost::unordered_map< OUString,
+typedef std::unordered_map< OUString,
sal_Int32, OUStringHash,
-::std::equal_to< OUString > > NameIndexHash;
+std::equal_to< OUString > > NameIndexHash;
static uno::Reference< XHelperInterface > lcl_createWorkbookHIParent( const uno::Reference< frame::XModel >& xModel, const uno::Reference< uno::XComponentContext >& xContext, const uno::Any& aApplication )
{
diff --git a/sc/source/ui/vba/vbaworkbooks.cxx b/sc/source/ui/vba/vbaworkbooks.cxx
index ba030a6..8a9d267 100644
--- a/sc/source/ui/vba/vbaworkbooks.cxx
+++ b/sc/source/ui/vba/vbaworkbooks.cxx
@@ -53,7 +53,6 @@
#include "vbaworkbooks.hxx"
#include <vbahelper/vbahelper.hxx>
-#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 9d739b1..7f1d88b 100644
--- a/sc/source/ui/view/dbfunc3.cxx
+++ b/sc/source/ui/view/dbfunc3.cxx
@@ -68,9 +68,9 @@
#include "stringutil.hxx"
#include <boost/scoped_ptr.hpp>
-#include <boost/unordered_set.hpp>
-#include <boost/unordered_map.hpp>
#include <list>
+#include <unordered_set>
+#include <unordered_map>
#include <vector>
using namespace com::sun::star;
@@ -1645,7 +1645,7 @@ bool ScDBFunc::DataPilotSort( const ScAddress& rPos, bool bAscending, sal_uInt16
typedef ScDPSaveDimension::MemberList MemList;
const MemList& rDimMembers = pSaveDim->GetMembers();
list<OUString> aMembers;
- boost::unordered_set<OUString, OUStringHash> aMemberSet;
+ std::unordered_set<OUString, OUStringHash> aMemberSet;
size_t nMemberCount = 0;
for (MemList::const_iterator itr = rDimMembers.begin(), itrEnd = rDimMembers.end();
itr != itrEnd; ++itr)
@@ -1662,7 +1662,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 boost::unordered_map<OUString, sal_uInt16, OUStringHash> UserSortMap;
+ typedef std::unordered_map<OUString, sal_uInt16, OUStringHash> UserSortMap;
UserSortMap aSubStrs;
sal_uInt16 nSubCount = 0;
if (pUserListId)
@@ -1766,7 +1766,7 @@ bool ScDBFunc::DataPilotMove( const ScRange& rSource, const ScAddress& rDest )
bool bValid = ( aDestData.Dimension >= 0 ); // dropping onto a field
// look through the source range
- boost::unordered_set< OUString, OUStringHash, std::equal_to<OUString> > aMembersSet; // for lookup
+ std::unordered_set< OUString, OUStringHash, std::equal_to<OUString> > aMembersSet; // for lookup
std::vector< 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/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 10442a7..df91fca 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -661,9 +661,9 @@ public:
class AddSelectedItemString : public std::unary_function<ScQueryEntry::Item, void>
{
- boost::unordered_set<OUString, OUStringHash>& mrSet;
+ std::unordered_set<OUString, OUStringHash>& mrSet;
public:
- AddSelectedItemString(boost::unordered_set<OUString, OUStringHash>& r) :
+ AddSelectedItemString(std::unordered_set<OUString, OUStringHash>& r) :
mrSet(r) {}
void operator() (const ScQueryEntry::Item& rItem)
@@ -702,7 +702,7 @@ void ScGridWindow::LaunchAutoFilterMenu(SCCOL nCol, SCROW nRow)
ScQueryParam aParam;
pDBData->GetQueryParam(aParam);
ScQueryEntry* pEntry = aParam.FindEntryByField(nCol, false);
- boost::unordered_set<OUString, OUStringHash> aSelected;
+ std::unordered_set<OUString, OUStringHash> aSelected;
if (pEntry && pEntry->bDoQuery)
{
if (pEntry->eOp == SC_EQUAL)
diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx
index 3728135..5b43442 100644
--- a/sc/source/ui/view/gridwin2.cxx
+++ b/sc/source/ui/view/gridwin2.cxx
@@ -46,15 +46,14 @@
#include <com/sun/star/sheet/DataPilotFieldOrientation.hpp>
+#include <unordered_map>
#include <vector>
#include <boost/scoped_ptr.hpp>
-#include <boost/unordered_map.hpp>
using namespace com::sun::star;
using ::com::sun::star::sheet::DataPilotFieldOrientation;
using ::std::vector;
using ::std::unique_ptr;
-using ::boost::unordered_map;
// STATIC DATA -----------------------------------------------------------
@@ -528,7 +527,7 @@ void ScGridWindow::DPLaunchFieldPopupMenu(
void ScGridWindow::UpdateDPFromFieldPopupMenu()
{
- typedef boost::unordered_map<OUString, OUString, OUStringHash> MemNameMapType;
+ typedef std::unordered_map<OUString, OUString, OUStringHash> MemNameMapType;
if (!mpDPFieldPopup)
return;
diff --git a/sw/inc/IDocumentExternalData.hxx b/sw/inc/IDocumentExternalData.hxx
index b9a8e10..adbaebc 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 1159d7a..3a27cbc 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 77f0255..6b98c528 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 c991185..bcc89ea 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 1aad77b..448f486 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 2dc755e..771b727 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 2039065..a717e12 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 f6c74f9..c52354d 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 5d7a32a..e3bce36 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 ca5cad51..71c25d7 100644
--- a/sw/inc/swwait.hxx
+++ b/sw/inc/swwait.hxx
@@ -22,7 +22,7 @@
#include <tools/solar.h>
#include "swdllapi.h"
-#include <boost/unordered_set.hpp>
+#include <unordered_set>
class SwDocShell;
class SfxDispatcher;
@@ -43,7 +43,7 @@ private:
SwDocShell& mrDoc;
const bool mbLockUnlockDispatcher;
- boost::unordered_set< SfxDispatcher* > mpLockedDispatchers;
+ std::unordered_set< SfxDispatcher* > mpLockedDispatchers;
};
#endif
diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx
index fec85f1..315b62d 100644
--- a/sw/source/core/access/accpara.hxx
+++ b/sw/source/core/access/accpara.hxx
@@ -29,9 +29,9 @@
#include <txmsrt.hxx>
#include <com/sun/star/accessibility/XAccessibleExtendedAttributes.hpp>
#include <com/sun/star/accessibility/XAccessibleTextAttributes.hpp>
-#include <boost/unordered_map.hpp>
#include <accselectionhelper.hxx>
#include <calbck.hxx>
+#include <unordered_map>
class SwField;
class SwTxtFrm;
@@ -49,7 +49,7 @@ namespace com { namespace sun { namespace star {
namespace style { struct TabStop; }
} } }
-typedef ::boost::unordered_map< OUString,
+typedef std::unordered_map< OUString,
::com::sun::star::beans::PropertyValue,
OUStringHash,
::std::equal_to< OUString > > tAccParaPropValMap;
diff --git a/sw/source/core/doc/DocumentListsManager.cxx b/sw/source/core/doc/DocumentListsManager.cxx
index 784b38f..c4ba23f 100644
--- a/sw/source/core/doc/DocumentListsManager.cxx
+++ b/sw/source/core/doc/DocumentListsManager.cxx
@@ -73,7 +73,7 @@ SwList* DocumentListsManager::getListByName( const OUString& sListId ) const
{
SwList* pList = 0;
- boost::unordered_map< OUString, SwList*, OUStringHash >::const_iterator
+ std::unordered_map< OUString, SwList*, OUStringHash >::const_iterator
aListIter = maLists.find( sListId );
if ( aListIter != maLists.end() )
{
@@ -120,7 +120,7 @@ SwList* DocumentListsManager::getListForListStyle( const OUString& sListStyleNam
{
SwList* pList = 0;
- boost::unordered_map< OUString, SwList*, OUStringHash >::const_iterator
+ std::unordered_map< OUString, SwList*, OUStringHash >::const_iterator
aListIter = maListStyleLists.find( sListStyleName );
if ( aListIter != maListStyleLists.end() )
{
@@ -189,7 +189,7 @@ void DocumentListsManager::trackChangeOfListStyleName( const OUString& sListStyl
DocumentListsManager::~DocumentListsManager()
{
- for ( boost::unordered_map< OUString, SwList*, OUStringHash >::iterator
+ for ( std::unordered_map< OUString, SwList*, OUStringHash >::iterator
aListIter = maLists.begin();
aListIter != maLists.end();
++aListIter )
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index 0667e46..c48ffd7 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -42,10 +42,10 @@
#include <numrule.hxx>
#include <SwNodeNum.hxx>
-#include <boost/unordered_map.hpp>
-
#include <list.hxx>
+
#include <algorithm>
+#include <unordered_map>
#include <unotools/saveopt.hxx>
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list