summaryrefslogtreecommitdiff
path: root/sw/source/core
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-01-02 16:22:46 +0000
committerCaolán McNamara <caolanm@redhat.com>2015-01-03 21:11:20 +0000
commit79f115b91e5ad4d9038e127bf0b57843e157eac9 (patch)
tree704dee023dca3144f78613c41ba528ed65b1d80f /sw/source/core
parent05dcb073d60579a142e3074fb1b137f36840ee9e (diff)
boost::unordered_map->std::unordered_map
Change-Id: I2c65709cda6f10810452dfb8aa1a247cb3a5564f
Diffstat (limited to 'sw/source/core')
-rw-r--r--sw/source/core/access/accpara.hxx4
-rw-r--r--sw/source/core/doc/DocumentListsManager.cxx6
-rw-r--r--sw/source/core/doc/number.cxx6
-rw-r--r--sw/source/core/doc/swstylemanager.cxx10
-rw-r--r--sw/source/core/inc/DocumentListsManager.hxx4
-rw-r--r--sw/source/core/inc/MarkManager.hxx6
-rw-r--r--sw/source/core/inc/layouter.hxx4
-rw-r--r--sw/source/core/unocore/unocoll.cxx3
8 files changed, 22 insertions, 21 deletions
diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx
index fec85f191c58..315b62d28886 100644
--- a/sw/source/core/access/accpara.hxx
+++ b/sw/source/core/access/accpara.hxx
@@ -29,9 +29,9 @@
#include <txmsrt.hxx>
#include <com/sun/star/accessibility/XAccessibleExtendedAttributes.hpp>
#include <com/sun/star/accessibility/XAccessibleTextAttributes.hpp>
-#include <boost/unordered_map.hpp>
#include <accselectionhelper.hxx>
#include <calbck.hxx>
+#include <unordered_map>
class SwField;
class SwTxtFrm;
@@ -49,7 +49,7 @@ namespace com { namespace sun { namespace star {
namespace style { struct TabStop; }
} } }
-typedef ::boost::unordered_map< OUString,
+typedef std::unordered_map< OUString,
::com::sun::star::beans::PropertyValue,
OUStringHash,
::std::equal_to< OUString > > tAccParaPropValMap;
diff --git a/sw/source/core/doc/DocumentListsManager.cxx b/sw/source/core/doc/DocumentListsManager.cxx
index 784b38f6043c..c4ba23fb1290 100644
--- a/sw/source/core/doc/DocumentListsManager.cxx
+++ b/sw/source/core/doc/DocumentListsManager.cxx
@@ -73,7 +73,7 @@ SwList* DocumentListsManager::getListByName( const OUString& sListId ) const
{
SwList* pList = 0;
- boost::unordered_map< OUString, SwList*, OUStringHash >::const_iterator
+ std::unordered_map< OUString, SwList*, OUStringHash >::const_iterator
aListIter = maLists.find( sListId );
if ( aListIter != maLists.end() )
{
@@ -120,7 +120,7 @@ SwList* DocumentListsManager::getListForListStyle( const OUString& sListStyleNam
{
SwList* pList = 0;
- boost::unordered_map< OUString, SwList*, OUStringHash >::const_iterator
+ std::unordered_map< OUString, SwList*, OUStringHash >::const_iterator
aListIter = maListStyleLists.find( sListStyleName );
if ( aListIter != maListStyleLists.end() )
{
@@ -189,7 +189,7 @@ void DocumentListsManager::trackChangeOfListStyleName( const OUString& sListStyl
DocumentListsManager::~DocumentListsManager()
{
- for ( boost::unordered_map< OUString, SwList*, OUStringHash >::iterator
+ for ( std::unordered_map< OUString, SwList*, OUStringHash >::iterator
aListIter = maLists.begin();
aListIter != maLists.end();
++aListIter )
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index 0667e4684be4..c48ffd7f7486 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -42,10 +42,10 @@
#include <numrule.hxx>
#include <SwNodeNum.hxx>
-#include <boost/unordered_map.hpp>
-
#include <list.hxx>
+
#include <algorithm>
+#include <unordered_map>
#include <unotools/saveopt.hxx>
@@ -149,7 +149,7 @@ void SwNumRule::RemoveTxtNode( SwTxtNode& rTxtNode )
}
}
-void SwNumRule::SetNumRuleMap(boost::unordered_map<OUString, SwNumRule *, OUStringHash> *
+void SwNumRule::SetNumRuleMap(std::unordered_map<OUString, SwNumRule *, OUStringHash> *
pNumRuleMap)
{
mpNumRuleMap = pNumRuleMap;
diff --git a/sw/source/core/doc/swstylemanager.cxx b/sw/source/core/doc/swstylemanager.cxx
index cbca9bdb4bd0..af8e6d224d8e 100644
--- a/sw/source/core/doc/swstylemanager.cxx
+++ b/sw/source/core/doc/swstylemanager.cxx
@@ -18,18 +18,18 @@
*/
#include "swstylemanager.hxx"
-#include <boost/unordered_map.hpp>
#include <svl/stylepool.hxx>
#include <doc.hxx>
#include <charfmt.hxx>
#include <docary.hxx>
#include <swtypes.hxx>
#include <istyleaccess.hxx>
+#include <unordered_map>
-typedef ::boost::unordered_map< const OUString,
- StylePool::SfxItemSet_Pointer_t,
- OUStringHash,
- ::std::equal_to< OUString > > SwStyleNameCache;
+typedef std::unordered_map< OUString,
+ StylePool::SfxItemSet_Pointer_t,
+ OUStringHash,
+ std::equal_to< OUString > > SwStyleNameCache;
class SwStyleCache
{
diff --git a/sw/source/core/inc/DocumentListsManager.hxx b/sw/source/core/inc/DocumentListsManager.hxx
index 37bdfaee68e3..83bfdd41e94a 100644
--- a/sw/source/core/inc/DocumentListsManager.hxx
+++ b/sw/source/core/inc/DocumentListsManager.hxx
@@ -22,7 +22,7 @@
#include <IDocumentListsAccess.hxx>
#include <boost/utility.hpp>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
class SwList;
class SwDoc;
@@ -56,7 +56,7 @@ class DocumentListsManager : public IDocumentListsAccess,
SwDoc& m_rDoc;
- typedef boost::unordered_map<OUString, SwList*, OUStringHash> tHashMapForLists;
+ typedef std::unordered_map<OUString, SwList*, OUStringHash> tHashMapForLists;
// container to hold the lists of the text document
tHashMapForLists maLists;
// relation between list style and its default list
diff --git a/sw/source/core/inc/MarkManager.hxx b/sw/source/core/inc/MarkManager.hxx
index 52fea0a07d91..4e820b5efbc4 100644
--- a/sw/source/core/inc/MarkManager.hxx
+++ b/sw/source/core/inc/MarkManager.hxx
@@ -22,8 +22,8 @@
#include <IMark.hxx>
#include <IDocumentMarkAccess.hxx>
-#include <boost/unordered_set.hpp>
-#include <boost/unordered_map.hpp>
+#include <unordered_set>
+#include <unordered_map>
namespace sw {
namespace mark {
@@ -109,7 +109,7 @@ namespace sw {
// additional container for fieldmarks
container_t m_vFieldmarks;
- boost::unordered_set<OUString, OUStringHash> m_aMarkNamesSet;
+ std::unordered_set<OUString, OUStringHash> m_aMarkNamesSet;
// container for annotation marks
container_t m_vAnnotationMarks;
diff --git a/sw/source/core/inc/layouter.hxx b/sw/source/core/inc/layouter.hxx
index c961bd8a72fa..0287c3b8ad22 100644
--- a/sw/source/core/inc/layouter.hxx
+++ b/sw/source/core/inc/layouter.hxx
@@ -20,6 +20,7 @@
#define INCLUDED_SW_SOURCE_CORE_INC_LAYOUTER_HXX
#include "swtypes.hxx"
+#include <unordered_map>
class SwEndnoter;
class SwDoc;
@@ -33,7 +34,6 @@ class SwTxtFrm;
class SwRowFrm;
class SwObjsMarkedAsTmpConsiderWrapInfluence;
class SwAnchoredObject;
-#include <boost/unordered_map.hpp>
class SwFlowFrm;
class SwLayoutFrm;
@@ -89,7 +89,7 @@ private:
p_key1.mnFreeSpaceInNewUpper == p_key2.mnFreeSpaceInNewUpper;
}
};
- boost::unordered_map< const tMoveBwdLayoutInfoKey, sal_uInt16,
+ std::unordered_map< const tMoveBwdLayoutInfoKey, sal_uInt16,
fMoveBwdLayoutInfoKeyHash,
fMoveBwdLayoutInfoKeyEq > maMoveBwdLayoutInfo;
public:
diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx
index 72b93371d4e7..d4fe261d74d4 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -175,7 +175,8 @@ public:
}
};
-typedef boost::unordered_map< OUString, OUString, OUStringHash > StringHashMap;
+typedef std::unordered_map< OUString, OUString, OUStringHash > StringHashMap;
+
class SwVbaProjectNameProvider : public ::cppu::WeakImplHelper1< container::XNameContainer >
{
StringHashMap mTemplateToProject;