From 36e92f38c98e5cb21aecf07434df34b3ad75272a Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 11 Jul 2017 13:56:33 +0200 Subject: [PATCH] drop TPropertyValueEqualFunctor was only in two places, and did nothing to make the code simpler or easier to understand Change-Id: I8e91d7e00f14a0611bf563a855d616ad11da5342 Reviewed-on: https://gerrit.libreoffice.org/39813 Tested-by: Jenkins Reviewed-by: Noel Grandin --- dbaccess/source/ui/misc/UITools.cxx | 4 ++-- include/comphelper/stl_types.hxx | 11 ----------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index f2e2cabb553b..8453b903d86c 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -1036,13 +1036,13 @@ void fillAutoIncrementValue(const Reference& _xDatasource, // search the right propertyvalue const PropertyValue* pValue =std::find_if(aInfo.begin(), aInfo.end(), [](const PropertyValue& lhs) - {return TPropertyValueEqualFunctor()(lhs, PROPERTY_AUTOINCREMENTCREATION);} ); + {return lhs.Name == PROPERTY_AUTOINCREMENTCREATION;} ); if ( pValue != aInfo.end() ) pValue->Value >>= _rsAutoIncrementValue; pValue =std::find_if(aInfo.begin(), aInfo.end(), [](const PropertyValue& lhs) - {return TPropertyValueEqualFunctor()(lhs, "IsAutoRetrievingEnabled");} ); + {return lhs.Name == "IsAutoRetrievingEnabled";} ); if ( pValue != aInfo.end() ) pValue->Value >>= _rAutoIncrementValueEnabled; diff --git a/include/comphelper/stl_types.hxx b/include/comphelper/stl_types.hxx index b82db0c9c8ec..bb50c21a7e8c 100644 --- a/include/comphelper/stl_types.hxx +++ b/include/comphelper/stl_types.hxx @@ -63,17 +63,6 @@ public: bool isCaseSensitive() const {return m_bCaseSensitive;} }; -class TPropertyValueEqualFunctor -{ -public: - TPropertyValueEqualFunctor() - {} - bool operator() (const css::beans::PropertyValue& lhs, const OUString& rhs) const - { - return !!(lhs.Name == rhs); - } -}; - /// by-value less functor for std::set> template struct UniquePtrValueLess {