Get rid of comphelper::UStringLess

...default std::less<OUString> is just fine.

Change-Id: Ib9d3c10f2817d757f3c19eb3d4607095883af91a

8 files changed, 10 insertions, 22 deletions

diff --git a/xmloff/inc/txtlists.hxx b/xmloff/inc/txtlists.hxx
index 447ffa7cf2ac..eb7f8caa5494 100644
--- a/xmloff/inc/txtlists.hxx
+++ b/xmloff/inc/txtlists.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_XMLOFF_INC_TXTLISTS_HXX
 
 #include <rtl/ustring.hxx>
-#include <comphelper/stl_types.hxx>
 #include <map>
 #include <vector>
 #include <stack>
@@ -138,8 +137,7 @@ class XMLTextListsHelper : private boost::noncopyable
         // map with <ListId> as key and pair( <ListStyleName, ContinueListId> )
         // as value
         typedef ::std::map< OUString,
-                            ::std::pair< OUString, OUString >,
-                            ::comphelper::UStringLess > tMapForLists;
+                            ::std::pair< OUString, OUString > > tMapForLists;
         tMapForLists* mpProcessedLists;
         OUString msLastProcessedListId;
         OUString msListStyleOfLastProcessedList;
@@ -153,8 +151,7 @@ class XMLTextListsHelper : private boost::noncopyable
         // container type to build up continue list chain:
         // map with <ListId> of master list as key and <ListId> of last list
         // continuing the master list as value
-        typedef ::std::map< OUString, OUString,
-                            ::comphelper::UStringLess > tMapForContinuingLists;
+        typedef ::std::map< OUString, OUString > tMapForContinuingLists;
         tMapForContinuingLists* mpContinuingLists;
 
         // stack type for opened list elements and its list style:
diff --git a/xmloff/source/draw/sdxmlimp_impl.hxx b/xmloff/source/draw/sdxmlimp_impl.hxx
index aff29f37fb3b..4d50c63a64c5 100644
--- a/xmloff/source/draw/sdxmlimp_impl.hxx
+++ b/xmloff/source/draw/sdxmlimp_impl.hxx
@@ -25,6 +25,7 @@
 #include <com/sun/star/task/XStatusIndicator.hpp>
 #include <xmloff/xmltkmap.hxx>
 #include <com/sun/star/container/XNameAccess.hpp>
+#include <comphelper/stl_types.hxx>
 
 #include <vector>
 #include <xmloff/xmlimp.hxx>
diff --git a/xmloff/source/style/MultiPropertySetHelper.cxx b/xmloff/source/style/MultiPropertySetHelper.cxx
index 06ce388e9042..fc690bee8fb1 100644
--- a/xmloff/source/style/MultiPropertySetHelper.cxx
+++ b/xmloff/source/style/MultiPropertySetHelper.cxx
@@ -23,7 +23,6 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <comphelper/stl_types.hxx>
 
 // STL includes
 #include <algorithm>
@@ -37,7 +36,6 @@ using ::com::sun::star::uno::Any;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::UNO_QUERY;
-using ::comphelper::UStringLess;
 using ::std::sort;
 
 
diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx
index 48d8a952bf7e..b0c9ade38fb7 100644
--- a/xmloff/source/style/prstylei.cxx
+++ b/xmloff/source/style/prstylei.cxx
@@ -168,7 +168,7 @@ Reference < XStyle > XMLPropStyleContext::Create()
     return xNewStyle;
 }
 
