summaryrefslogtreecommitdiff
path: root/svgio
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-01-03 21:24:08 +0000
committerCaolán McNamara <caolanm@redhat.com>2015-01-04 11:07:58 +0000
commit0be5d2b2f6366b295a47a3b9d4e87091b6fd446b (patch)
tree093a35526d927b073640783b41ef23f44a6af221 /svgio
parent799e07f02dbca97f4dd9cff5b779392b13b9021c (diff)
boost::unordered_map->std::unordered_map
Change-Id: I82f668ef72e916d2ff11df5cda2a02653999f66f
Diffstat (limited to 'svgio')
-rw-r--r--svgio/inc/pch/precompiled_svgio.hxx2
-rw-r--r--svgio/inc/svgio/svgreader/svgdocument.hxx5
-rw-r--r--svgio/inc/svgio/svgreader/svgnode.hxx2
-rw-r--r--svgio/inc/svgio/svgreader/svgtoken.hxx1
-rw-r--r--svgio/source/svgreader/svgtoken.cxx3
-rw-r--r--svgio/source/svgreader/svgtools.cxx4
6 files changed, 8 insertions, 9 deletions
diff --git a/svgio/inc/pch/precompiled_svgio.hxx b/svgio/inc/pch/precompiled_svgio.hxx
index cf8ecc2d5e14..8a5e7d3ddaed 100644
--- a/svgio/inc/pch/precompiled_svgio.hxx
+++ b/svgio/inc/pch/precompiled_svgio.hxx
@@ -24,7 +24,6 @@
#include <basegfx/polygon/b2dpolypolygontools.hxx>
#include <basegfx/vector/b2enums.hxx>
#include <boost/noncopyable.hpp>
-#include <boost/unordered_map.hpp>
#include <com/sun/star/graphic/XSvgParser.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -65,6 +64,7 @@
#include <tools/color.hxx>
#include <tools/stream.hxx>
#include <tools/urlobj.hxx>
+#include <unordered_map>
#include <vcl/bitmapex.hxx>
#include <vcl/graphicfilter.hxx>
diff --git a/svgio/inc/svgio/svgreader/svgdocument.hxx b/svgio/inc/svgio/svgreader/svgdocument.hxx
index 46df2542faad..0c3a9df2cba9 100644
--- a/svgio/inc/svgio/svgreader/svgdocument.hxx
+++ b/svgio/inc/svgio/svgreader/svgdocument.hxx
@@ -22,6 +22,7 @@
#include <boost/utility.hpp>
#include <svgio/svgreader/svgnode.hxx>
+#include <unordered_map>
namespace svgio
{
@@ -37,14 +38,14 @@ namespace svgio
const OUString maAbsolutePath;
/// hash mapper to find nodes by their id
- typedef boost::unordered_map< const OUString, const SvgNode*,
+ typedef std::unordered_map< OUString, const SvgNode*,
OUStringHash,
::std::equal_to< OUString > > IdTokenMapper;
typedef std::pair< const OUString, const SvgNode* > IdTokenValueType;
IdTokenMapper maIdTokenMapperList;
/// hash mapper to find css styles by their id
- typedef boost::unordered_map< const OUString, const SvgStyleAttributes*, OUStringHash, ::std::equal_to< OUString > > IdStyleTokenMapper;
+ typedef std::unordered_map< OUString, const SvgStyleAttributes*, OUStringHash, ::std::equal_to< OUString > > IdStyleTokenMapper;
typedef std::pair< const OUString, const SvgStyleAttributes* > IdStyleTokenValueType;
IdStyleTokenMapper maIdStyleTokenMapperList;
diff --git a/svgio/inc/svgio/svgreader/svgnode.hxx b/svgio/inc/svgio/svgreader/svgnode.hxx
index ac91af9085e2..d8e488d9c396 100644
--- a/svgio/inc/svgio/svgreader/svgnode.hxx
+++ b/svgio/inc/svgio/svgreader/svgnode.hxx
@@ -26,8 +26,6 @@
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <com/sun/star/xml/sax/XAttributeList.hpp>
#include <vector>
-#include <boost/unordered_map.hpp>
-
// predefines
namespace svgio
diff --git a/svgio/inc/svgio/svgreader/svgtoken.hxx b/svgio/inc/svgio/svgreader/svgtoken.hxx
index e755449ea0e0..adc6783c7704 100644
--- a/svgio/inc/svgio/svgreader/svgtoken.hxx
+++ b/svgio/inc/svgio/svgreader/svgtoken.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTOKEN_HXX
#include <rtl/ustring.hxx>
-#include <boost/unordered_map.hpp>
namespace svgio
{
diff --git a/svgio/source/svgreader/svgtoken.cxx b/svgio/source/svgreader/svgtoken.cxx
index 989847433104..945b04588c0e 100644
--- a/svgio/source/svgreader/svgtoken.cxx
+++ b/svgio/source/svgreader/svgtoken.cxx
@@ -18,6 +18,7 @@
*/
#include <svgio/svgreader/svgtoken.hxx>
+#include <unordered_map>
namespace svgio
{
@@ -165,7 +166,7 @@ namespace svgio
SVGToken StrToSVGToken(const OUString& rStr, bool bCaseIndependent)
{
- typedef boost::unordered_map< OUString, SVGToken, OUStringHash,::std::equal_to< OUString > > SVGTokenMapper;
+ typedef std::unordered_map< OUString, SVGToken, OUStringHash, std::equal_to< OUString > > SVGTokenMapper;
typedef std::pair< OUString, SVGToken > SVGTokenValueType;
static SVGTokenMapper aSVGTokenMapperList;
diff --git a/svgio/source/svgreader/svgtools.cxx b/svgio/source/svgreader/svgtools.cxx
index 3135631e1e5c..5ae5830c2996 100644
--- a/svgio/source/svgreader/svgtools.cxx
+++ b/svgio/source/svgreader/svgtools.cxx
@@ -23,7 +23,7 @@
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/matrix/b2dhommatrixtools.hxx>
#include <svgio/svgreader/svgtoken.hxx>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
namespace svgio
{
@@ -635,7 +635,7 @@ namespace svgio
bool match_colorKeyword(basegfx::BColor& rColor, const OUString& rName, bool bCaseIndependent)
{
- typedef boost::unordered_map< OUString, Color,
+ typedef std::unordered_map< OUString, Color,
OUStringHash,
::std::equal_to< OUString >
> ColorTokenMapper;