diff options
author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-02-06 10:37:38 +0100 |
---|---|---|
committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-02-06 10:37:38 +0100 |
commit | c49b647c0ad2b5f7e729b4b8f4d4c21629d0be0c (patch) | |
tree | 5c05613ee96ac58466c9c037e1bbe0348a780168 | |
parent | Update of the libxslt based xsltfilter implementation. (diff) | |
download | core-c49b647c0ad2b5f7e729b4b8f4d4c21629d0be0c.tar.gz core-c49b647c0ad2b5f7e729b4b8f4d4c21629d0be0c.zip |
sgi hash containers -> boost unordered containers
35 files changed, 67 insertions, 67 deletions
diff --git a/filter/inc/filter/msfilter/msocximex.hxx b/filter/inc/filter/msfilter/msocximex.hxx index afc7811c6a10..e88108d05363 100644 --- a/filter/inc/filter/msfilter/msocximex.hxx +++ b/filter/inc/filter/msfilter/msocximex.hxx @@ -38,7 +38,7 @@ //#endif #include "filter/msfilter/msfilterdllapi.h" #include <vector> -#include <hash_map> +#include <boost/unordered_map.hpp> namespace com{namespace sun{namespace star{ namespace drawing{ @@ -540,7 +540,7 @@ protected: com::sun::star::uno::Reference< com::sun::star::container::XNameContainer > mxParent; std::vector<OCX_Control*> mpControls; - std::hash_map<sal_uInt16, sal_uInt16> mActiveXIDMap; + boost::unordered_map<sal_uInt16, sal_uInt16> mActiveXIDMap; SotStorageRef mContainerStorage; SotStorageStreamRef mContainerStream; SotStorageStreamRef mContainedControlsStream; @@ -630,7 +630,7 @@ private: std::vector< rtl::OUString > sCaptions; // order of Ids corrosponds to the order of captions above std::vector< sal_Int32 > mPageIds; - std::hash_map< sal_Int32, OCX_Page* > idToPage; + boost::unordered_map< sal_Int32, OCX_Page* > idToPage; }; diff --git a/filter/inc/filter/msfilter/svxmsbas.hxx b/filter/inc/filter/msfilter/svxmsbas.hxx index 22d389b80ebd..76138ec6ebea 100644 --- a/filter/inc/filter/msfilter/svxmsbas.hxx +++ b/filter/inc/filter/msfilter/svxmsbas.hxx @@ -34,7 +34,7 @@ #include <sot/storage.hxx> #include <map> -#include <hash_map> +#include <boost/unordered_map.hpp> class SfxObjectShell; @@ -53,7 +53,7 @@ class SfxObjectShell; * probably what the user expects to see when viewing the code */ -typedef std::hash_map< sal_Int32, String > ObjIdToName; +typedef boost::unordered_map< sal_Int32, String > ObjIdToName; typedef std::map< String, ObjIdToName > ControlAttributeInfo; diff --git a/filter/source/config/cache/cacheitem.hxx b/filter/source/config/cache/cacheitem.hxx index 8ef1ac47b6a8..4080e43f7bd4 100644 --- a/filter/source/config/cache/cacheitem.hxx +++ b/filter/source/config/cache/cacheitem.hxx @@ -32,7 +32,7 @@ //_______________________________________________ // includes -#include <hash_map> +#include <boost/unordered_map.hpp> #include <deque> #include <list> #include <com/sun/star/uno/Any.h> @@ -190,7 +190,7 @@ class CacheItem : public ::comphelper::SequenceAsHashMap /** @short represent an item list of a FilterCache instance. */ -typedef ::std::hash_map< ::rtl::OUString , +typedef ::boost::unordered_map< ::rtl::OUString , CacheItem , ::rtl::OUStringHash , ::std::equal_to< ::rtl::OUString > > CacheItemList; @@ -209,7 +209,7 @@ typedef ::std::hash_map< ::rtl::OUString , there we need key-value pairs too, which cant be provided by a pur vector! */ -typedef ::std::hash_map< ::rtl::OUString , +typedef ::boost::unordered_map< ::rtl::OUString , OUStringList , ::rtl::OUStringHash , ::std::equal_to< ::rtl::OUString > > CacheItemRegistration; diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx index 76437181108b..505ebb45f99c 100644 --- a/filter/source/config/cache/filtercache.cxx +++ b/filter/source/config/cache/filtercache.cxx @@ -1418,7 +1418,7 @@ void FilterCache::impl_resolveItem4TypeRegistration( CacheItemList* pList throw(css::uno::Exception) { CacheItem& rItem = (*pList)[sItem]; - // In case its a new created entry (automaticly done by the hash_map index operator!) + // In case its a new created entry (automaticly done by the boost::unordered_map index operator!) // we must be shure, that this entry has its own name as property available. // Its needed later at our container interface! rItem[PROPNAME_NAME] <<= sItem; diff --git a/filter/source/config/cache/querytokenizer.hxx b/filter/source/config/cache/querytokenizer.hxx index c7c5caa747ee..c3cbbdb58b05 100644 --- a/filter/source/config/cache/querytokenizer.hxx +++ b/filter/source/config/cache/querytokenizer.hxx @@ -32,7 +32,7 @@ //_______________________________________________ // includes -#include <hash_map> +#include <boost/unordered_map.hpp> #include <rtl/ustring.hxx> //_______________________________________________ @@ -61,7 +61,7 @@ namespace filter{ @attention This class is not threadsafe implemented. Because its not neccessary. But you have to make shure, that ist not used as such :-) */ -class QueryTokenizer : public ::std::hash_map< ::rtl::OUString , +class QueryTokenizer : public ::boost::unordered_map< ::rtl::OUString , ::rtl::OUString , ::rtl::OUStringHash , ::std::equal_to< ::rtl::OUString > > diff --git a/filter/source/msfilter/msocximex.cxx b/filter/source/msfilter/msocximex.cxx index b4732b7bf4e0..c4465301865b 100644 --- a/filter/source/msfilter/msocximex.cxx +++ b/filter/source/msfilter/msocximex.cxx @@ -3912,7 +3912,7 @@ sal_Bool OCX_MultiPage::Import(com::sun::star::uno::Reference< // need to sort the controls according to the order of the ids for ( sal_Int32 index = 1 ; ( sCaptions.size() == idToPage.size() ) && itCtrlId != itCtrlId_end; ++itCtrlId, ++itCaption, ++index ) { - std::hash_map< sal_Int32, OCX_Page* >::iterator it = idToPage.find( *itCtrlId ); + boost::unordered_map< sal_Int32, OCX_Page* >::iterator it = idToPage.find( *itCtrlId ); if ( it != idToPage.end() ) { it->second->msTitle = *itCaption; diff --git a/filter/source/msfilter/svxmsbas.cxx b/filter/source/msfilter/svxmsbas.cxx index 7aabccd91dcd..e35439c79f11 100644 --- a/filter/source/msfilter/svxmsbas.cxx +++ b/filter/source/msfilter/svxmsbas.cxx @@ -379,9 +379,9 @@ BOOL SvxImportMSVBasic::ImportCode_Impl( VBA_Impl& aVBA, const std::vector< Stri catch( Exception& ) { } } } - typedef std::hash_map< rtl::OUString, uno::Any, ::rtl::OUStringHash, + typedef boost::unordered_map< rtl::OUString, uno::Any, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > NameModuleDataHash; - typedef std::hash_map< rtl::OUString, script::ModuleInfo, ::rtl::OUStringHash, + typedef boost::unordered_map< rtl::OUString, script::ModuleInfo, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > NameModuleInfoHash; NameModuleDataHash moduleData; diff --git a/filter/source/svg/gfxtypes.hxx b/filter/source/svg/gfxtypes.hxx index 8cad13556cdf..60e6a6c4bcc1 100644 --- a/filter/source/svg/gfxtypes.hxx +++ b/filter/source/svg/gfxtypes.hxx @@ -31,8 +31,8 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/polygon/b2dlinegeometry.hxx> -#include <hash_set> -#include <hash_map> +#include <boost/unordered_set.hpp> +#include <boost/unordered_map.hpp> #include <rtl/ustring.hxx> namespace svgi @@ -348,8 +348,8 @@ struct StateHash } }; -typedef std::hash_set<State, StateHash> StatePool; -typedef std::hash_map<sal_Int32, State> StateMap; +typedef boost::unordered_set<State, StateHash> StatePool; +typedef boost::unordered_map<sal_Int32, State> StateMap; } // namespace svgi diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx index d1025baea0bf..ef13731d7800 100644 --- a/filter/source/svg/svgfilter.hxx +++ b/filter/source/svg/svgfilter.hxx @@ -56,7 +56,7 @@ #include <com/sun/star/java/XJavaThreadRegister_11.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <osl/diagnose.h> #include <rtl/process.h> #include <tools/debug.hxx> @@ -175,7 +175,7 @@ class SVGFilter : public cppu::WeakImplHelper4 < XFilter, XExporter, XExtendedFilterDetection > { - typedef ::std::hash_map< Reference< XInterface >, ObjectRepresentation, HashReferenceXInterface > ObjectMap; + typedef ::boost::unordered_map< Reference< XInterface >, ObjectRepresentation, HashReferenceXInterface > ObjectMap; private: diff --git a/filter/source/svg/svgfontexport.hxx b/filter/source/svg/svgfontexport.hxx index 12c1733d1119..45a27e7aeaec 100644 --- a/filter/source/svg/svgfontexport.hxx +++ b/filter/source/svg/svgfontexport.hxx @@ -39,7 +39,7 @@ class SVGFontExport { - typedef ::std::hash_map< ::rtl::OUString, ::std::set< sal_Unicode >, ::comphelper::UStringHash > GlyphMap; + typedef ::boost::unordered_map< ::rtl::OUString, ::std::set< sal_Unicode >, ::comphelper::UStringHash > GlyphMap; typedef ::std::vector< ObjectRepresentation > ObjectVector; private: diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx index 3de63e2947d4..948036ef2e52 100644 --- a/filter/source/svg/svgreader.cxx +++ b/filter/source/svg/svgreader.cxx @@ -64,7 +64,7 @@ #include <tools/zcodec.hxx> #include <boost/bind.hpp> -#include <hash_set> +#include <boost/unordered_set.hpp> #include <map> #include <string.h> diff --git a/lotuswordpro/source/filter/lwpfoundry.hxx b/lotuswordpro/source/filter/lwpfoundry.hxx index 5dd0066548ec..765097ae10bd 100644 --- a/lotuswordpro/source/filter/lwpfoundry.hxx +++ b/lotuswordpro/source/filter/lwpfoundry.hxx @@ -317,7 +317,7 @@ private: } }; - typedef std::hash_map<LwpObjectID, IXFStyle*, hashFunc, eqFunc> LwpStyleMap; + typedef boost::unordered_map<LwpObjectID, IXFStyle*, hashFunc, eqFunc> LwpStyleMap; LwpStyleMap m_StyleList; public: void SetFoundry(LwpFoundry* pFoundry){m_pFoundry = pFoundry;} diff --git a/lotuswordpro/source/filter/lwpheader.hxx b/lotuswordpro/source/filter/lwpheader.hxx index 5d0910ccd1b7..36c1770e8575 100644 --- a/lotuswordpro/source/filter/lwpheader.hxx +++ b/lotuswordpro/source/filter/lwpheader.hxx @@ -68,7 +68,7 @@ #include <math.h> #include <vector> #include <memory> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <map> #include <assert.h> #include <string> diff --git a/lotuswordpro/source/filter/lwpobjfactory.hxx b/lotuswordpro/source/filter/lwpobjfactory.hxx index bbdf48b8bdea..16c0cd13c9e9 100644 --- a/lotuswordpro/source/filter/lwpobjfactory.hxx +++ b/lotuswordpro/source/filter/lwpobjfactory.hxx @@ -101,7 +101,7 @@ private: return(rKey1==rKey2); } }; - typedef std::hash_map<LwpObjectID, LwpObject *, hashFunc, eqFunc> LwpObjMap; + typedef boost::unordered_map<LwpObjectID, LwpObject *, hashFunc, eqFunc> LwpObjMap; LwpObjMap m_ObjList; LwpIndexManager m_IndexMgr; void ClearObjectMap(); diff --git a/oox/inc/oox/export/chartexport.hxx b/oox/inc/oox/export/chartexport.hxx index 8d15e99b641e..8c20d50d0082 100644 --- a/oox/inc/oox/export/chartexport.hxx +++ b/oox/inc/oox/export/chartexport.hxx @@ -36,7 +36,7 @@ #include <oox/export/drawingml.hxx> #include <sax/fshelper.hxx> #include <vcl/mapmod.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <map> namespace com { namespace sun { namespace star { diff --git a/oox/inc/oox/export/shapes.hxx b/oox/inc/oox/export/shapes.hxx index 89c4860c61ad..da7d476cc790 100644 --- a/oox/inc/oox/export/shapes.hxx +++ b/oox/inc/oox/export/shapes.hxx @@ -34,7 +34,7 @@ #include <oox/export/drawingml.hxx> #include <sax/fshelper.hxx> #include <vcl/mapmod.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> namespace com { namespace sun { namespace star { namespace beans { @@ -67,7 +67,7 @@ private: }; public: - typedef std::hash_map< const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape>, sal_Int32, ShapeHash, ShapeCheck> ShapeHashMap; + typedef boost::unordered_map< const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape>, sal_Int32, ShapeHash, ShapeCheck> ShapeHashMap; protected: sal_Int32 mnShapeIdMax, mnPictureIdMax; diff --git a/oox/inc/oox/xls/webquerybuffer.hxx b/oox/inc/oox/xls/webquerybuffer.hxx index a2e4dabba72b..483edf993e7c 100644 --- a/oox/inc/oox/xls/webquerybuffer.hxx +++ b/oox/inc/oox/xls/webquerybuffer.hxx @@ -30,7 +30,7 @@ #define OOX_XLS_WEBQUERYBUFFER_HXX #include <vector> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <boost/shared_ptr.hpp> #include <com/sun/star/table/CellRangeAddress.hpp> #include "oox/xls/workbookhelper.hxx" @@ -96,7 +96,7 @@ struct Connection // ============================================================================ -typedef ::std::hash_map< ::rtl::OUString, QueryTable, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > QueryTableHashMap; +typedef ::boost::unordered_map< ::rtl::OUString, QueryTable, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > QueryTableHashMap; class WebQueryBuffer : public WorkbookHelper { diff --git a/oox/source/drawingml/customshapegeometry.cxx b/oox/source/drawingml/customshapegeometry.cxx index d1e86de16e9b..1691aae3af25 100644 --- a/oox/source/drawingml/customshapegeometry.cxx +++ b/oox/source/drawingml/customshapegeometry.cxx @@ -30,7 +30,7 @@ #include <com/sun/star/xml/sax/FastToken.hpp> #include <comphelper/stl_types.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> #include "oox/helper/helper.hxx" #include "oox/helper/attributelist.hxx" #include "oox/token/tokenmap.hxx" @@ -94,7 +94,7 @@ static FormularCommandNameTable pFormularCommandNameTable[] = { "val", FC_VAL } }; -typedef std::hash_map< rtl::OUString, FormularCommand, comphelper::UStringHash, comphelper::UStringEqual > FormulaCommandHMap; +typedef boost::unordered_map< rtl::OUString, FormularCommand, comphelper::UStringHash, comphelper::UStringEqual > FormulaCommandHMap; static const FormulaCommandHMap* pCommandHashMap; diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx index c547aa59cc83..9c3a56457a3f 100644 --- a/oox/source/export/shapes.cxx +++ b/oox/source/export/shapes.cxx @@ -326,7 +326,7 @@ struct StringCheck } }; -typedef std::hash_map< const char*, const char*, std::hash<const char*>, StringCheck> CustomShapeTypeTranslationHashMap; +typedef boost::unordered_map< const char*, const char*, std::hash<const char*>, StringCheck> CustomShapeTypeTranslationHashMap; static CustomShapeTypeTranslationHashMap* pCustomShapeTypeTranslationHashMap = NULL; static const char* lcl_GetPresetGeometry( const char* sShapeType ) @@ -869,7 +869,7 @@ ShapeExport& ShapeExport::WriteRectangleShape( Reference< XShape > xShape ) } typedef ShapeExport& (ShapeExport::*ShapeConverter)( Reference< XShape > ); -typedef std::hash_map< const char*, ShapeConverter, std::hash<const char*>, StringCheck> NameToConvertMapType; +typedef boost::unordered_map< const char*, ShapeConverter, std::hash<const char*>, StringCheck> NameToConvertMapType; static const NameToConvertMapType& lcl_GetConverters() { diff --git a/oox/source/ole/vbamodule.cxx b/oox/source/ole/vbamodule.cxx index 310f86572ce8..1043b59b65f4 100644 --- a/oox/source/ole/vbamodule.cxx +++ b/oox/source/ole/vbamodule.cxx @@ -27,7 +27,7 @@ ************************************************************************/ #include "oox/ole/vbamodule.hxx" -#include <hash_map> +#include <boost/unordered_map.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/script/ModuleInfo.hpp> @@ -56,7 +56,7 @@ using ::rtl::OUString; using ::rtl::OUStringBuffer; // ============================================================================ typedef ::cppu::WeakImplHelper1< XIndexContainer > OleIdToNameContainer_BASE; -typedef std::hash_map< sal_Int32, rtl::OUString > ObjIdToName; +typedef boost::unordered_map< sal_Int32, rtl::OUString > ObjIdToName; class OleIdToNameContainer : public OleIdToNameContainer_BASE { diff --git a/unoxml/source/dom/node.hxx b/unoxml/source/dom/node.hxx index be84ee49087c..d880eab60c75 100644 --- a/unoxml/source/dom/node.hxx +++ b/unoxml/source/dom/node.hxx @@ -56,7 +56,7 @@ #include <libxml/tree.h> #include <map> -#include <hash_map> +#include <boost/unordered_map.hpp> using ::rtl::OUString; using ::rtl::OString; @@ -92,7 +92,7 @@ namespace DOM }; typedef std::vector< std::vector<Namespace> > NamespaceVectorType; - typedef std::hash_map< OUString, + typedef boost::unordered_map< OUString, sal_Int32, rtl::OUStringHash > NamespaceMapType; diff --git a/writerfilter/inc/resourcemodel/TagLogger.hxx b/writerfilter/inc/resourcemodel/TagLogger.hxx index 4af36ea8777c..e6de7b8835fd 100644 --- a/writerfilter/inc/resourcemodel/TagLogger.hxx +++ b/writerfilter/inc/resourcemodel/TagLogger.hxx @@ -36,7 +36,7 @@ #include <WriterFilterDllApi.hxx> #include <resourcemodel/WW8ResourceModel.hxx> #include <string> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <boost/shared_ptr.hpp> #include <libxml/xmlwriter.h> diff --git a/writerfilter/qa/cppunittests/qname/testQName.cxx b/writerfilter/qa/cppunittests/qname/testQName.cxx index fc465c703fd2..11cbd18232f4 100644 --- a/writerfilter/qa/cppunittests/qname/testQName.cxx +++ b/writerfilter/qa/cppunittests/qname/testQName.cxx @@ -32,7 +32,7 @@ #include <rtl/string.hxx> #include <rtl/random.h> #include <osl/time.h> -#include <hash_set> +#include <boost/unordered_set.hpp> #include <stdexcept> diff --git a/writerfilter/source/doctok/WW8BinTableImpl.hxx b/writerfilter/source/doctok/WW8BinTableImpl.hxx index 0203285069b6..fb9b7100746a 100644 --- a/writerfilter/source/doctok/WW8BinTableImpl.hxx +++ b/writerfilter/source/doctok/WW8BinTableImpl.hxx @@ -33,7 +33,7 @@ #include <WW8BinTable.hxx> #include <PLCF.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> namespace writerfilter { namespace doctok @@ -74,7 +74,7 @@ class WW8BinTableImpl : public WW8BinTable { /// PLCF containing the numbers of the FKPs of the binary table PLCF<PageNumber> mData; - mutable hash_map<Fc, sal_uInt32, FcHash> mPageMap; + mutable boost::unordered_map<Fc, sal_uInt32, FcHash> mPageMap; public: WW8BinTableImpl(WW8Stream & rStream, sal_uInt32 nOffset, diff --git a/writerfilter/source/doctok/WW8CpAndFc.hxx b/writerfilter/source/doctok/WW8CpAndFc.hxx index 810809d85ae5..2ff63292bfae 100644 --- a/writerfilter/source/doctok/WW8CpAndFc.hxx +++ b/writerfilter/source/doctok/WW8CpAndFc.hxx @@ -32,7 +32,7 @@ #include <sal/types.h> #include <doctok/WW8Document.hxx> #include <set> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <iostream> namespace writerfilter { @@ -351,7 +351,7 @@ struct CpAndFcHash } }; -typedef hash_map<Cp, Fc, CpHash, CpEq> Cp2FcHashMap_t; +typedef boost::unordered_map<Cp, Fc, CpHash, CpEq> Cp2FcHashMap_t; } // namespace doctok } // namespace writerfilter diff --git a/writerfilter/source/doctok/WW8DocumentImpl.hxx b/writerfilter/source/doctok/WW8DocumentImpl.hxx index 90177cf64a77..04e364677326 100644 --- a/writerfilter/source/doctok/WW8DocumentImpl.hxx +++ b/writerfilter/source/doctok/WW8DocumentImpl.hxx @@ -167,7 +167,7 @@ public: class ShapeHelper { public: - typedef hash_map<CpAndFc, WW8FSPA::Pointer_t, CpAndFcHash> Map_t; + typedef boost::unordered_map<CpAndFc, WW8FSPA::Pointer_t, CpAndFcHash> Map_t; private: WW8DocumentImpl * mpDoc; @@ -192,7 +192,7 @@ public: class FieldHelper { public: - typedef hash_map<CpAndFc, WW8FLD::Pointer_t, + typedef boost::unordered_map<CpAndFc, WW8FLD::Pointer_t, CpAndFcHash> Map_t; private: @@ -218,7 +218,7 @@ public: class BreakHelper { public: - typedef hash_map<CpAndFc, WW8BKD::Pointer_t, + typedef boost::unordered_map<CpAndFc, WW8BKD::Pointer_t, CpAndFcHash> Map_t; private: WW8DocumentImpl * mpDoc; diff --git a/writerfilter/source/ooxml/OOXMLFactory.hxx b/writerfilter/source/ooxml/OOXMLFactory.hxx index 12f46ee98b4b..f4510474c807 100644 --- a/writerfilter/source/ooxml/OOXMLFactory.hxx +++ b/writerfilter/source/ooxml/OOXMLFactory.hxx @@ -29,7 +29,7 @@ #ifndef INCLUDED_OOXML_FACTORY_HXX #define INCLUDED_OOXML_FACTORY_HXX -#include <hash_map> +#include <boost/unordered_map.hpp> #include <boost/shared_ptr.hpp> #include <resourcemodel/WW8ResourceModel.hxx> @@ -73,13 +73,13 @@ struct AttributeInfo AttributeInfo(); }; -typedef hash_map<Token_t, AttributeInfo> AttributeToResourceMap; +typedef boost::unordered_map<Token_t, AttributeInfo> AttributeToResourceMap; typedef boost::shared_ptr<AttributeToResourceMap> AttributeToResourceMapPointer; -typedef hash_map<Id, AttributeToResourceMapPointer> AttributesMap; +typedef boost::unordered_map<Id, AttributeToResourceMapPointer> AttributesMap; -typedef hash_map<rtl::OUString, sal_Int32, ::rtl::OUStringHash> ListValueMap; +typedef boost::unordered_map<rtl::OUString, sal_Int32, ::rtl::OUStringHash> ListValueMap; typedef boost::shared_ptr<ListValueMap> ListValueMapPointer; -typedef hash_map<Id, ListValueMapPointer> ListValuesMap; +typedef boost::unordered_map<Id, ListValueMapPointer> ListValuesMap; struct CreateElement { @@ -90,15 +90,15 @@ struct CreateElement CreateElement(); }; -typedef hash_map<Token_t, CreateElement> CreateElementMap; +typedef boost::unordered_map<Token_t, CreateElement> CreateElementMap; typedef boost::shared_ptr<CreateElementMap> CreateElementMapPointer; -typedef hash_map<Id, CreateElementMapPointer> CreateElementsMap; -typedef hash_map<Id, string> IdToStringMap; +typedef boost::unordered_map<Id, CreateElementMapPointer> CreateElementsMap; +typedef boost::unordered_map<Id, string> IdToStringMap; typedef boost::shared_ptr<IdToStringMap> IdToStringMapPointer; -typedef hash_map<Id, Token_t> TokenToIdMap; +typedef boost::unordered_map<Id, Token_t> TokenToIdMap; typedef boost::shared_ptr<TokenToIdMap> TokenToIdMapPointer; -typedef hash_map<Id, TokenToIdMapPointer> TokenToIdsMap; +typedef boost::unordered_map<Id, TokenToIdMapPointer> TokenToIdsMap; class OOXMLFactory_ns { public: diff --git a/writerfilter/source/resourcemodel/TagLogger.cxx b/writerfilter/source/resourcemodel/TagLogger.cxx index d6ff3019012a..15786951c131 100644 --- a/writerfilter/source/resourcemodel/TagLogger.cxx +++ b/writerfilter/source/resourcemodel/TagLogger.cxx @@ -43,7 +43,7 @@ namespace writerfilter } }; - typedef hash_map<const char *, TagLogger::Pointer_t, hash<const char *>, eqstr> TagLoggerHashMap_t; + typedef boost::unordered_map<const char *, TagLogger::Pointer_t, hash<const char *>, eqstr> TagLoggerHashMap_t; static TagLoggerHashMap_t * tagLoggers = NULL; TagLogger::TagLogger(const char* name) diff --git a/writerfilter/source/resourcemodel/WW8Analyzer.hxx b/writerfilter/source/resourcemodel/WW8Analyzer.hxx index f2dc392b4ec8..521ccc765eeb 100644 --- a/writerfilter/source/resourcemodel/WW8Analyzer.hxx +++ b/writerfilter/source/resourcemodel/WW8Analyzer.hxx @@ -31,7 +31,7 @@ #include <resourcemodel/WW8ResourceModel.hxx> -#include <hash_set> +#include <boost/unordered_set.hpp> #include <map> namespace writerfilter @@ -48,7 +48,7 @@ class WW8Analyzer : public Properties, public Table, { typedef map<sal_uInt32, sal_uInt32> SprmMap; - typedef hash_set<sal_uInt32, hash<sal_uInt32>, eqSalUInt32> IdSet; + typedef boost::unordered_set<sal_uInt32, hash<sal_uInt32>, eqSalUInt32> IdSet; typedef map<Id, sal_uInt32> AttributeMap; mutable SprmMap mSprmMap; diff --git a/writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx b/writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx index 25f5f245bce6..5ba20a706547 100644 --- a/writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx +++ b/writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx @@ -39,7 +39,7 @@ #include <com/sun/star/ucb/XSimpleFileAccess.hpp> #include <osl/process.h> #include <rtl/string.hxx> -#include <hash_set> +#include <boost/unordered_set.hpp> #include <assert.h> #include <cppuhelper/implbase2.hxx> #include <com/sun/star/embed/XTransactedObject.hpp> diff --git a/writerfilter/unocomponent/debugservices/doctok/DocTokTestService.cxx b/writerfilter/unocomponent/debugservices/doctok/DocTokTestService.cxx index dd0827e8e3cd..926a9dcf9c8a 100644 --- a/writerfilter/unocomponent/debugservices/doctok/DocTokTestService.cxx +++ b/writerfilter/unocomponent/debugservices/doctok/DocTokTestService.cxx @@ -39,7 +39,7 @@ #include <com/sun/star/ucb/XSimpleFileAccess.hpp> #include <osl/process.h> #include <rtl/string.hxx> -#include <hash_set> +#include <boost/unordered_set.hpp> #include <assert.h> #include <cppuhelper/implbase2.hxx> #include <com/sun/star/embed/XTransactedObject.hpp> diff --git a/writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.cxx b/writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.cxx index f67d894a329c..d002ff39ddad 100644 --- a/writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.cxx +++ b/writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.cxx @@ -41,7 +41,7 @@ #include <com/sun/star/ucb/XSimpleFileAccess.hpp> #include <osl/process.h> #include <rtl/string.hxx> -#include <hash_set> +#include <boost/unordered_set.hpp> #include <assert.h> #include <cppuhelper/implbase2.hxx> #include <com/sun/star/embed/XTransactedObject.hpp> diff --git a/writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.cxx b/writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.cxx index 352e00a346d9..45d3fe86abd1 100644 --- a/writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.cxx +++ b/writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.cxx @@ -44,7 +44,7 @@ #include <com/sun/star/ucb/XSimpleFileAccess.hpp> #include <osl/process.h> #include <rtl/string.hxx> -#include <hash_set> +#include <boost/unordered_set.hpp> #include <assert.h> #include <cppuhelper/implbase2.hxx> #include <cppuhelper/bootstrap.hxx> diff --git a/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx b/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx index 281c228865f7..c0726fb44c73 100644 --- a/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx +++ b/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx @@ -42,7 +42,7 @@ #include <com/sun/star/ucb/XSimpleFileAccess.hpp> #include <osl/process.h> #include <rtl/string.hxx> -#include <hash_set> +#include <boost/unordered_set.hpp> #include <assert.h> #include <cppuhelper/implbase2.hxx> #include <com/sun/star/embed/XTransactedObject.hpp> @@ -75,7 +75,7 @@ struct ScannerTestServiceHelper } }; -typedef ::std::hash_set< ::rtl::OString, ScannerTestServiceHelper, ScannerTestServiceHelper > ScannerTestServiceTokenMap; +typedef ::boost::unordered_set< ::rtl::OString, ScannerTestServiceHelper, ScannerTestServiceHelper > ScannerTestServiceTokenMap; class MyRtfScannerHandler : public writerfilter::rtftok::RTFScannerHandler { diff --git a/writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx b/writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx index 86a61aa6fbbe..8214dc240ffa 100644 --- a/writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx +++ b/writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx @@ -42,7 +42,7 @@ #include <com/sun/star/ucb/XSimpleFileAccess.hpp> #include <osl/process.h> #include <rtl/string.hxx> -#include <hash_set> +#include <boost/unordered_set.hpp> #include <assert.h> #include <string> #include <cppuhelper/implbase2.hxx> |