[Libreoffice-commits] core.git: extensions/source

[Daniel Robertson]

 extensions/source/propctrlr/eformshelper.cxx           |    5 ++---
 extensions/source/propctrlr/eventhandler.cxx           |    3 +--
 extensions/source/propctrlr/genericpropertyhandler.cxx |    4 ++--
 3 files changed, 5 insertions(+), 7 deletions(-)

New commits:
commit 4ce10ff6ce725212efa91a017a61e1bd781008c1
Author: Daniel Robertson <danlrobertson89 at gmail.com>
Date:   Fri Aug 7 23:09:04 2015 -0400

    tdf#92459 remove compat_functional from extensions
    
    Replace all uses of deprecated features from the o3tl in
    compat_functional.hxx with lambda expressions in extensions. There
    should be no side effects due to this patch.
    
    Change-Id: Ib9a217c1d61593eaba82431ab047e5b899c74568
    Reviewed-on: https://gerrit.libreoffice.org/17587
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/extensions/source/propctrlr/eformshelper.cxx b/extensions/source/propctrlr/eformshelper.cxx
index db9dec1..14731e1b 100644
--- a/extensions/source/propctrlr/eformshelper.cxx
+++ b/extensions/source/propctrlr/eformshelper.cxx
@@ -34,8 +34,6 @@
 
 #include <functional>
 #include <algorithm>
-#include <o3tl/compat_functional.hxx>
-
 
 namespace pcr
 {
@@ -701,7 +699,8 @@ namespace pcr
         }
 
         _rElementNames.resize( rMapUINameToElement.size() );
-        ::std::transform( rMapUINameToElement.begin(), rMapUINameToElement.end(), _rElementNames.begin(), ::o3tl::select1st< MapStringToPropertySet::value_type >() );
+        ::std::transform( rMapUINameToElement.begin(), rMapUINameToElement.end(), _rElementNames.begin(),
+                []( const ::std::pair< MapStringToPropertySet::key_type, MapStringToPropertySet::mapped_type>& cp) { return cp.first; } );
     }
 
 
diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx
index b521709..6a15c56 100644
--- a/extensions/source/propctrlr/eventhandler.cxx
+++ b/extensions/source/propctrlr/eventhandler.cxx
@@ -68,7 +68,6 @@
 
 #include <map>
 #include <algorithm>
-#include <o3tl/compat_functional.hxx>
 
 extern "C" void SAL_CALL createRegistryInfo_EventHandler()
 {
@@ -776,7 +775,7 @@ namespace pcr
 
         StlSyntaxSequence< Property > aReturn( aOrderedProperties.size() );
         ::std::transform( aOrderedProperties.begin(), aOrderedProperties.end(), aReturn.begin(),
-            ::o3tl::select2nd< ::std::map< EventId, Property >::value_type >() );
+                []( const ::std::pair< EventId, Property >& cp ) { return cp.second; } );
         return aReturn;
     }
 
diff --git a/extensions/source/propctrlr/genericpropertyhandler.cxx b/extensions/source/propctrlr/genericpropertyhandler.cxx
index de94363..af489cc 100644
--- a/extensions/source/propctrlr/genericpropertyhandler.cxx
+++ b/extensions/source/propctrlr/genericpropertyhandler.cxx
@@ -41,7 +41,6 @@
 #include <tools/debug.hxx>
 
 #include <algorithm>
-#include <o3tl/compat_functional.hxx>
 
 extern "C" void SAL_CALL createRegistryInfo_GenericPropertyHandler()
 {
@@ -531,7 +530,8 @@ namespace pcr
 
         Sequence< Property > aReturn( m_aProperties.size() );
         ::std::transform( m_aProperties.begin(), m_aProperties.end(),
-            aReturn.getArray(), ::o3tl::select2nd< PropertyMap::value_type >() );
+            aReturn.getArray(), []( const ::std::pair< PropertyMap::key_type, PropertyMap::mapped_type >& cp )
+            { return cp.second; } );
         return aReturn;
     }