diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-01-02 16:22:46 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-01-03 21:11:20 +0000 |
commit | 79f115b91e5ad4d9038e127bf0b57843e157eac9 (patch) | |
tree | 704dee023dca3144f78613c41ba528ed65b1d80f /sc/source/ui/inc | |
parent | 05dcb073d60579a142e3074fb1b137f36840ee9e (diff) |
boost::unordered_map->std::unordered_map
Change-Id: I2c65709cda6f10810452dfb8aa1a247cb3a5564f
Diffstat (limited to 'sc/source/ui/inc')
-rw-r--r-- | sc/source/ui/inc/checklistmenu.hxx | 4 | ||||
-rw-r--r-- | sc/source/ui/inc/crnrdlg.hxx | 4 | ||||
-rw-r--r-- | sc/source/ui/inc/docsh.hxx | 5 | ||||
-rw-r--r-- | sc/source/ui/inc/gridwin.hxx | 3 | ||||
-rw-r--r-- | sc/source/ui/inc/pvfundlg.hxx | 8 |
5 files changed, 11 insertions, 13 deletions
diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx index aa2adc004049..5e3cc183ad74 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 be92e60efdad..b2d97ab9035d 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 fc6bccc2bc31..1f4793daff18 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 05f99946a4b9..fe43cf2d0385 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 0db4dfa56838..8a0fc1b750e0 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; }; |