xmloff: use ::comphelper::UStringLess instead of less_functor

sw/source/filter/xml/xmltexti.hxx

@@ -29,7 +29,6 @@
 #define _XMLTEXTI_HXX
 
 #include <xmloff/txtimp.hxx>
-#include <xmloff/functional.hxx>
 
 class XMLRedlineImportHelper;
 class SvXMLImport;

xmloff/Package_inc.mk

@@ -76,7 +76,6 @@ $(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/families.hxx,xmloff/fami
 $(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/formlayerexport.hxx,xmloff/formlayerexport.hxx))
 $(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/formlayerimport.hxx,xmloff/formlayerimport.hxx))
 $(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/formsimp.hxx,xmloff/formsimp.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/functional.hxx,xmloff/functional.hxx))
 $(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/i18nmap.hxx,xmloff/i18nmap.hxx))
 $(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/maptype.hxx,xmloff/maptype.hxx))
 $(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/nmspmap.hxx,xmloff/nmspmap.hxx))

xmloff/inc/functional.hxx

-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#ifndef _XMLOFF_FUNCTIONAL_HXX
-#define _XMLOFF_FUNCTIONAL_HXX
-
-#include <rtl/ustring.hxx>
-
-/* THIS HEADER IS DEPRECATED. USE comphelper/stl_types.hxx INSTEAD!!! */
-
-/** @#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
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

xmloff/inc/xmloff/txtimp.hxx

@@ -39,9 +39,6 @@
 #include <boost/shared_ptr.hpp>
 
 #include <xmloff/xmltkmap.hxx>
-
-// xmloff/functional.hxx is obsolete and should be replaced by its comphelper
-// counterpart
 #include <comphelper/stl_types.hxx>
 #include <xmloff/uniref.hxx>
 

xmloff/source/transform/MetaTContext.hxx

@@ -30,15 +30,14 @@
 #define _XMLOFF_METATCONTEXT_HXX
 
 #include <rtl/ref.hxx>
-#include "xmloff/functional.hxx"
-
+#include <comphelper/stl_types.hxx>
 #include <map>
 
 #include "FlatTContext.hxx"
 
 typedef ::std::multimap< ::rtl::OUString,
                     ::rtl::Reference< XMLPersTextContentTContext >,
-                    less_functor > XMLMetaContexts_Impl;
+                    ::comphelper::UStringLess > XMLMetaContexts_Impl;
 
 
 class XMLMetaTransformerContext : public XMLTransformerContext