summaryrefslogtreecommitdiff
path: root/sc/source/filter
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-01-02 16:22:46 +0000
committerCaolán McNamara <caolanm@redhat.com>2015-01-03 21:11:20 +0000
commit79f115b91e5ad4d9038e127bf0b57843e157eac9 (patch)
tree704dee023dca3144f78613c41ba528ed65b1d80f /sc/source/filter
parent05dcb073d60579a142e3074fb1b137f36840ee9e (diff)
boost::unordered_map->std::unordered_map
Change-Id: I2c65709cda6f10810452dfb8aa1a247cb3a5564f
Diffstat (limited to 'sc/source/filter')
-rw-r--r--sc/source/filter/excel/excimp8.cxx4
-rw-r--r--sc/source/filter/excel/xepivotxml.cxx2
-rw-r--r--sc/source/filter/inc/htmlpars.hxx8
-rw-r--r--sc/source/filter/inc/imp_op.hxx4
-rw-r--r--sc/source/filter/inc/namebuff.hxx4
-rw-r--r--sc/source/filter/inc/orcusinterface.hxx5
-rw-r--r--sc/source/filter/inc/xepivotxml.hxx4
-rw-r--r--sc/source/filter/inc/xetable.hxx8
-rw-r--r--sc/source/filter/oox/formulabuffer.cxx2
-rw-r--r--sc/source/filter/xml/editattributemap.hxx6
-rw-r--r--sc/source/filter/xml/pivotsource.hxx6
-rw-r--r--sc/source/filter/xml/sheetdata.cxx2
-rw-r--r--sc/source/filter/xml/xmldpimp.hxx4
-rw-r--r--sc/source/filter/xml/xmlexprt.hxx4
-rw-r--r--sc/source/filter/xml/xmlimprt.hxx4
15 files changed, 33 insertions, 34 deletions
diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx
index 55d4f1f0454a..c1d342ee38dc 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 3f7d320b4cff..fa04e1f2558b 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 d39737a776bc..b582498b3458 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 241338aead27..ebbcd408a305 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 332fef0b5c2a..520d5fd5b2fd 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 9c37aae9ae68..a77831043c8c 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 b6710606b0ab..0b34f2528241 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 7fca5e45ee3e..12b6ed21517c 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 c4298e238091..189017d65196 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 965f43e4548f..031e9356c51f 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 5281a5416f39..83136164d120 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 dd820f9454ed..e5e771dc09a1 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 9a0f1d3533d0..626a0538324c 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 d86dd695fb46..135726fb5d08 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 7f428e30f545..39d3a40a9cff 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;