summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
Diffstat (limited to 'sd')
-rw-r--r--sd/inc/CustomAnimationPreset.hxx8
-rw-r--r--sd/inc/TransitionPreset.hxx4
-rw-r--r--sd/inc/pch/precompiled_sd.hxx2
-rw-r--r--sd/source/filter/eppt/epptooxml.hxx2
-rw-r--r--sd/source/filter/eppt/pptx-epptooxml.cxx1
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx6
-rw-r--r--sd/source/ui/framework/configuration/ResourceFactoryManager.hxx4
-rw-r--r--sd/source/ui/framework/module/ModuleController.cxx6
-rw-r--r--sd/source/ui/framework/tools/FrameworkHelper.cxx4
-rw-r--r--sd/source/ui/sidebar/MasterPageObserver.cxx4
-rw-r--r--sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx2
-rw-r--r--sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx1
-rw-r--r--sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx2
-rw-r--r--sd/source/ui/tools/IconCache.cxx4
-rw-r--r--sd/source/ui/unoidl/facreg.cxx5
-rw-r--r--sd/source/ui/view/ViewShellManager.cxx10
16 files changed, 31 insertions, 34 deletions
diff --git a/sd/inc/CustomAnimationPreset.hxx b/sd/inc/CustomAnimationPreset.hxx
index 26e949550fcd..8aff9a768d4b 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 a15b1d51df6f..7420fc84c163 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 e182a24e77c5..27a55f416e87 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 aa59d0ce0640..28d9d3f8f9c7 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 08313df23f77..6b5d15008e31 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 35b9ae9a210a..6b801500e070 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 904c2d3bfd8e..3087051118f1 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 5d18ca658d44..2275b06b576f 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 a22e70ba9c87..f775eb2cd972 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 bec5042642e8..606902ac7ba4 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 bfc098d0bac9..7cc55952c95c 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 e453e05a91c8..c6165450f101 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 feb4f02753ac..453683e85ca5 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 33858b82955b..ae895876c912 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 22cdc3dee0f2..cae322031701 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 a2a8153474e4..ad678affd91b 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
generated by cgit (git 2.34.1) at 2024-07-10 09:05:01 +0000