[Libreoffice-commits] .: extensions/source

Lubos Lunak llunak at kemper.freedesktop.org
Tue Feb 8 10:23:24 PST 2011


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

New commits:
commit 3e151a33b48dfce7ab2e9255921ad7e8c6e73bea
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Tue Feb 8 19:22:43 2011 +0100

    std:: -> o3tl:: fixes

diff --git a/extensions/source/propctrlr/eformshelper.cxx b/extensions/source/propctrlr/eformshelper.cxx
index 9a356d4..ec8af0b 100644
--- a/extensions/source/propctrlr/eformshelper.cxx
+++ b/extensions/source/propctrlr/eformshelper.cxx
@@ -47,6 +47,7 @@
 
 #include <functional>
 #include <algorithm>
+#include <o3tl/compat_functional.hxx>
 
 //........................................................................
 namespace pcr
@@ -715,7 +716,7 @@ namespace pcr
         }
 
         _rElementNames.resize( rMapUINameToElement.size() );
-        ::std::transform( rMapUINameToElement.begin(), rMapUINameToElement.end(), _rElementNames.begin(), ::std::select1st< MapStringToPropertySet::value_type >() );
+        ::std::transform( rMapUINameToElement.begin(), rMapUINameToElement.end(), _rElementNames.begin(), ::o3tl::select1st< MapStringToPropertySet::value_type >() );
     }
 
     //--------------------------------------------------------------------
diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx
index 956ff8f..37f5c87 100644
--- a/extensions/source/propctrlr/eventhandler.cxx
+++ b/extensions/source/propctrlr/eventhandler.cxx
@@ -78,6 +78,7 @@
 
 #include <map>
 #include <algorithm>
+#include <o3tl/compat_functional.hxx>
 
 //------------------------------------------------------------------------
 extern "C" void SAL_CALL createRegistryInfo_EventHandler()
@@ -845,7 +846,7 @@ namespace pcr
 
         StlSyntaxSequence< Property > aReturn( aOrderedProperties.size() );
         ::std::transform( aOrderedProperties.begin(), aOrderedProperties.end(), aReturn.begin(),
-            ::std::select2nd< ::std::map< EventId, Property >::value_type >() );
+            ::o3tl::select2nd< ::std::map< EventId, Property >::value_type >() );
         return aReturn;
     }
     
diff --git a/extensions/source/propctrlr/genericpropertyhandler.cxx b/extensions/source/propctrlr/genericpropertyhandler.cxx
index 51d11c8..409635d 100644
--- a/extensions/source/propctrlr/genericpropertyhandler.cxx
+++ b/extensions/source/propctrlr/genericpropertyhandler.cxx
@@ -46,6 +46,7 @@
 #include <cppuhelper/extract.hxx>
 
 #include <algorithm>
+#include <o3tl/compat_functional.hxx>
 
 //------------------------------------------------------------------------
 extern "C" void SAL_CALL createRegistryInfo_GenericPropertyHandler()
@@ -614,7 +615,7 @@ namespace pcr
 
         Sequence< Property > aReturn( m_aProperties.size() );
         ::std::transform( m_aProperties.begin(), m_aProperties.end(),
-            aReturn.getArray(), ::std::select2nd< PropertyMap::value_type >() );
+            aReturn.getArray(), ::o3tl::select2nd< PropertyMap::value_type >() );
         return aReturn;
     }
 


More information about the Libreoffice-commits mailing list