[Libreoffice-commits] .: forms/source

[Jesús Corrius]

 forms/source/component/GroupManager.hxx |    4 ++--
 forms/source/misc/property.cxx          |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 29cc3b7054864400bbb19deff561a4e8dbe801b8
Author: Jesús Corrius <jesus at softcatala.org>
Date:   Thu Oct 28 13:55:00 2010 +0200

    Make some stl functions less ambiguous (fixes VC++ 10 compilation)

diff --git a/forms/source/component/GroupManager.hxx b/forms/source/component/GroupManager.hxx
index 002f056..b75d4d7 100644
--- a/forms/source/component/GroupManager.hxx
+++ b/forms/source/component/GroupManager.hxx
@@ -71,7 +71,7 @@ namespace frm
     template <class ELEMENT, class LESS_COMPARE>
     sal_Int32 insert_sorted(::std::vector<ELEMENT>& _rArray, const ELEMENT& _rNewElement, const LESS_COMPARE& _rCompareOp)
     {
-        typename ::std::vector<ELEMENT>::iterator aInsertPos = lower_bound(
+        typename ::std::vector<ELEMENT>::iterator aInsertPos = ::std::lower_bound(
             _rArray.begin(),
             _rArray.end(),
             _rNewElement,
@@ -84,7 +84,7 @@ namespace frm
     template <class ELEMENT, class LESS_COMPARE>
     sal_Bool seek_entry(const ::std::vector<ELEMENT>& _rArray, const ELEMENT& _rNewElement, sal_Int32& nPos, const LESS_COMPARE& _rCompareOp)
     {
-        typename ::std::vector<ELEMENT>::const_iterator aExistentPos = lower_bound(
+        typename ::std::vector<ELEMENT>::const_iterator aExistentPos = ::std::lower_bound(
             _rArray.begin(),
             _rArray.end(),
             _rNewElement,
diff --git a/forms/source/misc/property.cxx b/forms/source/misc/property.cxx
index e93dc20..4e95fa8 100644
--- a/forms/source/misc/property.cxx
+++ b/forms/source/misc/property.cxx
@@ -54,7 +54,7 @@ sal_Int32 PropertyInfoService::getPropertyId(const ::rtl::OUString& _rName)
 
     PropertyAssignment aCompareName(_rName, -1);
 
-    ::std::pair<PropertyMapIterator,PropertyMapIterator> aPair = equal_range(
+    ::std::pair<PropertyMapIterator,PropertyMapIterator> aPair = ::std::equal_range(
         s_AllKnownProperties.begin(),
         s_AllKnownProperties.end(),
         aCompareName,