summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-01-01 19:58:59 +0000
committerCaolán McNamara <caolanm@redhat.com>2015-01-02 16:14:36 +0000
commitfd1372ba8b1c3eb3c7fad6d9c623176c8071f31b (patch)
tree448f0d04f780007b3eeeb76b7c4c8c54cbfd6d9b /xmloff
parentc48b928acab9f226ad5ad816fe773c21051431e8 (diff)
boost::unordered_map->std::unordered_map
you can get debug stl this way Change-Id: Ia70a3e7c7c452390e8bee34975d296c9318e4a19
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/inc/StyleMap.hxx4
-rw-r--r--xmloff/inc/pch/precompiled_xo.hxx2
-rw-r--r--xmloff/inc/pch/precompiled_xof.hxx2
-rw-r--r--xmloff/source/core/nmspmap.cxx2
-rw-r--r--xmloff/source/draw/EnhancedCustomShapeToken.cxx4
-rw-r--r--xmloff/source/draw/ximpcustomshape.cxx4
-rw-r--r--xmloff/source/forms/property_meta_data.cxx10
-rw-r--r--xmloff/source/text/txtparae.cxx8
-rw-r--r--xmloff/source/transform/EventOASISTContext.cxx4
-rw-r--r--xmloff/source/transform/EventOOoTContext.cxx4
-rw-r--r--xmloff/source/transform/TransformerActions.hxx5
-rw-r--r--xmloff/source/transform/TransformerTokenMap.hxx4
12 files changed, 26 insertions, 27 deletions
diff --git a/xmloff/inc/StyleMap.hxx b/xmloff/inc/StyleMap.hxx
index 2c1be800e2b6..1f3142a6aaac 100644
--- a/xmloff/inc/StyleMap.hxx
+++ b/xmloff/inc/StyleMap.hxx
@@ -22,7 +22,7 @@
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <cppuhelper/implbase1.hxx>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
struct StyleNameKey_Impl
{
@@ -64,7 +64,7 @@ inline bool StyleNameHash_Impl::operator()(
class StyleMap :
public ::cppu::WeakImplHelper1< ::com::sun::star::lang::XUnoTunnel>,
- public ::boost::unordered_map< StyleNameKey_Impl, OUString,
+ public std::unordered_map< StyleNameKey_Impl, OUString,
StyleNameHash_Impl, StyleNameHash_Impl >
{
diff --git a/xmloff/inc/pch/precompiled_xo.hxx b/xmloff/inc/pch/precompiled_xo.hxx
index 3a8c4ab671d7..67ce4a1fdc8a 100644
--- a/xmloff/inc/pch/precompiled_xo.hxx
+++ b/xmloff/inc/pch/precompiled_xo.hxx
@@ -39,7 +39,6 @@
#include <boost/scoped_array.hpp>
#include <boost/scoped_ptr.hpp>
#include <boost/shared_ptr.hpp>
-#include <boost/unordered_map.hpp>
#include <cassert>
#include <com/sun/star/animations/AnimationAdditiveMode.hpp>
#include <com/sun/star/animations/AnimationCalcMode.hpp>
@@ -552,6 +551,7 @@
#include <tools/time.hxx>
#include <tools/urlobj.hxx>
#include <typeinfo>
+#include <unordered_map>
#include <unotools/bootstrap.hxx>
#include <unotools/calendarwrapper.hxx>
#include <unotools/charclass.hxx>
diff --git a/xmloff/inc/pch/precompiled_xof.hxx b/xmloff/inc/pch/precompiled_xof.hxx
index 4edfb09d295f..02b1a9e0cca1 100644
--- a/xmloff/inc/pch/precompiled_xof.hxx
+++ b/xmloff/inc/pch/precompiled_xof.hxx
@@ -14,7 +14,6 @@
also fixes all possible problems, so it's usually better to use it).
*/
-#include <boost/unordered_map.hpp>
#include <com/sun/star/beans/XPropertySetInfo.hpp>
#include <com/sun/star/i18n/CharacterClassification.hpp>
#include <com/sun/star/i18n/UnicodeType.hpp>
@@ -37,5 +36,6 @@
#include <rtl/ustrbuf.hxx>
#include <sax/tools/converter.hxx>
#include <string.h>
+#include <unordered_map>
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/core/nmspmap.cxx b/xmloff/source/core/nmspmap.cxx
index d1aa755ce6f7..2f78a6a530ea 100644
--- a/xmloff/source/core/nmspmap.cxx
+++ b/xmloff/source/core/nmspmap.cxx
@@ -32,7 +32,7 @@
using namespace ::xmloff::token;
/* The basic idea of this class is that we have two two ways to search our
- * data...by prefix and by key. We use an STL boost::unordered_map for fast prefix
+ * data...by prefix and by key. We use an unordered_map for fast prefix
* searching and an STL map for fast key searching.
*
* The references to an 'Index' refer to an earlier implementation of the
diff --git a/xmloff/source/draw/EnhancedCustomShapeToken.cxx b/xmloff/source/draw/EnhancedCustomShapeToken.cxx
index d9c45ea1698a..c8fa8a8eb337 100644
--- a/xmloff/source/draw/EnhancedCustomShapeToken.cxx
+++ b/xmloff/source/draw/EnhancedCustomShapeToken.cxx
@@ -19,12 +19,12 @@
#include "EnhancedCustomShapeToken.hxx"
#include <osl/mutex.hxx>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
#include <string.h>
namespace xmloff { namespace EnhancedCustomShapeToken {
-typedef boost::unordered_map< const char*, EnhancedCustomShapeTokenEnum, rtl::CStringHash, rtl::CStringEqual> TypeNameHashMap;
+typedef std::unordered_map< const char*, EnhancedCustomShapeTokenEnum, rtl::CStringHash, rtl::CStringEqual> TypeNameHashMap;
static TypeNameHashMap* pHashMap = NULL;
static ::osl::Mutex& getHashMapMutex()
{
diff --git a/xmloff/source/draw/ximpcustomshape.cxx b/xmloff/source/draw/ximpcustomshape.cxx
index fe6b60f19a7f..0db4b72f4aa3 100644
--- a/xmloff/source/draw/ximpcustomshape.cxx
+++ b/xmloff/source/draw/ximpcustomshape.cxx
@@ -44,8 +44,8 @@
#include <com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.hpp>
#include <com/sun/star/drawing/EnhancedCustomShapeTextPathMode.hpp>
#include <com/sun/star/drawing/ProjectionMode.hpp>
-#include <boost/unordered_map.hpp>
#include <sax/tools/converter.hxx>
+#include <unordered_map>
using namespace ::com::sun::star;
using namespace ::xmloff::token;
@@ -1213,7 +1213,7 @@ void SdXMLCustomShapePropertyMerge( std::vector< com::sun::star::beans::Property
}
}
-typedef boost::unordered_map< OUString, sal_Int32, OUStringHash > EquationHashMap;
+typedef std::unordered_map< OUString, sal_Int32, OUStringHash > EquationHashMap;
/* if rPara.Type is from type EnhancedCustomShapeParameterType::EQUATION, the name of the equation
will be converted from OUString to index */
diff --git a/xmloff/source/forms/property_meta_data.cxx b/xmloff/source/forms/property_meta_data.cxx
index e48e1f575887..e5898f38a04b 100644
--- a/xmloff/source/forms/property_meta_data.cxx
+++ b/xmloff/source/forms/property_meta_data.cxx
@@ -27,7 +27,7 @@
#include <tools/debug.hxx>
#include <osl/diagnose.h>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
namespace xmloff { namespace metadata
{
@@ -68,7 +68,7 @@ namespace xmloff { namespace metadata
// one big instance, since in this case, every instance can quickly decide whether it is responsible
// for some attribute or property, and otherwise delegate to the next instance.
- typedef ::boost::unordered_map< OUString, const PropertyDescription*, OUStringHash > DescriptionsByName;
+ typedef std::unordered_map< OUString, const PropertyDescription*, OUStringHash > DescriptionsByName;
const DescriptionsByName& lcl_getPropertyDescriptions()
{
@@ -105,7 +105,7 @@ namespace xmloff { namespace metadata
return s_indexedPropertyGroups;
}
- typedef ::boost::unordered_map< OUString, XMLTokenEnum, OUStringHash > ReverseTokenLookup;
+ typedef std::unordered_map< OUString, XMLTokenEnum, OUStringHash > ReverseTokenLookup;
const ReverseTokenLookup& getReverseTokenLookup()
{
@@ -131,7 +131,7 @@ namespace xmloff { namespace metadata
}
};
- typedef ::boost::unordered_multimap< AttributeDescription, PropertyGroup, AttributeHash > AttributeGroups;
+ typedef std::unordered_multimap< AttributeDescription, PropertyGroup, AttributeHash > AttributeGroups;
const AttributeGroups& lcl_getAttributeGroups()
{
@@ -150,7 +150,7 @@ namespace xmloff { namespace metadata
return s_attributeGroups;
}
- typedef ::boost::unordered_map< AttributeDescription, PropertyGroups, AttributeHash > AttributesWithoutGroup;
+ typedef std::unordered_map< AttributeDescription, PropertyGroups, AttributeHash > AttributesWithoutGroup;
const AttributesWithoutGroup& lcl_getAttributesWithoutGroups()
{
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 9ad98920a93a..c73c802c73ee 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -21,9 +21,6 @@
#include <tools/debug.hxx>
#include <rtl/ustrbuf.hxx>
#include <sal/types.h>
-#include <vector>
-#include <list>
-#include <boost/unordered_map.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/container/XEnumerationAccess.hpp>
#include <com/sun/star/container/XEnumeration.hpp>
@@ -108,6 +105,9 @@
#include <com/sun/star/document/XStorageBasedDocument.hpp>
#include <txtlists.hxx>
#include <com/sun/star/rdf/XMetadatable.hpp>
+#include <list>
+#include <unordered_map>
+#include <vector>
using namespace ::std;
using namespace ::com::sun::star;
@@ -198,7 +198,7 @@ namespace
};
private:
- typedef boost::unordered_map<
+ typedef std::unordered_map<
Reference<XTextFrame>,
TextContentSet,
FrameRefHash> framebound_map_t;
diff --git a/xmloff/source/transform/EventOASISTContext.cxx b/xmloff/source/transform/EventOASISTContext.cxx
index a6bea92f8dee..03213bebbcd7 100644
--- a/xmloff/source/transform/EventOASISTContext.cxx
+++ b/xmloff/source/transform/EventOASISTContext.cxx
@@ -32,14 +32,14 @@
#include <com/sun/star/uri/XVndSunStarScriptUrl.hpp>
#include <comphelper/processfactory.hxx>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
using namespace ::xmloff::token;
class XMLTransformerOASISEventMap_Impl:
- public ::boost::unordered_map< NameKey_Impl, OUString,
+ public std::unordered_map< NameKey_Impl, OUString,
NameHash_Impl, NameHash_Impl >
{
public:
diff --git a/xmloff/source/transform/EventOOoTContext.cxx b/xmloff/source/transform/EventOOoTContext.cxx
index 47a3c3611437..48ce63c1d91e 100644
--- a/xmloff/source/transform/EventOOoTContext.cxx
+++ b/xmloff/source/transform/EventOOoTContext.cxx
@@ -28,14 +28,14 @@
#include <rtl/ustrbuf.hxx>
#include <osl/diagnose.h>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
using namespace ::xmloff::token;
class XMLTransformerOOoEventMap_Impl:
- public ::boost::unordered_map< OUString, NameKey_Impl, OUStringHash >
+ public std::unordered_map< OUString, NameKey_Impl, OUStringHash >
{
public:
diff --git a/xmloff/source/transform/TransformerActions.hxx b/xmloff/source/transform/TransformerActions.hxx
index e28afc7f5a16..f1950ec138f7 100644
--- a/xmloff/source/transform/TransformerActions.hxx
+++ b/xmloff/source/transform/TransformerActions.hxx
@@ -22,10 +22,9 @@
#include <rtl/ustring.hxx>
#include <xmloff/nmspmap.hxx>
-
-#include <boost/unordered_map.hpp>
#include "TransformerActionInit.hxx"
#include "TransformerAction.hxx"
+#include <unordered_map>
struct NameKey_Impl
{
@@ -133,7 +132,7 @@ struct TransformerAction_Impl
};
class XMLTransformerActions :
- public ::boost::unordered_map< NameKey_Impl, TransformerAction_Impl,
+ public std::unordered_map< NameKey_Impl, TransformerAction_Impl,
NameHash_Impl, NameHash_Impl >
{
public:
diff --git a/xmloff/source/transform/TransformerTokenMap.hxx b/xmloff/source/transform/TransformerTokenMap.hxx
index b3a05a1e9817..30914f7dcf12 100644
--- a/xmloff/source/transform/TransformerTokenMap.hxx
+++ b/xmloff/source/transform/TransformerTokenMap.hxx
@@ -21,11 +21,11 @@
#define INCLUDED_XMLOFF_SOURCE_TRANSFORM_TRANSFORMERTOKENMAP_HXX
#include <rtl/ustring.hxx>
-#include <boost/unordered_map.hpp>
#include <xmloff/xmltoken.hxx>
+#include <unordered_map>
class XMLTransformerTokenMap :
- public ::boost::unordered_map< OUString, ::xmloff::token::XMLTokenEnum,
+ public std::unordered_map< OUString, ::xmloff::token::XMLTokenEnum,
OUStringHash >
{
public: