[Libreoffice-commits] core.git: bridges/source connectivity/source embedserv/source extensions/source scripting/source sfx2/inc sfx2/source stoc/source ucb/source
Caolán McNamara
caolanm at redhat.com
Sun Jan 4 05:15:50 PST 2015
bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx | 3 -
bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx | 5 +
connectivity/source/commontools/TSkipDeletedSet.cxx | 1
connectivity/source/drivers/mork/MColumnAlias.hxx | 4 -
connectivity/source/drivers/mork/MQueryHelper.hxx | 6 --
connectivity/source/drivers/mozab/MColumnAlias.hxx | 4 -
connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx | 5 -
connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx | 4 -
connectivity/source/drivers/postgresql/pq_connection.hxx | 7 +-
connectivity/source/drivers/postgresql/pq_databasemetadata.cxx | 2
connectivity/source/drivers/postgresql/pq_statics.hxx | 6 --
connectivity/source/drivers/postgresql/pq_tools.hxx | 2
connectivity/source/drivers/postgresql/pq_xcontainer.hxx | 8 +--
connectivity/source/inc/TSkipDeletedSet.hxx | 2
embedserv/source/inc/embeddoc.hxx | 6 +-
extensions/source/bibliography/framectr.cxx | 4 -
extensions/source/ole/oleobjw.cxx | 8 +--
extensions/source/ole/oleobjw.hxx | 6 +-
extensions/source/ole/unoconversionutilities.hxx | 26 +++++-----
extensions/source/ole/unoobjw.cxx | 6 +-
extensions/source/ole/unoobjw.hxx | 6 +-
extensions/source/propctrlr/browserlistbox.hxx | 2
extensions/source/propctrlr/eventhandler.cxx | 2
extensions/source/propctrlr/eventhandler.hxx | 2
extensions/source/propctrlr/pcrcommontypes.hxx | 4 -
extensions/source/propctrlr/propcontroller.hxx | 10 +--
scripting/source/dlgprov/dlgevtatt.hxx | 11 +---
scripting/source/provider/ActiveMSPList.hxx | 22 +++-----
scripting/source/provider/BrowseNodeFactoryImpl.cxx | 8 +--
scripting/source/provider/ProviderCache.hxx | 5 +
scripting/source/stringresource/stringresource.hxx | 6 +-
scripting/source/vbaevents/eventhelper.cxx | 6 +-
sfx2/inc/pch/precompiled_sfx.hxx | 2
sfx2/source/appl/imagemgr.cxx | 4 -
sfx2/source/appl/newhelp.cxx | 4 -
sfx2/source/appl/workwin.cxx | 4 -
sfx2/source/control/bindings.cxx | 4 -
sfx2/source/doc/Metadatable.cxx | 18 +++---
sfx2/source/toolbox/imgmgr.cxx | 7 +-
sfx2/source/view/sfxbasecontroller.cxx | 7 +-
stoc/source/corereflection/base.hxx | 6 +-
stoc/source/corereflection/lrucache.hxx | 4 -
stoc/source/inspect/introspection.cxx | 6 +-
stoc/source/invocation_adapterfactory/iafactory.cxx | 11 +---
stoc/source/namingservice/namingservice.cxx | 5 +
stoc/source/security/file_policy.cxx | 6 +-
stoc/source/security/lru_cache.h | 4 -
stoc/source/servicemanager/servicemanager.cxx | 13 ++---
ucb/source/core/ucbstore.cxx | 16 ------
ucb/source/ucp/file/filnot.hxx | 5 -
ucb/source/ucp/file/filtask.hxx | 7 +-
ucb/source/ucp/file/shell.hxx | 12 ++--
ucb/source/ucp/hierarchy/hierarchyprovider.hxx | 8 ---
ucb/source/ucp/package/pkgprovider.cxx | 14 -----
ucb/source/ucp/webdav-neon/ContentProperties.hxx | 11 ----
ucb/source/ucp/webdav-neon/NeonSession.cxx | 4 -
ucb/source/ucp/webdav-neon/PropertyMap.hxx | 4 -
ucb/source/ucp/webdav/ContentProperties.hxx | 11 ----
ucb/source/ucp/webdav/PropertyMap.hxx | 6 --
ucb/source/ucp/webdav/webdavresponseparser.cxx | 7 --
60 files changed, 174 insertions(+), 235 deletions(-)
New commits:
commit ca8787a98171070c771dc167b43d5bdb98c52ce4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jan 4 11:10:45 2015 +0000
boost::unordered_map->std::unordered_map
Change-Id: I5d458f43616edc395faa8c27edaddc7d515166db
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
index 1e12643..767a7fe 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
@@ -20,7 +20,6 @@
#include <stdio.h>
#include <stdlib.h>
-#include <boost/unordered_map.hpp>
#include <rtl/alloc.h>
#include <osl/mutex.hxx>
@@ -44,8 +43,6 @@
using namespace ::osl;
using namespace ::com::sun::star::uno;
-
-
// Perform the UNO call
//
// We must convert the parameters stored in gpreg, fpreg and ovrflw to UNO
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx
index b0f300d..3f5292d 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx
@@ -21,11 +21,12 @@
#include <cassert>
#include <typeinfo>
+#include <unordered_map>
#include <utility>
+#include <vector>
#include <dlfcn.h>
-#include <boost/unordered_map.hpp>
#include <osl/mutex.hxx>
#include <rtl/instance.hxx>
#include <rtl/strbuf.hxx>
@@ -39,7 +40,7 @@ namespace {
class RTTI
{
- typedef boost::unordered_map< OUString, std::type_info *, OUStringHash > t_rtti_map;
+ typedef std::unordered_map< OUString, std::type_info *, OUStringHash > t_rtti_map;
osl::Mutex m_mutex;
t_rtti_map m_rttis;
diff --git a/connectivity/source/commontools/TSkipDeletedSet.cxx b/connectivity/source/commontools/TSkipDeletedSet.cxx
index cd98dd3..829dfd1 100644
--- a/connectivity/source/commontools/TSkipDeletedSet.cxx
+++ b/connectivity/source/commontools/TSkipDeletedSet.cxx
@@ -20,6 +20,7 @@
#include "TSkipDeletedSet.hxx"
#include <osl/diagnose.h>
#include <sal/log.hxx>
+#include <algorithm>
using namespace connectivity;
diff --git a/connectivity/source/drivers/mork/MColumnAlias.hxx b/connectivity/source/drivers/mork/MColumnAlias.hxx
index 25b992c..f45453b 100644
--- a/connectivity/source/drivers/mork/MColumnAlias.hxx
+++ b/connectivity/source/drivers/mork/MColumnAlias.hxx
@@ -24,8 +24,8 @@
#include <unotools/confignode.hxx>
#include <osl/mutex.hxx>
+#include <unordered_map>
#include <vector>
-#include <boost/unordered_map.hpp>
namespace connectivity
{
@@ -50,7 +50,7 @@ namespace connectivity
{
}
};
- typedef ::boost::unordered_map< OUString, AliasEntry, OUStringHash > AliasMap;
+ typedef std::unordered_map< OUString, AliasEntry, OUStringHash > AliasMap;
private:
AliasMap m_aAliasMap;
diff --git a/connectivity/source/drivers/mork/MQueryHelper.hxx b/connectivity/source/drivers/mork/MQueryHelper.hxx
index d2549c7..42a2c93 100644
--- a/connectivity/source/drivers/mork/MQueryHelper.hxx
+++ b/connectivity/source/drivers/mork/MQueryHelper.hxx
@@ -26,11 +26,9 @@
#include <osl/conditn.hxx>
#include <osl/thread.hxx>
#include <connectivity/FValue.hxx>
-
#include <boost/noncopyable.hpp>
-#include <boost/unordered_map.hpp>
-
#include "MErrorResource.hxx"
+#include <unordered_map>
namespace connectivity
{
@@ -155,7 +153,7 @@ namespace connectivity
class MQueryHelperResultEntry
{
private:
- typedef ::boost::unordered_map< OString, OUString, OStringHash > FieldMap;
+ typedef std::unordered_map< OString, OUString, OStringHash > FieldMap;
FieldMap m_Fields;
diff --git a/connectivity/source/drivers/mozab/MColumnAlias.hxx b/connectivity/source/drivers/mozab/MColumnAlias.hxx
index 5c141fb..4067fd6 100644
--- a/connectivity/source/drivers/mozab/MColumnAlias.hxx
+++ b/connectivity/source/drivers/mozab/MColumnAlias.hxx
@@ -24,8 +24,8 @@
#include <unotools/confignode.hxx>
#include <osl/mutex.hxx>
+#include <unordered_map>
#include <vector>
-#include <boost/unordered_map.hpp>
namespace connectivity
{
@@ -50,7 +50,7 @@ namespace connectivity
{
}
};
- typedef ::boost::unordered_map< OUString, AliasEntry, OUStringHash > AliasMap;
+ typedef std::unordered_map< OUString, AliasEntry, OUStringHash > AliasMap;
private:
AliasMap m_aAliasMap;
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
index 9c346b0..a3429b7 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
@@ -29,8 +29,7 @@
#include <tools/diagnose_ex.h>
-#include <boost/unordered_map.hpp>
-
+#include <unordered_map>
namespace connectivity { namespace mozab {
@@ -62,7 +61,7 @@ namespace connectivity { namespace mozab {
}
};
- typedef ::boost::unordered_map< OString, CardPropertyData, OStringHash > MapPropertiesToAttributes;
+ typedef std::unordered_map< OString, CardPropertyData, OStringHash > MapPropertiesToAttributes;
#define DEF_CARD_ACCESS( PropertyName ) \
&nsIAbCard::Get##PropertyName, &nsIAbCard::Set##PropertyName
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx
index cd725df..a492ca6 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx
@@ -32,7 +32,7 @@
#include <osl/conditn.hxx>
#include <osl/thread.hxx>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
namespace connectivity
{
@@ -41,7 +41,7 @@ namespace connectivity
class MQueryHelperResultEntry
{
private:
- typedef ::boost::unordered_map< OString, OUString, OStringHash > FieldMap;
+ typedef std::unordered_map< OString, OUString, OStringHash > FieldMap;
mutable ::osl::Mutex m_aMutex;
FieldMap m_Fields;
diff --git a/connectivity/source/drivers/postgresql/pq_connection.hxx b/connectivity/source/drivers/postgresql/pq_connection.hxx
index 4daa7a1..3d3bb13 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.hxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.hxx
@@ -38,7 +38,6 @@
#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_POSTGRESQL_PQ_CONNECTION_HXX
#include <config_lgpl.h>
-#include <boost/unordered_map.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/script/XTypeConverter.hpp>
@@ -57,8 +56,10 @@
#include <cppuhelper/weakref.hxx>
#include <cppuhelper/compbase6.hxx>
+#include <boost/functional/hash.hpp>
#include <libpq-fe.h>
+#include <unordered_map>
namespace pq_sdbc_driver
{
@@ -145,7 +146,7 @@ struct HashByteSequence
}
};
-typedef ::boost::unordered_map<
+typedef std::unordered_map<
::rtl::ByteSequence,
::com::sun::star::uno::WeakReference< com::sun::star::sdbc::XCloseable >,
HashByteSequence,
@@ -155,7 +156,7 @@ typedef ::std::vector< OString > OStringVector;
-typedef ::boost::unordered_map
+typedef std::unordered_map
<
const sal_Int32,
OUString,
diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
index 33c3209..8d7695e 100644
--- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
@@ -1413,7 +1413,7 @@ struct DatabaseTypeDescription
OUString typeType;
};
-typedef ::boost::unordered_map
+typedef std::unordered_map
<
sal_Int32,
DatabaseTypeDescription,
diff --git a/connectivity/source/drivers/postgresql/pq_statics.hxx b/connectivity/source/drivers/postgresql/pq_statics.hxx
index a8890a8..537017c 100644
--- a/connectivity/source/drivers/postgresql/pq_statics.hxx
+++ b/connectivity/source/drivers/postgresql/pq_statics.hxx
@@ -37,7 +37,7 @@
#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_POSTGRESQL_PQ_STATICS_HXX
#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_POSTGRESQL_PQ_STATICS_HXX
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
#include <vector>
#include <com/sun/star/uno/Any.hxx>
@@ -103,7 +103,7 @@ struct TypeDetails
bool isSearchable;
};
-typedef ::boost::unordered_map
+typedef std::unordered_map
<
OUString,
sal_Int32,
@@ -111,8 +111,6 @@ typedef ::boost::unordered_map
::std::equal_to< OUString >
> BaseTypeMap;
-
-
struct ImplementationStatics
{
ImplementationStatics() :
diff --git a/connectivity/source/drivers/postgresql/pq_tools.hxx b/connectivity/source/drivers/postgresql/pq_tools.hxx
index b3b3aeb..00a3858 100644
--- a/connectivity/source/drivers/postgresql/pq_tools.hxx
+++ b/connectivity/source/drivers/postgresql/pq_tools.hxx
@@ -123,7 +123,7 @@ com::sun::star::uno::Sequence< sal_Int32 > string2intarray( const OUString & str
com::sun::star::uno::Sequence< OUString > convertMappedIntArray2StringArray(
const Int2StringMap &map, const com::sun::star::uno::Sequence< sal_Int32> &source );
-typedef ::boost::unordered_map
+typedef std::unordered_map
<
OString,
OString,
diff --git a/connectivity/source/drivers/postgresql/pq_xcontainer.hxx b/connectivity/source/drivers/postgresql/pq_xcontainer.hxx
index 6a867e2..82110ff 100644
--- a/connectivity/source/drivers/postgresql/pq_xcontainer.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xcontainer.hxx
@@ -36,9 +36,6 @@
#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_POSTGRESQL_PQ_XCONTAINER_HXX
#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_POSTGRESQL_PQ_XCONTAINER_HXX
-#include <boost/unordered_map.hpp>
-#include <vector>
-
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/container/XIndexAccess.hpp>
#include <com/sun/star/container/XEnumerationAccess.hpp>
@@ -52,6 +49,9 @@
#include <cppuhelper/compbase8.hxx>
+#include <unordered_map>
+#include <vector>
+
#include "pq_connection.hxx"
#include "pq_statics.hxx"
@@ -86,7 +86,7 @@ public:
}
};
-typedef ::boost::unordered_map
+typedef std::unordered_map
<
OUString,
sal_Int32,
diff --git a/connectivity/source/inc/TSkipDeletedSet.hxx b/connectivity/source/inc/TSkipDeletedSet.hxx
index 206a5b8..98ba098 100644
--- a/connectivity/source/inc/TSkipDeletedSet.hxx
+++ b/connectivity/source/inc/TSkipDeletedSet.hxx
@@ -21,7 +21,7 @@
#include "TResultSetHelper.hxx"
#include <rtl/alloc.h>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
#include <vector>
#include <connectivity/dbtoolsdllapi.hxx>
diff --git a/embedserv/source/inc/embeddoc.hxx b/embedserv/source/inc/embeddoc.hxx
index e6d0d4f..0ba3483 100644
--- a/embedserv/source/inc/embeddoc.hxx
+++ b/embedserv/source/inc/embeddoc.hxx
@@ -27,15 +27,15 @@
#include <oleidl.h>
#include <objidl.h>
-#include <boost/unordered_map.hpp>
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/uno/SEQUENCE.h>
+#include <unordered_map>
#include "embeddocaccess.hxx"
#include "docholder.hxx"
-typedef ::boost::unordered_map< DWORD, IAdviseSink* > AdviseSinkHashMap;
-typedef ::boost::unordered_map< DWORD, IAdviseSink* >::iterator AdviseSinkHashMapIterator;
+typedef std::unordered_map< DWORD, IAdviseSink* > AdviseSinkHashMap;
+typedef std::unordered_map< DWORD, IAdviseSink* >::iterator AdviseSinkHashMapIterator;
class GDIMetaFile;
class CIIAObj;
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index ba2f7a8..4302999 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -51,7 +51,7 @@
#include <vcl/edit.hxx>
#include <osl/mutex.hxx>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
using namespace osl;
using namespace cppu;
@@ -98,7 +98,7 @@ static const DispatchInfo SupportedCommandsArray[] =
{ 0 , 0 , false }
};
-typedef ::boost::unordered_map< OUString, CacheDispatchInfo, OUStringHash, ::std::equal_to< OUString > > CmdToInfoCache;
+typedef std::unordered_map< OUString, CacheDispatchInfo, OUStringHash, ::std::equal_to< OUString > > CmdToInfoCache;
const CmdToInfoCache& GetCommandToInfoCache()
{
diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx
index cb7ee0b..b5560fc 100644
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -79,16 +79,16 @@ namespace ole_adapter
// called.
// Before UNO object is wrapped to COM object this map is checked
// to see if the UNO object is already a wrapper.
-boost::unordered_map<sal_uInt32, sal_uInt32> AdapterToWrapperMap;
+std::unordered_map<sal_uInt32, sal_uInt32> AdapterToWrapperMap;
// key: XInterface of the wrapper object.
// value: XInterface of the Interface created by the Invocation Adapter Factory.
// A COM wrapper is responsible for removing the corresponding entry
// in AdapterToWrappperMap if it is being destroyed. Because the wrapper does not
// know about its adapted interface it uses WrapperToAdapterMap to get the
// adapted interface which is then used to locate the entry in AdapterToWrapperMap.
-boost::unordered_map<sal_uInt32,sal_uInt32> WrapperToAdapterMap;
+std::unordered_map<sal_uInt32,sal_uInt32> WrapperToAdapterMap;
-boost::unordered_map<sal_uInt32, WeakReference<XInterface> > ComPtrToWrapperMap;
+std::unordered_map<sal_uInt32, WeakReference<XInterface> > ComPtrToWrapperMap;
/*****************************************************************************
class implementation IUnknownWrapper_Impl
@@ -115,7 +115,7 @@ IUnknownWrapper_Impl::~IUnknownWrapper_Impl()
#endif
// remove entries in global maps
- typedef boost::unordered_map<sal_uInt32, sal_uInt32>::iterator _IT;
+ typedef std::unordered_map<sal_uInt32, sal_uInt32>::iterator _IT;
_IT it= WrapperToAdapterMap.find( (sal_uInt32) xIntRoot);
if( it != WrapperToAdapterMap.end())
{
diff --git a/extensions/source/ole/oleobjw.hxx b/extensions/source/ole/oleobjw.hxx
index b9e55f9..886c9aa 100644
--- a/extensions/source/ole/oleobjw.hxx
+++ b/extensions/source/ole/oleobjw.hxx
@@ -23,8 +23,8 @@
#include "ole2uno.hxx"
#include "wincrap.hxx"
+#include <unordered_map>
#include <vector>
-#include <boost/unordered_map.hpp>
#include <cppuhelper/implbase3.hxx>
#include <cppuhelper/implbase4.hxx>
@@ -53,9 +53,9 @@ namespace ole_adapter
-typedef boost::unordered_map<OUString, pair<DISPID, unsigned short>, OUStringHash> DispIdMap;
+typedef std::unordered_map<OUString, pair<DISPID, unsigned short>, OUStringHash> DispIdMap;
-typedef boost::unordered_multimap<OUString, unsigned int, OUStringHash> TLBFuncIndexMap;
+typedef std::unordered_multimap<OUString, unsigned int, OUStringHash> TLBFuncIndexMap;
// This class wraps an IDispatch and maps XInvocation calls to IDispatch calls on the wrapped object.
// If m_TypeDescription is set then this class represents an UNO interface implemented in a COM component.
diff --git a/extensions/source/ole/unoconversionutilities.hxx b/extensions/source/ole/unoconversionutilities.hxx
index d0ab452..84feeed 100644
--- a/extensions/source/ole/unoconversionutilities.hxx
+++ b/extensions/source/ole/unoconversionutilities.hxx
@@ -32,7 +32,7 @@
#include "ole2uno.hxx"
#include "unotypewrapper.hxx"
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
// for some reason DECIMAL_NEG (wtypes.h) which contains BYTE is not resolved.
typedef unsigned char BYTE;
@@ -63,17 +63,17 @@ using namespace com::sun::star::bridge::oleautomation;
using namespace boost;
namespace ole_adapter
{
-extern boost::unordered_map<sal_uInt32, sal_uInt32> AdapterToWrapperMap;
-extern boost::unordered_map<sal_uInt32, sal_uInt32> WrapperToAdapterMap;
-typedef boost::unordered_map<sal_uInt32, sal_uInt32>::iterator IT_Wrap;
-typedef boost::unordered_map<sal_uInt32, sal_uInt32>::iterator CIT_Wrap;
+extern std::unordered_map<sal_uInt32, sal_uInt32> AdapterToWrapperMap;
+extern std::unordered_map<sal_uInt32, sal_uInt32> WrapperToAdapterMap;
+typedef std::unordered_map<sal_uInt32, sal_uInt32>::iterator IT_Wrap;
+typedef std::unordered_map<sal_uInt32, sal_uInt32>::iterator CIT_Wrap;
//Maps IUnknown pointers to a weak reference of the respective wrapper class (e.g.
// IUnknownWrapperImpl. It is the responsibility of the wrapper to remove the entry when
// it is being destroyed.
// Used to ensure that an Automation object is always mapped to the same UNO objects.
-extern boost::unordered_map<sal_uInt32, WeakReference<XInterface> > ComPtrToWrapperMap;
-typedef boost::unordered_map<sal_uInt32, WeakReference<XInterface> >::iterator IT_Com;
-typedef boost::unordered_map<sal_uInt32, WeakReference<XInterface> >::const_iterator CIT_Com;
+extern std::unordered_map<sal_uInt32, WeakReference<XInterface> > ComPtrToWrapperMap;
+typedef std::unordered_map<sal_uInt32, WeakReference<XInterface> >::iterator IT_Com;
+typedef std::unordered_map<sal_uInt32, WeakReference<XInterface> >::const_iterator CIT_Com;
// Maps XInterface pointers to a weak reference of its wrapper class (i.e.
// InterfaceOleWrapper_Impl). It is the responsibility of the wrapper to remove the entry when
@@ -81,9 +81,9 @@ typedef boost::unordered_map<sal_uInt32, WeakReference<XInterface> >::const_iter
// is mapped to IDispatch which is kept alive in the COM environment. If the same
// UNO interface is mapped again to COM then the IDispach of the first mapped instance
// must be returned.
-extern boost::unordered_map<sal_uInt32, WeakReference<XInterface> > UnoObjToWrapperMap;
-typedef boost::unordered_map<sal_uInt32, WeakReference<XInterface> >::iterator IT_Uno;
-typedef boost::unordered_map<sal_uInt32, WeakReference<XInterface> >::const_iterator CIT_Uno;
+extern std::unordered_map<sal_uInt32, WeakReference<XInterface> > UnoObjToWrapperMap;
+typedef std::unordered_map<sal_uInt32, WeakReference<XInterface> >::iterator IT_Uno;
+typedef std::unordered_map<sal_uInt32, WeakReference<XInterface> >::const_iterator CIT_Uno;
#ifdef __MINGW32__
inline void reduceRange( Any& any);
#endif
@@ -1391,7 +1391,7 @@ void UnoConversionUtilities<T>::createUnoObjectWrapper(const Any & rObj, VARIANT
else
{
Reference<XInterface> xIntComWrapper = xInt;
- typedef boost::unordered_map<sal_uInt32,sal_uInt32>::iterator _IT;
+ typedef std::unordered_map<sal_uInt32,sal_uInt32>::iterator _IT;
// Adapter? then get the COM wrapper to which the adapter delegates its calls
_IT it= AdapterToWrapperMap.find( (sal_uInt32) xInt.get());
if( it != AdapterToWrapperMap.end() )
@@ -1881,7 +1881,7 @@ Reference<XInterface> UnoConversionUtilities<T>::createAdapter(const Sequence<Ty
// in a global map. Thus we can determine in a call to createUnoObjectWrapper whether the UNO
// object is a wrapped COM object. In that case we extract the original COM object rather than
// creating a wrapper around the UNO object.
- typedef boost::unordered_map<sal_uInt32,sal_uInt32>::value_type VALUE;
+ typedef std::unordered_map<sal_uInt32,sal_uInt32>::value_type VALUE;
AdapterToWrapperMap.insert( VALUE( (sal_uInt32) xIntAdapted.get(), (sal_uInt32) receiver.get()));
WrapperToAdapterMap.insert( VALUE( (sal_uInt32) receiver.get(), (sal_uInt32) xIntAdapted.get()));
}
diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx
index d8c20de..1ad58f9 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -20,9 +20,9 @@
#include "ole2uno.hxx"
#include <stdio.h>
-#include <vector>
#include <list>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
+#include <vector>
#include <osl/diagnose.h>
#include <salhelper/simplereferenceobject.hxx>
@@ -68,7 +68,7 @@ extern "C" const GUID IID_IDispatchEx;
namespace ole_adapter
{
-boost::unordered_map<sal_uInt32, WeakReference<XInterface> > UnoObjToWrapperMap;
+std::unordered_map<sal_uInt32, WeakReference<XInterface> > UnoObjToWrapperMap;
static sal_Bool writeBackOutParameter(VARIANTARG* pDest, VARIANT* pSource);
static sal_Bool writeBackOutParameter2( VARIANTARG* pDest, VARIANT* pSource);
static HRESULT mapCannotConvertException(const CannotConvertException &e, unsigned int * puArgErr);
diff --git a/extensions/source/ole/unoobjw.hxx b/extensions/source/ole/unoobjw.hxx
index 87e2715..f31ef1b 100644
--- a/extensions/source/ole/unoobjw.hxx
+++ b/extensions/source/ole/unoobjw.hxx
@@ -76,21 +76,21 @@ struct MemberInfo
OUString name;
};
-typedef boost::unordered_map
+typedef std::unordered_map
<
OUString,
DISPID,
OUStringHash
> NameToIdMap;
-typedef boost::unordered_map
+typedef std::unordered_map
<
OUString,
sal_Bool,
OUStringHash
> BadNameMap;
-typedef boost::unordered_map
+typedef std::unordered_map
<
DISPID,
MemberInfo
diff --git a/extensions/source/propctrlr/browserlistbox.hxx b/extensions/source/propctrlr/browserlistbox.hxx
index 272d4e4..839c8b5 100644
--- a/extensions/source/propctrlr/browserlistbox.hxx
+++ b/extensions/source/propctrlr/browserlistbox.hxx
@@ -33,8 +33,8 @@
#include <rtl/ref.hxx>
#include <set>
+#include <unordered_map>
#include <vector>
-#include <boost/unordered_map.hpp>
#include <boost/shared_ptr.hpp>
diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx
index 7a6cd34..4ea25f7 100644
--- a/extensions/source/propctrlr/eventhandler.cxx
+++ b/extensions/source/propctrlr/eventhandler.cxx
@@ -325,7 +325,7 @@ namespace pcr
class EventHolder : public EventHolder_Base
{
private:
- typedef ::boost::unordered_map< OUString, ScriptEventDescriptor, OUStringHash > EventMap;
+ typedef std::unordered_map< OUString, ScriptEventDescriptor, OUStringHash > EventMap;
typedef ::std::map< EventId, EventMap::iterator > EventMapIndexAccess;
EventMap m_aEventNameAccess;
diff --git a/extensions/source/propctrlr/eventhandler.hxx b/extensions/source/propctrlr/eventhandler.hxx
index babfc5c..e2bd3d5 100644
--- a/extensions/source/propctrlr/eventhandler.hxx
+++ b/extensions/source/propctrlr/eventhandler.hxx
@@ -66,7 +66,7 @@ namespace pcr
const OString& _sUniqueBrowseId );
};
- typedef ::boost::unordered_map< OUString, EventDescription, OUStringHash > EventMap;
+ typedef std::unordered_map< OUString, EventDescription, OUStringHash > EventMap;
//= EventHandler
diff --git a/extensions/source/propctrlr/pcrcommontypes.hxx b/extensions/source/propctrlr/pcrcommontypes.hxx
index 37ab9b0..f16ee1b 100644
--- a/extensions/source/propctrlr/pcrcommontypes.hxx
+++ b/extensions/source/propctrlr/pcrcommontypes.hxx
@@ -23,14 +23,14 @@
#include <com/sun/star/beans/Property.hpp>
#include <rtl/ustring.hxx>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
namespace pcr
{
- typedef ::boost::unordered_map< OUString, ::com::sun::star::beans::Property, OUStringHash >
+ typedef std::unordered_map< OUString, ::com::sun::star::beans::Property, OUStringHash >
PropertyMap;
diff --git a/extensions/source/propctrlr/propcontroller.hxx b/extensions/source/propctrlr/propcontroller.hxx
index 5dbe78a..af943de 100644
--- a/extensions/source/propctrlr/propcontroller.hxx
+++ b/extensions/source/propctrlr/propcontroller.hxx
@@ -56,9 +56,9 @@
#include <comphelper/broadcasthelper.hxx>
#include <map>
-#include <boost/unordered_map.hpp>
-#include <vector>
#include <memory>
+#include <unordered_map>
+#include <vector>
namespace vcl { class Window; }
@@ -113,9 +113,9 @@ namespace pcr
typedef ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler >
PropertyHandlerRef;
typedef ::std::vector< PropertyHandlerRef > PropertyHandlerArray;
- typedef ::boost::unordered_map< OUString, PropertyHandlerRef, OUStringHash >
+ typedef std::unordered_map< OUString, PropertyHandlerRef, OUStringHash >
PropertyHandlerRepository;
- typedef ::boost::unordered_multimap< OUString, PropertyHandlerRef, OUStringHash >
+ typedef std::unordered_multimap< OUString, PropertyHandlerRef, OUStringHash >
PropertyHandlerMultiRepository;
PropertyHandlerRepository m_aPropertyHandlers;
PropertyHandlerMultiRepository m_aDependencyHandlers;
@@ -133,7 +133,7 @@ namespace pcr
/// the property we're just committing
OUString m_sCommittingProperty;
- typedef ::boost::unordered_map< OUString, sal_uInt16, OUStringHash > HashString2Int16;
+ typedef std::unordered_map< OUString, sal_uInt16, OUStringHash > HashString2Int16;
HashString2Int16 m_aPageIds;
bool m_bContainerFocusListening;
diff --git a/scripting/source/dlgprov/dlgevtatt.hxx b/scripting/source/dlgprov/dlgevtatt.hxx
index de1ff42..b662603 100644
--- a/scripting/source/dlgprov/dlgevtatt.hxx
+++ b/scripting/source/dlgprov/dlgevtatt.hxx
@@ -32,20 +32,15 @@
#include <com/sun/star/script/XScriptEventsSupplier.hpp>
-#include <boost/unordered_map.hpp>
-
+#include <unordered_map>
namespace dlgprov
{
-
-
-
// class DialogEventsAttacherImpl
-
- typedef boost::unordered_map< OUString,
+ typedef std::unordered_map< OUString,
::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptListener >,
OUStringHash,
- ::std::equal_to< OUString > > ListenerHash;
+ std::equal_to< OUString > > ListenerHash;
typedef ::cppu::WeakImplHelper1<
::com::sun::star::script::XScriptEventsAttacher > DialogEventsAttacherImpl_BASE;
diff --git a/scripting/source/provider/ActiveMSPList.hxx b/scripting/source/provider/ActiveMSPList.hxx
index 9b2e803..93e4bc8 100644
--- a/scripting/source/provider/ActiveMSPList.hxx
+++ b/scripting/source/provider/ActiveMSPList.hxx
@@ -19,9 +19,6 @@
#ifndef INCLUDED_SCRIPTING_SOURCE_PROVIDER_ACTIVEMSPLIST_HXX
#define INCLUDED_SCRIPTING_SOURCE_PROVIDER_ACTIVEMSPLIST_HXX
-#include <boost/unordered_map.hpp>
-#include <map>
-
#include <osl/mutex.hxx>
#include <rtl/ustring.hxx>
#include <cppuhelper/implbase1.hxx>
@@ -36,22 +33,21 @@
#include <comphelper/stl_types.hxx>
+#include <map>
+#include <unordered_map>
+
namespace func_provider
{
//Typedefs
+typedef std::map < css::uno::Reference< css::uno::XInterface >
+ , css::uno::Reference< css::script::provider::XScriptProvider >
+ , ::comphelper::OInterfaceCompare< css::uno::XInterface >
+ > ScriptComponent_map;
-
-
-typedef ::std::map < css::uno::Reference< css::uno::XInterface >
- , css::uno::Reference< css::script::provider::XScriptProvider >
- , ::comphelper::OInterfaceCompare< css::uno::XInterface >
- > ScriptComponent_map;
-
-typedef ::boost::unordered_map< OUString,
+typedef std::unordered_map< OUString,
css::uno::Reference< css::script::provider::XScriptProvider >,
- OUStringHash,
- ::std::equal_to< OUString > > Msp_hash;
+ OUStringHash, std::equal_to< OUString > > Msp_hash;
class NonDocMSPCreator;
diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.cxx b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
index 4a8af6a..9407a1c 100644
--- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx
+++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
@@ -158,13 +158,11 @@ public:
}
};
-
-//typedef ::std::map< OUString, Reference< browse::XBrowseNode > >
-typedef ::boost::unordered_map< OUString, Reference< browse::XBrowseNode >,
+//typedef std::map< OUString, Reference< browse::XBrowseNode > >
+typedef std::unordered_map< OUString, Reference< browse::XBrowseNode >,
OUStringHash, ::std::equal_to< OUString > >
BrowseNodeAggregatorHash;
-typedef ::std::vector< OUString > vString;
-
+typedef std::vector< OUString > vString;
struct alphaSort
{
diff --git a/scripting/source/provider/ProviderCache.hxx b/scripting/source/provider/ProviderCache.hxx
index c446dfd..b365887 100644
--- a/scripting/source/provider/ProviderCache.hxx
+++ b/scripting/source/provider/ProviderCache.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_SCRIPTING_SOURCE_PROVIDER_PROVIDERCACHE_HXX
#define INCLUDED_SCRIPTING_SOURCE_PROVIDER_PROVIDERCACHE_HXX
-#include <boost/unordered_map.hpp>
#include <osl/mutex.hxx>
#include <rtl/ustring.hxx>
#include <cppuhelper/implbase1.hxx>
@@ -33,6 +32,8 @@
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/script/provider/XScriptProvider.hpp>
+#include <unordered_map>
+
namespace func_provider
{
@@ -45,7 +46,7 @@ struct ProviderDetails
css::uno::Reference< css::lang::XSingleComponentFactory > factory;
css::uno::Reference< css::script::provider::XScriptProvider > provider;
};
-typedef ::boost::unordered_map < OUString, ProviderDetails , OUStringHash,
+typedef std::unordered_map < OUString, ProviderDetails , OUStringHash,
::std::equal_to< OUString > > ProviderDetails_hash;
diff --git a/scripting/source/stringresource/stringresource.hxx b/scripting/source/stringresource/stringresource.hxx
index a349379..ff750bd 100644
--- a/scripting/source/stringresource/stringresource.hxx
+++ b/scripting/source/stringresource/stringresource.hxx
@@ -33,8 +33,8 @@
#include <cppuhelper/interfacecontainer.hxx>
#include <osl/mutex.hxx>
+#include <unordered_map>
#include <vector>
-#include <boost/unordered_map.hpp>
namespace stringresource
@@ -53,7 +53,7 @@ namespace stringresource
// Hashtable to map string ids to string
-typedef boost::unordered_map
+typedef std::unordered_map
<
OUString,
OUString,
@@ -61,7 +61,7 @@ typedef boost::unordered_map
>
IdToStringMap;
-typedef boost::unordered_map
+typedef std::unordered_map
<
OUString,
sal_Int32,
diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx
index d0b97db..5ab80df 100644
--- a/scripting/source/vbaevents/eventhelper.cxx
+++ b/scripting/source/vbaevents/eventhelper.cxx
@@ -76,7 +76,7 @@
#include <comphelper/evtmethodhelper.hxx>
#include <list>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
#include <service.hxx>
@@ -192,7 +192,7 @@ struct TranslateInfo
};
-typedef boost::unordered_map< OUString,
+typedef std::unordered_map< OUString,
std::list< TranslateInfo >,
OUStringHash,
::std::equal_to< OUString > > EventInfoHash;
@@ -498,7 +498,7 @@ public:
{ return ( ( m_hEvents.size() > 0 ? sal_True : sal_False ) ); }
private:
-typedef boost::unordered_map< OUString, Any, OUStringHash,
+typedef std::unordered_map< OUString, Any, OUStringHash,
::std::equal_to< OUString > > EventSupplierHash;
EventSupplierHash m_hEvents;
diff --git a/sfx2/inc/pch/precompiled_sfx.hxx b/sfx2/inc/pch/precompiled_sfx.hxx
index 39cfe31..8ea040f 100644
--- a/sfx2/inc/pch/precompiled_sfx.hxx
+++ b/sfx2/inc/pch/precompiled_sfx.hxx
@@ -50,7 +50,6 @@
#include <boost/shared_array.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/tuple/tuple.hpp>
-#include <boost/unordered_map.hpp>
#include <cassert>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
@@ -708,6 +707,7 @@
#include <ucbhelper/simpleinteractionrequest.hxx>
#include <uno/current_context.hxx>
#include <uno/mapping.hxx>
+#include <unordered_map>
#include <unotools/accessiblestatesethelper.hxx>
#include <unotools/bootstrap.hxx>
#include <unotools/cmdoptions.hxx>
diff --git a/sfx2/source/appl/imagemgr.cxx b/sfx2/source/appl/imagemgr.cxx
index 3cfe055..11db32e 100644
--- a/sfx2/source/appl/imagemgr.cxx
+++ b/sfx2/source/appl/imagemgr.cxx
@@ -41,7 +41,7 @@
#include <sfx2/objsh.hxx>
#include <sfx2/docfac.hxx>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::frame;
@@ -49,7 +49,7 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::util;
using namespace ::com::sun::star::ui;
-typedef boost::unordered_map< OUString,
+typedef std::unordered_map< OUString,
WeakReference< XImageManager >,
OUStringHash,
::std::equal_to< OUString > > ModuleIdToImagegMgr;
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index a2ae700..61fa159 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -36,7 +36,6 @@
#include "newhelp.hrc"
#include "helpid.hrc"
-#include <boost/unordered_map.hpp>
#include <rtl/ustrbuf.hxx>
#include <comphelper/configurationhelper.hxx>
#include <comphelper/processfactory.hxx>
@@ -107,6 +106,7 @@
#include <sfx2/objsh.hxx>
#include <sfx2/docfac.hxx>
+#include <unordered_map>
#include <vector>
using namespace ::ucbhelper;
@@ -552,7 +552,7 @@ IndexTabPage_Impl::~IndexTabPage_Impl()
namespace sfx2 {
- typedef ::boost::unordered_map< OUString, int, OUStringHash > KeywordInfo;
+ typedef std::unordered_map< OUString, int, OUStringHash > KeywordInfo;
}
#define NEW_ENTRY( url, bool ) \
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 2a8d461..db5d7da 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -20,7 +20,6 @@
#include <config_features.h>
#include <comphelper/processfactory.hxx>
#include <stdio.h>
-#include <boost/unordered_map.hpp>
#include <sfx2/docfile.hxx>
#include <sfx2/objsh.hxx>
@@ -55,6 +54,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/awt/XWindow.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
+#include <unordered_map>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -324,7 +324,7 @@ namespace
class FilledToolBarResIdToResourceURLMap
{
private:
- typedef boost::unordered_map< sal_Int32, OUString > ToolBarResIdToResourceURLMap;
+ typedef std::unordered_map< sal_Int32, OUString > ToolBarResIdToResourceURLMap;
ToolBarResIdToResourceURLMap m_aResIdToResourceURLMap;
public:
FilledToolBarResIdToResourceURLMap()
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index 6002aca..cb25df7 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -21,7 +21,6 @@
#include <iomanip>
-#include <boost/unordered_map.hpp>
#include <sal/log.hxx>
#include <svl/itempool.hxx>
#include <svl/itemiter.hxx>
@@ -67,6 +66,7 @@
#include <boost/scoped_array.hpp>
#include <boost/scoped_ptr.hpp>
#include <boost/ptr_container/ptr_vector.hpp>
+#include <unordered_map>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -78,7 +78,7 @@ static sal_uInt16 nTimeOut = 300;
#define TIMEOUT_UPDATING 20
#define TIMEOUT_IDLE 2500
-typedef boost::unordered_map< sal_uInt16, bool > InvalidateSlotMap;
+typedef std::unordered_map< sal_uInt16, bool > InvalidateSlotMap;
diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx
index c82336f..331ad88 100644
--- a/sfx2/source/doc/Metadatable.cxx
+++ b/sfx2/source/doc/Metadatable.cxx
@@ -28,10 +28,10 @@
#include <boost/bind.hpp>
-#include <memory>
-#include <boost/unordered_map.hpp>
-#include <list>
#include <algorithm>
+#include <list>
+#include <memory>
+#include <unordered_map>
#if OSL_DEBUG_LEVEL > 0
#include <typeinfo>
#endif
@@ -393,11 +393,11 @@ XmlIdRegistry::GetXmlIdForElement(const Metadatable& i_rObject) const
/// generate unique xml:id
template< typename T >
/*static*/ OUString create_id(const
- ::boost::unordered_map< OUString, T, OUStringHash > & i_rXmlIdMap)
+ std::unordered_map< OUString, T, OUStringHash > & i_rXmlIdMap)
{
static bool bHack = (getenv("LIBO_ONEWAY_STABLE_ODF_EXPORT") != NULL);
const OUString prefix(s_prefix);
- typename ::boost::unordered_map< OUString, T, OUStringHash >
+ typename std::unordered_map< OUString, T, OUStringHash >
::const_iterator iter;
OUString id;
@@ -433,7 +433,7 @@ template< typename T >
typedef ::std::list< Metadatable* > XmlIdList_t;
/// Idref -> (content.xml element list, styles.xml element list)
-typedef ::boost::unordered_map< OUString,
+typedef std::unordered_map< OUString,
::std::pair< XmlIdList_t, XmlIdList_t >, OUStringHash > XmlIdMap_t;
/// pointer hash template
@@ -446,7 +446,7 @@ template<typename T> struct PtrHash
};
/// element -> (stream name, idref)
-typedef ::boost::unordered_map< const Metadatable*,
+typedef std::unordered_map< const Metadatable*,
::std::pair< OUString, OUString>, PtrHash<Metadatable> >
XmlIdReverseMap_t;
@@ -926,13 +926,13 @@ struct RMapEntry
};
/// element -> (stream name, idref, source)
-typedef ::boost::unordered_map< const Metadatable*,
+typedef std::unordered_map< const Metadatable*,
struct RMapEntry,
PtrHash<Metadatable> >
ClipboardXmlIdReverseMap_t;
/// Idref -> (content.xml element, styles.xml element)
-typedef ::boost::unordered_map< OUString,
+typedef std::unordered_map< OUString,
::std::pair< Metadatable*, Metadatable* >, OUStringHash >
ClipboardXmlIdMap_t;
diff --git a/sfx2/source/toolbox/imgmgr.cxx b/sfx2/source/toolbox/imgmgr.cxx
index 7891777..befb3c3 100644
--- a/sfx2/source/toolbox/imgmgr.cxx
+++ b/sfx2/source/toolbox/imgmgr.cxx
@@ -19,7 +19,6 @@
#include <stdio.h>
-#include <boost/unordered_map.hpp>
#include <boost/shared_ptr.hpp>
#include <sfx2/imgmgr.hxx>
@@ -40,6 +39,8 @@
#include <comphelper/processfactory.hxx>
+#include <unordered_map>
+
const sal_uInt32 IMAGELIST_COUNT = 4; // small, small-hi, large, large-hi
struct ToolBoxInf_Impl
@@ -71,7 +72,7 @@ public:
namespace
{
- typedef boost::unordered_map< SfxModule*, boost::shared_ptr<SfxImageManager_Impl> > SfxImageManagerImplMap;
+ typedef std::unordered_map< SfxModule*, boost::shared_ptr<SfxImageManager_Impl> > SfxImageManagerImplMap;
class theImageManagerImplMap :
public rtl::Static<SfxImageManagerImplMap, theImageManagerImplMap> {};
@@ -247,7 +248,7 @@ SfxImageManager::~SfxImageManager()
namespace
{
- typedef boost::unordered_map< SfxModule*, boost::shared_ptr<SfxImageManager> > SfxImageManagerMap;
+ typedef std::unordered_map< SfxModule*, boost::shared_ptr<SfxImageManager> > SfxImageManagerMap;
class theImageManagerMap :
public rtl::Static<SfxImageManagerMap, theImageManagerMap> {};
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx
index 0d08a0d..943f60d 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -74,12 +74,12 @@
#include <comphelper/processfactory.hxx>
#include <vcl/msgbox.hxx>
-#include <boost/unordered_map.hpp>
-
#include <sfx2/event.hxx>
#include <sfx2/viewfac.hxx>
#include "sfxbasecontroller_internal.hxx"
+#include <unordered_map>
+
#define TIMEOUT_START_RESCHEDULE 10L /* 10th s */
using namespace ::com::sun::star;
@@ -141,8 +141,7 @@ static const GroupIDToCommandGroup GroupIDCommandGroupMap[] =
{ 0 , 0 }
};
-typedef boost::unordered_map< sal_Int16, sal_Int16 > GroupHashMap;
-
+typedef std::unordered_map< sal_Int16, sal_Int16 > GroupHashMap;
sal_Int16 MapGroupIDToCommandGroup( sal_Int16 nGroupID )
{
diff --git a/stoc/source/corereflection/base.hxx b/stoc/source/corereflection/base.hxx
index f49eb74..08bba8f 100644
--- a/stoc/source/corereflection/base.hxx
+++ b/stoc/source/corereflection/base.hxx
@@ -37,7 +37,7 @@
#include <list>
#include <algorithm>
#endif
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -77,9 +77,9 @@ inline typelib_TypeDescription * getTypeByName( const OUString & rName )
return pTypeDescr;
}
-typedef boost::unordered_map< OUString, css::uno::WeakReference< css::reflection::XIdlField >,
+typedef std::unordered_map< OUString, css::uno::WeakReference< css::reflection::XIdlField >,
OUStringHash > OUString2Field;
-typedef boost::unordered_map< OUString, css::uno::WeakReference< css::reflection::XIdlMethod >,
+typedef std::unordered_map< OUString, css::uno::WeakReference< css::reflection::XIdlMethod >,
OUStringHash > OUString2Method;
diff --git a/stoc/source/corereflection/lrucache.hxx b/stoc/source/corereflection/lrucache.hxx
index 67f351b..7fbcb9d 100644
--- a/stoc/source/corereflection/lrucache.hxx
+++ b/stoc/source/corereflection/lrucache.hxx
@@ -26,7 +26,7 @@
#include <rtl/ustring.hxx>
#include <sal/log.hxx>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
/** Implementation of a least recently used (lru) cache.
<br>
@@ -42,7 +42,7 @@ class LRU_Cache
CacheEntry * pPred;
CacheEntry * pSucc;
};
- typedef ::boost::unordered_map< t_Key, CacheEntry *, t_KeyHash > t_Key2Element;
+ typedef std::unordered_map< t_Key, CacheEntry *, t_KeyHash > t_Key2Element;
mutable ::osl::Mutex _aCacheMutex;
sal_Int32 _nCachedElements;
diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx
index bd76197..9869b4c 100644
--- a/stoc/source/inspect/introspection.cxx
+++ b/stoc/source/inspect/introspection.cxx
@@ -65,7 +65,7 @@
#include <rtl/ref.hxx>
#include <rtl/ustrbuf.hxx>
#include <rtl/strbuf.hxx>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
using namespace css::uno;
using namespace css::lang;
@@ -136,7 +136,7 @@ bool isDerivedFrom( Reference<XIdlClass> xToTestClass, Reference<XIdlClass> xDer
// part of the new Instance-related ImplIntrospectionAccess
// Hashtable for the search of names
-typedef boost::unordered_map
+typedef std::unordered_map
<
OUString,
sal_Int32,
@@ -147,7 +147,7 @@ IntrospectionNameMap;
// Hashtable to assign exact names to the Lower-Case
// converted names, for the support of XExactName
-typedef boost::unordered_map
+typedef std::unordered_map
<
OUString,
OUString,
diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx
index c3bdf2f..3e5b391 100644
--- a/stoc/source/invocation_adapterfactory/iafactory.cxx
+++ b/stoc/source/invocation_adapterfactory/iafactory.cxx
@@ -18,9 +18,6 @@
*/
-#include <boost/unordered_map.hpp>
-#include <boost/unordered_set.hpp>
-
#include <osl/diagnose.h>
#include <osl/interlck.h>
#include <osl/mutex.hxx>
@@ -48,8 +45,10 @@
#include <com/sun/star/reflection/InvocationTargetException.hpp>
#include <com/sun/star/uno/RuntimeException.hpp>
-#define IMPLNAME "com.sun.star.comp.stoc.InvocationAdapterFactory"
+#include <unordered_map>
+#include <unordered_set>
+#define IMPLNAME "com.sun.star.comp.stoc.InvocationAdapterFactory"
using namespace ::std;
using namespace ::osl;
@@ -76,8 +75,8 @@ struct hash_ptr
inline size_t operator() ( void * p ) const
{ return reinterpret_cast<size_t>(p); }
};
-typedef boost::unordered_set< void *, hash_ptr, equal_to< void * > > t_ptr_set;
-typedef boost::unordered_map< void *, t_ptr_set, hash_ptr, equal_to< void * > > t_ptr_map;
+typedef std::unordered_set< void *, hash_ptr, equal_to< void * > > t_ptr_set;
+typedef std::unordered_map< void *, t_ptr_set, hash_ptr, equal_to< void * > > t_ptr_map;
class FactoryImpl
diff --git a/stoc/source/namingservice/namingservice.cxx b/stoc/source/namingservice/namingservice.cxx
index b0b016a..46b073c 100644
--- a/stoc/source/namingservice/namingservice.cxx
+++ b/stoc/source/namingservice/namingservice.cxx
@@ -18,7 +18,6 @@
*/
-#include <boost/unordered_map.hpp>
#include <osl/mutex.hxx>
#include <osl/diagnose.h>
#include <uno/dispatcher.h>
@@ -34,6 +33,8 @@
#include <com/sun/star/uno/XNamingService.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <unordered_map>
+
using namespace cppu;
using namespace osl;
using namespace std;
@@ -61,7 +62,7 @@ static OUString ns_getImplementationName()
return OUString(IMPLNAME);
}
-typedef boost::unordered_map
+typedef std::unordered_map
<
OUString,
Reference<XInterface >,
diff --git a/stoc/source/security/file_policy.cxx b/stoc/source/security/file_policy.cxx
index b26806f..fdbb5fc 100644
--- a/stoc/source/security/file_policy.cxx
+++ b/stoc/source/security/file_policy.cxx
@@ -18,8 +18,6 @@
*/
-#include <boost/unordered_map.hpp>
-
#include <osl/diagnose.h>
#include <osl/file.h>
#include <rtl/byteseq.hxx>
@@ -39,6 +37,8 @@
#include <com/sun/star/io/FilePermission.hpp>
#include <com/sun/star/connection/SocketPermission.hpp>
+#include <unordered_map>
+
#define IMPL_NAME "com.sun.star.security.comp.stoc.FilePolicy"
using namespace ::osl;
@@ -63,7 +63,7 @@ class FilePolicy
AccessControl m_ac;
Sequence< Any > m_defaultPermissions;
- typedef boost::unordered_map< OUString, Sequence< Any >, OUStringHash > t_permissions;
+ typedef std::unordered_map< OUString, Sequence< Any >, OUStringHash > t_permissions;
t_permissions m_userPermissions;
bool m_init;
diff --git a/stoc/source/security/lru_cache.h b/stoc/source/security/lru_cache.h
index 4688dc9..4a40792 100644
--- a/stoc/source/security/lru_cache.h
+++ b/stoc/source/security/lru_cache.h
@@ -19,7 +19,7 @@
#ifndef INCLUDED_STOC_SOURCE_SECURITY_LRU_CACHE_H
#define INCLUDED_STOC_SOURCE_SECURITY_LRU_CACHE_H
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
// __CACHE_DIAGNOSE works only for OUString keys
#ifdef __CACHE_DIAGNOSE
@@ -45,7 +45,7 @@ class lru_cache
Entry * m_pred;
Entry * m_succ;
};
- typedef ::boost::unordered_map< t_key, Entry *, t_hashKey, t_equalKey > t_key2element;
+ typedef std::unordered_map< t_key, Entry *, t_hashKey, t_equalKey > t_key2element;
t_key2element m_key2element;
::std::size_t m_size;
diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx
index 9641332..06bb757 100644
--- a/stoc/source/servicemanager/servicemanager.cxx
+++ b/stoc/source/servicemanager/servicemanager.cxx
@@ -22,8 +22,6 @@
#include <rtl/ref.hxx>
#include <rtl/ustrbuf.hxx>
-#include <boost/unordered_map.hpp>
-#include <boost/unordered_set.hpp>
#include <uno/mapping.hxx>
#include <uno/dispatcher.h>
#include <cppuhelper/queryinterface.hxx>
@@ -55,6 +53,9 @@
#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
#include <com/sun/star/uno/XUnloadingPreference.hpp>
+#include <unordered_map>
+#include <unordered_set>
+
using namespace com::sun::star;
using namespace css::uno;
using namespace css::beans;
@@ -142,7 +143,7 @@ struct equaltoRef_Impl
{ return rName1 == rName2; }
};
-typedef boost::unordered_set
+typedef std::unordered_set
<
Reference<XInterface >,
hashRef_Impl,
@@ -290,20 +291,20 @@ Any ImplementationEnumeration_Impl::nextElement()
/*****************************************************************************
Hash tables
*****************************************************************************/
-typedef boost::unordered_set
+typedef std::unordered_set
<
OUString,
OUStringHash
> HashSet_OWString;
-typedef boost::unordered_multimap
+typedef std::unordered_multimap
<
OUString,
Reference<XInterface >,
OUStringHash
> HashMultimap_OWString_Interface;
-typedef boost::unordered_map
+typedef std::unordered_map
<
OUString,
Reference<XInterface >,
diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx
index dc40ce8..98fb48a 100644
--- a/ucb/source/core/ucbstore.cxx
+++ b/ucb/source/core/ucbstore.cxx
@@ -25,7 +25,7 @@
*************************************************************************/
#include <list>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
#include <osl/diagnose.h>
#include <rtl/ustrbuf.hxx>
#include <cppuhelper/interfacecontainer.hxx>
@@ -92,8 +92,6 @@ OUString makeHierarchalNameSegment( const OUString & rIn )
return OUString( aBuffer.makeStringAndClear() );
}
-
-
#define STORE_CONTENTPROPERTIES_KEY "/org.openoffice.ucb.Store/ContentProperties"
// describe path of cfg entry
@@ -101,13 +99,8 @@ OUString makeHierarchalNameSegment( const OUString & rIn )
// true->async. update; false->sync. update
#define CFGPROPERTY_LAZYWRITE "lazywrite"
-
-
// PropertySetMap_Impl.
-
-
-
-typedef boost::unordered_map
+typedef std::unordered_map
<
OUString,
PersistentPropertySet*,
@@ -115,12 +108,7 @@ typedef boost::unordered_map
>
PropertySetMap_Impl;
-
-
// class PropertySetInfo_Impl
-
-
-
class PropertySetInfo_Impl : public cppu::WeakImplHelper1 < XPropertySetInfo >
{
Reference< XComponentContext > m_xContext;
diff --git a/ucb/source/ucp/file/filnot.hxx b/ucb/source/ucp/file/filnot.hxx
index 0edf0b5..5e782d1 100644
--- a/ucb/source/ucp/file/filnot.hxx
+++ b/ucb/source/ucp/file/filnot.hxx
@@ -19,13 +19,12 @@
#ifndef INCLUDED_UCB_SOURCE_UCP_FILE_FILNOT_HXX
#define INCLUDED_UCB_SOURCE_UCP_FILE_FILNOT_HXX
-#include <boost/unordered_map.hpp>
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/uno/XInterface.hpp>
#include <com/sun/star/beans/PropertyChangeEvent.hpp>
#include <com/sun/star/ucb/XContentIdentifier.hpp>
#include "filglob.hxx"
-
+#include <unordered_map>
namespace fileaccess {
@@ -81,7 +80,7 @@ namespace fileaccess {
};
- typedef boost::unordered_map< OUString,
+ typedef std::unordered_map< OUString,
com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::uno::XInterface > >,
OUStringHash > ListenerMap;
diff --git a/ucb/source/ucp/file/filtask.hxx b/ucb/source/ucp/file/filtask.hxx
index a08c1c8..04ede93 100644
--- a/ucb/source/ucp/file/filtask.hxx
+++ b/ucb/source/ucp/file/filtask.hxx
@@ -20,7 +20,6 @@
#define INCLUDED_UCB_SOURCE_UCP_FILE_FILTASK_HXX
#endif
-#include <boost/unordered_map.hpp>
#include <rtl/ustring.hxx>
#include "osl/mutex.hxx"
@@ -29,7 +28,9 @@
#include <com/sun/star/ucb/XProgressHandler.hpp>
#include <com/sun/star/task/XInteractionHandler.hpp>
#include <com/sun/star/task/XInteractionRequest.hpp>
+#include <boost/functional/hash.hpp>
#include "filerror.hxx"
+#include <unordered_map>
namespace fileaccess
{
@@ -138,9 +139,7 @@ namespace fileaccess
}; // end class TaskHandling
- typedef boost::unordered_map< sal_Int32,TaskHandling,boost::hash< sal_Int32 > > TaskMap;
-
-
+ typedef std::unordered_map< sal_Int32,TaskHandling,boost::hash< sal_Int32 > > TaskMap;
private:
osl::Mutex m_aMutex;
diff --git a/ucb/source/ucp/file/shell.hxx b/ucb/source/ucp/file/shell.hxx
index 7582bc8..a8bae85 100644
--- a/ucb/source/ucp/file/shell.hxx
+++ b/ucb/source/ucp/file/shell.hxx
@@ -25,10 +25,6 @@
#include <cppuhelper/weak.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <cppuhelper/typeprovider.hxx>
-#include <vector>
-#include <boost/unordered_map.hpp>
-#include <boost/unordered_set.hpp>
-#include <list>
#include <osl/file.hxx>
#include "osl/mutex.hxx"
@@ -58,6 +54,10 @@
#include <com/sun/star/ucb/ContentInfo.hpp>
#include "filtask.hxx"
#include "filnot.hxx"
+#include <list>
+#include <unordered_map>
+#include <unordered_set>
+#include <vector>
namespace fileaccess {
@@ -130,7 +130,7 @@ namespace fileaccess {
}
};
- typedef boost::unordered_set< MyProperty,hMyProperty,eMyProperty > PropertySet;
+ typedef std::unordered_set< MyProperty,hMyProperty,eMyProperty > PropertySet;
typedef std::list< Notifier* > NotifierList;
@@ -151,7 +151,7 @@ namespace fileaccess {
com::sun::star::uno::Reference< com::sun::star::beans::XPropertyAccess > xA;
};
- typedef boost::unordered_map< OUString,UnqPathData,OUStringHash > ContentMap;
+ typedef std::unordered_map< OUString,UnqPathData,OUStringHash > ContentMap;
public:
diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
index 7910309..29e465d 100644
--- a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
@@ -20,9 +20,9 @@
#ifndef INCLUDED_UCB_SOURCE_UCP_HIERARCHY_HIERARCHYPROVIDER_HXX
#define INCLUDED_UCB_SOURCE_UCP_HIERARCHY_HIERARCHYPROVIDER_HXX
-#include <boost/unordered_map.hpp>
#include <ucbhelper/providerhelper.hxx>
#include <com/sun/star/lang/XInitialization.hpp>
+#include <unordered_map>
namespace com { namespace sun { namespace star {
namespace container {
@@ -50,8 +50,6 @@ namespace hierarchy_ucp {
#define HIERARCHY_LINK_CONTENT_TYPE \
"application/" HIERARCHY_URL_SCHEME "-link"
-
-
struct ConfigProviderMapEntry
{
com::sun::star::uno::Reference<
@@ -63,7 +61,7 @@ struct ConfigProviderMapEntry
ConfigProviderMapEntry() : bTriedToGetRootReadAccess( false ) {}
};
-typedef boost::unordered_map
+typedef std::unordered_map
<
OUString, // servcie specifier
ConfigProviderMapEntry,
@@ -71,8 +69,6 @@ typedef boost::unordered_map
>
ConfigProviderMap;
-
-
class HierarchyContentProvider : public ::ucbhelper::ContentProviderImplHelper,
public com::sun::star::lang::XInitialization
{
diff --git a/ucb/source/ucp/package/pkgprovider.cxx b/ucb/source/ucp/package/pkgprovider.cxx
index b21f727..48a607d 100644
--- a/ucb/source/ucp/package/pkgprovider.cxx
+++ b/ucb/source/ucp/package/pkgprovider.cxx
@@ -24,7 +24,6 @@
*************************************************************************/
-#include <boost/unordered_map.hpp>
#include <osl/diagnose.h>
#include <comphelper/processfactory.hxx>
#include <cppuhelper/weak.hxx>
@@ -34,6 +33,7 @@
#include "pkgprovider.hxx"
#include "pkgcontent.hxx"
#include "pkguri.hxx"
+#include <unordered_map>
using namespace com::sun::star;
@@ -86,12 +86,8 @@ public:
};
-
// Packages.
-
-
-
-typedef boost::unordered_map
+typedef std::unordered_map
<
OUString,
Package*,
@@ -106,13 +102,7 @@ class Packages : public PackageMap {};
using namespace package_ucp;
-
-
// ContentProvider Implementation.
-
-
-
-
ContentProvider::ContentProvider(
const uno::Reference< uno::XComponentContext >& rxContext )
: ::ucbhelper::ContentProviderImplHelper( rxContext ),
diff --git a/ucb/source/ucp/webdav-neon/ContentProperties.hxx b/ucb/source/ucp/webdav-neon/ContentProperties.hxx
index 0a3cf70..a805c61 100644
--- a/ucb/source/ucp/webdav-neon/ContentProperties.hxx
+++ b/ucb/source/ucp/webdav-neon/ContentProperties.hxx
@@ -31,8 +31,8 @@
#include <config_lgpl.h>
#include <memory>
+#include <unordered_map>
#include <vector>
-#include <boost/unordered_map.hpp>
#include <rtl/ustring.hxx>
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Sequence.hxx>
@@ -46,14 +46,7 @@ namespace webdav_ucp
struct DAVResource;
-
-
-
-
// PropertyValueMap.
-
-
-
class PropertyValue
{
private:
@@ -74,7 +67,7 @@ public:
};
-typedef boost::unordered_map
+typedef std::unordered_map
<
OUString,
PropertyValue,
diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx b/ucb/source/ucp/webdav-neon/NeonSession.cxx
index 2b8fc5d..954e81f 100644
--- a/ucb/source/ucp/webdav-neon/NeonSession.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx
@@ -27,7 +27,7 @@
************************************************************************/
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
#include <vector>
#include <string.h>
#include "osl/diagnose.h"
@@ -107,7 +107,7 @@ struct hashPtr
}
};
-typedef boost::unordered_map
+typedef std::unordered_map
<
ne_request*,
RequestData,
diff --git a/ucb/source/ucp/webdav-neon/PropertyMap.hxx b/ucb/source/ucp/webdav-neon/PropertyMap.hxx
index fbe70dd..2cd84ce 100644
--- a/ucb/source/ucp/webdav-neon/PropertyMap.hxx
+++ b/ucb/source/ucp/webdav-neon/PropertyMap.hxx
@@ -30,8 +30,8 @@
#define INCLUDED_UCB_SOURCE_UCP_WEBDAV_NEON_PROPERTYMAP_HXX
#include <config_lgpl.h>
-#include <boost/unordered_set.hpp>
#include <com/sun/star/beans/Property.hpp>
+#include <unordered_set>
namespace webdav_ucp {
@@ -54,7 +54,7 @@ struct hashPropertyName
}
};
-typedef boost::unordered_set
+typedef std::unordered_set
<
::com::sun::star::beans::Property,
hashPropertyName,
diff --git a/ucb/source/ucp/webdav/ContentProperties.hxx b/ucb/source/ucp/webdav/ContentProperties.hxx
index 64e227f..483cab8 100644
--- a/ucb/source/ucp/webdav/ContentProperties.hxx
+++ b/ucb/source/ucp/webdav/ContentProperties.hxx
@@ -23,9 +23,9 @@
#define INCLUDED_UCB_SOURCE_UCP_WEBDAV_CONTENTPROPERTIES_HXX
#include <memory>
+#include <unordered_map>
#include <vector>
#include <boost/scoped_ptr.hpp>
-#include <boost/unordered_map.hpp>
#include <rtl/ustring.hxx>
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Sequence.hxx>
@@ -39,14 +39,7 @@ namespace http_dav_ucp
struct DAVResource;
-
-
-
-
// PropertyValueMap.
-
-
-
class PropertyValue
{
private:
@@ -67,7 +60,7 @@ public:
};
-typedef boost::unordered_map
+typedef std::unordered_map
<
OUString,
PropertyValue,
diff --git a/ucb/source/ucp/webdav/PropertyMap.hxx b/ucb/source/ucp/webdav/PropertyMap.hxx
index 638eea5..25ed286 100644
--- a/ucb/source/ucp/webdav/PropertyMap.hxx
+++ b/ucb/source/ucp/webdav/PropertyMap.hxx
@@ -22,13 +22,11 @@
#ifndef INCLUDED_UCB_SOURCE_UCP_WEBDAV_PROPERTYMAP_HXX
#define INCLUDED_UCB_SOURCE_UCP_WEBDAV_PROPERTYMAP_HXX
-#include <boost/unordered_set.hpp>
#include <com/sun/star/beans/Property.hpp>
+#include <unordered_set>
namespace http_dav_ucp {
-
-
struct equalPropertyName
{
bool operator()( const ::com::sun::star::beans::Property & p1,
@@ -46,7 +44,7 @@ struct hashPropertyName
}
};
-typedef boost::unordered_set
+typedef std::unordered_set
<
::com::sun::star::beans::Property,
hashPropertyName,
diff --git a/ucb/source/ucp/webdav/webdavresponseparser.cxx b/ucb/source/ucp/webdav/webdavresponseparser.cxx
index 2e2d214..ca485d1 100644
--- a/ucb/source/ucp/webdav/webdavresponseparser.cxx
+++ b/ucb/source/ucp/webdav/webdavresponseparser.cxx
@@ -29,15 +29,12 @@
#include <com/sun/star/ucb/LockType.hpp>
#include <com/sun/star/ucb/Lock.hpp>
#include <map>
-#include <boost/unordered_map.hpp>
-
-
+#include <unordered_map>
using namespace com::sun::star;
// WebDAVNamespace enum and StringToEnum converter
-
namespace
{
enum WebDAVNamespace
@@ -99,7 +96,7 @@ namespace
WebDAVName StrToWebDAVName(const OUString& rStr)
{
- typedef boost::unordered_map< OUString, WebDAVName, OUStringHash > WebDAVNameMapper;
+ typedef std::unordered_map< OUString, WebDAVName, OUStringHash > WebDAVNameMapper;
typedef std::pair< OUString, WebDAVName > WebDAVNameValueType;
static WebDAVNameMapper aWebDAVNameMapperList;
More information about the Libreoffice-commits
mailing list