11 files changed, 27 insertions, 62 deletions
diff --git a/ucb/source/ucp/file/filnot.hxx b/ucb/source/ucp/file/filnot.hxx
index 0edf0b5719f3..5e782d1b61e2 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 a08c1c84ef08..04ede9303266 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 7582bc81df4c..a8bae857822d 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 7910309d42fd..29e465d5cdec 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 b21f727b5663..48a607d4f411 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 0a3cf70ee70c..a805c611ce5d 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 2b8fc5ddbb17..954e81f2336b 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 fbe70dd4da96..2cd84ced131f 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 64e227f9fe18..483cab83daa2 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 638eea5d7128..25ed28639517 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 2e2d214d5552..ca485d1004a2 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;