[Libreoffice-commits] core.git: i18nlangtag/source sax/source sccomp/source sdext/inc sdext/source sd/inc sd/source slideshow/inc slideshow/source sot/source svgio/inc svgio/source svx/inc svx/source
Caolán McNamara
caolanm at redhat.com
Sun Jan 4 03:08:24 PST 2015
i18nlangtag/source/languagetag/languagetag.cxx | 4 +-
sax/source/fastparser/fastparser.cxx | 4 +-
sccomp/source/solver/SolverComponent.hxx | 4 +-
sd/inc/CustomAnimationPreset.hxx | 8 ++---
sd/inc/TransitionPreset.hxx | 4 +-
sd/inc/pch/precompiled_sd.hxx | 2 -
sd/source/filter/eppt/epptooxml.hxx | 2 -
sd/source/filter/eppt/pptx-epptooxml.cxx | 1
sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx | 6 ++--
sd/source/ui/framework/configuration/ResourceFactoryManager.hxx | 4 +-
sd/source/ui/framework/module/ModuleController.cxx | 6 ++--
sd/source/ui/framework/tools/FrameworkHelper.cxx | 4 +-
sd/source/ui/sidebar/MasterPageObserver.cxx | 4 +-
sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx | 2 -
sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx | 1
sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx | 2 -
sd/source/ui/tools/IconCache.cxx | 4 +-
sd/source/ui/unoidl/facreg.cxx | 5 +--
sd/source/ui/view/ViewShellManager.cxx | 10 +++----
sdext/inc/pch/precompiled_PresentationMinimizer.hxx | 2 -
sdext/source/minimizer/pppoptimizertoken.cxx | 4 +-
sdext/source/pdfimport/filterdet.cxx | 4 +-
sdext/source/pdfimport/inc/pdfihelper.hxx | 4 +-
sdext/source/pdfimport/inc/pdfparse.hxx | 4 +-
sdext/source/pdfimport/pdfparse/pdfentries.cxx | 8 ++---
sdext/source/pdfimport/sax/saxattrlist.cxx | 6 ++--
sdext/source/pdfimport/sax/saxattrlist.hxx | 6 ++--
sdext/source/pdfimport/test/pdfunzip.cxx | 4 +-
sdext/source/pdfimport/test/tests.cxx | 6 ++--
sdext/source/pdfimport/tree/pdfiprocessor.hxx | 10 +++----
sdext/source/pdfimport/tree/style.cxx | 14 +++++-----
sdext/source/pdfimport/tree/style.hxx | 14 +++++-----
sdext/source/pdfimport/wrapper/wrapper.cxx | 4 +-
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 2 -
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 4 +-
slideshow/inc/pch/precompiled_slideshow.hxx | 2 -
slideshow/source/engine/eventmultiplexer.cxx | 3 --
slideshow/source/engine/slide/layermanager.hxx | 8 ++---
slideshow/source/engine/slide/targetpropertiescreator.cxx | 6 ++--
sot/source/sdstor/stgcache.cxx | 2 +
sot/source/sdstor/stgcache.hxx | 5 ++-
svgio/inc/pch/precompiled_svgio.hxx | 2 -
svgio/inc/svgio/svgreader/svgdocument.hxx | 5 ++-
svgio/inc/svgio/svgreader/svgnode.hxx | 2 -
svgio/inc/svgio/svgreader/svgtoken.hxx | 1
svgio/source/svgreader/svgtoken.cxx | 3 +-
svgio/source/svgreader/svgtools.cxx | 4 +-
svx/inc/pch/precompiled_svx.hxx | 2 -
svx/inc/pch/precompiled_svxcore.hxx | 2 -
svx/source/accessibility/lookupcolorname.cxx | 4 +-
svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx | 6 ++--
svx/source/table/propertyset.hxx | 8 +----
svx/source/unodraw/shapepropertynotifier.cxx | 4 +-
svx/source/unodraw/unoprov.cxx | 4 +-
54 files changed, 120 insertions(+), 126 deletions(-)
New commits:
commit 0be5d2b2f6366b295a47a3b9d4e87091b6fd446b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 3 21:24:08 2015 +0000
boost::unordered_map->std::unordered_map
Change-Id: I82f668ef72e916d2ff11df5cda2a02653999f66f
diff --git a/i18nlangtag/source/languagetag/languagetag.cxx b/i18nlangtag/source/languagetag/languagetag.cxx
index 54d8bf6..96c53c6 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -18,8 +18,8 @@
#include <osl/mutex.hxx>
#include <rtl/instance.hxx>
#include <rtl/locale.h>
-#include <boost/unordered_set.hpp>
#include <map>
+#include <unordered_set>
//#define erDEBUG
@@ -52,7 +52,7 @@ struct theEmptyLocale : public rtl::Static< lang::Locale, theEmptyLocale > {};
struct theEmptyBcp47 : public rtl::Static< OUString, theEmptyBcp47 > {};
}
-typedef ::boost::unordered_set< OUString, OUStringHash > KnownTagSet;
+typedef std::unordered_set< OUString, OUStringHash > KnownTagSet;
namespace {
struct theKnowns : public rtl::Static< KnownTagSet, theKnowns > {};
struct theMutex : public rtl::Static< osl::Mutex, theMutex > {};
diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx
index bf25332..d586e35 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -38,8 +38,8 @@
#include <boost/optional.hpp>
#include <boost/scoped_ptr.hpp>
#include <boost/shared_ptr.hpp>
-#include <boost/unordered_map.hpp>
#include <stack>
+#include <unordered_map>
#include <vector>
#include <queue>
#include <cassert>
@@ -68,7 +68,7 @@ struct Entity;
typedef ::boost::shared_ptr< NamespaceDefine > NamespaceDefineRef;
-typedef ::boost::unordered_map< OUString, sal_Int32,
+typedef std::unordered_map< OUString, sal_Int32,
OUStringHash, ::std::equal_to< OUString > > NamespaceMap;
typedef std::vector<Event> EventList;
diff --git a/sccomp/source/solver/SolverComponent.hxx b/sccomp/source/solver/SolverComponent.hxx
index 2f4a199..7d3c1b1 100644
--- a/sccomp/source/solver/SolverComponent.hxx
+++ b/sccomp/source/solver/SolverComponent.hxx
@@ -30,7 +30,7 @@
#include <comphelper/propertycontainer.hxx>
#include <comphelper/proparrhlp.hxx>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
class ResMgr;
@@ -52,7 +52,7 @@ struct ScSolverCellEqual
bool operator()( const css::table::CellAddress& rAddr1, const css::table::CellAddress& rAddr2 ) const;
};
-typedef boost::unordered_map< css::table::CellAddress, std::vector<double>, ScSolverCellHash, ScSolverCellEqual > ScSolverCellHashMap;
+typedef std::unordered_map< css::table::CellAddress, std::vector<double>, ScSolverCellHash, ScSolverCellEqual > ScSolverCellHashMap;
typedef cppu::WeakImplHelper3<
com::sun::star::sheet::XSolver,
diff --git a/sd/inc/CustomAnimationPreset.hxx b/sd/inc/CustomAnimationPreset.hxx
index 26e9495..8aff9a7 100644
--- a/sd/inc/CustomAnimationPreset.hxx
+++ b/sd/inc/CustomAnimationPreset.hxx
@@ -30,12 +30,12 @@
#include <CustomAnimationEffect.hxx>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
namespace sd {
-typedef boost::unordered_map< OUString, CustomAnimationEffectPtr, OUStringHash > EffectsSubTypeMap;
-typedef boost::unordered_map< OUString, OUString, OUStringHash > UStringMap;
+typedef std::unordered_map< OUString, CustomAnimationEffectPtr, OUStringHash > EffectsSubTypeMap;
+typedef std::unordered_map< OUString, OUString, OUStringHash > UStringMap;
typedef std::vector< OUString > UStringList;
class CustomAnimationPreset
@@ -74,7 +74,7 @@ private:
};
typedef boost::shared_ptr< CustomAnimationPreset > CustomAnimationPresetPtr;
-typedef boost::unordered_map<OUString, CustomAnimationPresetPtr, OUStringHash> EffectDescriptorMap;
+typedef std::unordered_map<OUString, CustomAnimationPresetPtr, OUStringHash> EffectDescriptorMap;
typedef std::vector< CustomAnimationPresetPtr > EffectDescriptorList;
struct PresetCategory
diff --git a/sd/inc/TransitionPreset.hxx b/sd/inc/TransitionPreset.hxx
index a15b1d5..7420fc8 100644
--- a/sd/inc/TransitionPreset.hxx
+++ b/sd/inc/TransitionPreset.hxx
@@ -24,7 +24,7 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <list>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
namespace com { namespace sun { namespace star {
namespace animations { class XAnimationNode; }
@@ -38,7 +38,7 @@ namespace sd {
class TransitionPreset;
typedef boost::shared_ptr< TransitionPreset > TransitionPresetPtr;
typedef std::list< TransitionPresetPtr > TransitionPresetList;
-typedef boost::unordered_map< OUString, OUString, OUStringHash > UStringMap;
+typedef std::unordered_map< OUString, OUString, OUStringHash > UStringMap;
class TransitionPreset
{
diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index e182a24..27a55f4 100644
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@ -79,7 +79,6 @@
#include <boost/scoped_array.hpp>
#include <boost/scoped_ptr.hpp>
#include <boost/shared_ptr.hpp>
-#include <boost/unordered_map.hpp>
#include <boost/weak_ptr.hpp>
#include <canvas/canvastools.hxx>
#include <canvas/elapsedtime.hxx>
@@ -836,6 +835,7 @@
#include <tools/urlobj.hxx>
#include <tools/wintypes.hxx>
#include <tools/wldcrd.hxx>
+#include <unordered_map>
#include <unotools/accessiblestatesethelper.hxx>
#include <unotools/charclass.hxx>
#include <unotools/confignode.hxx>
diff --git a/sd/source/filter/eppt/epptooxml.hxx b/sd/source/filter/eppt/epptooxml.hxx
index aa59d0c..28d9d3f 100644
--- a/sd/source/filter/eppt/epptooxml.hxx
+++ b/sd/source/filter/eppt/epptooxml.hxx
@@ -157,7 +157,7 @@ private:
sal_Int32 nId;
sal_Int32 nLastIndex;
};
- typedef ::boost::unordered_map< OUString, struct AuthorComments, OUStringHash > AuthorsMap;
+ typedef std::unordered_map< OUString, struct AuthorComments, OUStringHash > AuthorsMap;
AuthorsMap maAuthors;
void WriteAuthors();
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 08313df..6b5d150 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <boost/unordered_map.hpp>
#include <boost/foreach.hpp>
#include <stdio.h>
#include <oox/drawingml/chart/chartconverter.hxx>
diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx
index 35b9ae9..6b80150 100644
--- a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx
+++ b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx
@@ -24,8 +24,8 @@
#include <com/sun/star/drawing/framework/XConfigurationController.hpp>
#include <com/sun/star/drawing/framework/ConfigurationChangeEvent.hpp>
+#include <unordered_map>
#include <vector>
-#include <boost/unordered_map.hpp>
namespace sd { namespace framework {
@@ -114,8 +114,8 @@ private:
css::drawing::framework::XConfigurationChangeListener> mxListener;
css::uno::Any maUserData;
};
- typedef ::std::vector<ListenerDescriptor> ListenerList;
- typedef ::boost::unordered_map
+ typedef std::vector<ListenerDescriptor> ListenerList;
+ typedef std::unordered_map
<OUString,
ListenerList,
OUStringHash> ListenerMap;
diff --git a/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx b/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx
index 904c2d3..3087051 100644
--- a/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx
+++ b/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx
@@ -22,6 +22,7 @@
#include <sal/config.h>
+#include <unordered_map>
#include <utility>
#include <vector>
@@ -30,7 +31,6 @@
#include <com/sun/star/drawing/framework/XResourceFactoryManager.hpp>
#include <com/sun/star/util/XURLTransformer.hpp>
#include <osl/mutex.hxx>
-#include <boost/unordered_map.hpp>
namespace sd { namespace framework {
@@ -87,7 +87,7 @@ public:
private:
::osl::Mutex maMutex;
- typedef ::boost::unordered_map<
+ typedef std::unordered_map<
OUString,
css::uno::Reference<css::drawing::framework::XResourceFactory>,
OUStringHash> FactoryMap;
diff --git a/sd/source/ui/framework/module/ModuleController.cxx b/sd/source/ui/framework/module/ModuleController.cxx
index 5d18ca6..2275b06 100644
--- a/sd/source/ui/framework/module/ModuleController.cxx
+++ b/sd/source/ui/framework/module/ModuleController.cxx
@@ -22,7 +22,7 @@
#include "tools/ConfigurationAccess.hxx"
#include <comphelper/processfactory.hxx>
#include <boost/bind.hpp>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
#include <tools/diagnose_ex.h>
@@ -39,7 +39,7 @@ static const sal_uInt32 snFactoryPropertyCount (2);
static const sal_uInt32 snStartupPropertyCount (1);
class ModuleController::ResourceToFactoryMap
- : public ::boost::unordered_map<
+ : public std::unordered_map<
OUString,
OUString,
OUStringHash>
@@ -49,7 +49,7 @@ public:
};
class ModuleController::LoadedFactoryContainer
- : public ::boost::unordered_map<
+ : public std::unordered_map<
OUString,
WeakReference<XInterface>,
OUStringHash>
diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index a22e70b..f775eb2 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -43,7 +43,7 @@
#include <osl/doublecheckedlocking.h>
#include <osl/getglobalmutex.hxx>
#include <tools/diagnose_ex.h>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -273,7 +273,7 @@ namespace
drawing framework and the enums defined in the ViewShell class.
*/
class FrameworkHelper::ViewURLMap
- : public ::boost::unordered_map<
+ : public std::unordered_map<
OUString,
ViewShell::ShellType,
OUStringHash>
diff --git a/sd/source/ui/sidebar/MasterPageObserver.cxx b/sd/source/ui/sidebar/MasterPageObserver.cxx
index bec5042..606902a 100644
--- a/sd/source/ui/sidebar/MasterPageObserver.cxx
+++ b/sd/source/ui/sidebar/MasterPageObserver.cxx
@@ -22,8 +22,8 @@
#include <algorithm>
#include "drawdoc.hxx"
#include "sdpage.hxx"
-#include <boost/unordered_map.hpp>
#include <set>
+#include <unordered_map>
#include <vector>
#include <svl/lstner.hxx>
#include <osl/doublecheckedlocking.h>
@@ -73,7 +73,7 @@ private:
size_t operator()(SdDrawDocument* argument) const
{ return reinterpret_cast<unsigned long>(argument); }
};
- typedef ::boost::unordered_map<SdDrawDocument*,
+ typedef std::unordered_map<SdDrawDocument*,
MasterPageObserver::MasterPageNameSet,
DrawDocHash>
MasterPageContainer;
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
index bfc098d..7cc5595 100644
--- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
@@ -85,7 +85,7 @@ public:
};
class BitmapCache::CacheBitmapContainer
- : public ::boost::unordered_map<CacheKey, CacheEntry, CacheHash>
+ : public std::unordered_map<CacheKey, CacheEntry, CacheHash>
{
public:
CacheBitmapContainer (void) {}
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx
index e453e05..c616545 100644
--- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx
@@ -25,7 +25,6 @@ class SdrPage;
#include <vcl/bitmapex.hxx>
#include <osl/mutex.hxx>
#include <boost/shared_ptr.hpp>
-#include <boost/unordered_map.hpp>
#include <boost/scoped_ptr.hpp>
namespace sd { namespace slidesorter { namespace cache {
diff --git a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx
index feb4f02..453683e 100644
--- a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx
@@ -111,7 +111,7 @@ namespace sd { namespace slidesorter { namespace cache {
/** Container for the active caches.
*/
class PageCacheManager::PageCacheContainer
- : public ::boost::unordered_map<CacheDescriptor,
+ : public std::unordered_map<CacheDescriptor,
::boost::shared_ptr<PageCacheManager::Cache>,
CacheDescriptor::Hash,
CacheDescriptor::Equal>
diff --git a/sd/source/ui/tools/IconCache.cxx b/sd/source/ui/tools/IconCache.cxx
index 33858b8..ae89587 100644
--- a/sd/source/ui/tools/IconCache.cxx
+++ b/sd/source/ui/tools/IconCache.cxx
@@ -20,9 +20,9 @@
#include "tools/IconCache.hxx"
#include "sdresid.hxx"
-#include <boost/unordered_map.hpp>
#include <osl/doublecheckedlocking.h>
#include <osl/getglobalmutex.hxx>
+#include <unordered_map>
namespace sd {
@@ -39,7 +39,7 @@ private:
*/
static IconCache* mpInstance;
- typedef ::boost::unordered_map<sal_uInt16,Image> ImageContainer;
+ typedef std::unordered_map<sal_uInt16,Image> ImageContainer;
ImageContainer maContainer;
Image GetIcon (sal_uInt16 nResourceId);
diff --git a/sd/source/ui/unoidl/facreg.cxx b/sd/source/ui/unoidl/facreg.cxx
index 22cdc3d..cae3220 100644
--- a/sd/source/ui/unoidl/facreg.cxx
+++ b/sd/source/ui/unoidl/facreg.cxx
@@ -28,9 +28,8 @@
#include "sal/types.h"
#include <string.h>
-
-#include <boost/unordered_map.hpp>
#include <boost/shared_ptr.hpp>
+#include <unordered_map>
using namespace com::sun::star;
@@ -69,7 +68,7 @@ enum FactoryId
SlideLayoutControllerFactoryId,
InsertSlideControllerFactoryId,
};
-typedef ::boost::unordered_map<OUString, FactoryId, OUStringHash> FactoryMap;
+typedef std::unordered_map<OUString, FactoryId, OUStringHash> FactoryMap;
namespace {
static ::boost::shared_ptr<FactoryMap> spFactoryMap;
diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx
index a2a81534..ad678af 100644
--- a/sd/source/ui/view/ViewShellManager.cxx
+++ b/sd/source/ui/view/ViewShellManager.cxx
@@ -28,8 +28,8 @@
#include <svx/svxids.hrc>
#include <svx/fmshell.hxx>
-#include <boost/unordered_map.hpp>
#include <iterator>
+#include <unordered_map>
namespace sd {
@@ -153,7 +153,7 @@ private:
mutable ::osl::Mutex maMutex;
class ShellHash { public: size_t operator()(const SfxShell* p) const { return reinterpret_cast<size_t>(p);} };
- typedef ::boost::unordered_multimap<const SfxShell*,SharedShellFactory,ShellHash>
+ typedef std::unordered_multimap<const SfxShell*,SharedShellFactory,ShellHash>
FactoryList;
FactoryList maShellFactories;
@@ -161,11 +161,11 @@ private:
to put on the shell stack each view shell in this list is asked for
its sub-shells (typically toolbars).
*/
- typedef ::std::list<ShellDescriptor> ActiveShellList;
+ typedef std::list<ShellDescriptor> ActiveShellList;
ActiveShellList maActiveViewShells;
- typedef ::std::list<ShellDescriptor> SubShellSubList;
- typedef ::boost::unordered_map<const SfxShell*,SubShellSubList,ShellHash> SubShellList;
+ typedef std::list<ShellDescriptor> SubShellSubList;
+ typedef std::unordered_map<const SfxShell*,SubShellSubList,ShellHash> SubShellList;
SubShellList maActiveSubShells;
/** In this member we remember what shells we have pushed on the shell
diff --git a/sdext/inc/pch/precompiled_PresentationMinimizer.hxx b/sdext/inc/pch/precompiled_PresentationMinimizer.hxx
index bfdc4f9..0a38add 100644
--- a/sdext/inc/pch/precompiled_PresentationMinimizer.hxx
+++ b/sdext/inc/pch/precompiled_PresentationMinimizer.hxx
@@ -17,7 +17,6 @@
#include "com/sun/star/util/URL.hpp"
#include "com/sun/star/util/URLTransformer.hpp"
#include "com/sun/star/util/XURLTransformer.hpp"
-#include <boost/unordered_map.hpp>
#include <com/sun/star/awt/FontDescriptor.hpp>
#include <com/sun/star/awt/FontWeight.hpp>
#include <com/sun/star/awt/MessageBoxButtons.hpp>
@@ -107,6 +106,7 @@
#include <sal/macros.h>
#include <sal/types.h>
#include <string.h>
+#include <unordered_map>
#include <vector>
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/minimizer/pppoptimizertoken.cxx b/sdext/source/minimizer/pppoptimizertoken.cxx
index 874206c..ecce848 100644
--- a/sdext/source/minimizer/pppoptimizertoken.cxx
+++ b/sdext/source/minimizer/pppoptimizertoken.cxx
@@ -21,10 +21,10 @@
#include "pppoptimizertoken.hxx"
#include <osl/mutex.hxx>
#include <sal/macros.h>
-#include <boost/unordered_map.hpp>
#include <string.h>
+#include <unordered_map>
-typedef boost::unordered_map< const char*, PPPOptimizerTokenEnum, rtl::CStringHash, rtl::CStringEqual> TypeNameHashMap;
+typedef std::unordered_map< const char*, PPPOptimizerTokenEnum, rtl::CStringHash, rtl::CStringEqual> TypeNameHashMap;
static TypeNameHashMap* pHashMap = NULL;
static ::osl::Mutex& getHashMapMutex()
{
diff --git a/sdext/source/pdfimport/filterdet.cxx b/sdext/source/pdfimport/filterdet.cxx
index 511b7d6..f0f6793 100644
--- a/sdext/source/pdfimport/filterdet.cxx
+++ b/sdext/source/pdfimport/filterdet.cxx
@@ -492,7 +492,7 @@ uno::Reference< io::XStream > getAdditionalStream( const OUString&
if( pTrailer && pTrailer->m_pDict )
{
// search document checksum entry
- boost::unordered_map< OString,
+ std::unordered_map< OString,
pdfparse::PDFEntry*,
OStringHash >::iterator chk;
chk = pTrailer->m_pDict->m_aMap.find( "DocChecksum" );
@@ -509,7 +509,7 @@ uno::Reference< io::XStream > getAdditionalStream( const OUString&
}
// search for AdditionalStreams entry
- boost::unordered_map< OString,
+ std::unordered_map< OString,
pdfparse::PDFEntry*,
OStringHash >::iterator add_stream;
add_stream = pTrailer->m_pDict->m_aMap.find( "AdditionalStreams" );
diff --git a/sdext/source/pdfimport/inc/pdfihelper.hxx b/sdext/source/pdfimport/inc/pdfihelper.hxx
index 69d8a8f..e989279 100644
--- a/sdext/source/pdfimport/inc/pdfihelper.hxx
+++ b/sdext/source/pdfimport/inc/pdfihelper.hxx
@@ -31,9 +31,9 @@
#include "com/sun/star/rendering/PathCapType.hpp"
#include "com/sun/star/rendering/PathJoinType.hpp"
+#include <unordered_map>
#include <vector>
#include <boost/functional/hash.hpp>
-#include <boost/unordered_map.hpp>
// virtual resolution of the PDF OutputDev in dpi
#define PDFI_OUTDEV_RESOLUTION 7200
@@ -43,7 +43,7 @@ namespace com { namespace sun { namespace star { namespace task
namespace pdfi
{
- typedef boost::unordered_map< OUString, OUString, OUStringHash > PropertyMap;
+ typedef std::unordered_map< OUString, OUString, OUStringHash > PropertyMap;
typedef sal_Int32 ImageId;
/// What to do with a polygon. values can be ORed together
diff --git a/sdext/source/pdfimport/inc/pdfparse.hxx b/sdext/source/pdfimport/inc/pdfparse.hxx
index f747e8c..b3f5653 100644
--- a/sdext/source/pdfimport/inc/pdfparse.hxx
+++ b/sdext/source/pdfimport/inc/pdfparse.hxx
@@ -24,8 +24,8 @@
#include <rtl/ustring.hxx>
#include <rtl/string.hxx>
+#include <unordered_map>
#include <vector>
-#include <boost/unordered_map.hpp>
namespace pdfparse
{
@@ -180,7 +180,7 @@ struct PDFArray : public PDFContainer
struct PDFDict : public PDFContainer
{
- typedef boost::unordered_map<OString,PDFEntry*,OStringHash> Map;
+ typedef std::unordered_map<OString,PDFEntry*,OStringHash> Map;
Map m_aMap;
PDFDict() {}
diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
index 7607058..c4febf6 100644
--- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
@@ -531,7 +531,7 @@ void PDFDict::insertValue( const OString& rName, PDFEntry* pValue )
if( ! pValue )
eraseValue( rName );
- boost::unordered_map<OString,PDFEntry*,OStringHash>::iterator it = m_aMap.find( rName );
+ std::unordered_map<OString,PDFEntry*,OStringHash>::iterator it = m_aMap.find( rName );
if( it == m_aMap.end() )
{
// new name/value, pair, append it
@@ -625,7 +625,7 @@ unsigned int PDFStream::getDictLength( const PDFContainer* pContainer ) const
if( ! m_pDict )
return 0;
// find /Length entry, can either be a direct or indirect number object
- boost::unordered_map<OString,PDFEntry*,OStringHash>::const_iterator it =
+ std::unordered_map<OString,PDFEntry*,OStringHash>::const_iterator it =
m_pDict->m_aMap.find( "Length" );
if( it == m_pDict->m_aMap.end() )
return 0;
@@ -675,7 +675,7 @@ bool PDFObject::getDeflatedStream( char** ppStream, unsigned int* pBytes, const
return false;
}
// is there a filter entry ?
- boost::unordered_map<OString,PDFEntry*,OStringHash>::const_iterator it =
+ std::unordered_map<OString,PDFEntry*,OStringHash>::const_iterator it =
m_pStream->m_pDict->m_aMap.find( "Filter" );
if( it != m_pStream->m_pDict->m_aMap.end() )
{
@@ -840,7 +840,7 @@ bool PDFObject::emit( EmitContext& rWriteContext ) const
if( bDeflate && rWriteContext.m_bDeflate )
{
// delete flatedecode filter
- boost::unordered_map<OString,PDFEntry*,OStringHash>::const_iterator it =
+ std::unordered_map<OString,PDFEntry*,OStringHash>::const_iterator it =
pClone->m_pStream->m_pDict->m_aMap.find( "Filter" );
if( it != pClone->m_pStream->m_pDict->m_aMap.end() )
{
diff --git a/sdext/source/pdfimport/sax/saxattrlist.cxx b/sdext/source/pdfimport/sax/saxattrlist.cxx
index 2ec4da5..9d6d900 100644
--- a/sdext/source/pdfimport/sax/saxattrlist.cxx
+++ b/sdext/source/pdfimport/sax/saxattrlist.cxx
@@ -23,10 +23,10 @@
namespace pdfi
{
-SaxAttrList::SaxAttrList( const boost::unordered_map< OUString, OUString, OUStringHash >& rMap )
+SaxAttrList::SaxAttrList( const std::unordered_map< OUString, OUString, OUStringHash >& rMap )
{
m_aAttributes.reserve(rMap.size());
- for( boost::unordered_map< OUString,
+ for( std::unordered_map< OUString,
OUString,
OUStringHash >::const_iterator it = rMap.begin();
it != rMap.end(); ++it )
@@ -80,7 +80,7 @@ OUString SAL_CALL SaxAttrList::getValueByIndex( sal_Int16 i_nIndex ) throw(std::
OUString SAL_CALL SaxAttrList::getValueByName(const OUString& i_rName) throw(std::exception)
{
- boost::unordered_map< OUString, size_t, OUStringHash >::const_iterator it = m_aIndexMap.find( i_rName );
+ std::unordered_map< OUString, size_t, OUStringHash >::const_iterator it = m_aIndexMap.find( i_rName );
return (it != m_aIndexMap.end()) ? m_aAttributes[it->second].m_aValue : OUString();
}
diff --git a/sdext/source/pdfimport/sax/saxattrlist.hxx b/sdext/source/pdfimport/sax/saxattrlist.hxx
index eee4d95..65def21 100644
--- a/sdext/source/pdfimport/sax/saxattrlist.hxx
+++ b/sdext/source/pdfimport/sax/saxattrlist.hxx
@@ -21,8 +21,8 @@
#define INCLUDED_SDEXT_SOURCE_PDFIMPORT_SAX_SAXATTRLIST_HXX
#include <rtl/ustring.hxx>
+#include <unordered_map>
#include <vector>
-#include <boost/unordered_map.hpp>
#include <cppuhelper/implbase2.hxx>
#include <com/sun/star/util/XCloneable.hpp>
@@ -44,11 +44,11 @@ namespace pdfi
: m_aName( i_rName ), m_aValue( i_rValue ) {}
};
std::vector< AttrEntry > m_aAttributes;
- boost::unordered_map< OUString, size_t, OUStringHash > m_aIndexMap;
+ std::unordered_map< OUString, size_t, OUStringHash > m_aIndexMap;
public:
SaxAttrList() {}
- SaxAttrList( const boost::unordered_map< OUString, OUString, OUStringHash >& );
+ SaxAttrList( const std::unordered_map< OUString, OUString, OUStringHash >& );
SaxAttrList( const SaxAttrList& );
virtual ~SaxAttrList();
diff --git a/sdext/source/pdfimport/test/pdfunzip.cxx b/sdext/source/pdfimport/test/pdfunzip.cxx
index 7ea3aaa..f86ae2b 100644
--- a/sdext/source/pdfimport/test/pdfunzip.cxx
+++ b/sdext/source/pdfimport/test/pdfunzip.cxx
@@ -296,7 +296,7 @@ int write_addStreams( const char* pInFile, const char* pOutFile, PDFFile* pPDFFi
if( pTrailer && pTrailer->m_pDict )
{
// search for AdditionalStreams entry
- boost::unordered_map<OString,PDFEntry*,OStringHash>::iterator add_stream;
+ std::unordered_map<OString,PDFEntry*,OStringHash>::iterator add_stream;
add_stream = pTrailer->m_pDict->m_aMap.find( "AdditionalStreams" );
if( add_stream != pTrailer->m_pDict->m_aMap.end() )
{
@@ -323,7 +323,7 @@ int write_fonts( const char* i_pInFile, const char* i_pOutFile, PDFFile* i_pPDFF
if( ! pDict )
continue;
- boost::unordered_map<OString,PDFEntry*,OStringHash>::iterator map_it =
+ std::unordered_map<OString,PDFEntry*,OStringHash>::iterator map_it =
pDict->m_aMap.find( "Type" );
if( map_it == pDict->m_aMap.end() )
continue;
diff --git a/sdext/source/pdfimport/test/tests.cxx b/sdext/source/pdfimport/test/tests.cxx
index 101757e..8388377 100644
--- a/sdext/source/pdfimport/test/tests.cxx
+++ b/sdext/source/pdfimport/test/tests.cxx
@@ -49,8 +49,8 @@
#include <basegfx/polygon/b2dpolypolygontools.hxx>
#include <basegfx/polygon/b2dpolygonclipper.hxx>
+#include <unordered_map>
#include <vector>
-#include <boost/unordered_map.hpp>
#include <cassert>
#include <rtl/ustring.hxx>
@@ -433,8 +433,8 @@ namespace
{
}
- typedef boost::unordered_map<sal_Int32,FontAttributes> IdToFontMap;
- typedef boost::unordered_map<FontAttributes,sal_Int32,FontAttrHash> FontToIdMap;
+ typedef std::unordered_map<sal_Int32,FontAttributes> IdToFontMap;
+ typedef std::unordered_map<FontAttributes,sal_Int32,FontAttrHash> FontToIdMap;
typedef std::vector<GraphicsContext> GraphicsContextStack;
diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.hxx b/sdext/source/pdfimport/tree/pdfiprocessor.hxx
index 26f73f4..bfef980 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.hxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.hxx
@@ -39,7 +39,7 @@
#include <boost/shared_ptr.hpp>
#include <list>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
#include "imagecontainer.hxx"
#include "contentsink.hxx"
@@ -174,11 +174,11 @@ namespace pdfi
void setupImage(ImageId nImage);
- typedef boost::unordered_map<sal_Int32,FontAttributes> IdToFontMap;
- typedef boost::unordered_map<FontAttributes,sal_Int32,FontAttrHash> FontToIdMap;
+ typedef std::unordered_map<sal_Int32,FontAttributes> IdToFontMap;
+ typedef std::unordered_map<FontAttributes,sal_Int32,FontAttrHash> FontToIdMap;
- typedef boost::unordered_map<sal_Int32,GraphicsContext> IdToGCMap;
- typedef boost::unordered_map<GraphicsContext,sal_Int32,GraphicsContextHash> GCToIdMap;
+ typedef std::unordered_map<sal_Int32,GraphicsContext> IdToGCMap;
+ typedef std::unordered_map<GraphicsContext,sal_Int32,GraphicsContextHash> GCToIdMap;
typedef std::vector<GraphicsContext> GraphicsContextStack;
diff --git a/sdext/source/pdfimport/tree/style.cxx b/sdext/source/pdfimport/tree/style.cxx
index 4e91dcf..4df1942 100644
--- a/sdext/source/pdfimport/tree/style.cxx
+++ b/sdext/source/pdfimport/tree/style.cxx
@@ -47,7 +47,7 @@ sal_Int32 StyleContainer::impl_getStyleId( const Style& rStyle, bool bSubStyle )
for( unsigned int n = 0; n < rStyle.SubStyles.size(); ++n )
aSearchStyle.SubStyles.push_back( impl_getStyleId( *rStyle.SubStyles[n], true ) );
- boost::unordered_map< HashedStyle, sal_Int32, StyleHash >::iterator it =
+ std::unordered_map< HashedStyle, sal_Int32, StyleHash >::iterator it =
m_aStyleToId.find( aSearchStyle );
if( it != m_aStyleToId.end() )
@@ -85,7 +85,7 @@ sal_Int32 StyleContainer::getStandardStyleId( const OString& rName )
const PropertyMap* StyleContainer::getProperties( sal_Int32 nStyleId ) const
{
- boost::unordered_map< sal_Int32, HashedStyle >::const_iterator it =
+ std::unordered_map< sal_Int32, HashedStyle >::const_iterator it =
m_aIdToStyle.find( nStyleId );
return it != m_aIdToStyle.end() ? &(it->second.Properties) : NULL;
}
@@ -93,7 +93,7 @@ const PropertyMap* StyleContainer::getProperties( sal_Int32 nStyleId ) const
sal_Int32 StyleContainer::setProperties( sal_Int32 nStyleId, const PropertyMap& rNewProps )
{
sal_Int32 nRet = -1;
- boost::unordered_map< sal_Int32, HashedStyle >::iterator it =
+ std::unordered_map< sal_Int32, HashedStyle >::iterator it =
m_aIdToStyle.find( nStyleId );
if( it != m_aIdToStyle.end() )
{
@@ -121,7 +121,7 @@ sal_Int32 StyleContainer::setProperties( sal_Int32 nStyleId, const PropertyMap&
aSearchStyle.IsSubStyle = it->second.IsSubStyle;
// find out whether this new style already exists
- boost::unordered_map< HashedStyle, sal_Int32, StyleHash >::iterator new_it =
+ std::unordered_map< HashedStyle, sal_Int32, StyleHash >::iterator new_it =
m_aStyleToId.find( aSearchStyle );
if( new_it != m_aStyleToId.end() )
{
@@ -147,7 +147,7 @@ OUString StyleContainer::getStyleName( sal_Int32 nStyle ) const
{
OUStringBuffer aRet( 64 );
- boost::unordered_map< sal_Int32, HashedStyle >::const_iterator style_it =
+ std::unordered_map< sal_Int32, HashedStyle >::const_iterator style_it =
m_aIdToStyle.find( nStyle );
if( style_it != m_aIdToStyle.end() )
{
@@ -184,7 +184,7 @@ void StyleContainer::impl_emitStyle( sal_Int32 nStyleId,
EmitContext& rContext,
ElementTreeVisitor& rContainedElemVisitor )
{
- boost::unordered_map< sal_Int32, HashedStyle >::const_iterator it = m_aIdToStyle.find( nStyleId );
+ std::unordered_map< sal_Int32, HashedStyle >::const_iterator it = m_aIdToStyle.find( nStyleId );
if( it != m_aIdToStyle.end() )
{
const HashedStyle& rStyle = it->second;
@@ -210,7 +210,7 @@ void StyleContainer::emit( EmitContext& rContext,
ElementTreeVisitor& rContainedElemVisitor )
{
std::vector< sal_Int32 > aMasterPageSection, aAutomaticStyleSection, aOfficeStyleSection;
- for( boost::unordered_map< sal_Int32, HashedStyle >::iterator it = m_aIdToStyle.begin();
+ for( std::unordered_map< sal_Int32, HashedStyle >::iterator it = m_aIdToStyle.begin();
it != m_aIdToStyle.end(); ++it )
{
if( ! it->second.IsSubStyle )
diff --git a/sdext/source/pdfimport/tree/style.hxx b/sdext/source/pdfimport/tree/style.hxx
index 7dabe68..8d1ce8a 100644
--- a/sdext/source/pdfimport/tree/style.hxx
+++ b/sdext/source/pdfimport/tree/style.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_SDEXT_SOURCE_PDFIMPORT_TREE_STYLE_HXX
#include "pdfihelper.hxx"
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
#include <vector>
#include <rtl/ustring.hxx>
#include <rtl/string.hxx>
@@ -124,16 +124,16 @@ namespace pdfi
friend struct StyleIdNameSort;
struct StyleIdNameSort
{
- const boost::unordered_map< sal_Int32, HashedStyle >* m_pMap;
+ const std::unordered_map< sal_Int32, HashedStyle >* m_pMap;
- StyleIdNameSort( const boost::unordered_map< sal_Int32, HashedStyle >* pMap ) :
+ StyleIdNameSort( const std::unordered_map< sal_Int32, HashedStyle >* pMap ) :
m_pMap(pMap)
{}
bool operator()( sal_Int32 nLeft, sal_Int32 nRight )
{
- const boost::unordered_map< sal_Int32, HashedStyle >::const_iterator left_it =
+ const std::unordered_map< sal_Int32, HashedStyle >::const_iterator left_it =
m_pMap->find( nLeft );
- const boost::unordered_map< sal_Int32, HashedStyle >::const_iterator right_it =
+ const std::unordered_map< sal_Int32, HashedStyle >::const_iterator right_it =
m_pMap->find( nRight );
if( left_it == m_pMap->end() )
return false;
@@ -145,8 +145,8 @@ namespace pdfi
};
sal_Int32 m_nNextId;
- boost::unordered_map< sal_Int32, HashedStyle > m_aIdToStyle;
- boost::unordered_map< HashedStyle, sal_Int32, StyleHash > m_aStyleToId;
+ std::unordered_map< sal_Int32, HashedStyle > m_aIdToStyle;
+ std::unordered_map< HashedStyle, sal_Int32, StyleHash > m_aStyleToId;
void impl_emitStyle( sal_Int32 nStyleId,
EmitContext& rContext,
diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx
index c393724..331b790 100644
--- a/sdext/source/pdfimport/wrapper/wrapper.cxx
+++ b/sdext/source/pdfimport/wrapper/wrapper.cxx
@@ -61,7 +61,7 @@
#include <vcl/virdev.hxx>
#include <boost/scoped_ptr.hpp>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
#include <string.h>
#ifdef WNT
#include <stdlib.h>
@@ -134,7 +134,7 @@ enum parseKey {
class Parser
{
- typedef boost::unordered_map< sal_Int64,
+ typedef std::unordered_map< sal_Int64,
FontAttributes > FontMapType;
const uno::Reference<uno::XComponentContext> m_xContext;
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index 4484e8f..946d3c4 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -732,7 +732,7 @@ void PDFOutDev::updateFont(GfxState *state)
Ref* pID = gfxFont->getID();
// TODO(Q3): Portability problem
long long fontID = (long long)pID->gen << 32 | (long long)pID->num;
- boost::unordered_map< long long, FontAttributes >::const_iterator it =
+ std::unordered_map< long long, FontAttributes >::const_iterator it =
m_aFontMap.find( fontID );
if( it == m_aFontMap.end() )
{
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
index a1fe931..daba445 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
@@ -44,7 +44,7 @@
#pragma warning(pop)
#endif
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
#include <vector>
class GfxPath;
@@ -135,7 +135,7 @@ namespace pdfi
{
// not owned by this class
PDFDoc* m_pDoc;
- mutable boost::unordered_map< long long,
+ mutable std::unordered_map< long long,
FontAttributes > m_aFontMap;
UnicodeMap* m_pUtf8Map;
diff --git a/slideshow/inc/pch/precompiled_slideshow.hxx b/slideshow/inc/pch/precompiled_slideshow.hxx
index e091600..ffdc8bb 100644
--- a/slideshow/inc/pch/precompiled_slideshow.hxx
+++ b/slideshow/inc/pch/precompiled_slideshow.hxx
@@ -49,7 +49,6 @@
#include <boost/shared_ptr.hpp>
#include <boost/spirit/include/classic_core.hpp>
#include <boost/tuple/tuple.hpp>
-#include <boost/unordered_map.hpp>
#include <boost/weak_ptr.hpp>
#include <canvas/canvastools.hxx>
#include <canvas/debug.hxx>
@@ -208,6 +207,7 @@
#include <tools/helpers.hxx>
#include <tools/stream.hxx>
#include <tools/urlobj.hxx>
+#include <unordered_map>
#include <unotools/streamwrap.hxx>
#include <unotools/ucbstreamhelper.hxx>
#include <vcl/animate.hxx>
diff --git a/slideshow/source/engine/eventmultiplexer.cxx b/slideshow/source/engine/eventmultiplexer.cxx
index 3049a5a..98d06d1 100644
--- a/slideshow/source/engine/eventmultiplexer.cxx
+++ b/slideshow/source/engine/eventmultiplexer.cxx
@@ -50,9 +50,8 @@
#include <boost/noncopyable.hpp>
#include <boost/bind.hpp>
-#include <vector>
-#include <boost/unordered_map.hpp>
#include <algorithm>
+#include <vector>
using namespace ::com::sun::star;
diff --git a/slideshow/source/engine/slide/layermanager.hxx b/slideshow/source/engine/slide/layermanager.hxx
index 12a1427..76a369e 100644
--- a/slideshow/source/engine/slide/layermanager.hxx
+++ b/slideshow/source/engine/slide/layermanager.hxx
@@ -31,11 +31,11 @@
#include "layer.hxx"
#include "tools.hxx"
-#include <vector>
-#include <map>
-#include <boost/unordered_map.hpp>
#include <algorithm>
#include <functional>
+#include <map>
+#include <unordered_map>
+#include <vector>
namespace basegfx {
class B2DRange;
@@ -230,7 +230,7 @@ namespace slideshow
Provides quicker lookup than ShapeSet for simple mappings
*/
- typedef ::boost::unordered_map<
+ typedef std::unordered_map<
::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShape >,
ShapeSharedPtr,
diff --git a/slideshow/source/engine/slide/targetpropertiescreator.cxx b/slideshow/source/engine/slide/targetpropertiescreator.cxx
index 52541bc..deef54f 100644
--- a/slideshow/source/engine/slide/targetpropertiescreator.cxx
+++ b/slideshow/source/engine/slide/targetpropertiescreator.cxx
@@ -26,7 +26,7 @@
#include <com/sun/star/animations/AnimationNodeType.hpp>
#include <com/sun/star/animations/XAnimate.hpp>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
#include <vector>
#include "targetpropertiescreator.hxx"
@@ -59,7 +59,7 @@ namespace internal
*/
sal_Int16 mnParagraphIndex;
- /// Comparison needed for boost::unordered_map
+ /// Comparison needed for unordered_map
bool operator==( const ShapeHashKey& rRHS ) const
{
return mxRef == rRHS.mxRef && mnParagraphIndex == rRHS.mnParagraphIndex;
@@ -89,7 +89,7 @@ namespace internal
};
// A hash map which maps a XShape to the corresponding vector of initial properties
- typedef ::boost::unordered_map< ShapeHashKey, VectorOfNamedValues, ShapeKeyHasher > XShapeHash;
+ typedef std::unordered_map< ShapeHashKey, VectorOfNamedValues, ShapeKeyHasher > XShapeHash;
class NodeFunctor
diff --git a/sot/source/sdstor/stgcache.cxx b/sot/source/sdstor/stgcache.cxx
index 5176e0a..2e3d33b 100644
--- a/sot/source/sdstor/stgcache.cxx
+++ b/sot/source/sdstor/stgcache.cxx
@@ -29,6 +29,8 @@
#include "stgdir.hxx"
#include "stgio.hxx"
+#include <algorithm>
+
////////////////////////////// class StgPage
// This class implements buffer functionality. The cache will always return
// a page buffer, even if a read fails. It is up to the caller to determine
diff --git a/sot/source/sdstor/stgcache.hxx b/sot/source/sdstor/stgcache.hxx
index 4a71279..bee74e3 100644
--- a/sot/source/sdstor/stgcache.hxx
+++ b/sot/source/sdstor/stgcache.hxx
@@ -26,8 +26,9 @@
#include <tools/stream.hxx>
#include <stgelem.hxx>
#include <boost/noncopyable.hpp>
-#include <boost/unordered_map.hpp>
+#include <boost/functional/hash.hpp>
#include <salhelper/simplereferenceobject.hxx>
+#include <unordered_map>
class UCBStorageStream;
class StgPage;
@@ -36,7 +37,7 @@ class StorageBase;
class StgCache
{
- typedef boost::unordered_map
+ typedef std::unordered_map
<
sal_Int32, rtl::Reference< StgPage >,
boost::hash< sal_Int32 >, std::equal_to< sal_Int32 >
diff --git a/svgio/inc/pch/precompiled_svgio.hxx b/svgio/inc/pch/precompiled_svgio.hxx
index cf8ecc2..8a5e7d3 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 46df254..0c3a9df 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 ac91af9..d8e488d 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 e755449..adc6783 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 9898474..945b045 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 3135631..5ae5830 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;
diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx
index 15bb626..a9ae9be 100644
--- a/svx/inc/pch/precompiled_svx.hxx
+++ b/svx/inc/pch/precompiled_svx.hxx
@@ -20,7 +20,6 @@
#endif
#include "boost/noncopyable.hpp"
-#include "boost/unordered_map.hpp"
#include "com/sun/star/container/XNameAccess.hpp"
#include "com/sun/star/container/XNameContainer.hpp"
#include "com/sun/star/drawing/ColorTable.hpp"
@@ -519,6 +518,7 @@
#include <vcl/window.hxx>
#include <vcl/wrkwin.hxx>
#include <vcl/xtextedt.hxx>
+#include <unordered_map>
#include <vector>
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/pch/precompiled_svxcore.hxx b/svx/inc/pch/precompiled_svxcore.hxx
index 9bb0722..53958f7 100644
--- a/svx/inc/pch/precompiled_svxcore.hxx
+++ b/svx/inc/pch/precompiled_svxcore.hxx
@@ -100,7 +100,6 @@
#include <boost/scoped_ptr.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/spirit/include/classic_core.hpp>
-#include <boost/unordered_map.hpp>
#include <cassert>
#include <cmath>
#include <com/sun/star/accessibility/XAccessible.hpp>
@@ -816,6 +815,7 @@
#include <vcl/window.hxx>
#include <vcl/wmf.hxx>
#include <vcl/wrkwin.hxx>
+#include <unordered_map>
#include <vector>
#include <xmloff/xmlictxt.hxx>
diff --git a/svx/source/accessibility/lookupcolorname.cxx b/svx/source/accessibility/lookupcolorname.cxx
index d6567e0..1e941b0 100644
--- a/svx/source/accessibility/lookupcolorname.cxx
+++ b/svx/source/accessibility/lookupcolorname.cxx
@@ -20,7 +20,6 @@
#include "sal/config.h"
#include "boost/noncopyable.hpp"
-#include "boost/unordered_map.hpp"
#include "com/sun/star/container/XNameAccess.hpp"
#include "com/sun/star/container/XNameContainer.hpp"
#include "com/sun/star/drawing/ColorTable.hpp"
@@ -35,6 +34,7 @@
#include "vcl/svapp.hxx"
#include <lookupcolorname.hxx>
+#include <unordered_map>
namespace {
@@ -45,7 +45,7 @@ public:
OUString lookUp(long color) const;
private:
- typedef boost::unordered_map< long, OUString > Map;
+ typedef std::unordered_map< long, OUString > Map;
Map map_;
};
diff --git a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
index 68bdd32..15a6aa5 100644
--- a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
@@ -19,9 +19,9 @@
#include "svx/EnhancedCustomShapeTypeNames.hxx"
#include <osl/mutex.hxx>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
-typedef boost::unordered_map< const char*, MSO_SPT, rtl::CStringHash, rtl::CStringEqual> TypeNameHashMap;
+typedef std::unordered_map< const char*, MSO_SPT, rtl::CStringHash, rtl::CStringEqual> TypeNameHashMap;
static TypeNameHashMap* pHashMap = NULL;
static ::osl::Mutex& getHashMapMutex()
@@ -306,7 +306,7 @@ OUString EnhancedCustomShapeTypeNames::Get( const MSO_SPT eShapeType )
: OUString();
}
-typedef boost::unordered_map< const char*, const char*, rtl::CStringHash, rtl::CStringEqual> TypeACCNameHashMap;
+typedef std::unordered_map< const char*, const char*, rtl::CStringHash, rtl::CStringEqual> TypeACCNameHashMap;
static TypeACCNameHashMap* pACCHashMap = NULL;
struct ACCNameTypeTable
diff --git a/svx/source/table/propertyset.hxx b/svx/source/table/propertyset.hxx
index 772770e..001212b 100644
--- a/svx/source/table/propertyset.hxx
+++ b/svx/source/table/propertyset.hxx
@@ -25,7 +25,7 @@
#include <com/sun/star/beans/XFastPropertySet.hpp>
#include <rtl/ref.hxx>
#include <functional>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
#include <vector>
#include <cppuhelper/implbase1.hxx>
@@ -33,12 +33,8 @@
namespace sdr { namespace table {
-
-
typedef std::vector< ::com::sun::star::beans::Property > PropertyVector;
-typedef boost::unordered_map< OUString, ::sal_uInt32, OUStringHash, ::std::equal_to< OUString > > PropertyMap;
-
-
+typedef std::unordered_map< OUString, ::sal_uInt32, OUStringHash, std::equal_to< OUString > > PropertyMap;
class FastPropertySetInfo : public ::cppu::WeakAggImplHelper1< ::com::sun::star::beans::XPropertySetInfo >
{
diff --git a/svx/source/unodraw/shapepropertynotifier.cxx b/svx/source/unodraw/shapepropertynotifier.cxx
index 26b537e..19bd256 100644
--- a/svx/source/unodraw/shapepropertynotifier.cxx
+++ b/svx/source/unodraw/shapepropertynotifier.cxx
@@ -26,7 +26,7 @@
#include <cppuhelper/weak.hxx>
#include <tools/diagnose_ex.h>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
namespace
{
@@ -61,7 +61,7 @@ namespace svx
using ::com::sun::star::lang::EventObject;
using ::com::sun::star::beans::XPropertySet;
- typedef ::boost::unordered_map< ShapeProperty, PPropertyValueProvider, ShapePropertyHash > PropertyProviders;
+ typedef std::unordered_map< ShapeProperty, PPropertyValueProvider, ShapePropertyHash > PropertyProviders;
typedef cppu::OMultiTypeInterfaceContainerHelperVar<OUString>
PropertyChangeListenerContainer;
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index 4bd4151..cd97bb3 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -27,7 +27,6 @@
#include <com/sun/star/media/ZoomLevel.hpp>
#include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <boost/unordered_map.hpp>
#include <tools/fldunit.hxx>
#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
@@ -43,6 +42,7 @@
#include <svx/svdobj.hxx>
#include <shapeimpl.hxx>
+#include <unordered_map>
using namespace ::com::sun::star;
using namespace ::com::sun::star::beans::PropertyAttribute;
@@ -801,7 +801,7 @@ comphelper::PropertyMapEntry const * ImplGetAdditionalWriterDrawingDefaultsPrope
return aSvxAdditionalDefaultsPropertyMap_Impl;
}
-typedef ::boost::unordered_map< OUString, sal_uInt32, OUStringHash > UHashMapImpl;
+typedef std::unordered_map< OUString, sal_uInt32, OUStringHash > UHashMapImpl;
namespace {
More information about the Libreoffice-commits
mailing list