[Libreoffice-commits] .: basctl/source forms/source

Lubos Lunak llunak at kemper.freedesktop.org
Tue Feb 8 10:33:44 PST 2011


 basctl/source/dlged/dlgedobj.cxx           |    3 ++-
 forms/source/xforms/convert.cxx            |    2 ++
 forms/source/xforms/datatyperepository.cxx |    3 ++-
 3 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit c612232fd98d7b19be6e97c290022e4dbdab78a2
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Tue Feb 8 19:33:25 2011 +0100

    more std:: -> o3tl:: build fixes

diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index 5e3a3b8..39aa04c 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -59,6 +59,7 @@
 
 #include <algorithm>
 #include <functional>
+#include <o3tl/compat_functional.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -646,7 +647,7 @@ void DlgEdObj::TabIndexChange( const beans::PropertyChangeEvent& evt ) throw (Ru
             ::std::transform(
                     aIndexToNameMap.begin(), aIndexToNameMap.end(),
                     aNameList.begin(),
-                    ::std::select2nd< IndexToNameMap::value_type >( )
+                    ::o3tl::select2nd< IndexToNameMap::value_type >( )
                 );
 
             // check tab index
diff --git a/forms/source/xforms/convert.cxx b/forms/source/xforms/convert.cxx
index 1f39163..27112b8 100644
--- a/forms/source/xforms/convert.cxx
+++ b/forms/source/xforms/convert.cxx
@@ -35,6 +35,7 @@
 #include <memory>
 #include <algorithm>
 #include <functional>
+#include <o3tl/compat_functional.hxx>
 #include <rtl/math.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <tools/date.hxx>
@@ -51,6 +52,7 @@ using com::sun::star::uno::Any;
 using com::sun::star::uno::makeAny;
 using com::sun::star::util::Time;
 using namespace std;
+using namespace o3tl;
 
 typedef com::sun::star::util::Date UNODate;
 typedef com::sun::star::util::Time UNOTime;
diff --git a/forms/source/xforms/datatyperepository.cxx b/forms/source/xforms/datatyperepository.cxx
index a5c5f8b..517403c 100644
--- a/forms/source/xforms/datatyperepository.cxx
+++ b/forms/source/xforms/datatyperepository.cxx
@@ -43,6 +43,7 @@
 
 #include <functional>
 #include <algorithm>
+#include <o3tl/compat_functional.hxx>
 
 //........................................................................
 namespace xforms
@@ -205,7 +206,7 @@ namespace xforms
             m_aRepository.begin(),
             m_aRepository.end(),
             aNames.getArray(),
-            ::std::select1st< Repository::value_type >()
+            ::o3tl::select1st< Repository::value_type >()
         );
         return aNames;
     }


More information about the Libreoffice-commits mailing list