summaryrefslogtreecommitdiff
path: root/dbaccess
diff options
context:
space:
mode:
authorJochen Nitschke <j.nitschke+logerrit@ok.de>2017-07-04 12:23:19 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-07-04 20:27:24 +0200
commitdb714f4d76cb71c1124eb2f4902a816168f6513b (patch)
tree83096269d9f0115aeca9b9f7bbe469e8fd741f71 /dbaccess
parent27f61c4cfb88c23ef3c370921e6f9c186c602175 (diff)
make binary functors unary, related tdf#108782
These functors were always used as unary functors with std::bind2nd. This patch is a preparation of removal of deprecated std::binary_function. Change-Id: Ifd120227ab0a0db4c93dd56a9d46feb602b1ae4c Reviewed-on: https://gerrit.libreoffice.org/39500 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'dbaccess')
-rw-r--r--dbaccess/source/ui/browser/genericcontroller.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index 5e5d83a5e8fd..6c0057e2eea8 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -506,7 +506,7 @@ bool OGenericUnoController::isFeatureSupported( sal_Int32 _nId )
SupportedFeatures::const_iterator aFeaturePos = std::find_if(
m_aSupportedFeatures.begin(),
m_aSupportedFeatures.end(),
- std::bind2nd( CompareFeatureById(), _nId )
+ CompareFeatureById(_nId)
);
return ( m_aSupportedFeatures.end() != aFeaturePos && !aFeaturePos->first.isEmpty());
@@ -539,7 +539,7 @@ void OGenericUnoController::InvalidateFeature_Impl()
SupportedFeatures::const_iterator aFeaturePos = std::find_if(
m_aSupportedFeatures.begin(),
m_aSupportedFeatures.end(),
- std::bind2nd( CompareFeatureById(), aNextFeature.nId )
+ CompareFeatureById( aNextFeature.nId )
);
#if OSL_DEBUG_LEVEL > 0
@@ -575,7 +575,7 @@ void OGenericUnoController::ImplInvalidateFeature( sal_Int32 _nId, const Referen
SupportedFeatures::const_iterator aFeaturePos = std::find_if(
m_aSupportedFeatures.begin(),
m_aSupportedFeatures.end(),
- std::bind2nd( CompareFeatureById(), _nId )
+ CompareFeatureById( _nId )
);
OSL_ENSURE( aFeaturePos != m_aSupportedFeatures.end(), "OGenericUnoController::ImplInvalidateFeature: invalidating an unsupported feature is suspicious, at least!" );
}
@@ -760,7 +760,7 @@ void OGenericUnoController::removeStatusListener(const Reference< XStatusListene
m_aFeaturesToInvalidate.erase(
std::remove_if( m_aFeaturesToInvalidate.begin(),
m_aFeaturesToInvalidate.end(),
- std::bind2nd(FindFeatureListener(),aListener))
+ FindFeatureListener(aListener))
,m_aFeaturesToInvalidate.end());
}
@@ -899,7 +899,7 @@ URL OGenericUnoController::getURLForId(sal_Int32 _nId) const
SupportedFeatures::const_iterator aIter = std::find_if(
m_aSupportedFeatures.begin(),
m_aSupportedFeatures.end(),
- std::bind2nd( CompareFeatureById(), _nId )
+ CompareFeatureById( _nId )
);
if ( m_aSupportedFeatures.end() != aIter && !aIter->first.isEmpty() )