7 files changed, 11 insertions, 12 deletions
diff --git a/oox/inc/drawingml/customshapeproperties.hxx b/oox/inc/drawingml/customshapeproperties.hxx
index ff80b5265589..d5fbd88a047d 100644
--- a/oox/inc/drawingml/customshapeproperties.hxx
+++ b/oox/inc/drawingml/customshapeproperties.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_OOX_DRAWINGML_CUSTOMSHAPEPROPERTIES_HXX
 
 #include <boost/shared_ptr.hpp>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
 #include <vector>
 #include <map>
 #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp>
@@ -154,7 +154,7 @@ private:
     bool                            mbMirroredY;
     sal_Int32                       mnTextRotateAngle;
 
-    typedef boost::unordered_map< sal_Int32, PropertyMap > PresetDataMap;
+    typedef std::unordered_map< sal_Int32, PropertyMap > PresetDataMap;
 
     static PresetDataMap maPresetDataMap;
     static void initializePresetDataMap();
diff --git a/oox/inc/pch/precompiled_oox.hxx b/oox/inc/pch/precompiled_oox.hxx
index d0acc055bb92..6b6d99129ee9 100644
--- a/oox/inc/pch/precompiled_oox.hxx
+++ b/oox/inc/pch/precompiled_oox.hxx
@@ -34,8 +34,6 @@
 #include <boost/noncopyable.hpp>
 #include <boost/optional.hpp>
 #include <boost/scoped_ptr.hpp>
-#include <boost/unordered_map.hpp>
-#include <boost/unordered_set.hpp>
 #include <boost/utility.hpp>
 #include <cassert>
 #include <com/sun/star/animations/AnimationCalcMode.hpp>
@@ -409,6 +407,8 @@
 #include <tools/multisel.hxx>
 #include <tools/stream.hxx>
 #include <tools/time.hxx>
+#include <unordered_map>
+#include <unordered_set>
 #include <unotools/docinfohelper.hxx>
 #include <unotools/fltrcfg.hxx>
 #include <unotools/fontcvt.hxx>
diff --git a/oox/source/drawingml/customshapegeometry.cxx b/oox/source/drawingml/customshapegeometry.cxx
index 9d6db8f5852f..b8857c02b9cb 100644
--- a/oox/source/drawingml/customshapegeometry.cxx
+++ b/oox/source/drawingml/customshapegeometry.cxx
@@ -22,10 +22,10 @@
 
 #include <com/sun/star/xml/sax/FastToken.hpp>
 #include <osl/diagnose.h>
-#include <boost/unordered_map.hpp>
 #include "oox/helper/helper.hxx"
 #include "oox/helper/attributelist.hxx"
 #include "oox/helper/propertymap.hxx"
+#include <unordered_map>
 
 using namespace ::oox::core;
 using namespace ::com::sun::star::uno;
@@ -84,7 +84,7 @@ static const FormularCommandNameTable pFormularCommandNameTable[] =
     { "val",    FC_VAL }
 
 };
-typedef boost::unordered_map< OUString, FormularCommand, OUStringHash > FormulaCommandHMap;
+typedef std::unordered_map< OUString, FormularCommand, OUStringHash > FormulaCommandHMap;
 
 static const FormulaCommandHMap* pCommandHashMap;
 
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index 56d6c1f02a42..727d3072fea9 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -88,7 +88,7 @@
 #include <xmloff/SchXMLSeriesHelper.hxx>
 #include "ColorPropertySet.hxx"
 #include <set>
-#include <boost/unordered_set.hpp>
+#include <unordered_set>
 
 #include <rtl/math.hxx>
 
@@ -2543,7 +2543,7 @@ struct LabelPlacementParam
     bool mbExport;
     sal_Int32 meDefault;
 
-    boost::unordered_set<sal_Int32> maAllowedValues;
+    std::unordered_set<sal_Int32> maAllowedValues;
 
     LabelPlacementParam() :
         mbExport(true),
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 35266360edf1..71968b91ade9 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -748,7 +748,7 @@ ShapeExport& ShapeExport::WriteRectangleShape( Reference< XShape > xShape )
 }
 
 typedef ShapeExport& (ShapeExport::*ShapeConverter)( Reference< XShape > );
-typedef boost::unordered_map< const char*, ShapeConverter, rtl::CStringHash, rtl::CStringEqual> NameToConvertMapType;
+typedef std::unordered_map< const char*, ShapeConverter, rtl::CStringHash, rtl::CStringEqual> NameToConvertMapType;
 
 static const NameToConvertMapType& lcl_GetConverters(DrawingML::DocumentType eDocumentType)
 {
diff --git a/oox/source/ole/vbacontrol.cxx b/oox/source/ole/vbacontrol.cxx
index ddfb303035d0..b59094f916f0 100644
--- a/oox/source/ole/vbacontrol.cxx
+++ b/oox/source/ole/vbacontrol.cxx
@@ -37,7 +37,7 @@
 #include "oox/helper/storagebase.hxx"
 #include "oox/helper/textinputstream.hxx"
 #include "oox/ole/vbahelper.hxx"
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
 
 namespace oox {
 namespace ole {
@@ -419,7 +419,7 @@ void VbaFormControl::importStorage( StorageBase& rStrg, const AxClassTable& rCla
                     BinaryXInputStream aXStrm( rStrg.openInputStream( "x" ), true );
                     pMultiPage->importPageAndMultiPageProperties( aXStrm, maControls.size() );
                 }
-                typedef boost::unordered_map< sal_uInt32, ::boost::shared_ptr< VbaFormControl > > IdToPageMap;
+                typedef std::unordered_map< sal_uInt32, ::boost::shared_ptr< VbaFormControl > > IdToPageMap;
                 IdToPageMap idToPage;
                 VbaFormControlVector::iterator it = maControls.begin();
                 VbaFormControlVector::iterator it_end = maControls.end();
diff --git a/oox/source/ole/vbamodule.cxx b/oox/source/ole/vbamodule.cxx
index 15291b80055e..8a0c83e175a1 100644
--- a/oox/source/ole/vbamodule.cxx
+++ b/oox/source/ole/vbamodule.cxx
@@ -18,7 +18,6 @@
  */
 
 #include "oox/ole/vbamodule.hxx"
-#include <boost/unordered_map.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/script/ModuleInfo.hpp>