C++11 remove std::unary_function bases from functors

std::unary_function is deprecated since C++11 and removed in C++17

90% done with regexp magic.
removed obsolete <functional> includes.

The std::unary_function base class was used in 3 places:
* chart2/source/tools/DataSeriesHelper.cxx: lcl_MatchesRole
is used in a std::not1 function helper who uses the members
return_type and argument_type.
- replace deprecated std::not1 with a lambda
* chart2/source/tools/ModifyListenerHelper.cxx:
lcl_weakReferenceToSame used the argument_type member in the
operator() parameter.
- inline the parameter type.
* xmloff/source/chart/SchXMLExport.cxx: lcl_SequenceToMapElement
used result_type and argument_type in operator().
- inline the types

Also fix compile error with gcc about finding std::for_each.

Change-Id: I073673beb01410c3108e7d0346d9e7d6b9ad2e2f
Reviewed-on: https://gerrit.libreoffice.org/39358
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>

44 files changed, 117 insertions, 124 deletions

diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx
index 5f778da68e43..5abd47579ef0 100644
--- a/sc/inc/dptabres.hxx
+++ b/sc/inc/dptabres.hxx
@@ -220,7 +220,7 @@ class ScDPDataMember;
 #define SC_DPMEASURE_ALL    -1
 #define SC_DPMEASURE_ANY    -2
 
-struct MemberHashIndexFunc : public std::unary_function< const SCROW &, size_t >
+struct MemberHashIndexFunc
 {
     size_t operator() (SCROW rDataIndex) const { return rDataIndex; }
 };
diff --git a/sc/inc/typedstrdata.hxx b/sc/inc/typedstrdata.hxx
index d0cb0d9fa4ad..e7c47a47c9e1 100644
--- a/sc/inc/typedstrdata.hxx
+++ b/sc/inc/typedstrdata.hxx
@@ -65,7 +65,7 @@ private:
     bool   mbIsDate;
 };
 
