summaryrefslogtreecommitdiff
path: root/sfx2/source
diff options
context:
space:
mode:
Diffstat (limited to 'sfx2/source')
-rw-r--r--sfx2/source/appl/imagemgr.cxx4
-rw-r--r--sfx2/source/appl/newhelp.cxx4
-rw-r--r--sfx2/source/appl/workwin.cxx4
-rw-r--r--sfx2/source/control/bindings.cxx4
-rw-r--r--sfx2/source/doc/Metadatable.cxx18
-rw-r--r--sfx2/source/toolbox/imgmgr.cxx7
-rw-r--r--sfx2/source/view/sfxbasecontroller.cxx7
7 files changed, 24 insertions, 24 deletions
diff --git a/sfx2/source/appl/imagemgr.cxx b/sfx2/source/appl/imagemgr.cxx
index 3cfe055323c1..11db32e02409 100644
--- a/sfx2/source/appl/imagemgr.cxx
+++ b/sfx2/source/appl/imagemgr.cxx
@@ -41,7 +41,7 @@
#include <sfx2/objsh.hxx>
#include <sfx2/docfac.hxx>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::frame;
@@ -49,7 +49,7 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::util;
using namespace ::com::sun::star::ui;
-typedef boost::unordered_map< OUString,
+typedef std::unordered_map< OUString,
WeakReference< XImageManager >,
OUStringHash,
::std::equal_to< OUString > > ModuleIdToImagegMgr;
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index a2ae700b89b9..61fa1596f66a 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -36,7 +36,6 @@
#include "newhelp.hrc"
#include "helpid.hrc"
-#include <boost/unordered_map.hpp>
#include <rtl/ustrbuf.hxx>
#include <comphelper/configurationhelper.hxx>
#include <comphelper/processfactory.hxx>
@@ -107,6 +106,7 @@
#include <sfx2/objsh.hxx>
#include <sfx2/docfac.hxx>
+#include <unordered_map>
#include <vector>
using namespace ::ucbhelper;
@@ -552,7 +552,7 @@ IndexTabPage_Impl::~IndexTabPage_Impl()
namespace sfx2 {
- typedef ::boost::unordered_map< OUString, int, OUStringHash > KeywordInfo;
+ typedef std::unordered_map< OUString, int, OUStringHash > KeywordInfo;
}
#define NEW_ENTRY( url, bool ) \
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 2a8d46183d08..db5d7da145a7 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -20,7 +20,6 @@
#include <config_features.h>
#include <comphelper/processfactory.hxx>
#include <stdio.h>
-#include <boost/unordered_map.hpp>
#include <sfx2/docfile.hxx>
#include <sfx2/objsh.hxx>
@@ -55,6 +54,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/awt/XWindow.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
+#include <unordered_map>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -324,7 +324,7 @@ namespace
class FilledToolBarResIdToResourceURLMap
{
private:
- typedef boost::unordered_map< sal_Int32, OUString > ToolBarResIdToResourceURLMap;
+ typedef std::unordered_map< sal_Int32, OUString > ToolBarResIdToResourceURLMap;
ToolBarResIdToResourceURLMap m_aResIdToResourceURLMap;
public:
FilledToolBarResIdToResourceURLMap()
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index 6002aca94df6..cb25df7e76aa 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -21,7 +21,6 @@
#include <iomanip>
-#include <boost/unordered_map.hpp>
#include <sal/log.hxx>
#include <svl/itempool.hxx>
#include <svl/itemiter.hxx>
@@ -67,6 +66,7 @@
#include <boost/scoped_array.hpp>
#include <boost/scoped_ptr.hpp>
#include <boost/ptr_container/ptr_vector.hpp>
+#include <unordered_map>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -78,7 +78,7 @@ static sal_uInt16 nTimeOut = 300;
#define TIMEOUT_UPDATING 20
#define TIMEOUT_IDLE 2500
-typedef boost::unordered_map< sal_uInt16, bool > InvalidateSlotMap;
+typedef std::unordered_map< sal_uInt16, bool > InvalidateSlotMap;
diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx
index c82336f9d4bf..331ad889f7b4 100644
--- a/sfx2/source/doc/Metadatable.cxx
+++ b/sfx2/source/doc/Metadatable.cxx
@@ -28,10 +28,10 @@
#include <boost/bind.hpp>
-#include <memory>
-#include <boost/unordered_map.hpp>
-#include <list>
#include <algorithm>
+#include <list>
+#include <memory>
+#include <unordered_map>
#if OSL_DEBUG_LEVEL > 0
#include <typeinfo>
#endif
@@ -393,11 +393,11 @@ XmlIdRegistry::GetXmlIdForElement(const Metadatable& i_rObject) const
/// generate unique xml:id
template< typename T >
/*static*/ OUString create_id(const
- ::boost::unordered_map< OUString, T, OUStringHash > & i_rXmlIdMap)
+ std::unordered_map< OUString, T, OUStringHash > & i_rXmlIdMap)
{
static bool bHack = (getenv("LIBO_ONEWAY_STABLE_ODF_EXPORT") != NULL);
const OUString prefix(s_prefix);
- typename ::boost::unordered_map< OUString, T, OUStringHash >
+ typename std::unordered_map< OUString, T, OUStringHash >
::const_iterator iter;
OUString id;
@@ -433,7 +433,7 @@ template< typename T >
typedef ::std::list< Metadatable* > XmlIdList_t;
/// Idref -> (content.xml element list, styles.xml element list)
-typedef ::boost::unordered_map< OUString,
+typedef std::unordered_map< OUString,
::std::pair< XmlIdList_t, XmlIdList_t >, OUStringHash > XmlIdMap_t;
/// pointer hash template
@@ -446,7 +446,7 @@ template<typename T> struct PtrHash
};
/// element -> (stream name, idref)
-typedef ::boost::unordered_map< const Metadatable*,
+typedef std::unordered_map< const Metadatable*,
::std::pair< OUString, OUString>, PtrHash<Metadatable> >
XmlIdReverseMap_t;
@@ -926,13 +926,13 @@ struct RMapEntry
};
/// element -> (stream name, idref, source)
-typedef ::boost::unordered_map< const Metadatable*,
+typedef std::unordered_map< const Metadatable*,
struct RMapEntry,
PtrHash<Metadatable> >
ClipboardXmlIdReverseMap_t;
/// Idref -> (content.xml element, styles.xml element)
-typedef ::boost::unordered_map< OUString,
+typedef std::unordered_map< OUString,
::std::pair< Metadatable*, Metadatable* >, OUStringHash >
ClipboardXmlIdMap_t;
diff --git a/sfx2/source/toolbox/imgmgr.cxx b/sfx2/source/toolbox/imgmgr.cxx
index 7891777bbcfd..befb3c36d9aa 100644
--- a/sfx2/source/toolbox/imgmgr.cxx
+++ b/sfx2/source/toolbox/imgmgr.cxx
@@ -19,7 +19,6 @@
#include <stdio.h>
-#include <boost/unordered_map.hpp>
#include <boost/shared_ptr.hpp>
#include <sfx2/imgmgr.hxx>
@@ -40,6 +39,8 @@
#include <comphelper/processfactory.hxx>
+#include <unordered_map>
+
const sal_uInt32 IMAGELIST_COUNT = 4; // small, small-hi, large, large-hi
struct ToolBoxInf_Impl
@@ -71,7 +72,7 @@ public:
namespace
{
- typedef boost::unordered_map< SfxModule*, boost::shared_ptr<SfxImageManager_Impl> > SfxImageManagerImplMap;
+ typedef std::unordered_map< SfxModule*, boost::shared_ptr<SfxImageManager_Impl> > SfxImageManagerImplMap;
class theImageManagerImplMap :
public rtl::Static<SfxImageManagerImplMap, theImageManagerImplMap> {};
@@ -247,7 +248,7 @@ SfxImageManager::~SfxImageManager()
namespace
{
- typedef boost::unordered_map< SfxModule*, boost::shared_ptr<SfxImageManager> > SfxImageManagerMap;
+ typedef std::unordered_map< SfxModule*, boost::shared_ptr<SfxImageManager> > SfxImageManagerMap;
class theImageManagerMap :
public rtl::Static<SfxImageManagerMap, theImageManagerMap> {};
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx
index 0d08a0d5ea30..943f60da08c1 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -74,12 +74,12 @@
#include <comphelper/processfactory.hxx>
#include <vcl/msgbox.hxx>
-#include <boost/unordered_map.hpp>
-
#include <sfx2/event.hxx>
#include <sfx2/viewfac.hxx>
#include "sfxbasecontroller_internal.hxx"
+#include <unordered_map>
+
#define TIMEOUT_START_RESCHEDULE 10L /* 10th s */
using namespace ::com::sun::star;
@@ -141,8 +141,7 @@ static const GroupIDToCommandGroup GroupIDCommandGroupMap[] =
{ 0 , 0 }
};
-typedef boost::unordered_map< sal_Int16, sal_Int16 > GroupHashMap;
-
+typedef std::unordered_map< sal_Int16, sal_Int16 > GroupHashMap;
sal_Int16 MapGroupIDToCommandGroup( sal_Int16 nGroupID )
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-26 06:46:20 +0000