-typedef ::std::set < OUString, ::comphelper::UStringLess > PropertyNameSet;
+typedef ::std::set < OUString > PropertyNameSet;
 
 void XMLPropStyleContext::CreateAndInsert( sal_Bool bOverwrite )
 {
diff --git a/xmloff/source/text/XMLPropertyBackpatcher.hxx b/xmloff/source/text/XMLPropertyBackpatcher.hxx
index 92266f88e1a7..fc506a529e5c 100644
--- a/xmloff/source/text/XMLPropertyBackpatcher.hxx
+++ b/xmloff/source/text/XMLPropertyBackpatcher.hxx
@@ -23,7 +23,6 @@
 
 #include <map>
 #include <vector>
-#include <comphelper/stl_types.hxx>
 
 namespace com { namespace sun { namespace star {
     namespace beans { class XPropertySet; }
@@ -85,10 +84,10 @@ class XMLPropertyBackpatcher
 
     /// backpatch list for unresolved IDs
     //::std::map<const OUString, BackpatchListType*> aBackpatchListMap;
-    ::std::map<const OUString, void*, ::comphelper::UStringLess> aBackpatchListMap;
+    ::std::map<const OUString, void*> aBackpatchListMap;
 
     /// mapping of names -> IDs
-    ::std::map<const OUString, A, ::comphelper::UStringLess> aIDMap;
+    ::std::map<const OUString, A> aIDMap;
 
 public:
 
diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx
index 37312211a755..f349814f10a1 100644
--- a/xmloff/source/text/XMLTextFrameContext.cxx
+++ b/xmloff/source/text/XMLTextFrameContext.cxx
@@ -50,7 +50,6 @@
 #include "XMLTextListBlockContext.hxx"
 #include "XMLTextListItemContext.hxx"
 #include <xmloff/attrlist.hxx>
-#include <comphelper/stl_types.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
@@ -77,7 +76,7 @@ using ::com::sun::star::document::XEventsSupplier;
 #define XML_TEXT_FRAME_PLUGIN 6
 #define XML_TEXT_FRAME_FLOATING_FRAME 7
 
-typedef ::std::map < const OUString, OUString, ::comphelper::UStringLess> ParamMap;
+typedef ::std::map < const OUString, OUString > ParamMap;
 
 class XMLTextFrameContextHyperlink_Impl
 {
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index ff88ffcea469..c6f43f67c346 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -74,9 +74,6 @@ using namespace ::com::sun::star::xml::sax;
 using namespace ::com::sun::star::lang;
 using namespace ::xmloff::token;
 using namespace ::com::sun::star::ucb;
-using ::comphelper::UStringLess;
-
-
 
 static const SvXMLTokenMapEntry aTextElemTokenMap[] =
 {
@@ -527,8 +524,7 @@ struct SAL_DLLPRIVATE XMLTextImportHelper::Impl
         ::boost::shared_ptr< ::xmloff::ParsedRDFaAttributes > >
             BookmarkMapEntry_t;
     /// start ranges for open bookmarks
-    ::std::map< OUString, BookmarkMapEntry_t,
-                ::comphelper::UStringLess> m_BookmarkStartRanges;
+    ::std::map< OUString, BookmarkMapEntry_t > m_BookmarkStartRanges;
 
     typedef ::std::vector< OUString > BookmarkVector_t;
     BookmarkVector_t m_BookmarkVector;
@@ -2738,7 +2734,7 @@ Reference< XPropertySet> XMLTextImportHelper::createAndInsertFloatingFrame(
 
 void XMLTextImportHelper::endAppletOrPlugin(
         const Reference < XPropertySet> &,
-        std::map < const OUString, OUString, UStringLess > &)
+        std::map < const OUString, OUString > &)
 {
 }
 // redline helper: dummy implementation to be overridden in sw/filter/xml
diff --git a/xmloff/source/transform/MetaTContext.hxx b/xmloff/source/transform/MetaTContext.hxx
index be8ac95ad354..b37b05fcc15f 100644
--- a/xmloff/source/transform/MetaTContext.hxx
+++ b/xmloff/source/transform/MetaTContext.hxx
@@ -21,14 +21,12 @@
 #define INCLUDED_XMLOFF_SOURCE_TRANSFORM_METATCONTEXT_HXX
 
 #include <rtl/ref.hxx>
-#include <comphelper/stl_types.hxx>
 #include <map>
 
 #include "FlatTContext.hxx"
 
 typedef ::std::multimap< OUString,
-                    ::rtl::Reference< XMLPersTextContentTContext >,
-                    ::comphelper::UStringLess > XMLMetaContexts_Impl;
+                    ::rtl::Reference< XMLPersTextContentTContext > > XMLMetaContexts_Impl;
 
 
 class XMLMetaTransformerContext : public XMLTransformerContext