-class FindTypedStrData : public std::unary_function<ScTypedStrData, bool>
+class FindTypedStrData
 {
     ScTypedStrData maVal;
     bool mbCaseSens;
diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx
index d41e0eb0a912..4c786f210545 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -1777,7 +1777,7 @@ void ScFiltersTest::testCellAnchoredHiddenShapesXLSX()
 
 namespace {
 
-class FindDimByName : public std::unary_function<const ScDPSaveDimension*, bool>
+class FindDimByName
 {
     OUString maName;
 public:
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 8456b872f70e..ecb0d5e8ab03 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -1982,7 +1982,7 @@ void ScColumn::MoveTo(SCROW nStartRow, SCROW nEndRow, ScColumn& rCol)
 
 namespace {
 
-class SharedTopFormulaCellPicker : public std::unary_function<sc::CellStoreType::value_type, void>
+class SharedTopFormulaCellPicker
 {
 public:
     virtual ~SharedTopFormulaCellPicker() {}
@@ -2056,7 +2056,7 @@ public:
     }
 };
 
-class UpdateRefOnNonCopy : public std::unary_function<sc::FormulaGroupEntry, void>
+class UpdateRefOnNonCopy
 {
     SCCOL mnCol;
     SCROW mnTab;
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index d08b9a559f8b..7a7591f3b032 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -1569,7 +1569,7 @@ namespace {
 
 #define DUMP_FORMULA_RESULTS 0
 
-struct ColumnStorageDumper : std::unary_function<sc::CellStoreType::value_type, void>
+struct ColumnStorageDumper
 {
     const ScDocument* mpDoc;
 
@@ -2614,7 +2614,7 @@ copyFirstFormulaBlock(
     return rCxt.setCachedColArray(nTab, nCol, pNumArray, pStrArray);
 }
 
-struct NonNullStringFinder : std::unary_function<const rtl_uString*, bool>
+struct NonNullStringFinder
 {
     bool operator() (const rtl_uString* p) const { return p != nullptr; }
 };
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 112afef0a14a..3afc14dd15d4 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -799,7 +799,7 @@ void ScColumn::InitBlockPosition( sc::ColumnBlockConstPosition& rBlockPos ) cons
 
 namespace {
 
-class CopyAttrArrayByRange : public std::unary_function<sc::RowSpan, void>
+class CopyAttrArrayByRange
 {
     ScAttrArray& mrDestAttrArray;
     ScAttrArray& mrSrcAttrArray;
diff --git a/sc/source/core/data/documen7.cxx b/sc/source/core/data/documen7.cxx
index 8ab7e6014266..dd4134965ad8 100644
--- a/sc/source/core/data/documen7.cxx
+++ b/sc/source/core/data/documen7.cxx
@@ -129,7 +129,7 @@ void ScDocument::BroadcastCells( const ScRange& rRange, SfxHintId nHint, bool bB
 
 namespace {
 
-class RefMovedNotifier : public std::unary_function<SvtListener*, void>
+class RefMovedNotifier
 {
     const sc::RefMovedHint& mrHint;
 public:
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 27e7eb9cf5d8..c78e1db3acf9 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -1230,7 +1230,7 @@ bool ScDocument::CanInsertRow( const ScRange& rRange ) const
 
 namespace {
 
-struct SetDirtyIfPostponedHandler : std::unary_function<ScTable*, void>
+struct SetDirtyIfPostponedHandler
 {
     void operator() (ScTable* p)
     {
@@ -1239,7 +1239,7 @@ struct SetDirtyIfPostponedHandler : std::unary_function<ScTable*, void>
     }
 };
 
-struct BroadcastRecalcOnRefMoveHandler : std::unary_function<ScTable*, void>
+struct BroadcastRecalcOnRefMoveHandler
 {
     void operator() (ScTable* p)
     {
diff --git a/sc/source/core/data/document10.cxx b/sc/source/core/data/document10.cxx
index fddc029dc815..4768bfeadf10 100644
--- a/sc/source/core/data/document10.cxx
+++ b/sc/source/core/data/document10.cxx
@@ -463,7 +463,7 @@ void ScDocument::SetNeedsListeningGroups( const std::vector<ScAddress>& rPosArra
 
 namespace {
 
-class StartNeededListenersHandler : public std::unary_function<ScTable*, void>
+class StartNeededListenersHandler
 {
     std::shared_ptr<sc::StartListeningContext> mpCxt;
 public:
diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index 67d586a94484..9cc82795d3da 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -77,7 +77,7 @@ ScDPCache::ScDPCache(ScDocument* pDoc) :
 
 namespace {
 
-struct ClearObjectSource : std::unary_function<ScDPObject*, void>
+struct ClearObjectSource
 {
     void operator() (ScDPObject* p) const
     {
@@ -185,7 +185,7 @@ struct Bucket
 using std::cout;
 using std::endl;
 
-struct PrintBucket : std::unary_function<Bucket, void>
+struct PrintBucket
 {
     void operator() (const Bucket& v) const
     {
@@ -227,7 +227,7 @@ struct EqualByOrderIndex : std::binary_function<Bucket, Bucket, bool>
     }
 };
 
-class PushBackValue : public std::unary_function<Bucket, void>
+class PushBackValue
 {
     ScDPCache::ScDPItemDataVec& mrItems;
 public:
@@ -238,7 +238,7 @@ public:
     }
 };
 
-class PushBackOrderIndex : public std::unary_function<Bucket, void>
+class PushBackOrderIndex
 {
     ScDPCache::IndexArrayType& mrData;
 public:
@@ -336,7 +336,7 @@ struct InitDocData
 
 typedef std::unordered_set<OUString, OUStringHash> LabelSet;
 
-class InsertLabel : public std::unary_function<OUString, void>
+class InsertLabel
 {
     LabelSet& mrNames;
 public:
@@ -1378,7 +1378,7 @@ void ScDPCache::GetGroupDimMemberIds(long nDim, std::vector<SCROW>& rIds) const
 
 namespace {
 
-struct ClearGroupItems : std::unary_function<std::unique_ptr<ScDPCache::Field>, void>
+struct ClearGroupItems
 {
     void operator() (std::unique_ptr<ScDPCache::Field>& r) const
     {
diff --git a/sc/source/core/data/dpdimsave.cxx b/sc/source/core/data/dpdimsave.cxx
index 3ecc2ee04e75..564b56e93f02 100644
--- a/sc/source/core/data/dpdimsave.cxx
+++ b/sc/source/core/data/dpdimsave.cxx
@@ -659,7 +659,7 @@ void ScDPDimensionSaveData::WriteToData( ScDPGroupTableData& rData ) const
 
 namespace {
 
-class AddGroupDimToCache : public std::unary_function<ScDPSaveGroupDimension, void>
+class AddGroupDimToCache
 {
     ScDPCache& mrCache;
 public:
diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx
index d0d75bca5c2f..f4dab854015b 100644
--- a/sc/source/core/data/dpgroup.cxx
+++ b/sc/source/core/data/dpgroup.cxx
@@ -634,7 +634,7 @@ void ScDPGroupTableData::CreateCacheTable()
 
 namespace {
 
-class FindCaseInsensitive : public std::unary_function<ScDPItemData, bool>
+class FindCaseInsensitive
 {
     ScDPItemData maValue;
 public:
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index baddcf5e9e5b..fdba353ca7ed 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -82,7 +82,6 @@
 
 using namespace com::sun::star;
 using ::std::vector;
-using ::std::unary_function;
 using ::std::shared_ptr;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::Reference;
@@ -584,7 +583,7 @@ public:
     }
 };
 
-class FindIntersectingTable : public std::unary_function<std::unique_ptr<ScDPObject>, bool>
+class FindIntersectingTable
 {
     ScRange maRange;
 public:
@@ -596,7 +595,7 @@ public:
     }
 };
 
-class FindIntersectingTableByColumns : public std::unary_function<std::unique_ptr<ScDPObject>, bool>
+class FindIntersectingTableByColumns
 {
     SCCOL mnCol1;
     SCCOL mnCol2;
@@ -630,7 +629,7 @@ public:
     }
 };
 
-class FindIntersectingTableByRows : public std::unary_function<std::unique_ptr<ScDPObject>, bool>
+class FindIntersectingTableByRows
 {
     SCCOL mnCol;
     SCROW mnRow1;
@@ -664,7 +663,7 @@ public:
     }
 };
 
-class AccumulateOutputRanges : public std::unary_function<std::unique_ptr<ScDPObject>, void>
+class AccumulateOutputRanges
 {
     ScRangeList maRanges;
     SCTAB mnTab;
@@ -1326,7 +1325,7 @@ void ScDPObject::GetHeaderPositionData(const ScAddress& rPos, DataPilotTableHead
 
 namespace {
 
-class FindByName : public std::unary_function<const ScDPSaveDimension*, bool>
+class FindByName
 {
     OUString maName; // must be all uppercase.
 public:
@@ -2144,7 +2143,7 @@ static PivotFunc lcl_FirstSubTotal( const uno::Reference<beans::XPropertySet>& x
 
 namespace {
 
-class FindByColumn : public std::unary_function<ScPivotField, bool>
+class FindByColumn
 {
     SCCOL mnCol;
     PivotFunc mnMask;
@@ -2614,7 +2613,7 @@ bool hasFieldColumn(const vector<ScPivotField>* pRefFields, SCCOL nCol)
     return false;
 }
 
-class FindByOriginalDim : public std::unary_function<ScPivotField, bool>
+class FindByOriginalDim
 {
     long mnDim;
 public:
@@ -2902,7 +2901,7 @@ ScDPCollection::SheetCaches::SheetCaches(ScDocument* pDoc) : mpDoc(pDoc) {}
 
 namespace {
 
-struct FindInvalidRange : public std::unary_function<ScRange, bool>
+struct FindInvalidRange
 {
     bool operator() (const ScRange& r) const
     {
@@ -3388,7 +3387,7 @@ namespace {
 /**
  * Unary predicate to match DP objects by the table ID.
  */
-class MatchByTable : public unary_function<std::unique_ptr<ScDPObject>, bool>
+class MatchByTable
 {
     SCTAB mnTab;
 public:
@@ -3857,7 +3856,7 @@ bool ScDPCollection::HasTable( const ScRange& rRange ) const
 
 namespace {
 
-struct DumpTable : std::unary_function<std::unique_ptr<ScDPObject>, void>
+struct DumpTable
 {
     void operator() (const std::unique_ptr<ScDPObject>& rObj) const
     {
diff --git a/sc/source/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxx
index 323eb34b431d..7715eed721bb 100644
--- a/sc/source/core/data/dpsave.cxx
+++ b/sc/source/core/data/dpsave.cxx
@@ -847,7 +847,7 @@ const OUString* ScDPSaveData::GetGrandTotalName() const
 
 namespace {
 
-class DimOrderInserter : public std::unary_function<const ScDPSaveDimension*, void>
+class DimOrderInserter
 {
     ScDPSaveData::DimOrderType& mrNames;
 public:
diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx
index 7c92e59d3745..5610ed70d22e 100644
--- a/sc/source/core/data/dptabsrc.cxx
+++ b/sc/source/core/data/dptabsrc.cxx
@@ -662,7 +662,7 @@ void ScDPSource::FillCalcInfo(bool bIsRow, ScDPTableData::CalcInfo& rInfo, bool
 
 namespace {
 
-class CategoryDimInserter : public std::unary_function<long, void>
+class CategoryDimInserter
 {
     ScDPSource& mrSource;
     std::unordered_set<sal_Int32>& mrCatDims;
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index 464e33d545e5..713c26086844 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -1957,7 +1957,7 @@ void ScTable::MaybeAddExtraColumn(SCCOL& rCol, SCROW nRow, OutputDevice* pDev, d
 
 namespace {
 
-class SetTableIndex : public ::std::unary_function<ScRange, void>
+class SetTableIndex
 {
     SCTAB mnTab;
 public:
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 9e33ccb4aee4..cda78f27dd2b 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -652,7 +652,7 @@ void ScTable::DestroySortCollator()
 namespace {
 
 template<typename Hint, typename ReorderMap, typename Index>
-class ReorderNotifier : public std::unary_function<SvtListener*, void>
+class ReorderNotifier
 {
     Hint maHint;
 public:
@@ -665,7 +665,7 @@ public:
     }
 };
 
-class StartListeningNotifier : public std::unary_function<SvtListener*, void>
+class StartListeningNotifier
 {
     sc::RefStartListeningHint maHint;
 public:
@@ -677,7 +677,7 @@ public:
     }
 };
 
-class StopListeningNotifier : public std::unary_function<SvtListener*, void>
+class StopListeningNotifier
 {
     sc::RefStopListeningHint maHint;
 public:
@@ -689,7 +689,7 @@ public:
     }
 };
 
-class FormulaGroupPosCollector : public std::unary_function<SvtListener*, void>
+class FormulaGroupPosCollector
 {
     sc::RefQueryFormulaGroup& mrQuery;
 
@@ -2880,7 +2880,7 @@ void ScTable::TopTenQuery( ScQueryParam& rParam )
 
 namespace {
 
-class PrepareQueryItem : public std::unary_function<ScQueryEntry::Item, void>
+class PrepareQueryItem
 {
     const ScDocument& mrDoc;
 public:
diff --git a/sc/source/core/tool/chartlis.cxx b/sc/source/core/tool/chartlis.cxx
index 04fa263ec723..75010c572b54 100644
--- a/sc/source/core/tool/chartlis.cxx
+++ b/sc/source/core/tool/chartlis.cxx
@@ -27,7 +27,6 @@
 
 using namespace com::sun::star;
 using ::std::vector;
-using ::std::unary_function;
 using ::std::for_each;
 
 // Update chart listeners quickly, to get a similar behavior to loaded charts
@@ -237,7 +236,7 @@ void ScChartListener::SetRangeList( const ScRangeListRef& rNew )
 
 namespace {
 
-class StartEndListening : public unary_function<ScTokenRef, void>
+class StartEndListening
 {
 public:
     StartEndListening(ScDocument* pDoc, ScChartListener& rParent, bool bStart) :
@@ -503,7 +502,7 @@ void ScChartListenerCollection::ChangeListening( const OUString& rName,
 
 namespace {
 
-class InsertChartListener : public std::unary_function<ScChartListener*, void>
+class InsertChartListener
 {
     ScChartListenerCollection::ListenersType& mrListeners;
 public:
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index e8284bc8fa37..7b83cc6fcdfc 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -4337,7 +4337,7 @@ void ScCompiler::CreateStringFromXMLTokenArray( OUString& rFormula, OUString& rF
 
 namespace {
 
-class ExternalFileInserter : public std::unary_function<sal_uInt16, void>
+class ExternalFileInserter
 {
     ScAddress maPos;
     ScExternalRefManager& mrRefMgr;
diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx
index 202ec4edfb3a..a6580a5a8e24 100644
--- a/sc/source/core/tool/dbdata.cxx
+++ b/sc/source/core/tool/dbdata.cxx
@@ -41,7 +41,6 @@
 #include <utility>
 
 using ::std::unique_ptr;
-using ::std::unary_function;
 using ::std::for_each;
 using ::std::find_if;
 using ::std::remove_if;
@@ -724,7 +723,7 @@ void ScDBData::InvalidateTableColumnNames( bool bSwapToEmptyNames )
 }
 
 namespace {
-class TableColumnNameSearch : public unary_function<ScDBData, bool>
+class TableColumnNameSearch
 {
 public:
     explicit TableColumnNameSearch( const OUString& rSearchName ) :
@@ -933,7 +932,7 @@ void ScDBData::GetFilterSelCount( SCSIZE& nSelected, SCSIZE& nTotal )
 
 namespace {
 
-class FindByTable : public unary_function<std::unique_ptr<ScDBData>, bool>
+class FindByTable
 {
     SCTAB mnTab;
 public:
@@ -947,7 +946,7 @@ public:
     }
 };
 
-class UpdateRefFunc : public unary_function<std::unique_ptr<ScDBData>, void>
+class UpdateRefFunc
 {
     ScDocument* mpDoc;
     UpdateRefMode meMode;
@@ -977,7 +976,7 @@ public:
     }
 };
 
-class UpdateMoveTabFunc : public unary_function<std::unique_ptr<ScDBData>, void>
+class UpdateMoveTabFunc
 {
     SCTAB mnOldTab;
     SCTAB mnNewTab;
@@ -989,7 +988,7 @@ public:
     }
 };
 
-class FindByCursor : public unary_function<std::unique_ptr<ScDBData>, bool>
+class FindByCursor
 {
     SCCOL mnCol;
     SCROW mnRow;
@@ -1005,7 +1004,7 @@ public:
     }
 };
 
-class FindByRange : public unary_function<std::unique_ptr<ScDBData>, bool>
+class FindByRange
 {
     const ScRange& mrRange;
 public:
@@ -1018,7 +1017,7 @@ public:
     }
 };
 
-class FindByIndex : public unary_function<std::unique_ptr<ScDBData>, bool>
+class FindByIndex
 {
     sal_uInt16 mnIndex;
 public:
@@ -1029,7 +1028,7 @@ public:
     }
 };
 
-class FindByUpperName : public unary_function<std::unique_ptr<ScDBData>, bool>
+class FindByUpperName
 {
     const OUString& mrName;
 public:
@@ -1040,7 +1039,7 @@ public:
     }
 };
 
-class FindByPointer : public unary_function<std::unique_ptr<ScDBData>, bool>
+class FindByPointer
 {
     const ScDBData* mpDBData;
 public:
diff --git a/sc/source/core/tool/grouparealistener.cxx b/sc/source/core/tool/grouparealistener.cxx
index 031d53000870..888d0efdbf73 100644
--- a/sc/source/core/tool/grouparealistener.cxx
+++ b/sc/source/core/tool/grouparealistener.cxx
@@ -22,7 +22,7 @@ namespace sc {
 
 namespace {
 
-class Notifier : public std::unary_function<ScFormulaCell*, void>
+class Notifier
 {
     const SfxHint& mrHint;
 public:
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 5df85fad9e75..9ee855897f2a 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -71,7 +71,6 @@
 #include <float.h>
 #include <map>
 #include <algorithm>
-#include <functional>
 #include <basic/basmgr.hxx>
 #include <vbahelper/vbaaccesshelper.hxx>
 #include <memory>
@@ -3556,7 +3555,7 @@ bool ScInterpreter::SetSbxVariable( SbxVariable* pVar, const ScAddress& rPos )
 
 namespace {
 
-class FindByPointer : public ::std::unary_function<ScInterpreterTableOpParams, bool>
+class FindByPointer
 {
     const ScInterpreterTableOpParams* mpTableOp;
 public:
diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx
index 90c447e59eb8..75e3f8dd5da1 100644
--- a/sc/source/core/tool/interpr5.cxx
+++ b/sc/source/core/tool/interpr5.cxx
@@ -1659,7 +1659,7 @@ void ScInterpreter::ScPow()
 
 namespace {
 
-class SumValues : public std::unary_function<double, void>
+class SumValues
 {
     double mfSum;
     bool   mbError;
diff --git a/sc/source/core/tool/queryparam.cxx b/sc/source/core/tool/queryparam.cxx
index 2406ca523e0d..72fa4919537e 100644
--- a/sc/source/core/tool/queryparam.cxx
+++ b/sc/source/core/tool/queryparam.cxx
@@ -33,7 +33,7 @@ namespace {
 
 const size_t MAXQUERY = 8;
 
-class FindByField : public std::unary_function<ScQueryEntry, bool>
+class FindByField
 {
     SCCOLROW mnField;
 public:
@@ -44,7 +44,7 @@ public:
     }
 };
 
-struct FindUnused : public std::unary_function<ScQueryEntry, bool>
+struct FindUnused
 {
     bool operator() (const std::unique_ptr<ScQueryEntry>& rpEntry) const
     {
diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx
index f475ba16adb4..cb5c8e831458 100644
--- a/sc/source/core/tool/rangelst.cxx
+++ b/sc/source/core/tool/rangelst.cxx
@@ -38,7 +38,7 @@ using ::formula::FormulaGrammar;
 namespace {
 
 template<typename T>
-class FindEnclosingRange : public ::std::unary_function<ScRange*, bool>
+class FindEnclosingRange
 {
 public:
     explicit FindEnclosingRange(const T& rTest) : mrTest(rTest) {}
@@ -52,7 +52,7 @@ private:
 };
 
 template<typename T>
-class FindRangeIn : public ::std::unary_function<ScRange*, bool>
+class FindRangeIn
 {
 public:
     FindRangeIn(const T& rTest) : mrTest(rTest) {}
@@ -66,7 +66,7 @@ private:
 };
 
 template<typename T>
-class FindIntersectingRange : public ::std::unary_function<ScRange*, bool>
+class FindIntersectingRange
 {
 public:
     explicit FindIntersectingRange(const T& rTest) : mrTest(rTest) {}
@@ -79,7 +79,7 @@ private:
     const T& mrTest;
 };
 
-class AppendToList : public ::std::unary_function<const ScRange*, void>
+class AppendToList
 {
 public:
     explicit AppendToList(vector<ScRange*>& rRanges) : mrRanges(rRanges) {}
@@ -92,7 +92,7 @@ private:
     vector<ScRange*>& mrRanges;
 };
 
-class CountCells : public ::std::unary_function<const ScRange*, void>
+class CountCells
 {
 public:
     CountCells() : mnCellCount(0) {}
@@ -112,7 +112,7 @@ private:
     size_t mnCellCount;
 };
 
-class FormatString : public ::std::unary_function<const ScRange*, void>
+class FormatString
 {
 public:
     FormatString(OUString& rStr, ScRefFlags nFlags, ScDocument* pDoc, FormulaGrammar::AddressConvention eConv, sal_Unicode cDelim) :
diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx
index b9c6f9a77f8d..db12ebe0f6d2 100644
--- a/sc/source/core/tool/rangenam.cxx
+++ b/sc/source/core/tool/rangenam.cxx
@@ -41,7 +41,6 @@
 
 using namespace formula;
 using ::std::pair;
-using ::std::unary_function;
 
 // ScRangeData
 
@@ -652,7 +651,7 @@ namespace {
 /**
  * Predicate to check if the name references the specified range.
  */
-class MatchByRange : public unary_function<ScRangeData, bool>
+class MatchByRange
 {
     const ScRange& mrRange;
 public:
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index 812c956bae05..8a33b34e64df 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -52,7 +52,6 @@ using std::endl;
 
 using ::std::pair;
 using ::std::advance;
-using ::std::unary_function;
 
 /**
  * Custom string trait struct to tell mdds::multi_type_matrix about the
@@ -87,7 +86,7 @@ double convertStringToValue( ScInterpreter* pErrorInterpreter, const OUString& r
     return CreateDoubleError( FormulaError::NoValue);
 }
 
-struct ElemEqualZero : public unary_function<double, double>
+struct ElemEqualZero
 {
     double operator() (double val) const
     {
@@ -97,7 +96,7 @@ struct ElemEqualZero : public unary_function<double, double>
     }
 };
 
-struct ElemNotEqualZero : public unary_function<double, double>
+struct ElemNotEqualZero
 {
     double operator() (double val) const
     {
@@ -107,7 +106,7 @@ struct ElemNotEqualZero : public unary_function<double, double>
     }
 };
 
-struct ElemGreaterZero : public unary_function<double, double>
+struct ElemGreaterZero
 {
     double operator() (double val) const
     {
@@ -117,7 +116,7 @@ struct ElemGreaterZero : public unary_function<double, double>
     }
 };
 
-struct ElemLessZero : public unary_function<double, double>
+struct ElemLessZero
 {
     double operator() (double val) const
     {
@@ -127,7 +126,7 @@ struct ElemLessZero : public unary_function<double, double>
     }
 };
 
-struct ElemGreaterEqualZero : public unary_function<double, double>
+struct ElemGreaterEqualZero
 {
     double operator() (double val) const
     {
@@ -137,7 +136,7 @@ struct ElemGreaterEqualZero : public unary_function<double, double>
     }
 };
 
-struct ElemLessEqualZero : public unary_function<double, double>
+struct ElemLessEqualZero
 {
     double operator() (double val) const
     {
@@ -148,7 +147,7 @@ struct ElemLessEqualZero : public unary_function<double, double>
 };
 
 template<typename Comp>
-class CompareMatrixElemFunc : public std::unary_function<MatrixImplType::element_block_node_type, void>
+class CompareMatrixElemFunc
 {
     static Comp maComp;
 
@@ -1217,7 +1216,7 @@ public:
     }
 };
 
-class CountElements : public std::unary_function<MatrixImplType::element_block_node_type, void>
+class CountElements
 {
     size_t mnCount;
     bool mbCountString;
@@ -1264,7 +1263,7 @@ public:
 const size_t ResultNotSet = std::numeric_limits<size_t>::max();
 
 template<typename Type>
-class WalkAndMatchElements : public std::unary_function<MatrixImplType::element_block_node_type, void>
+class WalkAndMatchElements
 {
     Type maMatchValue;
     MatrixImplType::size_pair_type maSize;
@@ -1455,7 +1454,7 @@ struct Gcd
 };
 
 template<typename Op>
-class CalcMaxMinValue : public std::unary_function<MatrixImplType::element_block_type, void>
+class CalcMaxMinValue
 {
     double mfVal;
     bool mbTextAsZero;
@@ -1514,7 +1513,7 @@ public:
 };
 
 template<typename Op>
-class CalcGcdLcm : public std::unary_function<MatrixImplType::element_block_type,void>
+class CalcGcdLcm
 {
     double mfval;
 
@@ -1594,7 +1593,7 @@ inline double evaluate( double fVal, ScQueryOp eOp )
     return CreateDoubleError( FormulaError::UnknownState);
 }
 
-class CompareMatrixFunc : public std::unary_function<MatrixImplType::element_block_type, void>
+class CompareMatrixFunc
 {
     sc::Compare& mrComp;
     size_t mnMatPos;
@@ -1689,7 +1688,7 @@ public:
 /**
  * Left-hand side is a matrix while the right-hand side is a numeric value.
  */
-class CompareMatrixToNumericFunc : public std::unary_function<MatrixImplType::element_block_type, void>
+class CompareMatrixToNumericFunc
 {
     sc::Compare& mrComp;
     double mfRightValue;
@@ -1778,7 +1777,7 @@ public:
     }
 };
 
-class ToDoubleArray : public std::unary_function<MatrixImplType::element_block_type, void>
+class ToDoubleArray
 {
     std::vector<double> maArray;
     std::vector<double>::iterator miPos;
@@ -1852,7 +1851,7 @@ struct ArrayMul : public std::binary_function<double, double, double>
 };
 
 template<typename Op>
-class MergeDoubleArrayFunc : public std::unary_function<MatrixImplType::element_block_type, void>
+class MergeDoubleArrayFunc
 {
     std::vector<double>& mrArray;
     std::vector<double>::iterator miPos;
diff --git a/sc/source/core/tool/userlist.cxx b/sc/source/core/tool/userlist.cxx
index 0f542a9ed777..4a49e65dfe36 100644
--- a/sc/source/core/tool/userlist.cxx
+++ b/sc/source/core/tool/userlist.cxx
@@ -31,7 +31,7 @@
 
 namespace {
 
-class FindByName : public ::std::unary_function<ScUserListData::SubStr, bool>
+class FindByName
 {
     const OUString& mrName;
     bool mbUpper;
diff --git a/sc/source/filter/excel/xestring.cxx b/sc/source/filter/excel/xestring.cxx
index 442395596b0e..b02ec636d449 100644
--- a/sc/source/filter/excel/xestring.cxx
+++ b/sc/source/filter/excel/xestring.cxx
@@ -58,7 +58,7 @@ int lclCompareVectors( const ::std::vector< Type >& rLeft, const ::std::vector<
 /** Base class for value hashers.
     @descr  These function objects are used to hash any value to a sal_uInt32 value. */
 template< typename Type >
-struct XclHasher : public ::std::unary_function< Type, sal_uInt32 > {};
+struct XclHasher {};
 
 template< typename Type >
 struct XclDirectHasher : public XclHasher< Type >
diff --git a/sc/source/filter/orcus/interface.cxx b/sc/source/filter/orcus/interface.cxx
index 9efb60cc80c7..35e9ffacfafa 100644
--- a/sc/source/filter/orcus/interface.cxx
+++ b/sc/source/filter/orcus/interface.cxx
@@ -95,7 +95,7 @@ orcus::spreadsheet::iface::import_sheet* ScOrcusFactory::append_sheet(const char
     return maSheets.back().get();
 }
 
-class FindSheetByIndex : public std::unary_function< std::unique_ptr<ScOrcusSheet>, bool>
+class FindSheetByIndex
 {
     SCTAB mnTab;
 public:
diff --git a/sc/source/filter/orcus/xmlcontext.cxx b/sc/source/filter/orcus/xmlcontext.cxx
index 606456563a4d..cdbde68f81ee 100644
--- a/sc/source/filter/orcus/xmlcontext.cxx
+++ b/sc/source/filter/orcus/xmlcontext.cxx
@@ -141,7 +141,7 @@ public:
     }
 };
 
-class InsertFieldPath : public std::unary_function<OString, void>
+class InsertFieldPath
 {
     orcus::orcus_xml& mrFilter;
 public:
@@ -214,7 +214,7 @@ void ScOrcusXMLContextImpl::loadXMLStructure(SvTreeListBox& rTreeCtrl, ScOrcusXM
 
 namespace {
 
-class SetNamespaceAlias : public std::unary_function<size_t, void>
+class SetNamespaceAlias
 {
     orcus::orcus_xml& mrFilter;
     orcus::xmlns_repository& mrNsRepo;
diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
index 77d2711bbe2f..b388df8cc8b7 100644
--- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
+++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
@@ -113,7 +113,7 @@ ScMyEmptyDatabaseRangesContainer ScXMLExportDatabaseRanges::GetEmptyDatabaseRang
 
 namespace {
 
-class WriteDatabaseRange : public ::std::unary_function<ScDBData, void>
+class WriteDatabaseRange
 {
     ScXMLExport& mrExport;
     ScDocument* mpDoc;
@@ -420,7 +420,7 @@ private:
         return OUString("=");
     }
 
-    class WriteSetItem : public std::unary_function<ScQueryEntry::Item, void>
+    class WriteSetItem
     {
         ScXMLExport& mrExport;
     public:
diff --git a/sc/source/filter/xml/pivotsource.cxx b/sc/source/filter/xml/pivotsource.cxx
index 633b8c5b1abe..322459239320 100644
--- a/sc/source/filter/xml/pivotsource.cxx
+++ b/sc/source/filter/xml/pivotsource.cxx
@@ -54,7 +54,7 @@ void PivotTableSources::appendSelectedPages( ScDPObject* pObj, const SelectedPag
 
 namespace {
 
-struct SelectedPageProcessor : std::unary_function<PivotTableSources::SelectedPages, void>
+struct SelectedPageProcessor
 {
     void operator() ( PivotTableSources::SelectedPages& rItem )
     {
@@ -81,7 +81,7 @@ struct SelectedPageProcessor : std::unary_function<PivotTableSources::SelectedPa
     }
 };
 
-struct PivotSheetDescSetter : std::unary_function<sc::PivotTableSources::SheetSource, void>
+struct PivotSheetDescSetter
 {
     void operator() ( sc::PivotTableSources::SheetSource& rSrc )
     {
@@ -90,7 +90,7 @@ struct PivotSheetDescSetter : std::unary_function<sc::PivotTableSources::SheetSo
     }
 };
 
-struct PivotDBDescSetter : std::unary_function<sc::PivotTableSources::DBSource, void>
+struct PivotDBDescSetter
 {
     void operator() ( sc::PivotTableSources::DBSource& rSrc )
     {
@@ -99,7 +99,7 @@ struct PivotDBDescSetter : std::unary_function<sc::PivotTableSources::DBSource,
     }
 };
 
-struct PivotServiceDataSetter : std::unary_function<sc::PivotTableSources::ServiceSource, void>
+struct PivotServiceDataSetter
 {
     void operator() ( sc::PivotTableSources::ServiceSource& rSrc )
     {
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index abd40755e83c..0425953e7826 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -3178,7 +3178,7 @@ void ScXMLImport::SetLabelRanges()
 
 namespace {
 
-class RangeNameInserter : public ::std::unary_function<ScMyNamedExpression, void>
+class RangeNameInserter
 {
     ScDocument* mpDoc;
     ScRangeName& mrRangeName;
diff --git a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx
index 76c96eb554e4..2aa8ba93c3e3 100644
--- a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx
+++ b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx
@@ -50,7 +50,7 @@ using ::std::for_each;
 
 namespace {
 
-class AddRemoveEventListener : public ::std::unary_function<void, Reference<XAccessible> >
+class AddRemoveEventListener
 {
 public:
     explicit AddRemoveEventListener(const Reference<XAccessibleEventListener>& rListener, bool bAdd) :
diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx
index 1955934d4430..0b2155e1ac3a 100644
--- a/sc/source/ui/dbgui/dbnamdlg.cxx
+++ b/sc/source/ui/dbgui/dbnamdlg.cxx
@@ -496,7 +496,7 @@ IMPL_LINK_NOARG(ScDbNameDlg, AddBtnHdl, Button*, void)
 
 namespace {
 
-class FindByName : public ::std::unary_function<std::unique_ptr<ScDBData>, bool>
+class FindByName
 {
     const OUString& mrName;
 public:
diff --git a/sc/source/ui/docshell/autostyl.cxx b/sc/source/ui/docshell/autostyl.cxx
index 30a1fb16c93d..d3fb83763b1a 100644
--- a/sc/source/ui/docshell/autostyl.cxx
+++ b/sc/source/ui/docshell/autostyl.cxx
@@ -31,7 +31,7 @@ static inline sal_uLong TimeNow()          // seconds
 
 namespace {
 
-class FindByRange : public ::std::unary_function<ScAutoStyleData, bool>
+class FindByRange
 {
     ScRange maRange;
 public:
@@ -39,7 +39,7 @@ public:
     bool operator() (const ScAutoStyleData& rData) const { return rData.aRange == maRange; }
 };
 
-class FindByTimeout : public ::std::unary_function<ScAutoStyleData, bool>
+class FindByTimeout
 {
     sal_uLong mnTimeout;
 public:
@@ -47,7 +47,7 @@ public:
     bool operator() (const ScAutoStyleData& rData) const { return rData.nTimeout >= mnTimeout; }
 };
 
-struct FindNonZeroTimeout : public ::std::unary_function<ScAutoStyleData, bool>
+struct FindNonZeroTimeout
 {
     bool operator() (const ScAutoStyleData& rData) const
     {
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx
index a395daf2dd24..e90e0e5af690 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -65,10 +65,10 @@ using ::com::sun::star::uno::Any;
 using ::std::vector;
 using ::std::find;
 using ::std::find_if;
+using ::std::for_each;
 using ::std::distance;
 using ::std::pair;
 using ::std::list;
-using ::std::unary_function;
 using namespace formula;
 
 #define SRCDOC_LIFE_SPAN     30000      // 5 minutes (in 100th of a sec)
@@ -76,7 +76,7 @@ using namespace formula;
 
 namespace {
 
-class TabNameSearchPredicate : public unary_function<ScExternalRefCache::TableName, bool>
+class TabNameSearchPredicate
 {
 public:
     explicit TabNameSearchPredicate(const OUString& rSearchName) :
@@ -94,7 +94,7 @@ private:
     OUString maSearchName;
 };
 
-class FindSrcFileByName : public unary_function<ScExternalRefManager::SrcFileData, bool>
+class FindSrcFileByName
 {
 public:
     explicit FindSrcFileByName(const OUString& rMatchName) :
@@ -111,7 +111,7 @@ private:
     const OUString& mrMatchName;
 };
 
-class NotifyLinkListener : public unary_function<ScExternalRefManager::LinkListener*,  void>
+class NotifyLinkListener
 {
 public:
     NotifyLinkListener(sal_uInt16 nFileId, ScExternalRefManager::LinkUpdateType eType) :
@@ -129,7 +129,7 @@ private:
     ScExternalRefManager::LinkUpdateType meType;
 };
 
-struct UpdateFormulaCell : public unary_function<ScFormulaCell*, void>
+struct UpdateFormulaCell
 {
     void operator() (ScFormulaCell* pCell) const
     {
@@ -152,7 +152,7 @@ struct UpdateFormulaCell : public unary_function<ScFormulaCell*, void>
     }
 };
 
-class RemoveFormulaCell : public unary_function<pair<const sal_uInt16, ScExternalRefManager::RefCellSet>, void>
+class RemoveFormulaCell
 {
 public:
     explicit RemoveFormulaCell(ScFormulaCell* p) : mpCell(p) {}
@@ -164,7 +164,7 @@ private:
     ScFormulaCell* mpCell;
 };
 
-class ConvertFormulaToStatic : public unary_function<ScFormulaCell*, void>
+class ConvertFormulaToStatic
 {
 public:
     explicit ConvertFormulaToStatic(ScDocument* pDoc) : mpDoc(pDoc) {}
@@ -215,7 +215,7 @@ bool hasRefsToSrcDoc(ScRangeData& rData, sal_uInt16 nFileId)
     return false;
 }
 
-class EraseRangeByIterator : public unary_function<ScRangeName::iterator, void>
+class EraseRangeByIterator
 {
     ScRangeName& mrRanges;
 public:
diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx
index 53d6212aeb88..c62b497c9748 100644
--- a/sc/source/ui/undo/undoblk.cxx
+++ b/sc/source/ui/undo/undoblk.cxx
@@ -1261,7 +1261,7 @@ void ScUndoDragDrop::DoUndo( ScRange aRange )
 
 namespace {
 
-class DataChangeNotifier : public std::unary_function<SvtListener*, void>
+class DataChangeNotifier
 {
     ScHint maHint;
 public:
diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index 5593feed2a74..f50a852202ac 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -76,7 +76,6 @@ using ::std::unique_ptr;
 using ::std::vector;
 using ::std::list;
 using ::std::distance;
-using ::std::unary_function;
 using ::std::shared_ptr;
 
 namespace
@@ -104,7 +103,7 @@ const SfxItemPropertyMapEntry* lcl_GetDataSequencePropertyMap()
     return aDataSequencePropertyMap_Impl;
 }
 
-struct lcl_appendTableNumber : public ::std::unary_function< SCTAB, void >
+struct lcl_appendTableNumber
 {
     explicit lcl_appendTableNumber( OUStringBuffer & rBuffer ) :
             m_rBuffer( rBuffer )
@@ -828,7 +827,7 @@ void Chart2Positioner::createPositionMap()
 /**
  * Function object to create a range string from a token list.
  */
-class Tokens2RangeString : public unary_function<ScTokenRef, void>
+class Tokens2RangeString
 {
 public:
     Tokens2RangeString(ScDocument* pDoc, FormulaGrammar::Grammar eGram, sal_Unicode cRangeSep) :
@@ -882,7 +881,7 @@ private:
  *
  * and each address doesn't include any '$' symbols.
  */
-class Tokens2RangeStringXML : public unary_function<ScTokenRef, void>
+class Tokens2RangeStringXML
 {
 public:
     explicit Tokens2RangeStringXML(ScDocument* pDoc) :
@@ -1357,7 +1356,7 @@ bool lcl_addUpperLeftCornerIfMissing(vector<ScTokenRef>& rRefTokens,
 
 #define SHRINK_RANGE_THRESHOLD 10000
 
-class ShrinkRefTokenToDataRange : public std::unary_function<ScTokenRef, void>
+class ShrinkRefTokenToDataRange
 {
     ScDocument* mpDoc;
 public:
@@ -1605,7 +1604,7 @@ namespace
 /**
  * Function object to create a list of table numbers from a token list.
  */
-class InsertTabNumber : public unary_function<ScTokenRef, void>
+class InsertTabNumber
 {
 public:
     InsertTabNumber() :
@@ -3037,7 +3036,7 @@ namespace {
  * This function object is used to accumulatively count the numbers of
  * columns and rows in all reference tokens.
  */
-class AccumulateRangeSize : public unary_function<ScTokenRef, void>
+class AccumulateRangeSize
 {
 public:
     AccumulateRangeSize() :
@@ -3067,7 +3066,7 @@ private:
  * This function object is used to generate label strings from a list of
  * reference tokens.
  */
-class GenerateLabelStrings : public unary_function<ScTokenRef, void>
+class GenerateLabelStrings
 {
 public:
     GenerateLabelStrings(sal_Int32 nSize, chart2::data::LabelOrigin eOrigin, bool bColumn) :
diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx
index 5a5ac3de2b23..6c567dcc080a 100644
--- a/sc/source/ui/view/drawvie4.cxx
+++ b/sc/source/ui/view/drawvie4.cxx
@@ -282,7 +282,7 @@ void getChartSourceRanges(ScDocument* pDoc, const SdrMarkList& rObjs, std::vecto
     }
 }
 
-class InsertTabIndex : public std::unary_function<ScRange, void>
+class InsertTabIndex
 {
     std::vector<SCTAB>& mrTabs;
 public:
@@ -293,7 +293,7 @@ public:
     }
 };
 
-class CopyRangeData : public std::unary_function<ScRange, void>
+class CopyRangeData
 {
     ScDocument* mpSrc;
     ScDocument* mpDest;
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index a7a9e9b72ac7..59cd5d61cefe 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -582,7 +582,7 @@ public:
     }
 };
 
-class AddItemToEntry : public std::unary_function<OUString, void>
+class AddItemToEntry
 {
     ScQueryEntry::QueryItemsType& mrItems;
     svl::SharedStringPool& mrPool;
@@ -602,7 +602,7 @@ public:
     }
 };
 
-class AddSelectedItemString : public std::unary_function<ScQueryEntry::Item, void>
+class AddSelectedItemString
 {
     std::unordered_set<OUString, OUStringHash>& mrSet;
 public:
diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
index 09bd3dbabc09..b9bc6b9d147b 100644
--- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
+++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
@@ -238,7 +238,7 @@ void ScXMLSourceDlg::HandleGetFocus(Control* pCtrl)
 
 namespace {
 
-class UnhighlightEntry : public std::unary_function<SvTreeListEntry*, void>
+class UnhighlightEntry
 {
     SvTreeListBox& mrTree;
 public:
diff --git a/sc/workben/dpcache/perf-test.cpp b/sc/workben/dpcache/perf-test.cpp
index 8bc5026c0aca..d93630e6ac56 100644
--- a/sc/workben/dpcache/perf-test.cpp
+++ b/sc/workben/dpcache/perf-test.cpp
@@ -278,7 +278,7 @@ struct equal_by_value : std::binary_function<bucket, bucket, bool>
     }
 };
 
-class push_back_value : std::unary_function<bucket, void>
+class push_back_value
 {
     std::vector<int>& items;
 public:
@@ -289,7 +289,7 @@ public:
     }
 };
 
-class push_back_order_index : std::unary_function<bucket, void>
+class push_back_order_index
 {
     std::vector<size_t>& data_indices;
 public: