summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cui/source/options/dbregistersettings.hxx7
-rw-r--r--dbaccess/source/ui/misc/dsmeta.cxx2
-rw-r--r--include/comphelper/stl_types.hxx9
-rw-r--r--include/xmloff/txtimp.hxx3
-rw-r--r--sc/source/filter/xml/xmlfilti.hxx1
-rw-r--r--sd/source/ui/framework/module/ResourceManager.cxx3
-rw-r--r--svx/source/unodraw/UnoNameItemTable.cxx7
-rw-r--r--svx/source/unodraw/UnoNamespaceMap.cxx9
-rw-r--r--svx/source/unodraw/unomtabl.cxx9
-rw-r--r--sw/source/filter/xml/xmltexti.cxx6
-rw-r--r--sw/source/filter/xml/xmltexti.hxx2
-rw-r--r--xmloff/inc/txtlists.hxx7
-rw-r--r--xmloff/source/draw/sdxmlimp_impl.hxx1
-rw-r--r--xmloff/source/style/MultiPropertySetHelper.cxx2
-rw-r--r--xmloff/source/style/prstylei.cxx2
-rw-r--r--xmloff/source/text/XMLPropertyBackpatcher.hxx5
-rw-r--r--xmloff/source/text/XMLTextFrameContext.cxx3
-rw-r--r--xmloff/source/text/txtimp.cxx8
-rw-r--r--xmloff/source/transform/MetaTContext.hxx4
19 files changed, 35 insertions, 55 deletions
diff --git a/cui/source/options/dbregistersettings.hxx b/cui/source/options/dbregistersettings.hxx
index d59136b90ddc..68063d960fc3 100644
--- a/cui/source/options/dbregistersettings.hxx
+++ b/cui/source/options/dbregistersettings.hxx
@@ -20,7 +20,10 @@
#ifndef INCLUDED_CUI_SOURCE_OPTIONS_DBREGISTERSETTINGS_HXX
#define INCLUDED_CUI_SOURCE_OPTIONS_DBREGISTERSETTINGS_HXX
-#include <comphelper/stl_types.hxx>
+#include <sal/config.h>
+
+#include <map>
+
#include <svl/poolitem.hxx>
//........................................................................
@@ -58,7 +61,7 @@ namespace svx
}
};
- typedef ::std::map< OUString, DatabaseRegistration, ::comphelper::UStringLess > DatabaseRegistrations;
+ typedef ::std::map< OUString, DatabaseRegistration > DatabaseRegistrations;
//====================================================================
//= DatabaseMapItem
diff --git a/dbaccess/source/ui/misc/dsmeta.cxx b/dbaccess/source/ui/misc/dsmeta.cxx
index 39a731595acd..97a5bd26b288 100644
--- a/dbaccess/source/ui/misc/dsmeta.cxx
+++ b/dbaccess/source/ui/misc/dsmeta.cxx
@@ -86,7 +86,7 @@ namespace dbaui
static const FeatureSet& lcl_getFeatureSet( const OUString _rURL )
{
- typedef ::std::map< OUString, FeatureSet, ::comphelper::UStringLess > FeatureSets;
+ typedef ::std::map< OUString, FeatureSet > FeatureSets;
static FeatureSets s_aFeatureSets;
if ( s_aFeatureSets.empty() )
{
diff --git a/include/comphelper/stl_types.hxx b/include/comphelper/stl_types.hxx
index 9d129c2ab21c..228da5b443a6 100644
--- a/include/comphelper/stl_types.hxx
+++ b/include/comphelper/stl_types.hxx
@@ -44,12 +44,6 @@ namespace comphelper
//========================================================================
// comparison functors
-//------------------------------------------------------------------------
-struct UStringLess : public ::std::binary_function< OUString, OUString, bool>
-{
- bool operator() (const OUString& x, const OUString& y) const { return x < y ? true : false;} // construct prevents a MSVC6 warning
-};
-//------------------------------------------------------------------------
struct UStringMixLess : public ::std::binary_function< OUString, OUString, bool>
{
bool m_bCaseSensitive;
@@ -257,7 +251,8 @@ OutputIter intersperse(
DECLARE_STL_ITERATORS(classname) \
#define DECLARE_STL_USTRINGACCESS_MAP(valuetype, classname) \
- DECLARE_STL_MAP(OUString, valuetype, ::comphelper::UStringLess, classname) \
+ typedef std::map< OUString, valuetype > classname; \
+ DECLARE_STL_ITERATORS(classname)
#endif // INCLUDED_COMPHELPER_STL_TYPES_HXX
diff --git a/include/xmloff/txtimp.hxx b/include/xmloff/txtimp.hxx
index 99e10bc07d4b..75049eff9318 100644
--- a/include/xmloff/txtimp.hxx
+++ b/include/xmloff/txtimp.hxx
@@ -30,7 +30,6 @@
#include <boost/scoped_ptr.hpp>
#include <xmloff/xmltkmap.hxx>
-#include <comphelper/stl_types.hxx>
#include <xmloff/uniref.hxx>
class XMLTextListsHelper;
@@ -662,7 +661,7 @@ public:
virtual void endAppletOrPlugin(
const com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet> &rPropSet,
- ::std::map < const OUString, OUString, ::comphelper::UStringLess > &rParamMap );
+ ::std::map < const OUString, OUString > &rParamMap );
// applet helper methods
// implemented in sw/filter/xml/txtparai.hxx
diff --git a/sc/source/filter/xml/xmlfilti.hxx b/sc/source/filter/xml/xmlfilti.hxx
index 11557dbe569c..c6a9536c82fb 100644
--- a/sc/source/filter/xml/xmlfilti.hxx
+++ b/sc/source/filter/xml/xmlfilti.hxx
@@ -32,6 +32,7 @@
#include "xmldpimp.hxx"
#include "queryentry.hxx"
+#include <stack>
#include <vector>
class ScXMLImport;
diff --git a/sd/source/ui/framework/module/ResourceManager.cxx b/sd/source/ui/framework/module/ResourceManager.cxx
index 352ea00ff208..dbab4f42b618 100644
--- a/sd/source/ui/framework/module/ResourceManager.cxx
+++ b/sd/source/ui/framework/module/ResourceManager.cxx
@@ -24,7 +24,6 @@
#include "framework/ConfigurationController.hxx"
#include <com/sun/star/drawing/framework/XControllerManager.hpp>
-#include <comphelper/stl_types.hxx>
#include <set>
using namespace ::com::sun::star;
@@ -44,7 +43,7 @@ namespace {
namespace sd { namespace framework {
class ResourceManager::MainViewContainer
- : public ::std::set<OUString, ::comphelper::UStringLess>
+ : public ::std::set<OUString>
{
public:
MainViewContainer (void) {}
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 )
{
diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx
index fb968ac74155..221ad67a70bd 100644
--- a/sw/source/filter/xml/xmltexti.cxx
+++ b/sw/source/filter/xml/xmltexti.cxx
@@ -895,7 +895,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertFloatingFra
void SwXMLTextImportHelper::endAppletOrPlugin(
const uno::Reference < XPropertySet > &rPropSet,
- ::std::map < const OUString, OUString, ::comphelper::UStringLess > &rParamMap)
+ ::std::map < const OUString, OUString > &rParamMap)
{
// this method will modify the document directly -> lock SolarMutex
SolarMutexGuard aGuard;
@@ -920,8 +920,8 @@ void SwXMLTextImportHelper::endAppletOrPlugin(
const sal_Int32 nCount = rParamMap.size();
uno::Sequence< beans::PropertyValue > aCommandSequence( nCount );
- ::std::map < const OUString, OUString, ::comphelper::UStringLess > ::iterator aIter = rParamMap.begin();
- ::std::map < const OUString, OUString, ::comphelper::UStringLess > ::iterator aEnd = rParamMap.end();
+ ::std::map < const OUString, OUString > ::iterator aIter = rParamMap.begin();
+ ::std::map < const OUString, OUString > ::iterator aEnd = rParamMap.end();
sal_Int32 nIndex=0;
while (aIter != aEnd )
{
diff --git a/sw/source/filter/xml/xmltexti.hxx b/sw/source/filter/xml/xmltexti.hxx
index 2c31210d13a9..4210cc1e6c87 100644
--- a/sw/source/filter/xml/xmltexti.hxx
+++ b/sw/source/filter/xml/xmltexti.hxx
@@ -87,7 +87,7 @@ public:
virtual void endAppletOrPlugin(
const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > &rPropSet,
- ::std::map < const OUString, OUString, ::comphelper::UStringLess> &rParamMap);
+ ::std::map < const OUString, OUString > &rParamMap);
virtual sal_Bool IsInHeaderFooter() const;
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
generated by cgit (git 2.34.1) at 2025-02-03 11:57:56 +0000