diff options
author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-02-06 00:58:27 +0100 |
---|---|---|
committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-02-06 00:58:27 +0100 |
commit | ef0c79d924c5715cfb9adebe9fb1c3a2503d7fef (patch) | |
tree | 224eab9425a8b1a504451bdbabcdf356517c3f79 /sw/source | |
parent | 848b1a05c5c41b5e7ff19c984f60c297a8143990 (diff) |
port repository writer to boost unordered containers
Diffstat (limited to 'sw/source')
-rw-r--r-- | sw/source/core/access/accpara.hxx | 4 | ||||
-rw-r--r-- | sw/source/core/doc/docnew.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/doc/docnum.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/doc/number.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/doc/swstylemanager.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/inc/layouter.hxx | 4 | ||||
-rw-r--r-- | sw/source/core/unocore/unocoll.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/WW8TableInfo.hxx | 8 | ||||
-rw-r--r-- | sw/source/filter/xml/xmltbli.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/xml/xmltbli.hxx | 4 | ||||
-rw-r--r-- | sw/source/ui/vba/vbadocumentproperties.cxx | 6 | ||||
-rw-r--r-- | sw/source/ui/vba/vbadocumentproperties.hxx | 2 | ||||
-rw-r--r-- | sw/source/ui/vba/vbadocuments.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/vba/vbafont.cxx | 4 |
14 files changed, 26 insertions, 26 deletions
diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx index f8e6bb0624ea..0c8bbcde6175 100644 --- a/sw/source/core/access/accpara.hxx +++ b/sw/source/core/access/accpara.hxx @@ -35,7 +35,7 @@ #include <com/sun/star/accessibility/XAccessibleTextMarkup.hpp> #include <com/sun/star/accessibility/XAccessibleMultiLineText.hpp> #include <com/sun/star/accessibility/XAccessibleTextAttributes.hpp> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <accselectionhelper.hxx> #include <calbck.hxx> // #i108125# @@ -53,7 +53,7 @@ namespace com { namespace sun { namespace star { namespace accessibility { class XAccessibleHyperlink; } } } } -typedef ::std::hash_map< ::rtl::OUString, +typedef ::boost::unordered_map< ::rtl::OUString, ::com::sun::star::beans::PropertyValue, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > tAccParaPropValMap; diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx index 4549f0ec934e..fee0f23969d4 100644 --- a/sw/source/core/doc/docnew.cxx +++ b/sw/source/core/doc/docnew.cxx @@ -634,7 +634,7 @@ SwDoc::~SwDoc() delete pNumRuleTbl; { - for ( std::hash_map< String, SwList*, StringHash >::iterator + for ( boost::unordered_map< String, SwList*, StringHash >::iterator aListIter = maLists.begin(); aListIter != maLists.end(); ++aListIter ) diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx index fa30c58ceac0..e43fe517004d 100644 --- a/sw/source/core/doc/docnum.cxx +++ b/sw/source/core/doc/docnum.cxx @@ -2485,7 +2485,7 @@ SwList* SwDoc::getListByName( const String sListId ) const { SwList* pList = 0; - std::hash_map< String, SwList*, StringHash >::const_iterator + boost::unordered_map< String, SwList*, StringHash >::const_iterator aListIter = maLists.find( sListId ); if ( aListIter != maLists.end() ) { @@ -2535,7 +2535,7 @@ SwList* SwDoc::getListForListStyle( const String sListStyleName ) const { SwList* pList = 0; - std::hash_map< String, SwList*, StringHash >::const_iterator + boost::unordered_map< String, SwList*, StringHash >::const_iterator aListIter = maListStyleLists.find( sListStyleName ); if ( aListIter != maListStyleLists.end() ) { diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx index 6bf27d48a067..cda1f8494d28 100644 --- a/sw/source/core/doc/number.cxx +++ b/sw/source/core/doc/number.cxx @@ -54,7 +54,7 @@ #include <numrule.hxx> #include <SwNodeNum.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <list.hxx> #include <algorithm> @@ -164,7 +164,7 @@ void SwNumRule::RemoveTxtNode( SwTxtNode& rTxtNode ) } -void SwNumRule::SetNumRuleMap(std::hash_map<String, SwNumRule *, StringHash> * +void SwNumRule::SetNumRuleMap(boost::unordered_map<String, SwNumRule *, StringHash> * _pNumRuleMap) { pNumRuleMap = _pNumRuleMap; diff --git a/sw/source/core/doc/swstylemanager.cxx b/sw/source/core/doc/swstylemanager.cxx index 03dd5d65f8b7..ac67fd7fb89a 100644 --- a/sw/source/core/doc/swstylemanager.cxx +++ b/sw/source/core/doc/swstylemanager.cxx @@ -31,7 +31,7 @@ #include "swstylemanager.hxx" -#include <hash_map> +#include <boost/unordered_map.hpp> #include <svl/stylepool.hxx> #include <doc.hxx> #include <charfmt.hxx> @@ -39,7 +39,7 @@ #include <swtypes.hxx> #include <istyleaccess.hxx> -typedef ::std::hash_map< const ::rtl::OUString, +typedef ::boost::unordered_map< const ::rtl::OUString, StylePool::SfxItemSet_Pointer_t, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > SwStyleNameCache; diff --git a/sw/source/core/inc/layouter.hxx b/sw/source/core/inc/layouter.hxx index 3c4da1a97046..241fe542a94a 100644 --- a/sw/source/core/inc/layouter.hxx +++ b/sw/source/core/inc/layouter.hxx @@ -55,7 +55,7 @@ class SwFrm; // <-- // --> OD 2006-05-10 #i65250# #include <swtypes.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> class SwFlowFrm; class SwLayoutFrm; // <-- @@ -118,7 +118,7 @@ private: p_key1.mnFreeSpaceInNewUpper == p_key2.mnFreeSpaceInNewUpper; } }; - std::hash_map< const tMoveBwdLayoutInfoKey, sal_uInt16, + boost::unordered_map< const tMoveBwdLayoutInfoKey, sal_uInt16, fMoveBwdLayoutInfoKeyHash, fMoveBwdLayoutInfoKeyEq > maMoveBwdLayoutInfo; // <-- diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx index 58441564e5d2..a7ff473013af 100644 --- a/sw/source/core/unocore/unocoll.cxx +++ b/sw/source/core/unocore/unocoll.cxx @@ -173,7 +173,7 @@ public: } }; -typedef std::hash_map< rtl::OUString, rtl::OUString, rtl::OUStringHash > StringHashMap; +typedef boost::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash > StringHashMap; class SwVbaProjectNameProvider : public ::cppu::WeakImplHelper1< container::XNameContainer > { SwDocShell* mpDocShell; diff --git a/sw/source/filter/ww8/WW8TableInfo.hxx b/sw/source/filter/ww8/WW8TableInfo.hxx index bd913e93fe65..e3a12257a0d3 100644 --- a/sw/source/filter/ww8/WW8TableInfo.hxx +++ b/sw/source/filter/ww8/WW8TableInfo.hxx @@ -28,7 +28,7 @@ #ifndef WW8_TABLE_INFO_HXX #define WW8_TABLE_INFO_HXX -#include <hash_map> +#include <boost/unordered_map.hpp> #include <string> #include <map> #include <set> @@ -253,13 +253,13 @@ public: class WW8TableInfo { friend class WW8TableNodeInfoInner; - typedef hash_map<const SwNode *, WW8TableNodeInfo::Pointer_t, hashNode > Map_t; + typedef boost::unordered_map<const SwNode *, WW8TableNodeInfo::Pointer_t, hashNode > Map_t; Map_t mMap; - typedef hash_map<const SwTable *, WW8TableCellGrid::Pointer_t, hashTable > CellGridMap_t; + typedef boost::unordered_map<const SwTable *, WW8TableCellGrid::Pointer_t, hashTable > CellGridMap_t; CellGridMap_t mCellGridMap; - typedef hash_map<const SwTable *, const SwNode *, hashTable > FirstInTableMap_t; + typedef boost::unordered_map<const SwTable *, const SwNode *, hashTable > FirstInTableMap_t; FirstInTableMap_t mFirstInTableMap; WW8TableNodeInfo * diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index d07f1789a9dd..339016c496d9 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -78,7 +78,7 @@ using namespace ::com::sun::star::frame; using namespace ::com::sun::star::table; using namespace ::com::sun::star::xml::sax; using namespace ::xmloff::token; -using ::std::hash_map; +using ::boost::unordered_map; using rtl::OUString; enum SwXMLTableElemTokens diff --git a/sw/source/filter/xml/xmltbli.hxx b/sw/source/filter/xml/xmltbli.hxx index 7d7296b2ef19..c50201340b80 100644 --- a/sw/source/filter/xml/xmltbli.hxx +++ b/sw/source/filter/xml/xmltbli.hxx @@ -32,7 +32,7 @@ #include <xmloff/XMLTextTableContext.hxx> // STL include -#include <hash_map> +#include <boost/unordered_map.hpp> #if !defined(_SVSTDARR_USHORTS_DECL) || !defined(_SVSTDARR_BOOLS_DECL) || !defined(_SVSTDARR_STRINGSDTOR_DECL) #define _SVSTDARR_USHORTS @@ -88,7 +88,7 @@ class SwXMLTableContext : public XMLTextTableContext // hash map of shared format, indexed by the (XML) style name, // the column width, and protection flag - typedef std::hash_map<TableBoxIndex,SwTableBoxFmt*, + typedef boost::unordered_map<TableBoxIndex,SwTableBoxFmt*, TableBoxIndexHasher> map_BoxFmt; map_BoxFmt* pSharedBoxFormats; diff --git a/sw/source/ui/vba/vbadocumentproperties.cxx b/sw/source/ui/vba/vbadocumentproperties.cxx index 1b97e6cf383e..85913bfba166 100644 --- a/sw/source/ui/vba/vbadocumentproperties.cxx +++ b/sw/source/ui/vba/vbadocumentproperties.cxx @@ -236,7 +236,7 @@ public: }; -typedef std::hash_map< sal_Int32, DocPropInfo > MSOIndexToOODocPropInfo; +typedef boost::unordered_map< sal_Int32, DocPropInfo > MSOIndexToOODocPropInfo; class BuiltInIndexHelper { @@ -482,7 +482,7 @@ typedef ::cppu::WeakImplHelper3< com::sun::star::container::XIndexAccess ,com::sun::star::container::XEnumerationAccess > PropertiesImpl_BASE; -typedef std::hash_map< sal_Int32, uno::Reference< XDocumentProperty > > DocProps; +typedef boost::unordered_map< sal_Int32, uno::Reference< XDocumentProperty > > DocProps; typedef ::cppu::WeakImplHelper1< com::sun::star::container::XEnumeration > DocPropEnumeration_BASE; class DocPropEnumeration : public DocPropEnumeration_BASE @@ -504,7 +504,7 @@ public: } }; -typedef std::hash_map< rtl::OUString, uno::Reference< XDocumentProperty >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > DocPropsByName; +typedef boost::unordered_map< rtl::OUString, uno::Reference< XDocumentProperty >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > DocPropsByName; class BuiltInPropertiesImpl : public PropertiesImpl_BASE { diff --git a/sw/source/ui/vba/vbadocumentproperties.hxx b/sw/source/ui/vba/vbadocumentproperties.hxx index 7a3697771eaa..3f9a6c193741 100644 --- a/sw/source/ui/vba/vbadocumentproperties.hxx +++ b/sw/source/ui/vba/vbadocumentproperties.hxx @@ -31,7 +31,7 @@ #include <ooo/vba/XDocumentProperties.hpp> #include <com/sun/star/frame/XModel.hpp> #include <vbahelper/vbacollectionimpl.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> typedef CollTestImplHelper< ov::XDocumentProperties > SwVbaDocumentproperties_BASE; diff --git a/sw/source/ui/vba/vbadocuments.cxx b/sw/source/ui/vba/vbadocuments.cxx index de3c9bb1d060..51f6e882cb03 100644 --- a/sw/source/ui/vba/vbadocuments.cxx +++ b/sw/source/ui/vba/vbadocuments.cxx @@ -56,7 +56,7 @@ #include "vbadocuments.hxx" #include <vbahelper/vbahelper.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <osl/file.hxx> using namespace ::ooo::vba; using namespace ::com::sun::star; diff --git a/sw/source/ui/vba/vbafont.cxx b/sw/source/ui/vba/vbafont.cxx index 76803fa216e2..89ce1801c334 100644 --- a/sw/source/ui/vba/vbafont.cxx +++ b/sw/source/ui/vba/vbafont.cxx @@ -2,7 +2,7 @@ #include "vbafont.hxx" #include <com/sun/star/awt/FontUnderline.hpp> #include <ooo/vba/word/WdUnderline.hpp> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <sal/macros.h> #include <ooo/vba/word/WdColorIndex.hpp> @@ -39,7 +39,7 @@ static MapPair UnderLineTable[] = { { word::WdUnderline::wdUnderlineDashLongHeavy, com::sun::star::awt::FontUnderline::BOLDLONGDASH }, }; -typedef std::hash_map< sal_Int32, sal_Int32 > ConstToConst; +typedef boost::unordered_map< sal_Int32, sal_Int32 > ConstToConst; class UnderLineMapper { ConstToConst MSO2OOO; |