diff options
Diffstat (limited to 'oox/source')
-rw-r--r-- | oox/source/drawingml/customshapegeometry.cxx | 4 | ||||
-rw-r--r-- | oox/source/export/chartexport.cxx | 4 | ||||
-rw-r--r-- | oox/source/export/shapes.cxx | 2 | ||||
-rw-r--r-- | oox/source/ole/vbacontrol.cxx | 4 | ||||
-rw-r--r-- | oox/source/ole/vbamodule.cxx | 1 |
5 files changed, 7 insertions, 8 deletions
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> |