basctl/source/basicide/documentenumeration.cxx | 3 +++
connectivity/source/commontools/TTableHelper.cxx | 1 +
connectivity/source/commontools/dbtools.cxx | 1 +
cui/source/options/dbregistersettings.hxx | 7 +++++--
dbaccess/source/core/dataaccess/datasource.cxx | 2 ++
dbaccess/source/ui/dlg/DbAdminImpl.cxx | 10 +++++-----
dbaccess/source/ui/dlg/DbAdminImpl.hxx | 4 ++++
dbaccess/source/ui/dlg/dsselect.cxx | 2 +-
dbaccess/source/ui/inc/commontypes.hxx | 6 +++++-
dbaccess/source/ui/inc/dsmeta.hxx | 4 ++++
dbaccess/source/ui/misc/dsmeta.cxx | 2 +-
extensions/source/abpilot/abptypes.hxx | 6 +++++-
extensions/source/abpilot/datasourcehandling.cxx | 2 +-
extensions/source/abpilot/tableselectionpage.cxx | 2 +-
extensions/source/dbpilots/dbptypes.hxx | 6 +++++-
filter/source/svg/svgfontexport.hxx | 10 ++++++++--
include/comphelper/stl_types.hxx | 18 ++----------------
include/connectivity/dbcharset.hxx | 3 ++-
include/xmloff/txtimp.hxx | 3 +--
include/xmloff/xmlimp.hxx | 3 +++
sc/source/filter/xml/xmlfilti.hxx | 1 +
sd/source/ui/framework/module/ResourceManager.cxx | 3 +--
svx/source/inc/fmexch.hxx | 4 ++++
svx/source/unodraw/UnoNameItemTable.cxx | 7 +++----
svx/source/unodraw/UnoNamespaceMap.cxx | 9 +++------
svx/source/unodraw/unomtabl.cxx | 9 ++++-----
sw/source/filter/xml/xmltexti.cxx | 6 +++---
sw/source/filter/xml/xmltexti.hxx | 2 +-
xmloff/inc/txtlists.hxx | 7 ++-----
xmloff/source/draw/sdxmlexp_impl.hxx | 4 ++--
xmloff/source/draw/sdxmlimp_impl.hxx | 1 +
xmloff/source/forms/elementexport.cxx | 4 ++--
xmloff/source/forms/elementexport.hxx | 6 +++++-
xmloff/source/forms/layerexport.hxx | 4 ++++
xmloff/source/forms/propertyexport.cxx | 2 +-
xmloff/source/forms/propertyexport.hxx | 6 +++++-
xmloff/source/forms/propertyimport.hxx | 6 +++++-
xmloff/source/style/MultiPropertySetHelper.cxx | 2 --
xmloff/source/style/prstylei.cxx | 2 +-
xmloff/source/text/XMLPropertyBackpatcher.hxx | 5 ++---
xmloff/source/text/XMLTextFrameContext.cxx | 3 +--
xmloff/source/text/txtimp.cxx | 8 ++------
xmloff/source/transform/MetaTContext.hxx | 4 +---
43 files changed, 114 insertions(+), 86 deletions(-)
New commits:
commit 895e6e7bb7abddb135f6fe3cfef1505261d4cbc6
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Dec 5 18:34:54 2013 +0100
Get rid of comphelper::UStringLess
...default std::less<OUString> is just fine.
Change-Id: Ib9d3c10f2817d757f3c19eb3d4607095883af91a
diff --git a/cui/source/options/dbregistersettings.hxx
b/cui/source/options/dbregistersettings.hxx
index d59136b..68063d9 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 39a7315..97a5bd2 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 9d129c2..228da5b 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 99e10bc..75049ef 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 11557db..c6a9536 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 352ea00..dbab4f4 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 b696c29..0afe85a 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 f1bf74f..b6add6a 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 ff9e4b2..7c16259 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 fb968ac..221ad67 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 2c31210..4210cc1 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 447ffa7..eb7f8ca 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 aff29f3..4d50c63 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 06ce388..fc690be 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 48d8a95..b0c9ade 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 92266f88..fc506a5 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 3731221..f349814 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 ff88ffc..c6f43f6 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 be8ac95..b37b05f 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
commit 0c55303581156d01992d9d958ac5f7aafc4a3ebb
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Dec 5 17:42:08 2013 +0100
Get rid of DECLARE_STL_STDKEY_SET
Change-Id: I4817694d183d525fa5a29eb9693a20d491549e5d
diff --git a/basctl/source/basicide/documentenumeration.cxx
b/basctl/source/basicide/documentenumeration.cxx
index 83591f7..f281eca 100644
--- a/basctl/source/basicide/documentenumeration.cxx
+++ b/basctl/source/basicide/documentenumeration.cxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <set>
#include "documentenumeration.hxx"
diff --git a/connectivity/source/commontools/TTableHelper.cxx
b/connectivity/source/commontools/TTableHelper.cxx
index f77eefc..98dde62 100644
--- a/connectivity/source/commontools/TTableHelper.cxx
+++ b/connectivity/source/commontools/TTableHelper.cxx
@@ -37,6 +37,7 @@
#include <o3tl/compat_functional.hxx>
#include <iterator>
+#include <set>
using namespace ::comphelper;
using namespace connectivity;
diff --git a/connectivity/source/commontools/dbtools.cxx
b/connectivity/source/commontools/dbtools.cxx
index b5d578e..f38e861 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -83,6 +83,7 @@
#include <algorithm>
#include <iterator>
+#include <set>
using namespace ::comphelper;
using namespace ::com::sun::star::uno;
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx
b/dbaccess/source/core/dataaccess/datasource.cxx
index cd349b7..c2b46de 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -67,8 +67,10 @@
#include <unotools/confignode.hxx>
#include <unotools/sharedunocomponent.hxx>
#include <rtl/digest.h>
+
#include <algorithm>
#include <iterator>
+#include <set>
using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::sdbcx;
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.hxx
b/dbaccess/source/ui/dlg/DbAdminImpl.hxx
index d8b91e3..59bc3d2 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.hxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.hxx
@@ -20,6 +20,10 @@
#ifndef INCLUDED_DBACCESS_SOURCE_UI_DLG_DBADMINIMPL_HXX
#define INCLUDED_DBACCESS_SOURCE_UI_DLG_DBADMINIMPL_HXX
+#include <sal/config.h>
+
+#include <set>
+
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/dbaccess/source/ui/dlg/dsselect.cxx
b/dbaccess/source/ui/dlg/dsselect.cxx
index fea904b..e127037 100644
--- a/dbaccess/source/ui/dlg/dsselect.cxx
+++ b/dbaccess/source/ui/dlg/dsselect.cxx
@@ -138,7 +138,7 @@ void ODatasourceSelectDialog::fillListBox(const StringBag&
_rDatasources)
sSelected = m_aDatasource.GetSelectEntry();
m_aDatasource.Clear();
// fill the list
- for ( ConstStringBagIterator aDS = _rDatasources.begin();
+ for ( StringBag::const_iterator aDS = _rDatasources.begin();
aDS != _rDatasources.end();
++aDS
)
diff --git a/dbaccess/source/ui/inc/commontypes.hxx
b/dbaccess/source/ui/inc/commontypes.hxx
index 0292f33..e87ef13 100644
--- a/dbaccess/source/ui/inc/commontypes.hxx
+++ b/dbaccess/source/ui/inc/commontypes.hxx
@@ -20,6 +20,10 @@
#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_COMMONTYPES_HXX
#define INCLUDED_DBACCESS_SOURCE_UI_INC_COMMONTYPES_HXX
+#include <sal/config.h>
+
+#include <set>
+
#include <comphelper/stl_types.hxx>
#include <unotools/sharedunocomponent.hxx>
@@ -32,7 +36,7 @@ namespace com { namespace sun { namespace star {
namespace dbaui
{
- DECLARE_STL_STDKEY_SET( OUString, StringBag );
+ typedef std::set<OUString> StringBag;
DECLARE_STL_VECTOR( sal_Int8, ByteVector );
DECLARE_STL_VECTOR( OUString, StringArray );
diff --git a/dbaccess/source/ui/inc/dsmeta.hxx
b/dbaccess/source/ui/inc/dsmeta.hxx
index f9027da..5b1a1f4 100644
--- a/dbaccess/source/ui/inc/dsmeta.hxx
+++ b/dbaccess/source/ui/inc/dsmeta.hxx
@@ -20,6 +20,10 @@
#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DSMETA_HXX
#define INCLUDED_DBACCESS_SOURCE_UI_INC_DSMETA_HXX
+#include <sal/config.h>
+
+#include <set>
+
#include "dsntypes.hxx"
#include "dsitems.hxx"
diff --git a/extensions/source/abpilot/abptypes.hxx
b/extensions/source/abpilot/abptypes.hxx
index 0af46d1..435ef5a 100644
--- a/extensions/source/abpilot/abptypes.hxx
+++ b/extensions/source/abpilot/abptypes.hxx
@@ -20,6 +20,10 @@
#ifndef EXTENSIONS_ABP_ABPTYPES_HXX
#define EXTENSIONS_ABP_ABPTYPES_HXX
+#include <sal/config.h>
+
+#include <set>
+
#include <comphelper/stl_types.hxx>
#include <rtl/ustring.hxx>
@@ -28,7 +32,7 @@ namespace abp
{
//.........................................................................
- DECLARE_STL_STDKEY_SET( OUString, StringBag );
+ typedef std::set<OUString> StringBag;
DECLARE_STL_USTRINGACCESS_MAP( OUString, MapString2String );
diff --git a/extensions/source/abpilot/datasourcehandling.cxx
b/extensions/source/abpilot/datasourcehandling.cxx
index f9b0415..65d97ff 100644
--- a/extensions/source/abpilot/datasourcehandling.cxx
+++ b/extensions/source/abpilot/datasourcehandling.cxx
@@ -213,7 +213,7 @@ namespace abp
OUString& ODataSourceContext::disambiguate(OUString& _rDataSourceName)
{
OUString sCheck( _rDataSourceName );
- ConstStringBagIterator aPos = m_pImpl->aDataSourceNames.find( sCheck );
+ StringBag::const_iterator aPos = m_pImpl->aDataSourceNames.find(
sCheck );
sal_Int32 nPostFix = 1;
while ( ( m_pImpl->aDataSourceNames.end() != aPos ) && ( nPostFix <
65535 ) )
diff --git a/extensions/source/abpilot/tableselectionpage.cxx
b/extensions/source/abpilot/tableselectionpage.cxx
index c2f1a94..724cbd5 100644
--- a/extensions/source/abpilot/tableselectionpage.cxx
+++ b/extensions/source/abpilot/tableselectionpage.cxx
@@ -72,7 +72,7 @@ namespace abp
// this page should never bother the user if there is 1 or less
tables.
// fill the list
- for ( ConstStringBagIterator aTables = aTableNames.begin();
+ for ( StringBag::const_iterator aTables = aTableNames.begin();
aTables != aTableNames.end();
++aTables
)
diff --git a/extensions/source/dbpilots/dbptypes.hxx
b/extensions/source/dbpilots/dbptypes.hxx
index 3b99d4c..1b409b3 100644
--- a/extensions/source/dbpilots/dbptypes.hxx
+++ b/extensions/source/dbpilots/dbptypes.hxx
@@ -20,6 +20,10 @@
#ifndef _EXTENSIONS_DBP_DBPTYPES_HXX_
#define _EXTENSIONS_DBP_DBPTYPES_HXX_
+#include <sal/config.h>
+
+#include <set>
+
#include <comphelper/stl_types.hxx>
//.........................................................................
@@ -28,7 +32,7 @@ namespace dbp
//.........................................................................
DECLARE_STL_VECTOR( OUString, StringArray );
- DECLARE_STL_STDKEY_SET( OUString, StringBag );
+ typedef std::set<OUString> StringBag;
DECLARE_STL_STDKEY_MAP( sal_uInt32, OUString, MapInt2String );
//.........................................................................
diff --git a/filter/source/svg/svgfontexport.hxx
b/filter/source/svg/svgfontexport.hxx
index b200e89..e042a5f 100644
--- a/filter/source/svg/svgfontexport.hxx
+++ b/filter/source/svg/svgfontexport.hxx
@@ -20,9 +20,15 @@
#ifndef INCLUDED_FILTER_SOURCE_SVG_SVGFONTEXPORT_HXX
#define INCLUDED_FILTER_SOURCE_SVG_SVGFONTEXPORT_HXX
-#include <comphelper/stl_types.hxx>
-#include <tools/fontenum.hxx>
+#include <sal/config.h>
+
+#include <functional>
+#include <map>
+#include <set>
+#include <vector>
+#include <rtl/ustring.hxx>
+#include <tools/fontenum.hxx>
// -----------------
// - SVGFontExport -
diff --git a/include/comphelper/stl_types.hxx b/include/comphelper/stl_types.hxx
index 6da8d99..9d129c2 100644
--- a/include/comphelper/stl_types.hxx
+++ b/include/comphelper/stl_types.hxx
@@ -25,7 +25,6 @@
#include <map>
#include <stack>
-#include <set>
#include <math.h>
#include <functional>
@@ -260,10 +259,6 @@ OutputIter intersperse(
#define DECLARE_STL_USTRINGACCESS_MAP(valuetype, classname) \
DECLARE_STL_MAP(OUString, valuetype, ::comphelper::UStringLess, classname)
\
-#define DECLARE_STL_STDKEY_SET(valuetype, classname) \
- typedef ::std::set< valuetype > classname; \
- DECLARE_STL_ITERATORS(classname) \
-
#endif // INCLUDED_COMPHELPER_STL_TYPES_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/dbcharset.hxx
b/include/connectivity/dbcharset.hxx
index 7286bfc..a07d024 100644
--- a/include/connectivity/dbcharset.hxx
+++ b/include/connectivity/dbcharset.hxx
@@ -23,6 +23,7 @@
#include <sal/config.h>
#include <cstddef>
+#include <set>
#include <comphelper/stl_types.hxx>
#include <rtl/textenc.h>
@@ -55,7 +56,7 @@ namespace dbtools
class OOO_DLLPUBLIC_DBTOOLS OCharsetMap
{
protected:
- DECLARE_STL_STDKEY_SET( rtl_TextEncoding, TextEncBag );
+ typedef std::set<rtl_TextEncoding> TextEncBag;
TextEncBag m_aEncodings;
diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index b305298..b2e3baf 100644
--- a/include/xmloff/xmlimp.hxx
+++ b/include/xmloff/xmlimp.hxx
@@ -21,6 +21,9 @@
#define INCLUDED_XMLOFF_XMLIMP_HXX
#include <sal/config.h>
+
+#include <set>
+
#include <xmloff/dllapi.h>
#include <sal/types.h>
#include <com/sun/star/embed/XStorage.hpp>
diff --git a/svx/source/inc/fmexch.hxx b/svx/source/inc/fmexch.hxx
index e2c9a84..927b3e6 100644
--- a/svx/source/inc/fmexch.hxx
+++ b/svx/source/inc/fmexch.hxx
@@ -19,6 +19,10 @@
#ifndef INCLUDED_SVX_SOURCE_INC_FMEXCH_HXX
#define INCLUDED_SVX_SOURCE_INC_FMEXCH_HXX
+#include <sal/config.h>
+
+#include <set>
+
#include <comphelper/stl_types.hxx>
#include <svtools/transfer.hxx>
#include <com/sun/star/uno/Sequence.hxx>
diff --git a/xmloff/source/draw/sdxmlexp_impl.hxx
b/xmloff/source/draw/sdxmlexp_impl.hxx
index 8a5c4fb..613bf2a 100644
--- a/xmloff/source/draw/sdxmlexp_impl.hxx
+++ b/xmloff/source/draw/sdxmlexp_impl.hxx
@@ -26,8 +26,8 @@
#include <com/sun/star/task/XStatusIndicator.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/drawing/XDrawPage.hpp>
-#include <comphelper/stl_types.hxx>
+#include <set>
#include <vector>
class Rectangle;
@@ -59,7 +59,7 @@ enum XmlPlaceholder
XmlPlaceholderVerticalOutline
};
-DECLARE_STL_STDKEY_SET( sal_Int32, SdXMLFormatMap );
+typedef std::set<sal_Int32> SdXMLFormatMap;
struct HeaderFooterPageSettingsImpl
{
diff --git a/xmloff/source/forms/elementexport.cxx
b/xmloff/source/forms/elementexport.cxx
index 5d4e635..ed6c471 100644
--- a/xmloff/source/forms/elementexport.cxx
+++ b/xmloff/source/forms/elementexport.cxx
@@ -1331,7 +1331,7 @@ namespace xmloff
++pValues;
}
- Int16SetIterator aSelectedPos = aSelection.find(i);
+ Int16Set::iterator aSelectedPos = aSelection.find(i);
if (aSelection.end() != aSelectedPos)
{ // the item at this position is selected
AddAttribute(
@@ -1342,7 +1342,7 @@ namespace xmloff
aSelection.erase(aSelectedPos);
}
- Int16SetIterator aDefaultSelectedPos = aDefaultSelection.find(i);
+ Int16Set::iterator aDefaultSelectedPos = aDefaultSelection.find(i);
if (aDefaultSelection.end() != aDefaultSelectedPos)
{ // the item at this position is selected as default
AddAttribute(
diff --git a/xmloff/source/forms/elementexport.hxx
b/xmloff/source/forms/elementexport.hxx
index 6b89f9d..c57c5fa 100644
--- a/xmloff/source/forms/elementexport.hxx
+++ b/xmloff/source/forms/elementexport.hxx
@@ -20,6 +20,10 @@
#ifndef INCLUDED_XMLOFF_SOURCE_FORMS_ELEMENTEXPORT_HXX
#define INCLUDED_XMLOFF_SOURCE_FORMS_ELEMENTEXPORT_HXX
+#include <sal/config.h>
+
+#include <set>
+
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/container/XIndexAccess.hpp>
#include <com/sun/star/script/ScriptEventDescriptor.hpp>
@@ -83,7 +87,7 @@ namespace xmloff
,public OElementExport
{
protected:
- DECLARE_STL_STDKEY_SET(sal_Int16, Int16Set);
+ typedef std::set<sal_Int16> Int16Set;
// used below
OUString m_sControlId; // the control id to use when
exporting
diff --git a/xmloff/source/forms/layerexport.hxx
b/xmloff/source/forms/layerexport.hxx
index 62d4111..2089d3b 100644
--- a/xmloff/source/forms/layerexport.hxx
+++ b/xmloff/source/forms/layerexport.hxx
@@ -20,6 +20,10 @@
#ifndef INCLUDED_XMLOFF_SOURCE_FORMS_LAYEREXPORT_HXX
#define INCLUDED_XMLOFF_SOURCE_FORMS_LAYEREXPORT_HXX
+#include <sal/config.h>
+
+#include <set>
+
#include <com/sun/star/container/XIndexAccess.hpp>
#include <com/sun/star/script/ScriptEventDescriptor.hpp>
#include <com/sun/star/util/XNumberFormats.hpp>
diff --git a/xmloff/source/forms/propertyexport.cxx
b/xmloff/source/forms/propertyexport.cxx
index 230d4f0..3943af2 100644
--- a/xmloff/source/forms/propertyexport.cxx
+++ b/xmloff/source/forms/propertyexport.cxx
@@ -108,7 +108,7 @@ namespace xmloff
OUString sValue;
// loop through all the properties which are yet to be exported
- for ( ConstStringSetIterator aProperty =
m_aRemainingProps.begin();
+ for ( StringSet::const_iterator aProperty =
m_aRemainingProps.begin();
aProperty != m_aRemainingProps.end();
++aProperty
)
diff --git a/xmloff/source/forms/propertyexport.hxx
b/xmloff/source/forms/propertyexport.hxx
index ea950b5..ce294c8 100644
--- a/xmloff/source/forms/propertyexport.hxx
+++ b/xmloff/source/forms/propertyexport.hxx
@@ -20,6 +20,10 @@
#ifndef INCLUDED_XMLOFF_SOURCE_FORMS_PROPERTYEXPORT_HXX
#define INCLUDED_XMLOFF_SOURCE_FORMS_PROPERTYEXPORT_HXX
+#include <sal/config.h>
+
+#include <set>
+
#include "formattributes.hxx"
#include <comphelper/stl_types.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
@@ -54,7 +58,7 @@ namespace xmloff
class OPropertyExport
{
private:
- DECLARE_STL_STDKEY_SET(OUString, StringSet);
+ typedef std::set<OUString> StringSet;
StringSet m_aRemainingProps;
// see examinePersistence
diff --git a/xmloff/source/forms/propertyimport.hxx
b/xmloff/source/forms/propertyimport.hxx
index 83d70e3..ee7b6a4 100644
--- a/xmloff/source/forms/propertyimport.hxx
+++ b/xmloff/source/forms/propertyimport.hxx
@@ -20,6 +20,10 @@
#ifndef INCLUDED_XMLOFF_SOURCE_FORMS_PROPERTYIMPORT_HXX
#define INCLUDED_XMLOFF_SOURCE_FORMS_PROPERTYIMPORT_HXX
+#include <sal/config.h>
+
+#include <set>
+
#include <xmloff/xmlictxt.hxx>
#include "formattributes.hxx"
#include <rtl/ref.hxx>
@@ -68,7 +72,7 @@ namespace xmloff
PropertyValueArray m_aGenericValues;
// the values which the instance collects between StartElement and
EndElement
- DECLARE_STL_STDKEY_SET( OUString, StringSet );
+ typedef std::set<OUString> StringSet;
StringSet m_aEncounteredAttributes;
OFormLayerXMLImport_Impl& m_rContext;
commit 75c4bff5f402229267d53ca6f5ece28473bff7d8
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Dec 5 16:16:28 2013 +0100
Get rid of DECLARE_STL_SET
Change-Id: Ie3e2fb6d9376e3b6e98bb17671b3e9e93cd69923
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index 43abe7e..be221ab 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -557,7 +557,7 @@ struct PropertyValueLess
{ return x.Name < y.Name ? true : false; } // construct prevents
a MSVC6 warning
};
-DECLARE_STL_SET( PropertyValue, PropertyValueLess, PropertyValueSet);
+typedef std::set<PropertyValue, PropertyValueLess> PropertyValueSet;
void ODbDataSourceAdministrationHelper::translateProperties(const Reference<
XPropertySet >& _rxSource, SfxItemSet& _rDest)
{
@@ -620,7 +620,7 @@ void
ODbDataSourceAdministrationHelper::translateProperties(const Reference< XPr
++aIndirect)
{
aSearchFor.Name = aIndirect->second;
- ConstPropertyValueSetIterator aInfoPos =
aInfos.find(aSearchFor);
+ PropertyValueSet::const_iterator aInfoPos =
aInfos.find(aSearchFor);
if (aInfos.end() != aInfoPos)
// the property is contained in the info sequence
// -> transfer it into an item
@@ -745,7 +745,7 @@ void
ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rS
for (sal_Int32 i = 0; i < nCount; ++i, ++pInfo)
{
aSearchFor.Name = pInfo->Name;
- PropertyValueSetIterator aOverwrittenSetting =
aRelevantSettings.find(aSearchFor);
+ PropertyValueSet::iterator aOverwrittenSetting =
aRelevantSettings.find(aSearchFor);
if (aRelevantSettings.end() != aOverwrittenSetting)
{ // the setting was present in the original sequence, and it is to
be overwritten -> replace it
if (
!::comphelper::compare(pInfo->Value,aOverwrittenSetting->Value) )
@@ -815,8 +815,8 @@ void
ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rS
sal_Int32 nOldLength = _rInfo.getLength();
_rInfo.realloc(nOldLength + aRelevantSettings.size());
PropertyValue* pAppendValues = _rInfo.getArray() + nOldLength;
- ConstPropertyValueSetIterator aRelevantEnd = aRelevantSettings.end();
- for ( ConstPropertyValueSetIterator aLoop =
aRelevantSettings.begin();
+ PropertyValueSet::const_iterator aRelevantEnd =
aRelevantSettings.end();
+ for ( PropertyValueSet::const_iterator aLoop =
aRelevantSettings.begin();
aLoop != aRelevantEnd;
++aLoop, ++pAppendValues
)
diff --git a/include/comphelper/stl_types.hxx b/include/comphelper/stl_types.hxx
index 4ed995a..6da8d99 100644
--- a/include/comphelper/stl_types.hxx
+++ b/include/comphelper/stl_types.hxx
@@ -264,10 +264,6 @@ OutputIter intersperse(
typedef ::std::set< valuetype > classname; \
DECLARE_STL_ITERATORS(classname) \
-#define DECLARE_STL_SET(valuetype, comparefct, classname) \
- typedef ::std::set< valuetype, comparefct > classname; \
- DECLARE_STL_ITERATORS(classname) \
-
#endif // INCLUDED_COMPHELPER_STL_TYPES_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
