diff options
author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-01-16 19:47:20 +0100 |
---|---|---|
committer | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-01-17 20:24:17 +0000 |
commit | e87071ac57a7711078715d9165c264ec3db180ab (patch) | |
tree | 6a2c5a62f7fb3f162d1f9e7caf44e6846468532a /sc | |
parent | d0f3363aa8db533ba6fe356053caaf79a1507d14 (diff) |
replace boost::checked_deleter with std::default_delete
and remove all traces of boost/checked_delete.hpp
Change-Id: I4486d0e07a7197d75f8739c8c6d79670163eaab2
Reviewed-on: https://gerrit.libreoffice.org/33182
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
Diffstat (limited to 'sc')
-rw-r--r-- | sc/inc/pch/precompiled_sc.hxx | 1 | ||||
-rw-r--r-- | sc/inc/pch/precompiled_scfilt.hxx | 1 | ||||
-rw-r--r-- | sc/source/core/data/column.cxx | 3 | ||||
-rw-r--r-- | sc/source/core/data/columnspanset.cxx | 4 | ||||
-rw-r--r-- | sc/source/core/data/document.cxx | 3 | ||||
-rw-r--r-- | sc/source/core/data/dptabres.cxx | 5 | ||||
-rw-r--r-- | sc/source/core/data/table3.cxx | 3 | ||||
-rw-r--r-- | sc/source/core/tool/chartlis.cxx | 4 | ||||
-rw-r--r-- | sc/source/core/tool/rangelst.cxx | 6 | ||||
-rw-r--r-- | sc/source/filter/xcl97/xcl97rec.cxx | 3 | ||||
-rw-r--r-- | sc/source/ui/unoobj/chart2uno.cxx | 3 | ||||
-rw-r--r-- | sc/source/ui/view/viewdata.cxx | 3 |
12 files changed, 14 insertions, 25 deletions
diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx index 986f9e30cbd0..643a525c9e7c 100644 --- a/sc/inc/pch/precompiled_sc.hxx +++ b/sc/inc/pch/precompiled_sc.hxx @@ -56,7 +56,6 @@ #include <unordered_set> #include <utility> #include <vector> -#include <boost/checked_delete.hpp> #include <boost/intrusive_ptr.hpp> #include <boost/math/special_functions/log1p.hpp> #include <boost/optional/optional.hpp> diff --git a/sc/inc/pch/precompiled_scfilt.hxx b/sc/inc/pch/precompiled_scfilt.hxx index 58908fb4fd0d..9048a2cca156 100644 --- a/sc/inc/pch/precompiled_scfilt.hxx +++ b/sc/inc/pch/precompiled_scfilt.hxx @@ -48,7 +48,6 @@ #include <unordered_set> #include <utility> #include <vector> -#include <boost/checked_delete.hpp> #include <boost/optional/optional.hpp> #include <osl/conditn.hxx> #include <osl/diagnose.h> diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx index beb758a9aac9..af35e8ccfe8a 100644 --- a/sc/source/core/data/column.cxx +++ b/sc/source/core/data/column.cxx @@ -58,7 +58,6 @@ #include <cstring> #include <map> #include <cstdio> -#include <boost/checked_delete.hpp> #include <memory> using ::editeng::SvxBorderLine; @@ -2254,7 +2253,7 @@ class UpdateRefOnNonCopy : public std::unary_function<sc::FormulaGroupEntry, voi if (!mpUndoDoc->SetFormulaCells(rOldPos, aCells)) // Insertion failed. Delete all formula cells. - std::for_each(aCells.begin(), aCells.end(), boost::checked_deleter<ScFormulaCell>()); + std::for_each(aCells.begin(), aCells.end(), std::default_delete<ScFormulaCell>()); } public: diff --git a/sc/source/core/data/columnspanset.cxx b/sc/source/core/data/columnspanset.cxx index efb79d0ea094..acefdb236dee 100644 --- a/sc/source/core/data/columnspanset.cxx +++ b/sc/source/core/data/columnspanset.cxx @@ -15,9 +15,9 @@ #include "markdata.hxx" #include "rangelst.hxx" #include <fstalgorithm.hxx> -#include <boost/checked_delete.hpp> #include <algorithm> +#include <memory> namespace sc { @@ -67,7 +67,7 @@ ColumnSpanSet::~ColumnSpanSet() if (!pTab) continue; - std::for_each(pTab->begin(), pTab->end(), boost::checked_deleter<ColumnType>()); + std::for_each(pTab->begin(), pTab->end(), std::default_delete<ColumnType>()); delete pTab; } } diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index f486e28139be..f02c8a39b273 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -104,7 +104,6 @@ #include <limits> #include <map> #include <memory> -#include <boost/checked_delete.hpp> #include <comphelper/lok.hxx> #include <LibreOfficeKit/LibreOfficeKitEnums.h> @@ -832,7 +831,7 @@ bool ScDocument::DeleteTabs( SCTAB nTab, SCTAB nSheets ) TableContainer::iterator it = maTabs.begin() + nTab; TableContainer::iterator itEnd = it + nSheets; - std::for_each(it, itEnd, boost::checked_deleter<ScTable>()); + std::for_each(it, itEnd, std::default_delete<ScTable>()); maTabs.erase(it, itEnd); // UpdateBroadcastAreas must be called between UpdateDeleteTab, // which ends listening, and StartAllListeners, to not modify diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx index a98d800078d6..0d2c3732f5c3 100644 --- a/sc/source/core/data/dptabres.cxx +++ b/sc/source/core/data/dptabres.cxx @@ -39,7 +39,6 @@ #include <algorithm> #include <memory> #include <unordered_map> -#include <boost/checked_delete.hpp> #include <com/sun/star/sheet/DataResultFlags.hpp> #include <com/sun/star/sheet/MemberResultFlags.hpp> @@ -760,7 +759,7 @@ ScDPResultData::ScDPResultData( ScDPSource& rSrc ) : ScDPResultData::~ScDPResultData() { - std::for_each(maDimMembers.begin(), maDimMembers.end(), boost::checked_deleter<ResultMembers>()); + std::for_each(maDimMembers.begin(), maDimMembers.end(), std::default_delete<ResultMembers>()); } void ScDPResultData::SetMeasureData( @@ -3545,7 +3544,7 @@ ScDPDataDimension::ScDPDataDimension( const ScDPResultData* pData ) : ScDPDataDimension::~ScDPDataDimension() { - std::for_each(maMembers.begin(), maMembers.end(), boost::checked_deleter<ScDPDataMember>()); + std::for_each(maMembers.begin(), maMembers.end(), std::default_delete<ScDPDataMember>()); } void ScDPDataDimension::InitFrom( const ScDPResultDimension* pDim ) diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx index fcd6984f650d..64c082b1fc61 100644 --- a/sc/source/core/data/table3.cxx +++ b/sc/source/core/data/table3.cxx @@ -69,7 +69,6 @@ #include <memory> #include <unordered_set> #include <vector> -#include <boost/checked_delete.hpp> #include <mdds/flat_segment_tree.hpp> #include <o3tl/make_unique.hxx> @@ -300,7 +299,7 @@ public: } if (mpRows) - std::for_each(mpRows->begin(), mpRows->end(), boost::checked_deleter<Row>()); + std::for_each(mpRows->begin(), mpRows->end(), std::default_delete<Row>()); } void SetKeepQuery( bool b ) { mbKeepQuery = b; } diff --git a/sc/source/core/tool/chartlis.cxx b/sc/source/core/tool/chartlis.cxx index c159f397355a..9bbd432a6e05 100644 --- a/sc/source/core/tool/chartlis.cxx +++ b/sc/source/core/tool/chartlis.cxx @@ -24,8 +24,6 @@ #include "document.hxx" #include "reftokenhelper.hxx" -#include <boost/checked_delete.hpp> - using namespace com::sun::star; using ::std::vector; using ::std::unary_function; @@ -591,7 +589,7 @@ void ScChartListenerCollection::FreeUno( const uno::Reference< chart::XChartData std::for_each(aUsed.begin(), aUsed.end(), InsertChartListener(m_Listeners)); // Now, delete the ones no longer needed. - std::for_each(aUnused.begin(), aUnused.end(), boost::checked_deleter<ScChartListener>()); + std::for_each(aUnused.begin(), aUnused.end(), std::default_delete<ScChartListener>()); } void ScChartListenerCollection::StartTimer() diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx index 8c40bf4fbe97..8370f2d0ca71 100644 --- a/sc/source/core/tool/rangelst.cxx +++ b/sc/source/core/tool/rangelst.cxx @@ -26,8 +26,8 @@ #include "refupdat.hxx" #include "rechead.hxx" #include "compiler.hxx" -#include <boost/checked_delete.hpp> #include <algorithm> +#include <memory> using ::std::vector; using ::std::advance; @@ -1091,7 +1091,7 @@ void ScRangeList::Remove(size_t nPos) void ScRangeList::RemoveAll() { - for_each(maRanges.begin(), maRanges.end(), boost::checked_deleter<ScRange>()); + for_each(maRanges.begin(), maRanges.end(), std::default_delete<ScRange>()); maRanges.clear(); } @@ -1222,7 +1222,7 @@ ScRangeList ScRangeList::GetIntersectedRange(const ScRange& rRange) const // ScRangePairList ScRangePairList::~ScRangePairList() { - for_each( maPairs.begin(), maPairs.end(), boost::checked_deleter<ScRangePair>() ); + for_each( maPairs.begin(), maPairs.end(), std::default_delete<ScRangePair>() ); maPairs.clear(); } diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx index 66c18054dbb4..3c94c058e291 100644 --- a/sc/source/filter/xcl97/xcl97rec.cxx +++ b/sc/source/filter/xcl97/xcl97rec.cxx @@ -77,7 +77,6 @@ #include <oox/export/utils.hxx> #include <oox/export/vmlexport.hxx> -#include <boost/checked_delete.hpp> #include <memory> using namespace ::com::sun::star; @@ -108,7 +107,7 @@ XclExpObjList::XclExpObjList( const XclExpRoot& rRoot, XclEscherEx& rEscherEx ) XclExpObjList::~XclExpObjList() { - std::for_each(maObjs.begin(), maObjs.end(), boost::checked_deleter<XclObj>()); + std::for_each(maObjs.begin(), maObjs.end(), std::default_delete<XclObj>()); delete pMsodrawingPerSheet; delete pSolverContainer; } diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index 5ff63561eae9..582b0c6d136a 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -60,7 +60,6 @@ #include <comphelper/sequence.hxx> #include <rtl/math.hxx> -#include <boost/checked_delete.hpp> SC_SIMPLE_SERVICE_INFO( ScChart2DataProvider, "ScChart2DataProvider", "com.sun.star.chart2.data.DataProvider") @@ -163,7 +162,7 @@ struct TokenTable } void clear() { - std::for_each(maTokens.begin(), maTokens.end(), boost::checked_deleter<FormulaToken>()); + std::for_each(maTokens.begin(), maTokens.end(), std::default_delete<FormulaToken>()); } void push_back( FormulaToken* pToken ) diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index b5ead95f4a98..67a220886fa6 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -59,7 +59,6 @@ #include "ViewSettingsSequenceDefines.hxx" #include <gridwin.hxx> #include <rtl/ustrbuf.hxx> -#include <boost/checked_delete.hpp> #include <comphelper/flagguard.hxx> #include <comphelper/lok.hxx> #include <comphelper/processfactory.hxx> @@ -498,7 +497,7 @@ ScViewData::~ScViewData() KillEditView(); delete pOptions; ::std::for_each( - maTabData.begin(), maTabData.end(), boost::checked_deleter<ScViewDataTable>()); + maTabData.begin(), maTabData.end(), std::default_delete<ScViewDataTable>()); } void ScViewData::UpdateCurrentTab() |