Get rid of comphelper::UStringLess

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

Change-Id: Ib9d3c10f2817d757f3c19eb3d4607095883af91a

3 files changed, 10 insertions, 15 deletions

diff --git a/svx/source/unodraw/UnoNameItemTable.cxx b/svx/source/unodraw/UnoNameItemTable.cxx
index b696c29665cd..0afe85a2ab1a 100644
--- a/svx/source/unodraw/UnoNameItemTable.cxx
+++ b/svx/source/unodraw/UnoNameItemTable.cxx
@@ -22,7 +22,6 @@
 #include <svl/itempool.hxx>
 #include <svl/itemset.hxx>
 #include <svl/style.hxx>
-#include <comphelper/stl_types.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
 #include <svx/svdmodel.hxx>
@@ -237,7 +236,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoNameItemTable::getElementNames(  )
 {
     SolarMutexGuard aGuard;
 
-    std::set< OUString, comphelper::UStringLess > aNameSet;
+    std::set< OUString > aNameSet;
 
     NameOrIndex *pItem;
 
@@ -257,8 +256,8 @@ uno::Sequence< OUString > SAL_CALL SvxUnoNameItemTable::getElementNames(  )
     uno::Sequence< OUString > aSeq( aNameSet.size() );
     OUString* pNames = aSeq.getArray();
 
-    std::set< OUString, comphelper::UStringLess >::iterator aIter( aNameSet.begin() );
-    const std::set< OUString, comphelper::UStringLess >::iterator aEnd( aNameSet.end() );
+    std::set< OUString >::iterator aIter( aNameSet.begin() );
+    const std::set< OUString >::iterator aEnd( aNameSet.end() );
 
     while( aIter != aEnd )
     {
diff --git a/svx/source/unodraw/UnoNamespaceMap.cxx b/svx/source/unodraw/UnoNamespaceMap.cxx
index f1bf74f0f262..b6add6abf219 100644
--- a/svx/source/unodraw/UnoNamespaceMap.cxx
+++ b/svx/source/unodraw/UnoNamespaceMap.cxx
@@ -27,13 +27,10 @@
 #include <cppuhelper/implbase2.hxx>
 #include <osl/diagnose.h>
 #include <osl/mutex.hxx>
-#include <comphelper/stl_types.hxx>
 #include <svl/itempool.hxx>
 #include "svx/unoapi.hxx"
 #include "editeng/xmlcnitm.hxx"
 
-
-using namespace ::comphelper;
 using namespace ::osl;
 using namespace ::cppu;
 using namespace ::com::sun::star;
@@ -224,7 +221,7 @@ Sequence< OUString > SAL_CALL NamespaceMap::getElementNames() throw (RuntimeExce
     OUString aPrefix;
     OUString aURL;
 
-    std::set< OUString, comphelper::UStringLess > aPrefixSet;
+    std::set< OUString > aPrefixSet;
 
     while( aIter.next( aPrefix, aURL ) )
         aPrefixSet.insert( aPrefix );
@@ -232,8 +229,8 @@ Sequence< OUString > SAL_CALL NamespaceMap::getElementNames() throw (RuntimeExce
     Sequence< OUString > aSeq( aPrefixSet.size() );
     OUString* pPrefixes = aSeq.getArray();
 
-    std::set< OUString, comphelper::UStringLess >::iterator aPrefixIter( aPrefixSet.begin() );
-    const std::set< OUString, comphelper::UStringLess >::iterator aEnd( aPrefixSet.end() );
+    std::set< OUString >::iterator aPrefixIter( aPrefixSet.begin() );
+    const std::set< OUString >::iterator aEnd( aPrefixSet.end() );
 
     while( aPrefixIter != aEnd )
     {
diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx
index ff9e4b2689a8..7c162591af79 100644
--- a/svx/source/unodraw/unomtabl.cxx
+++ b/svx/source/unodraw/unomtabl.cxx
@@ -19,7 +19,6 @@
 
 
 #include <set>
-#include <comphelper/stl_types.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/drawing/PointSequence.hpp>
@@ -333,7 +332,7 @@ uno::Any SAL_CALL SvxUnoMarkerTable::getByName( const OUString& aApiName )
     return aAny;
 }
 
-static void createNamesForPool( SfxItemPool* pPool, sal_uInt16 nWhich, std::set< OUString, comphelper::UStringLess >& rNameSet )
+static void createNamesForPool( SfxItemPool* pPool, sal_uInt16 nWhich, std::set< OUString >& rNameSet )
 {
     const sal_uInt32 nSuroCount = pPool->GetItemCount2( nWhich );
 
@@ -354,7 +353,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoMarkerTable::getElementNames()
 {
     SolarMutexGuard aGuard;
 
-    std::set< OUString, comphelper::UStringLess > aNameSet;
+    std::set< OUString > aNameSet;
 
     // search model pool for line starts
     createNamesForPool( mpModelPool, XATTR_LINESTART, aNameSet );
@@ -365,8 +364,8 @@ uno::Sequence< OUString > SAL_CALL SvxUnoMarkerTable::getElementNames()
     uno::Sequence< OUString > aSeq( aNameSet.size() );
     OUString* pNames = aSeq.getArray();
 
-    std::set< OUString, comphelper::UStringLess >::iterator aIter( aNameSet.begin() );
-    const std::set< OUString, comphelper::UStringLess >::iterator aEnd( aNameSet.end() );
+    std::set< OUString >::iterator aIter( aNameSet.begin() );
+    const std::set< OUString >::iterator aEnd( aNameSet.end() );
 
     while( aIter != aEnd )
     {