diff options
73 files changed, 97 insertions, 161 deletions
diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx index 6da5394ec3c6..f5fed7d1ad59 100644 --- a/basctl/source/basicide/scriptdocument.cxx +++ b/basctl/source/basicide/scriptdocument.cxx @@ -1119,7 +1119,7 @@ namespace basctl namespace { - struct DocumentTitleLess : public std::binary_function< ScriptDocument, ScriptDocument, bool > + struct DocumentTitleLess { explicit DocumentTitleLess( const CollatorWrapper& _rCollator ) :m_aCollator( _rCollator ) diff --git a/basegfx/source/workbench/convexhull.cxx b/basegfx/source/workbench/convexhull.cxx index 3e728777ace8..dda785668866 100644 --- a/basegfx/source/workbench/convexhull.cxx +++ b/basegfx/source/workbench/convexhull.cxx @@ -18,7 +18,6 @@ */ #include <algorithm> -#include <functional> #include <vector> #include "bezierclip.hxx" @@ -43,7 +42,7 @@ template <class PointType> double theta( const PointType& p1, const PointType& p /* Model of LessThanComparable for theta sort. * Uses the theta function from Sedgewick: Algorithms in XXX, chapter 24 */ -template <class PointType> class ThetaCompare : public std::binary_function< const PointType&, const PointType&, bool > +template <class PointType> class ThetaCompare { public: explicit ThetaCompare( const PointType& rRefPoint ) : maRefPoint( rRefPoint ) {} diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx b/chart2/source/controller/dialogs/DataBrowserModel.cxx index 9dc2478f76f9..bedd47a98b2d 100644 --- a/chart2/source/controller/dialogs/DataBrowserModel.cxx +++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx @@ -234,10 +234,9 @@ struct DataBrowserModel::tDataColumn {} }; -struct DataBrowserModel::implColumnLess : public std::binary_function< - DataBrowserModel::tDataColumn, DataBrowserModel::tDataColumn, bool > +struct DataBrowserModel::implColumnLess { - bool operator() ( const first_argument_type & rLeft, const second_argument_type & rRight ) + bool operator() ( const DataBrowserModel::tDataColumn & rLeft, const DataBrowserModel::tDataColumn & rRight ) { if( rLeft.m_xLabeledDataSequence.is() && rRight.m_xLabeledDataSequence.is()) { diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx index f39c49ac78e1..a9445be5d90d 100644 --- a/chart2/source/controller/dialogs/DialogModel.cxx +++ b/chart2/source/controller/dialogs/DialogModel.cxx @@ -46,7 +46,6 @@ #include <utility> #include <algorithm> #include <iterator> -#include <functional> #include <numeric> using namespace ::com::sun::star; @@ -349,8 +348,7 @@ Reference< XDataSeries > lcl_CreateNewSeries( return xResult; } -struct lcl_addSeriesNumber : public std::binary_function< - sal_Int32, Reference< XDataSeriesContainer >, sal_Int32 > +struct lcl_addSeriesNumber { sal_Int32 operator() ( sal_Int32 nCurrentNumber, const Reference< XDataSeriesContainer > & xCnt ) const { diff --git a/chart2/source/inc/RegressionCalculationHelper.hxx b/chart2/source/inc/RegressionCalculationHelper.hxx index 60ab60ddf621..084f49623c42 100644 --- a/chart2/source/inc/RegressionCalculationHelper.hxx +++ b/chart2/source/inc/RegressionCalculationHelper.hxx @@ -23,7 +23,6 @@ #include <utility> #include <algorithm> -#include <functional> #include <vector> namespace chart @@ -60,7 +59,7 @@ tDoubleVectorPair return aResult; } -class isValid : public std::binary_function< double, double, bool > +class isValid { public: bool operator()( double x, double y ) @@ -71,7 +70,7 @@ public: } }; -class isValidAndXPositive : public std::binary_function< double, double, bool > +class isValidAndXPositive { public: bool operator()( double x, double y ) @@ -83,7 +82,7 @@ public: } }; -class isValidAndYPositive : public std::binary_function< double, double, bool > +class isValidAndYPositive { public: bool operator()( double x, double y ) @@ -95,7 +94,7 @@ public: } }; -class isValidAndYNegative : public std::binary_function< double, double, bool > +class isValidAndYNegative { public: bool operator()( double x, double y ) @@ -107,7 +106,7 @@ public: } }; -class isValidAndBothPositive : public std::binary_function< double, double, bool > +class isValidAndBothPositive { public: bool operator()( double x, double y ) @@ -120,7 +119,7 @@ public: } }; -class isValidAndXPositiveAndYNegative : public std::binary_function< double, double, bool > +class isValidAndXPositiveAndYNegative { public: bool operator()( double x, double y ) diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx index dfa434f41ea6..c313475c0ed4 100644 --- a/chart2/source/tools/InternalDataProvider.cxx +++ b/chart2/source/tools/InternalDataProvider.cxx @@ -219,7 +219,7 @@ private: sal_Int32 m_nLevel; }; -struct lcl_setAnyAtLevel : public std::binary_function< vector< uno::Any >, uno::Any, vector< uno::Any > > +struct lcl_setAnyAtLevel { public: @@ -239,7 +239,7 @@ private: sal_Int32 m_nLevel; }; -struct lcl_setAnyAtLevelFromStringSequence : public std::binary_function< vector< uno::Any >, OUString, vector< uno::Any > > +struct lcl_setAnyAtLevelFromStringSequence { public: diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx index c95c558cb921..6b355b3734b4 100644 --- a/chart2/source/view/axes/VCartesianAxis.cxx +++ b/chart2/source/view/axes/VCartesianAxis.cxx @@ -1093,7 +1093,7 @@ VCartesianAxis::ScreenPosAndLogicPos VCartesianAxis::getScreenPosAndLogicPos( do } typedef std::vector< VCartesianAxis::ScreenPosAndLogicPos > tScreenPosAndLogicPosList; -struct lcl_LessXPos : std::binary_function< VCartesianAxis::ScreenPosAndLogicPos, VCartesianAxis::ScreenPosAndLogicPos, bool > +struct lcl_LessXPos { bool operator() ( const VCartesianAxis::ScreenPosAndLogicPos& rPos1, const VCartesianAxis::ScreenPosAndLogicPos& rPos2 ) { @@ -1101,7 +1101,7 @@ struct lcl_LessXPos : std::binary_function< VCartesianAxis::ScreenPosAndLogicPos } }; -struct lcl_GreaterYPos : std::binary_function< VCartesianAxis::ScreenPosAndLogicPos, VCartesianAxis::ScreenPosAndLogicPos, bool > +struct lcl_GreaterYPos { bool operator() ( const VCartesianAxis::ScreenPosAndLogicPos& rPos1, const VCartesianAxis::ScreenPosAndLogicPos& rPos2 ) { diff --git a/comphelper/source/property/opropertybag.cxx b/comphelper/source/property/opropertybag.cxx index 84e1e7527ff7..243c3920c7cd 100644 --- a/comphelper/source/property/opropertybag.cxx +++ b/comphelper/source/property/opropertybag.cxx @@ -32,7 +32,6 @@ #include <osl/thread.h> #include <algorithm> -#include <functional> #include <iterator> @@ -350,7 +349,7 @@ namespace comphelper namespace { - struct ComparePropertyValueByName : public std::binary_function< PropertyValue, PropertyValue, bool > + struct ComparePropertyValueByName { bool operator()( const PropertyValue& _rLHS, const PropertyValue& _rRHS ) { diff --git a/comphelper/source/property/propertycontainerhelper.cxx b/comphelper/source/property/propertycontainerhelper.cxx index a32b8d8def87..c1729c5576b9 100644 --- a/comphelper/source/property/propertycontainerhelper.cxx +++ b/comphelper/source/property/propertycontainerhelper.cxx @@ -41,7 +41,7 @@ using namespace ::com::sun::star::beans; namespace { // comparing two property descriptions - struct PropertyDescriptionHandleCompare : public std::binary_function< PropertyDescription, PropertyDescription, bool > + struct PropertyDescriptionHandleCompare { bool operator() (const PropertyDescription& x, const PropertyDescription& y) const { diff --git a/connectivity/source/commontools/ConnectionWrapper.cxx b/connectivity/source/commontools/ConnectionWrapper.cxx index 18f0b8cff56a..2ca1e2993ffb 100644 --- a/connectivity/source/commontools/ConnectionWrapper.cxx +++ b/connectivity/source/commontools/ConnectionWrapper.cxx @@ -173,7 +173,7 @@ Sequence< sal_Int8 > OConnectionWrapper::getUnoTunnelImplementationId() namespace { - class TPropertyValueLessFunctor : public std::binary_function< css::beans::PropertyValue,css::beans::PropertyValue,bool> + class TPropertyValueLessFunctor { public: TPropertyValueLessFunctor() diff --git a/connectivity/source/commontools/TSortIndex.cxx b/connectivity/source/commontools/TSortIndex.cxx index db67c5752683..10326a551be5 100644 --- a/connectivity/source/commontools/TSortIndex.cxx +++ b/connectivity/source/commontools/TSortIndex.cxx @@ -24,8 +24,8 @@ using namespace connectivity; -/// binary_function Functor object for class OSortIndex::TIntValuePairVector::value_type returntype is bool -struct TKeyValueFunc : std::binary_function<OSortIndex::TIntValuePairVector::value_type,OSortIndex::TIntValuePairVector::value_type,bool> +/// Functor object for class OSortIndex::TIntValuePairVector::value_type returntype is bool +struct TKeyValueFunc { OSortIndex* pIndex; diff --git a/connectivity/source/cpool/ZConnectionPool.hxx b/connectivity/source/cpool/ZConnectionPool.hxx index 890732848c90..04119d92d7a1 100644 --- a/connectivity/source/cpool/ZConnectionPool.hxx +++ b/connectivity/source/cpool/ZConnectionPool.hxx @@ -83,7 +83,7 @@ namespace connectivity // typedef TDigestHolder - struct TDigestLess : public std::binary_function< TDigestHolder, TDigestHolder, bool> + struct TDigestLess { bool operator() (const TDigestHolder& x, const TDigestHolder& y) const { diff --git a/connectivity/source/inc/odbc/OResultSet.hxx b/connectivity/source/inc/odbc/OResultSet.hxx index d1f75371cfe0..8b8218b9164d 100644 --- a/connectivity/source/inc/odbc/OResultSet.hxx +++ b/connectivity/source/inc/odbc/OResultSet.hxx @@ -67,8 +67,8 @@ namespace connectivity typedef std::pair<sal_Int64,sal_Int32> TVoidPtr; typedef std::allocator< TVoidPtr > TVoidAlloc; typedef std::vector<TVoidPtr> TVoidVector; - /// unary_function Functor object for class ZZ returntype is void - struct OOO_DLLPUBLIC_ODBCBASE TBookmarkPosMapCompare : std::binary_function< css::uno::Sequence<sal_Int8>, css::uno::Sequence<sal_Int8>, bool > + /// Functor object for class ZZ returntype is void + struct OOO_DLLPUBLIC_ODBCBASE TBookmarkPosMapCompare { bool operator()( const css::uno::Sequence<sal_Int8>& _rLH, const css::uno::Sequence<sal_Int8>& _rRH) const diff --git a/connectivity/source/manager/mdrivermanager.cxx b/connectivity/source/manager/mdrivermanager.cxx index 3905932fed85..b69e8646910e 100644 --- a/connectivity/source/manager/mdrivermanager.cxx +++ b/connectivity/source/manager/mdrivermanager.cxx @@ -212,7 +212,7 @@ Any SAL_CALL ODriverEnumeration::nextElement( ) } /// an STL argorithm compatible predicate comparing two DriverAccess instances by their implementation names - struct CompareDriverAccessByName : public std::binary_function< DriverAccess, DriverAccess, bool > + struct CompareDriverAccessByName { bool operator()( const DriverAccess& lhs, const DriverAccess& rhs ) @@ -222,7 +222,7 @@ Any SAL_CALL ODriverEnumeration::nextElement( ) }; /// and STL argorithm compatible predicate comparing a DriverAccess' impl name to a string - struct EqualDriverAccessToName : public std::binary_function< DriverAccess, OUString, bool > + struct EqualDriverAccessToName { OUString m_sImplName; explicit EqualDriverAccessToName(const OUString& _sImplName) : m_sImplName(_sImplName){} diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx index 4c36eb9982c9..2390bcf467e1 100644 --- a/dbaccess/source/core/dataaccess/connection.cxx +++ b/dbaccess/source/core/dataaccess/connection.cxx @@ -380,7 +380,7 @@ void SAL_CALL OConnection::clearWarnings( ) namespace { - struct CompareTypeByName : public std::binary_function< Type, Type, bool > + struct CompareTypeByName { bool operator() ( const Type& _rLHS, const Type& _rRHS ) const { diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx index 88b29f800642..68c8d140ddcf 100644 --- a/dbaccess/source/core/dataaccess/datasource.cxx +++ b/dbaccess/source/core/dataaccess/datasource.cxx @@ -275,7 +275,7 @@ class OSharedConnectionManager : public ::cppu::WeakImplHelper< XEventListener > } TConnectionHolder; // the less-compare functor, used for the stl::map - struct TDigestLess : public std::binary_function< TDigestHolder, TDigestHolder, bool> + struct TDigestLess { bool operator() (const TDigestHolder& x, const TDigestHolder& y) const { diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx index 5f4fafb65e36..8493190d4d56 100644 --- a/dbaccess/source/ui/dlg/generalpage.cxx +++ b/dbaccess/source/ui/dlg/generalpage.cxx @@ -94,7 +94,7 @@ namespace dbaui }; typedef std::vector< DisplayedType > DisplayedTypes; - struct DisplayedTypeLess : std::binary_function< DisplayedType, DisplayedType, bool > + struct DisplayedTypeLess { bool operator() ( const DisplayedType& _rLHS, const DisplayedType& _rRHS ) { diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx index beff20b48c31..7c7bc1dd0eb6 100644 --- a/dbaccess/source/ui/inc/sbagrid.hxx +++ b/dbaccess/source/ui/inc/sbagrid.hxx @@ -44,7 +44,7 @@ namespace com { namespace sun { namespace star { namespace dbaui { - struct SbaURLCompare : public std::binary_function< css::util::URL, css::util::URL, bool> + struct SbaURLCompare { bool operator() (const css::util::URL& x, const css::util::URL& y) const { return x.Complete == y.Complete; } }; diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx index 911073fa4eb6..6d655349c392 100644 --- a/editeng/source/editeng/editdoc.cxx +++ b/editeng/source/editeng/editdoc.cxx @@ -2758,7 +2758,7 @@ void EditDoc::dumpAsXml(struct _xmlTextWriter* pWriter) const namespace { -struct LessByStart : std::binary_function<std::unique_ptr<EditCharAttrib>, std::unique_ptr<EditCharAttrib>, bool> +struct LessByStart { bool operator() (const std::unique_ptr<EditCharAttrib>& left, const std::unique_ptr<EditCharAttrib>& right) const { diff --git a/extensions/source/propctrlr/composeduiupdate.cxx b/extensions/source/propctrlr/composeduiupdate.cxx index e39932925d81..c6a1c32a7ea7 100644 --- a/extensions/source/propctrlr/composeduiupdate.cxx +++ b/extensions/source/propctrlr/composeduiupdate.cxx @@ -47,10 +47,7 @@ namespace pcr namespace { - struct HandlerLess : public std::binary_function < Reference< XPropertyHandler > - , Reference< XPropertyHandler > - , bool - > + struct HandlerLess { bool operator()( const Reference< XPropertyHandler >& lhs, const Reference< XPropertyHandler >& rhs) const { diff --git a/extensions/source/propctrlr/formbrowsertools.hxx b/extensions/source/propctrlr/formbrowsertools.hxx index 6abc42d7a477..7fede482d47f 100644 --- a/extensions/source/propctrlr/formbrowsertools.hxx +++ b/extensions/source/propctrlr/formbrowsertools.hxx @@ -24,7 +24,6 @@ #include <com/sun/star/beans/Property.hpp> #include <rtl/ustring.hxx> -#include <functional> #include <set> @@ -65,10 +64,6 @@ namespace pcr struct PropertyLessByName - :public std::binary_function < css::beans::Property, - css::beans::Property, - bool - > { bool operator() (const css::beans::Property& _rLhs, const css::beans::Property& _rRhs) const { @@ -78,10 +73,6 @@ namespace pcr struct TypeLessByName - :public std::binary_function < css::uno::Type, - css::uno::Type, - bool - > { bool operator() (const css::uno::Type& _rLhs, const css::uno::Type& _rRhs) const { diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx index 2b29a7bba297..7aea41c8c6e5 100644 --- a/extensions/source/propctrlr/formmetadata.cxx +++ b/extensions/source/propctrlr/formmetadata.cxx @@ -25,7 +25,6 @@ #include <comphelper/extract.hxx> #include <sal/macros.h> #include <algorithm> -#include <functional> namespace pcr { @@ -66,7 +65,7 @@ namespace pcr // Compare PropertyInfo - struct PropertyInfoLessByName : public std::binary_function< OPropertyInfoImpl, OPropertyInfoImpl, bool > + struct PropertyInfoLessByName { bool operator()( const OPropertyInfoImpl& _rLHS, const OPropertyInfoImpl& _rRHS ) { diff --git a/extensions/source/propctrlr/genericpropertyhandler.hxx b/extensions/source/propctrlr/genericpropertyhandler.hxx index 1ba3b328957d..6cca09093ca4 100644 --- a/extensions/source/propctrlr/genericpropertyhandler.hxx +++ b/extensions/source/propctrlr/genericpropertyhandler.hxx @@ -38,7 +38,7 @@ namespace pcr { - struct TypeLess : std::binary_function< css::uno::Type, css::uno::Type, bool > + struct TypeLess { bool operator()( const css::uno::Type& _rLHS, const css::uno::Type& _rRHS ) const { diff --git a/extensions/source/resource/oooresourceloader.hxx b/extensions/source/resource/oooresourceloader.hxx index dccc2c2a7fd3..82e6d1ffea71 100644 --- a/extensions/source/resource/oooresourceloader.hxx +++ b/extensions/source/resource/oooresourceloader.hxx @@ -25,7 +25,6 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/implbase.hxx> -#include <functional> #include <map> #include <utility> @@ -33,7 +32,7 @@ namespace extensions { namespace resource { typedef std::pair< OUString, css::lang::Locale> ResourceBundleDescriptor; - struct ResourceBundleDescriptorLess : public std::binary_function<ResourceBundleDescriptor, ResourceBundleDescriptor, bool> + struct ResourceBundleDescriptorLess { bool operator()( const ResourceBundleDescriptor& _lhs, const ResourceBundleDescriptor& _rhs ) const { diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx index edb991294a67..d1b9911e7ccb 100644 --- a/filter/source/config/cache/typedetection.cxx +++ b/filter/source/config/cache/typedetection.cxx @@ -296,7 +296,7 @@ int getFlatTypeRank(const OUString& rType) * types, then types that are supported by the document service come next. * Lastly, sort them alphabetically. */ -struct SortByPriority : public std::binary_function<FlatDetectionInfo, FlatDetectionInfo, bool> +struct SortByPriority { bool operator() (const FlatDetectionInfo& r1, const FlatDetectionInfo& r2) const { @@ -320,7 +320,7 @@ struct SortByPriority : public std::binary_function<FlatDetectionInfo, FlatDetec } }; -struct SortByType : public std::binary_function<FlatDetectionInfo, FlatDetectionInfo, bool> +struct SortByType { bool operator() (const FlatDetectionInfo& r1, const FlatDetectionInfo& r2) const @@ -329,7 +329,7 @@ struct SortByType : public std::binary_function<FlatDetectionInfo, FlatDetection } }; -struct EqualByType : public std::binary_function<FlatDetectionInfo, FlatDetectionInfo, bool> +struct EqualByType { bool operator() (const FlatDetectionInfo& r1, const FlatDetectionInfo& r2) const { diff --git a/forms/source/component/GroupManager.cxx b/forms/source/component/GroupManager.cxx index a925e66551e4..859f6d91e537 100644 --- a/forms/source/component/GroupManager.cxx +++ b/forms/source/component/GroupManager.cxx @@ -65,7 +65,7 @@ bool OGroupCompAcc::operator==( const OGroupCompAcc& rCompAcc ) const return m_xComponent == rCompAcc.m_xComponent; } -class OGroupCompAccLess : public ::std::binary_function<OGroupCompAcc, OGroupCompAcc, sal_Bool> +class OGroupCompAccLess { public: bool operator() (const OGroupCompAcc& lhs, const OGroupCompAcc& rhs) const @@ -101,7 +101,7 @@ bool OGroupComp::operator==( const OGroupComp& rComp ) const return m_nTabIndex == rComp.GetTabIndex() && m_nPos == rComp.GetPos(); } -class OGroupCompLess : public ::std::binary_function<OGroupComp, OGroupComp, sal_Bool> +class OGroupCompLess { public: bool operator() (const OGroupComp& lhs, const OGroupComp& rhs) const diff --git a/forms/source/component/propertybaghelper.cxx b/forms/source/component/propertybaghelper.cxx index 53ed30505fca..5f14626bd081 100644 --- a/forms/source/component/propertybaghelper.cxx +++ b/forms/source/component/propertybaghelper.cxx @@ -240,7 +240,7 @@ namespace frm }; - struct PropertyValueLessByName : public ::std::binary_function< PropertyValue, PropertyValue, bool > + struct PropertyValueLessByName { bool operator()( const PropertyValue& _lhs, const PropertyValue& _rhs ) const { diff --git a/forms/source/inc/componenttools.hxx b/forms/source/inc/componenttools.hxx index f3e445effd1e..f684ec572220 100644 --- a/forms/source/inc/componenttools.hxx +++ b/forms/source/inc/componenttools.hxx @@ -25,14 +25,13 @@ #include <com/sun/star/frame/XModel.hpp> #include <set> -#include <functional> namespace frm { - struct TypeCompareLess : public ::std::binary_function< css::uno::Type, css::uno::Type, bool > + struct TypeCompareLess { bool operator()( const css::uno::Type& _rLHS, const css::uno::Type& _rRHS ) const { diff --git a/include/comphelper/anycompare.hxx b/include/comphelper/anycompare.hxx index c115658c145c..dd92d2734ca2 100644 --- a/include/comphelper/anycompare.hxx +++ b/include/comphelper/anycompare.hxx @@ -27,7 +27,6 @@ #include <comphelper/extract.hxx> -#include <functional> #include <memory> @@ -47,7 +46,7 @@ namespace comphelper //= LessPredicateAdapter - struct LessPredicateAdapter : public ::std::binary_function< css::uno::Any, css::uno::Any, bool > + struct LessPredicateAdapter { LessPredicateAdapter( const IKeyPredicateLess& _predicate ) :m_predicate( _predicate ) diff --git a/include/comphelper/property.hxx b/include/comphelper/property.hxx index 445f66cb3988..c8b583db7f9a 100644 --- a/include/comphelper/property.hxx +++ b/include/comphelper/property.hxx @@ -24,7 +24,6 @@ #include <comphelper/extract.hxx> #include <com/sun/star/beans/Property.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <functional> #include <type_traits> #include <comphelper/comphelperdllapi.h> #include <cppu/unotype.hxx> @@ -33,7 +32,7 @@ namespace comphelper { // comparing two property instances - struct PropertyCompareByName : public ::std::binary_function< css::beans::Property, css::beans::Property, bool > + struct PropertyCompareByName { bool operator() (const css::beans::Property& x, const css::beans::Property& y) const { diff --git a/include/comphelper/stl_types.hxx b/include/comphelper/stl_types.hxx index 594d6889cf21..b82db0c9c8ec 100644 --- a/include/comphelper/stl_types.hxx +++ b/include/comphelper/stl_types.hxx @@ -22,7 +22,6 @@ #include <sal/config.h> #include <math.h> -#include <functional> #include <memory> #include <rtl/ustring.hxx> @@ -35,7 +34,7 @@ namespace comphelper // comparison functors -struct UStringMixLess : public ::std::binary_function< OUString, OUString, bool> +struct UStringMixLess { bool m_bCaseSensitive; public: @@ -51,7 +50,7 @@ public: bool isCaseSensitive() const {return m_bCaseSensitive;} }; -class UStringMixEqual: public std::binary_function<OUString, OUString, bool> +class UStringMixEqual { bool m_bCaseSensitive; @@ -64,7 +63,7 @@ public: bool isCaseSensitive() const {return m_bCaseSensitive;} }; -class TPropertyValueEqualFunctor : public ::std::binary_function< css::beans::PropertyValue,OUString,bool> +class TPropertyValueEqualFunctor { public: TPropertyValueEqualFunctor() @@ -77,7 +76,6 @@ public: /// by-value less functor for std::set<std::unique_ptr<T>> template<class T> struct UniquePtrValueLess - : public ::std::binary_function<std::unique_ptr<T>, std::unique_ptr<T>, bool> { bool operator()(std::unique_ptr<T> const& lhs, std::unique_ptr<T> const& rhs) const @@ -115,10 +113,6 @@ bool ContainerUniquePtrEquals( */ template < class IAFCE > struct OInterfaceCompare - :public ::std::binary_function < css::uno::Reference< IAFCE > - , css::uno::Reference< IAFCE > - , bool - > { bool operator() (const css::uno::Reference< IAFCE >& lhs, const css::uno::Reference< IAFCE >& rhs) const { @@ -131,7 +125,7 @@ struct OInterfaceCompare }; template <class Tp, class Arg> -class mem_fun1_t : public ::std::binary_function<Tp*,Arg,void> +class mem_fun1_t { typedef void (Tp::*_fun_type)(Arg); public: diff --git a/include/o3tl/sorted_vector.hxx b/include/o3tl/sorted_vector.hxx index f18ff04588b6..c50e19912ea1 100644 --- a/include/o3tl/sorted_vector.hxx +++ b/include/o3tl/sorted_vector.hxx @@ -11,7 +11,6 @@ #define INCLUDED_O3TL_SORTED_VECTOR_HXX #include <vector> -#include <functional> #include <algorithm> namespace o3tl @@ -196,7 +195,7 @@ private: /** Implements an ordering function over a pointer, where the comparison uses the < operator on the pointed-to types. Very useful for the cases where we put pointers to objects inside a sorted_vector. */ -template <class T> struct less_ptr_to : public std::binary_function <T*,T*,bool> +template <class T> struct less_ptr_to { bool operator() ( T* const& lhs, T* const& rhs ) const { diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx index 248dc5d4689a..96265f967bc9 100644 --- a/include/vcl/builder.hxx +++ b/include/vcl/builder.hxx @@ -326,7 +326,6 @@ private: void delete_by_name(const OString& sID); class sortIntoBestTabTraversalOrder - : public std::binary_function<const vcl::Window*, const vcl::Window*, bool> { public: sortIntoBestTabTraversalOrder(VclBuilder *pBuilder) diff --git a/reportdesign/inc/RptDef.hxx b/reportdesign/inc/RptDef.hxx index 01cea68a878c..ed4fba1721dc 100644 --- a/reportdesign/inc/RptDef.hxx +++ b/reportdesign/inc/RptDef.hxx @@ -73,7 +73,7 @@ enum class ControlModification HEIGHT_GREATEST = 10, }; -class AnyConverter : public ::std::binary_function< OUString,css::uno::Any,css::uno::Any > +class AnyConverter { public: virtual ~AnyConverter(){} diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx b/reportdesign/source/ui/inc/ViewsWindow.hxx index cb707d7961af..3c3dd882b3a9 100644 --- a/reportdesign/source/ui/inc/ViewsWindow.hxx +++ b/reportdesign/source/ui/inc/ViewsWindow.hxx @@ -45,7 +45,7 @@ namespace rptui class OSectionView; enum class ControlModification; - struct RectangleLess : public ::std::binary_function< tools::Rectangle, tools::Rectangle, bool> + struct RectangleLess { enum CompareMode { POS_LEFT,POS_RIGHT,POS_UPPER,POS_DOWN,POS_CENTER_HORIZONTAL,POS_CENTER_VERTICAL }; CompareMode m_eCompareMode; diff --git a/reportdesign/source/ui/inspection/metadata.cxx b/reportdesign/source/ui/inspection/metadata.cxx index bf82cc555795..d1b41f36fd70 100644 --- a/reportdesign/source/ui/inspection/metadata.cxx +++ b/reportdesign/source/ui/inspection/metadata.cxx @@ -23,7 +23,6 @@ #include "RptResId.hrc" #include "uistrings.hrc" -#include <functional> #include <algorithm> @@ -66,7 +65,7 @@ namespace rptui // compare PropertyInfo - struct PropertyInfoLessByName : public ::std::binary_function< OPropertyInfoImpl, OPropertyInfoImpl, bool > + struct PropertyInfoLessByName { bool operator()( const OPropertyInfoImpl& _lhs, const OPropertyInfoImpl& _rhs ) { diff --git a/sal/osl/w32/procimpl.cxx b/sal/osl/w32/procimpl.cxx index 23c08a197040..73d1079c2bb8 100644 --- a/sal/osl/w32/procimpl.cxx +++ b/sal/osl/w32/procimpl.cxx @@ -64,8 +64,7 @@ namespace /* private */ The comparison is in upper case and returns true if the first of both strings is less than the second one. */ - struct less_environment_variable : - public std::binary_function<rtl::OUString, rtl::OUString, bool> + struct less_environment_variable { bool operator() (const rtl::OUString& lhs, const rtl::OUString& rhs) const { diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx index 8dff0355a648..23e5a69752d4 100644 --- a/sc/inc/conditio.hxx +++ b/sc/inc/conditio.hxx @@ -165,7 +165,7 @@ protected: }; -class approx_less : public std::binary_function<double, double, bool> +class approx_less { public: bool operator() (double nVal1, double nVal2) const diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx index 9412f23b7c65..a7b72bf9b0d0 100644 --- a/sc/inc/dbdata.hxx +++ b/sc/inc/dbdata.hxx @@ -101,7 +101,7 @@ private: using ScRefreshTimer::operator==; public: - struct less : public ::std::binary_function<std::unique_ptr<ScDBData>, std::unique_ptr<ScDBData>, bool> + struct less { bool operator() (const std::unique_ptr<ScDBData>& left, const std::unique_ptr<ScDBData>& right) const; }; diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx index aaed76a7e141..e258720daef6 100644 --- a/sc/inc/dpobject.hxx +++ b/sc/inc/dpobject.hxx @@ -324,7 +324,7 @@ public: OUString maCommand; DBType(sal_Int32 nSdbType, const OUString& rDBName, const OUString& rCommand); - struct less : public ::std::binary_function<DBType, DBType, bool> + struct less { bool operator() (const DBType& left, const DBType& right) const; }; diff --git a/sc/inc/typedstrdata.hxx b/sc/inc/typedstrdata.hxx index e7c47a47c9e1..8b9cb24f8734 100644 --- a/sc/inc/typedstrdata.hxx +++ b/sc/inc/typedstrdata.hxx @@ -36,22 +36,22 @@ public: StringType GetStringType() const { return meStrType;} double GetValue() const { return mfValue; } - struct LessCaseSensitive : std::binary_function<ScTypedStrData, ScTypedStrData, bool> + struct LessCaseSensitive { bool operator() (const ScTypedStrData& left, const ScTypedStrData& right) const; }; - struct LessCaseInsensitive : std::binary_function<ScTypedStrData, ScTypedStrData, bool> + struct LessCaseInsensitive { bool operator() (const ScTypedStrData& left, const ScTypedStrData& right) const; }; - struct EqualCaseSensitive : std::binary_function<ScTypedStrData, ScTypedStrData, bool> + struct EqualCaseSensitive { bool operator() (const ScTypedStrData& left, const ScTypedStrData& right) const; }; - struct EqualCaseInsensitive : std::binary_function<ScTypedStrData, ScTypedStrData, bool> + struct EqualCaseInsensitive { bool operator() (const ScTypedStrData& left, const ScTypedStrData& right) const; }; diff --git a/sc/qa/unit/ucalc_sharedformula.cxx b/sc/qa/unit/ucalc_sharedformula.cxx index dcf4accd0307..8a72cb88d88d 100644 --- a/sc/qa/unit/ucalc_sharedformula.cxx +++ b/sc/qa/unit/ucalc_sharedformula.cxx @@ -574,7 +574,7 @@ void Test::testSharedFormulasRefUpdateRange() m_pDoc->DeleteTab(0); } -struct SortByArea : std::binary_function<sc::AreaListener, sc::AreaListener, bool> +struct SortByArea { bool operator ()( const sc::AreaListener& rLeft, const sc::AreaListener& rRight ) const { diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx index 9cc82795d3da..75b337ff83b6 100644 --- a/sc/source/core/data/dpcache.cxx +++ b/sc/source/core/data/dpcache.cxx @@ -195,7 +195,7 @@ struct PrintBucket #endif -struct LessByValue : std::binary_function<Bucket, Bucket, bool> +struct LessByValue { bool operator() (const Bucket& left, const Bucket& right) const { @@ -203,7 +203,7 @@ struct LessByValue : std::binary_function<Bucket, Bucket, bool> } }; -struct LessByOrderIndex : std::binary_function<Bucket, Bucket, bool> +struct LessByOrderIndex { bool operator() (const Bucket& left, const Bucket& right) const { @@ -211,7 +211,7 @@ struct LessByOrderIndex : std::binary_function<Bucket, Bucket, bool> } }; -struct LessByDataIndex : std::binary_function<Bucket, Bucket, bool> +struct LessByDataIndex { bool operator() (const Bucket& left, const Bucket& right) const { @@ -219,7 +219,7 @@ struct LessByDataIndex : std::binary_function<Bucket, Bucket, bool> } }; -struct EqualByOrderIndex : std::binary_function<Bucket, Bucket, bool> +struct EqualByOrderIndex { bool operator() (const Bucket& left, const Bucket& right) const { diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index fdba353ca7ed..bc655a606e6f 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -1348,7 +1348,7 @@ public: } }; -class LessByDimOrder : public std::binary_function<sheet::DataPilotFieldFilter, sheet::DataPilotFieldFilter, bool> +class LessByDimOrder { const ScDPSaveData::DimOrderType& mrDimOrder; diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx index 7494f567bb24..2f340a7aa602 100644 --- a/sc/source/core/data/formulacell.cxx +++ b/sc/source/core/data/formulacell.cxx @@ -306,7 +306,7 @@ lcl_checkRangeDimensions( return bOk && aCur == rEnd; } -class LessByReference : public std::binary_function<const formula::FormulaToken*, const formula::FormulaToken*, bool> +class LessByReference { ScAddress maPos; DimensionSelector maFunc; @@ -327,7 +327,7 @@ public: * denoted by token p1. Dimension, in which the comparison takes place, is * given by maFunc. */ -class AdjacentByReference : public std::binary_function<const formula::FormulaToken*, const formula::FormulaToken*, bool> +class AdjacentByReference { ScAddress maPos; DimensionSelector maFunc; diff --git a/sc/source/core/data/sortparam.cxx b/sc/source/core/data/sortparam.cxx index 3eb29a305641..5ab81b70d3a3 100644 --- a/sc/source/core/data/sortparam.cxx +++ b/sc/source/core/data/sortparam.cxx @@ -248,7 +248,7 @@ namespace { struct ReorderIndex { - struct LessByPos2 : std::binary_function<ReorderIndex, ReorderIndex, bool> + struct LessByPos2 { bool operator() ( const ReorderIndex& r1, const ReorderIndex& r2 ) const { diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx index 1947af156de5..db8fd8605075 100644 --- a/sc/source/core/tool/interpr5.cxx +++ b/sc/source/core/tool/interpr5.cxx @@ -46,7 +46,7 @@ using namespace formula; namespace { -struct MatrixAdd : public ::std::binary_function<double,double,double> +struct MatrixAdd { double operator() (const double& lhs, const double& rhs) const { @@ -54,7 +54,7 @@ struct MatrixAdd : public ::std::binary_function<double,double,double> } }; -struct MatrixSub : public ::std::binary_function<double,double,double> +struct MatrixSub { double operator() (const double& lhs, const double& rhs) const { @@ -62,7 +62,7 @@ struct MatrixSub : public ::std::binary_function<double,double,double> } }; -struct MatrixMul : public ::std::binary_function<double,double,double> +struct MatrixMul { double operator() (const double& lhs, const double& rhs) const { @@ -70,7 +70,7 @@ struct MatrixMul : public ::std::binary_function<double,double,double> } }; -struct MatrixDiv : public ::std::binary_function<double,double,double> +struct MatrixDiv { double operator() (const double& lhs, const double& rhs) const { @@ -78,7 +78,7 @@ struct MatrixDiv : public ::std::binary_function<double,double,double> } }; -struct MatrixPow : public ::std::binary_function<double,double,double> +struct MatrixPow { double operator() (const double& lhs, const double& rhs) const { diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx index 8a33b34e64df..f1b9472e3fb2 100644 --- a/sc/source/core/tool/scmatrix.cxx +++ b/sc/source/core/tool/scmatrix.cxx @@ -1842,7 +1842,7 @@ public: } }; -struct ArrayMul : public std::binary_function<double, double, double> +struct ArrayMul { double operator() (const double& lhs, const double& rhs) const { diff --git a/sc/workben/dpcache/perf-test.cpp b/sc/workben/dpcache/perf-test.cpp index d93630e6ac56..28e7027207a2 100644 --- a/sc/workben/dpcache/perf-test.cpp +++ b/sc/workben/dpcache/perf-test.cpp @@ -15,7 +15,6 @@ #include <vector> #include <iterator> #include <algorithm> -#include <functional> using namespace std; @@ -254,7 +253,7 @@ void print_buckets(const vector<bucket>& buckets, const char* msg) cout << "---" << endl; } -struct less_by_value : std::binary_function<bucket, bucket, bool> +struct less_by_value { bool operator() (const bucket& left, const bucket& right) const { @@ -262,7 +261,7 @@ struct less_by_value : std::binary_function<bucket, bucket, bool> } }; -struct less_by_data_index : std::binary_function<bucket, bucket, bool> +struct less_by_data_index { bool operator() (const bucket& left, const bucket& right) const { @@ -270,7 +269,7 @@ struct less_by_data_index : std::binary_function<bucket, bucket, bool> } }; -struct equal_by_value : std::binary_function<bucket, bucket, bool> +struct equal_by_value { bool operator() (const bucket& left, const bucket& right) const { diff --git a/sd/source/ui/framework/configuration/Configuration.cxx b/sd/source/ui/framework/configuration/Configuration.cxx index 5c1b2b0af95e..ef0c2fc76340 100644 --- a/sd/source/ui/framework/configuration/Configuration.cxx +++ b/sd/source/ui/framework/configuration/Configuration.cxx @@ -33,7 +33,6 @@ namespace { for STL containers. */ class XResourceIdLess - : public ::std::binary_function <Reference<XResourceId>, Reference<XResourceId>, bool> { public: bool operator () (const Reference<XResourceId>& rId1, const Reference<XResourceId>& rId2) const diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx index 43eaf9aadba1..6315237e7a9b 100644 --- a/svtools/source/contnr/treelist.cxx +++ b/svtools/source/contnr/treelist.cxx @@ -1524,7 +1524,7 @@ void SvTreeList::Resort() namespace { -class SortComparator : public std::binary_function<SvTreeListEntry,SvTreeListEntry,bool> +class SortComparator { SvTreeList& mrList; public: diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx index 140a63c0850d..f83e11dcdf0a 100644 --- a/svtools/source/misc/templatefoldercache.cxx +++ b/svtools/source/misc/templatefoldercache.cxx @@ -41,7 +41,6 @@ #include <vector> #include <list> -#include <functional> #include <algorithm> @@ -159,10 +158,6 @@ namespace svt /// compares two TemplateContent by URL struct TemplateContentURLLess - :public ::std::binary_function < ::rtl::Reference< TemplateContent > - , ::rtl::Reference< TemplateContent > - , bool - > { bool operator() ( const ::rtl::Reference< TemplateContent >& _rxLHS, const ::rtl::Reference< TemplateContent >& _rxRHS ) const { @@ -203,10 +198,6 @@ namespace svt /** does a deep compare of two template contents */ struct TemplateContentEqual - :public ::std::binary_function < ::rtl::Reference< TemplateContent > - , ::rtl::Reference< TemplateContent > - , bool - > { bool operator() (const ::rtl::Reference< TemplateContent >& _rLHS, const ::rtl::Reference< TemplateContent >& _rRHS ) diff --git a/svx/source/inc/fmcontrolbordermanager.hxx b/svx/source/inc/fmcontrolbordermanager.hxx index c46e41da32e5..56928376809b 100644 --- a/svx/source/inc/fmcontrolbordermanager.hxx +++ b/svx/source/inc/fmcontrolbordermanager.hxx @@ -103,7 +103,7 @@ namespace svxform class ControlBorderManager { private: - struct ControlDataCompare : public ::std::binary_function< ControlData, ControlData, bool > + struct ControlDataCompare { bool operator()( const ControlData& _rLHS, const ControlData& _rRHS ) const { diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx index d28b0ae0fb48..3de25a068d94 100644 --- a/svx/source/inc/formcontroller.hxx +++ b/svx/source/inc/formcontroller.hxx @@ -79,7 +79,7 @@ #include <cppuhelper/compbase.hxx> -struct FmXTextComponentLess : public ::std::binary_function< css::uno::Reference< css::awt::XTextComponent >, css::uno::Reference< css::awt::XTextComponent> , bool> +struct FmXTextComponentLess { bool operator() (const css::uno::Reference< css::awt::XTextComponent >& x, const css::uno::Reference< css::awt::XTextComponent >& y) const { diff --git a/sw/source/core/txtnode/modeltoviewhelper.cxx b/sw/source/core/txtnode/modeltoviewhelper.cxx index 5d5cd6db54e5..496d92a54c1a 100644 --- a/sw/source/core/txtnode/modeltoviewhelper.cxx +++ b/sw/source/core/txtnode/modeltoviewhelper.cxx @@ -43,8 +43,7 @@ struct FieldResult { } }; -class sortfieldresults : - public std::binary_function<const FieldResult&, const FieldResult&, bool> +class sortfieldresults { public: bool operator()(const FieldResult &rOne, const FieldResult &rTwo) const diff --git a/sw/source/filter/inc/msfilter.hxx b/sw/source/filter/inc/msfilter.hxx index 1a1713982625..366094394e11 100644 --- a/sw/source/filter/inc/msfilter.hxx +++ b/sw/source/filter/inc/msfilter.hxx @@ -350,9 +350,7 @@ namespace sw SetEndIfOpen& operator=(const SetEndIfOpen&) = delete; }; - class CompareRedlines: - public std::binary_function<const SwFltStackEntry*, const SwFltStackEntry*, - bool> + class CompareRedlines { public: bool operator()(const SwFltStackEntry *pOneE, const SwFltStackEntry *pTwoE) diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx index c6621ddf5ce5..6c0fda0756ac 100644 --- a/sw/source/filter/ww8/writerhelper.cxx +++ b/sw/source/filter/ww8/writerhelper.cxx @@ -28,7 +28,6 @@ #include <com/sun/star/container/XChild.hpp> #include <algorithm> -#include <functional> #include <svl/itemiter.hxx> #include <svx/svdobj.hxx> #include <svx/svdoole2.hxx> @@ -78,8 +77,7 @@ namespace // #i98791# - adjust sorting // Utility to sort SwTextFormatColl's by their assigned outline style list level - class outlinecmp : public - std::binary_function<const SwTextFormatColl*, const SwTextFormatColl*, bool> + class outlinecmp { public: bool operator()(const SwTextFormatColl *pA, const SwTextFormatColl *pB) const diff --git a/sw/source/filter/ww8/writerhelper.hxx b/sw/source/filter/ww8/writerhelper.hxx index e97a9e5d025b..380a957ccb70 100644 --- a/sw/source/filter/ww8/writerhelper.hxx +++ b/sw/source/filter/ww8/writerhelper.hxx @@ -54,7 +54,6 @@ namespace sw namespace util { class ItemSort - : public std::binary_function<sal_uInt16, sal_uInt16, bool> { public: bool operator()(sal_uInt16 nA, sal_uInt16 nB) const; diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index d7bc33290396..248f354a8f82 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -21,7 +21,6 @@ #include <list> #include <utility> #include <algorithm> -#include <functional> #include <iostream> #include <i18nlangtag/mslangid.hxx> @@ -158,8 +157,7 @@ MSWordAttrIter::~MSWordAttrIter() m_rExport.m_pChpIter = pOld; } -class sortswflys : - public std::binary_function<const ww8::Frame&, const ww8::Frame&, bool> +class sortswflys { public: bool operator()(const ww8::Frame &rOne, const ww8::Frame &rTwo) const @@ -1879,7 +1877,7 @@ bool MSWordExportBase::GetAnnotationMarks( const SwTextNode& rNd, sal_Int32 nStt return ( rArr.size() > 0 ); } -class CompareMarksEnd : public std::binary_function < const IMark *, const IMark *, bool > +class CompareMarksEnd { public: bool operator() ( const IMark * pOneB, const IMark * pTwoB ) const diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index 922d5ec72166..7a6dc4ab5bce 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -6118,7 +6118,6 @@ void QuickHelpData::FillStrArr( SwWrtShell& rSh, const OUString& rWord ) namespace { class CompareIgnoreCaseAsciiFavorExact - : public std::binary_function<const OUString&, const OUString&, bool> { const OUString &m_rOrigWord; public: diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx b/toolkit/source/controls/geometrycontrolmodel.cxx index 7a541cafa0a6..3328a822ea35 100644 --- a/toolkit/source/controls/geometrycontrolmodel.cxx +++ b/toolkit/source/controls/geometrycontrolmodel.cxx @@ -27,7 +27,6 @@ #include <toolkit/controls/eventcontainer.hxx> #include <toolkit/helper/property.hxx> #include <algorithm> -#include <functional> #define GCM_PROPERTY_ID_POS_X 1 @@ -492,7 +491,7 @@ } - struct PropertyNameLess : public ::std::binary_function< Property, Property, bool > + struct PropertyNameLess { bool operator()( const Property& _rLHS, const Property& _rRHS ) { diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.cxx b/toolkit/source/controls/grid/sortablegriddatamodel.cxx index 91fc53f1ef95..90e50d9a0ac7 100644 --- a/toolkit/source/controls/grid/sortablegriddatamodel.cxx +++ b/toolkit/source/controls/grid/sortablegriddatamodel.cxx @@ -509,7 +509,7 @@ public: namespace { - class CellDataLessComparison : public ::std::binary_function< sal_Int32, sal_Int32, bool > + class CellDataLessComparison { public: CellDataLessComparison( diff --git a/toolkit/source/helper/property.cxx b/toolkit/source/helper/property.cxx index 3ace75837bcb..a4b65311e9af 100644 --- a/toolkit/source/helper/property.cxx +++ b/toolkit/source/helper/property.cxx @@ -44,7 +44,6 @@ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/container/XNameContainer.hpp> -#include <functional> #include <algorithm> using ::com::sun::star::uno::Any; @@ -293,7 +292,7 @@ ImplPropertyInfo* ImplGetPropertyInfos( sal_uInt16& rElementCount ) } -struct ImplPropertyInfoCompareFunctor : ::std::binary_function<ImplPropertyInfo,OUString,bool> +struct ImplPropertyInfoCompareFunctor { bool operator()(const ImplPropertyInfo& lhs,const ImplPropertyInfo& rhs) const { diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx index 339ba50df1c3..41179ad6ed88 100644 --- a/tools/source/rc/resmgr.cxx +++ b/tools/source/rc/resmgr.cxx @@ -47,7 +47,6 @@ #include <tools/simplerm.hxx> #include <algorithm> -#include <functional> #include <list> #include <set> #include <unordered_set> @@ -410,7 +409,7 @@ struct ImpContent sal_uInt32 nOffset; }; -struct ImpContentLessCompare : public ::std::binary_function< ImpContent, ImpContent, bool> +struct ImpContentLessCompare { bool operator() (const ImpContent& rLhs, const ImpContent& rRhs) const { diff --git a/unotools/source/config/fontcfg.cxx b/unotools/source/config/fontcfg.cxx index 8f577c70b0d0..8d432e9b7c20 100644 --- a/unotools/source/config/fontcfg.cxx +++ b/unotools/source/config/fontcfg.cxx @@ -772,7 +772,7 @@ void FontSubstConfiguration::getMapName( const OUString& rOrgName, OUString& rSh } } -struct StrictStringSort : public ::std::binary_function< const FontNameAttr&, const FontNameAttr&, bool > +struct StrictStringSort { bool operator()( const FontNameAttr& rLeft, const FontNameAttr& rRight ) { return rLeft.Name.compareTo( rRight.Name ) < 0; } diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx index 0473c541ae0f..af32ca98dab2 100644 --- a/vcl/source/window/layout.cxx +++ b/vcl/source/window/layout.cxx @@ -869,7 +869,6 @@ static int getButtonPriority(const OString &rType) } class sortButtons - : public std::binary_function<const vcl::Window*, const vcl::Window*, bool> { bool m_bVerticalContainer; public: diff --git a/vcl/source/window/taskpanelist.cxx b/vcl/source/window/taskpanelist.cxx index bc1fcb3d906d..a11f8d78b826 100644 --- a/vcl/source/window/taskpanelist.cxx +++ b/vcl/source/window/taskpanelist.cxx @@ -25,7 +25,6 @@ #include <svdata.hxx> #include "menubarwindow.hxx" -#include <functional> #include <algorithm> namespace { @@ -51,7 +50,7 @@ Point ImplTaskPaneListGetPos( const vcl::Window *w ) } // compares window pos left-to-right -struct LTRSort : public ::std::binary_function< const vcl::Window*, const vcl::Window*, bool > +struct LTRSort { bool operator()( const vcl::Window* w1, const vcl::Window* w2 ) const { @@ -64,7 +63,7 @@ struct LTRSort : public ::std::binary_function< const vcl::Window*, const vcl::W return ( pos1.X() < pos2.X() ); } }; -struct LTRSortBackward : public ::std::binary_function< const vcl::Window*, const vcl::Window*, bool > +struct LTRSortBackward { bool operator()( const vcl::Window* w2, const vcl::Window* w1 ) const { diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx index db32f2874919..6e7b69da18d6 100644 --- a/vcl/unx/generic/fontmanager/fontconfig.cxx +++ b/vcl/unx/generic/fontmanager/fontconfig.cxx @@ -150,7 +150,7 @@ namespace //Sort fonts so that fonts with the same family name are side-by-side, with //those with higher version numbers first - class SortFont : public ::std::binary_function< const FcPattern*, const FcPattern*, bool > + class SortFont { public: bool operator()(const FcPattern *a, const FcPattern *b) diff --git a/vcl/unx/generic/print/printerjob.cxx b/vcl/unx/generic/print/printerjob.cxx index 8a0fa92bb3f3..a2dd25945dba 100644 --- a/vcl/unx/generic/print/printerjob.cxx +++ b/vcl/unx/generic/print/printerjob.cxx @@ -668,7 +668,7 @@ PrinterJob::EndPage () return true; } -struct less_ppd_key : public ::std::binary_function<double, double, bool> +struct less_ppd_key { bool operator()(const PPDKey* left, const PPDKey* right) { return left->getOrderDependency() < right->getOrderDependency(); } diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx index b7e531e1f2ad..440f33e0edba 100644 --- a/vcl/unx/generic/printer/cupsmgr.cxx +++ b/vcl/unx/generic/printer/cupsmgr.cxx @@ -561,7 +561,7 @@ FILE* CUPSManager::startSpool( const OUString& rPrintername, bool bQuickCommand return fp; } -struct less_ppd_key : public ::std::binary_function<double, double, bool> +struct less_ppd_key { bool operator()(const PPDKey* left, const PPDKey* right) { return left->getOrderDependency() < right->getOrderDependency(); } diff --git a/xmloff/source/forms/ifacecompare.hxx b/xmloff/source/forms/ifacecompare.hxx index 9eab7abfb655..79b4bae04b2e 100644 --- a/xmloff/source/forms/ifacecompare.hxx +++ b/xmloff/source/forms/ifacecompare.hxx @@ -32,10 +32,6 @@ namespace xmloff */ template < class IAFCE > struct OInterfaceCompare - :public ::std::binary_function < css::uno::Reference< IAFCE > - , css::uno::Reference< IAFCE > - , bool - > { bool operator() (const css::uno::Reference< IAFCE >& lhs, const css::uno::Reference< IAFCE >& rhs) const { diff --git a/xmloff/source/forms/layerexport.cxx b/xmloff/source/forms/layerexport.cxx index bd08dcb6d77d..aea4f1206521 100644 --- a/xmloff/source/forms/layerexport.cxx +++ b/xmloff/source/forms/layerexport.cxx @@ -458,7 +458,7 @@ namespace xmloff namespace { - struct AccumulateSize : public ::std::binary_function< size_t, MapPropertySet2Map::value_type, size_t > + struct AccumulateSize { size_t operator()( size_t _size, const MapPropertySet2Map::value_type& _map ) const { diff --git a/xmloff/source/style/xmlimppr.cxx b/xmloff/source/style/xmlimppr.cxx index 8bd2c30354a2..ca87054c25ac 100644 --- a/xmloff/source/style/xmlimppr.cxx +++ b/xmloff/source/style/xmlimppr.cxx @@ -40,7 +40,6 @@ #include <xmloff/maptype.hxx> #include <algorithm> -#include <functional> #include <utility> #include <vector> @@ -546,8 +545,7 @@ bool SvXMLImportPropertyMapper::FillPropertySet_( typedef pair<const OUString*, const Any* > PropertyPair; typedef vector<PropertyPair> PropertyPairs; -struct PropertyPairLessFunctor : - public std::binary_function<PropertyPair, PropertyPair, bool> +struct PropertyPairLessFunctor { bool operator()( const PropertyPair& a, const PropertyPair& b ) const { |