- fixed warning when compiling txtimp.cxx and XMLPropertyBackpatcher

- fixed <:: into < ::
  (This was already in #ifdef MACOSX, but should be that way for all platforms.)

xmloff/inc/functional.hxx

+#ifndef _XMLOFF_FUNCTIONAL_HXX
+#define _XMLOFF_FUNCTIONAL_HXX
+
+/** @#file
+ *
+ * re-implement STL functors as needed
+ *
+ * The standard comparison operators from the STL cause warnings with
+ * several compilers about our sal_Bool (=unsigned char) being
+ * converted to bool (C++ bool). We wish to avoid that.
+ */
+
+struct less_functor
+{
+    bool operator()(const ::rtl::OUString& x,
+                    const ::rtl::OUString& y) const
+    {
+        return 0 != (x<y);
+    }
+};
+
+
+#endif

xmloff/source/text/XMLPropertyBackpatcher.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XMLPropertyBackpatcher.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: dvo $ $Date: 2000-09-27 15:58:44 $
+ *  last change: $Author: dvo $ $Date: 2000-09-28 18:27:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -251,4 +251,3 @@ void XMLPropertyBackpatcher<A>::SetDefault()
 // force instantiation of templates
 template XMLPropertyBackpatcher<sal_Int16>;
 template XMLPropertyBackpatcher<OUString>;
-

xmloff/source/text/XMLPropertyBackpatcher.hxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XMLPropertyBackpatcher.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: dvo $ $Date: 2000-09-27 15:58:45 $
+ *  last change: $Author: dvo $ $Date: 2000-09-28 18:27:14 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -71,6 +71,10 @@
 #include <stl/vector>
 #endif
 
+#ifndef _XMLOFF_FUNCTIONAL_HXX
+#include "functional.hxx"
+#endif
+
 
 namespace rtl { class OUString; }
 namespace com { namespace sun { namespace star {
@@ -78,6 +82,7 @@ namespace com { namespace sun { namespace star {
     namespace uno { template<class A> class Reference; }
 } } }
 
+
 /** This class maintains an OUString->sal_Int16 mapping for cases in
  * which an XPropertySet needs to be filled with values that are not
  * yet known.
@@ -132,10 +137,10 @@ class XMLPropertyBackpatcher
 
     /// backpatch list for unresolved IDs
     //::std::map<const ::rtl::OUString, BackpatchListType*> aBackpatchListMap;
-    ::std::map<const ::rtl::OUString, void* > aBackpatchListMap;
+    ::std::map<const ::rtl::OUString, void*, less_functor> aBackpatchListMap;
 
     /// mapping of names -> IDs
-    ::std::map<const ::rtl::OUString, A> aIDMap;
+    ::std::map<const ::rtl::OUString, A, less_functor> aIDMap;
 
 public: