[Libreoffice-commits] .: binfilter/bf_forms binfilter/bf_sfx2 binfilter/bf_svtools binfilter/bf_svx binfilter/bf_sw binfilter/bf_xmloff binfilter/inc binfilter/legacysmgr filter/inc filter/source lotuswordpro/source oox/inc oox/source unoxml/source writerfilter/inc writerfilter/qa writerfilter/source writerfilter/unocomponent
Fridrich Strba
fridrich at kemper.freedesktop.org
Sun Feb 6 03:18:29 PST 2011
binfilter/bf_forms/source/inc/InterfaceContainer.hxx | 4 +-
binfilter/bf_sfx2/source/inc/namecont.hxx | 4 +-
binfilter/bf_svtools/source/config/svt_cmdoptions.cxx | 16 +-------
binfilter/bf_svtools/source/config/svt_extendedsecurityoptions.cxx | 4 +-
binfilter/bf_svtools/source/config/svt_optionsdlg.cxx | 4 +-
binfilter/bf_svtools/source/config/svt_pathoptions.cxx | 8 ++--
binfilter/bf_svtools/source/config/svt_viewoptions.cxx | 4 +-
binfilter/bf_svx/source/inc/fmcontr.hxx | 2 -
binfilter/bf_svx/source/unodraw/svx_unoipset.cxx | 6 +--
binfilter/bf_svx/source/unodraw/svx_unomod.cxx | 2 -
binfilter/bf_svx/source/unodraw/svx_unoprov.cxx | 4 +-
binfilter/bf_sw/source/filter/xml/sw_xmltbli.cxx | 2 -
binfilter/bf_sw/source/filter/xml/xmltbli.hxx | 4 +-
binfilter/bf_xmloff/source/core/xmloff_nmspmap.cxx | 2 -
binfilter/bf_xmloff/source/style/xmloff_xmlexppr.cxx | 4 +-
binfilter/inc/bf_sc/addincol.hxx | 4 +-
binfilter/inc/bf_sc/compiler.hxx | 4 +-
binfilter/inc/bf_sw/SwStyleNameMapper.hxx | 4 +-
binfilter/inc/bf_xmloff/SinglePropertySetInfoCache.hxx | 4 +-
binfilter/inc/bf_xmloff/nmspmap.hxx | 6 +--
binfilter/legacysmgr/source/legacy/legacy_binfilters_smgr.cxx | 12 +++---
filter/inc/filter/msfilter/msocximex.hxx | 6 +--
filter/inc/filter/msfilter/svxmsbas.hxx | 4 +-
filter/source/config/cache/cacheitem.hxx | 6 +--
filter/source/config/cache/filtercache.cxx | 2 -
filter/source/config/cache/querytokenizer.hxx | 4 +-
filter/source/msfilter/msocximex.cxx | 2 -
filter/source/msfilter/svxmsbas.cxx | 4 +-
filter/source/svg/gfxtypes.hxx | 8 ++--
filter/source/svg/svgfilter.hxx | 4 +-
filter/source/svg/svgfontexport.hxx | 2 -
filter/source/svg/svgreader.cxx | 2 -
lotuswordpro/source/filter/lwpfoundry.hxx | 2 -
lotuswordpro/source/filter/lwpheader.hxx | 2 -
lotuswordpro/source/filter/lwpobjfactory.hxx | 2 -
oox/inc/oox/export/chartexport.hxx | 2 -
oox/inc/oox/export/shapes.hxx | 4 +-
oox/inc/oox/xls/webquerybuffer.hxx | 4 +-
oox/source/drawingml/customshapegeometry.cxx | 4 +-
oox/source/export/shapes.cxx | 4 +-
oox/source/ole/vbamodule.cxx | 4 +-
unoxml/source/dom/node.hxx | 4 +-
writerfilter/inc/resourcemodel/TagLogger.hxx | 2 -
writerfilter/qa/cppunittests/qname/testQName.cxx | 2 -
writerfilter/source/doctok/WW8BinTableImpl.hxx | 4 +-
writerfilter/source/doctok/WW8CpAndFc.hxx | 4 +-
writerfilter/source/doctok/WW8DocumentImpl.hxx | 6 +--
writerfilter/source/ooxml/OOXMLFactory.hxx | 20 +++++-----
writerfilter/source/resourcemodel/TagLogger.cxx | 2 -
writerfilter/source/resourcemodel/WW8Analyzer.hxx | 4 +-
writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx | 2 -
writerfilter/unocomponent/debugservices/doctok/DocTokTestService.cxx | 2 -
writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.cxx | 2 -
writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.cxx | 2 -
writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx | 4 +-
writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx | 2 -
56 files changed, 113 insertions(+), 125 deletions(-)
New commits:
commit 8d29cee2c8d727b406ebd6cea003df52dd1d853c
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Sun Feb 6 10:37:38 2011 +0100
sgi hash containers -> boost unordered containers
diff --git a/binfilter/bf_forms/source/inc/InterfaceContainer.hxx b/binfilter/bf_forms/source/inc/InterfaceContainer.hxx
index 484896f..3d7f081 100644
--- a/binfilter/bf_forms/source/inc/InterfaceContainer.hxx
+++ b/binfilter/bf_forms/source/inc/InterfaceContainer.hxx
@@ -29,7 +29,7 @@
#ifndef _FRM_INTERFACE_CONTAINER_HXX_
#define _FRM_INTERFACE_CONTAINER_HXX_
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <comphelper/stl_types.hxx>
#include <comphelper/uno3.hxx>
@@ -75,7 +75,7 @@ namespace frm
};
typedef ::std::vector<InterfaceRef> OInterfaceArray;
-typedef ::std::hash_multimap< ::rtl::OUString, InterfaceRef, ::comphelper::UStringHash, ::comphelper::UStringEqual> OInterfaceMap;
+typedef ::boost::unordered_multimap< ::rtl::OUString, InterfaceRef, ::comphelper::UStringHash, ::comphelper::UStringEqual> OInterfaceMap;
//==================================================================
// OInterfaceContainer
diff --git a/binfilter/bf_sfx2/source/inc/namecont.hxx b/binfilter/bf_sfx2/source/inc/namecont.hxx
index 29d01f0..7b236db 100644
--- a/binfilter/bf_sfx2/source/inc/namecont.hxx
+++ b/binfilter/bf_sfx2/source/inc/namecont.hxx
@@ -29,7 +29,7 @@
#ifndef _SFX_NAMECONT_HXX
#define _SFX_NAMECONT_HXX
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
@@ -87,7 +87,7 @@ struct eqName_Impl
}
};
-typedef std::hash_map
+typedef boost::unordered_map
<
::rtl::OUString,
sal_Int32,
diff --git a/binfilter/bf_svtools/source/config/svt_cmdoptions.cxx b/binfilter/bf_svtools/source/config/svt_cmdoptions.cxx
index f2c90dc..0aa3089 100644
--- a/binfilter/bf_svtools/source/config/svt_cmdoptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_cmdoptions.cxx
@@ -54,7 +54,7 @@
#include <itemholder1.hxx>
#include <algorithm>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
//_________________________________________________________________________________________________________________
// namespaces
@@ -116,11 +116,6 @@ class SvtCmdOptions
return ( m_aCommandHashMap.size() > 0 );
}
- void SetContainerSize( sal_Int32 nSize )
- {
- m_aCommandHashMap.resize( nSize );
- }
-
sal_Bool Lookup( const OUString& aCmd ) const
{
CommandHashMap::const_iterator pEntry = m_aCommandHashMap.find( aCmd );
@@ -154,7 +149,7 @@ class SvtCmdOptions
}
private:
- class CommandHashMap : public ::std::hash_map< ::rtl::OUString ,
+ class CommandHashMap : public ::boost::unordered_map< ::rtl::OUString ,
sal_Int32 ,
OUStringHashCode ,
::std::equal_to< ::rtl::OUString > >
@@ -278,9 +273,6 @@ SvtCommandOptions_Impl::SvtCommandOptions_Impl()
sal_Int32 nItem = 0 ;
OUString sCmd ;
- // Set size of hash_map reach a used size of approx. 60%
- m_aDisabledCommands.SetContainerSize( lNames.getLength() * 10 / 6 );
-
// Get names/values for disabled commands.
for( nItem=0; nItem < lNames.getLength(); ++nItem )
{
@@ -329,10 +321,6 @@ void SvtCommandOptions_Impl::Notify( const Sequence< OUString >& )
sal_Int32 nItem = 0 ;
OUString sCmd ;
- // Set size of hash_map reach a used size of approx. 60%
- m_aDisabledCommands.Clear();
- m_aDisabledCommands.SetContainerSize( lNames.getLength() * 10 / 6 );
-
// Get names/values for disabled commands.
for( nItem=0; nItem < lNames.getLength(); ++nItem )
{
diff --git a/binfilter/bf_svtools/source/config/svt_extendedsecurityoptions.cxx b/binfilter/bf_svtools/source/config/svt_extendedsecurityoptions.cxx
index 54ff579..e4d8e38 100644
--- a/binfilter/bf_svtools/source/config/svt_extendedsecurityoptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_extendedsecurityoptions.cxx
@@ -43,7 +43,7 @@
#include <tools/wldcrd.hxx>
#include <rtl/ustrbuf.hxx>
#include <bf_svtools/pathoptions.hxx>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <rtl/logfile.hxx>
#include "itemholder1.hxx"
@@ -82,7 +82,7 @@ struct OUStringHashCode
}
};
-class ExtensionHashMap : public ::std::hash_map< ::rtl::OUString,
+class ExtensionHashMap : public ::boost::unordered_map< ::rtl::OUString,
sal_Int32,
OUStringHashCode,
::std::equal_to< ::rtl::OUString > >
diff --git a/binfilter/bf_svtools/source/config/svt_optionsdlg.cxx b/binfilter/bf_svtools/source/config/svt_optionsdlg.cxx
index 8a95581..c9bbfe6 100644
--- a/binfilter/bf_svtools/source/config/svt_optionsdlg.cxx
+++ b/binfilter/bf_svtools/source/config/svt_optionsdlg.cxx
@@ -40,7 +40,7 @@
#include <osl/mutex.hxx>
#include <comphelper/stl_types.hxx>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include "itemholder1.hxx"
using namespace utl;
@@ -71,7 +71,7 @@ private:
}
};
- typedef std::hash_map< OUString, sal_Bool, OUStringHashCode, ::std::equal_to< OUString > > OptionNodeList;
+ typedef boost::unordered_map< OUString, sal_Bool, OUStringHashCode, ::std::equal_to< OUString > > OptionNodeList;
OUString m_sPathDelimiter;
OptionNodeList m_aOptionNodeList;
diff --git a/binfilter/bf_svtools/source/config/svt_pathoptions.cxx b/binfilter/bf_svtools/source/config/svt_pathoptions.cxx
index 0092b62..dd27a0e 100644
--- a/binfilter/bf_svtools/source/config/svt_pathoptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_pathoptions.cxx
@@ -61,7 +61,7 @@
#include <itemholder1.hxx>
#include <vector>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
using namespace osl;
using namespace utl;
@@ -115,19 +115,19 @@ enum VarNameProperty
VAR_NEEDS_FILEURL
};
-class NameToHandleMap : public ::std::hash_map< ::rtl::OUString, sal_Int32, OUStringHashCode, ::std::equal_to< ::rtl::OUString > >
+class NameToHandleMap : public ::boost::unordered_map< ::rtl::OUString, sal_Int32, OUStringHashCode, ::std::equal_to< ::rtl::OUString > >
{
public:
inline void free() { NameToHandleMap().swap( *this ); }
};
-class EnumToHandleMap : public ::std::hash_map< sal_Int32, sal_Int32, std::hash< sal_Int32 >, std::equal_to< sal_Int32 > >
+class EnumToHandleMap : public ::boost::unordered_map< sal_Int32, sal_Int32, std::hash< sal_Int32 >, std::equal_to< sal_Int32 > >
{
public:
inline void free() { EnumToHandleMap().swap( *this ); }
};
-class VarNameToEnumMap : public ::std::hash_map< OUString, VarNameProperty, OUStringHashCode, ::std::equal_to< OUString > >
+class VarNameToEnumMap : public ::boost::unordered_map< OUString, VarNameProperty, OUStringHashCode, ::std::equal_to< OUString > >
{
public:
inline void free() { VarNameToEnumMap().swap( *this ); }
diff --git a/binfilter/bf_svtools/source/config/svt_viewoptions.cxx b/binfilter/bf_svtools/source/config/svt_viewoptions.cxx
index eb11c10..76ad002 100644
--- a/binfilter/bf_svtools/source/config/svt_viewoptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_viewoptions.cxx
@@ -34,7 +34,7 @@
#include <bf_svtools/viewoptions.hxx>
#include <com/sun/star/uno/Any.hxx>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
@@ -274,7 +274,7 @@ struct IMPL_TStringHashCode
}
};
-typedef ::std::hash_map< ::rtl::OUString ,
+typedef ::boost::unordered_map< ::rtl::OUString ,
IMPL_TViewData ,
IMPL_TStringHashCode ,
::std::equal_to< ::rtl::OUString > > IMPL_TViewHash;
diff --git a/binfilter/bf_svx/source/inc/fmcontr.hxx b/binfilter/bf_svx/source/inc/fmcontr.hxx
index 1afb373..fe170ab 100644
--- a/binfilter/bf_svx/source/inc/fmcontr.hxx
+++ b/binfilter/bf_svx/source/inc/fmcontr.hxx
@@ -45,7 +45,7 @@
#include <com/sun/star/lang/EventObject.hpp>
namespace binfilter {
-typedef ::std::hash_multimap< ::rtl::OUString, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > , ::comphelper::UStringHash, ::comphelper::UStringEqual> OInterfaceMap;
+typedef ::boost::unordered_multimap< ::rtl::OUString, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > , ::comphelper::UStringHash, ::comphelper::UStringEqual> OInterfaceMap;
DECLARE_STL_VECTOR(::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > > ,InterfaceArray);
diff --git a/binfilter/bf_svx/source/unodraw/svx_unoipset.cxx b/binfilter/bf_svx/source/unodraw/svx_unoipset.cxx
index 296d358..ad7b83a 100644
--- a/binfilter/bf_svx/source/unodraw/svx_unoipset.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_unoipset.cxx
@@ -26,7 +26,7 @@
*
************************************************************************/
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <vector>
#include "svxids.hrc"
@@ -70,8 +70,8 @@ public:
class SvxInfoSetCache
{
private:
- typedef std::hash_map< const SfxItemPropertyMap*, uno::Reference< beans::XPropertySetInfo >, SfxItemPropertyMapHash > InfoMap;
- typedef std::hash_map< const SfxItemPropertyMap*, const SfxItemPropertyMap*, SfxItemPropertyMapHash > PropertyMap;
+ typedef boost::unordered_map< const SfxItemPropertyMap*, uno::Reference< beans::XPropertySetInfo >, SfxItemPropertyMapHash > InfoMap;
+ typedef boost::unordered_map< const SfxItemPropertyMap*, const SfxItemPropertyMap*, SfxItemPropertyMapHash > PropertyMap;
InfoMap maInfoMap;
PropertyMap maPropertyMap;
diff --git a/binfilter/bf_svx/source/unodraw/svx_unomod.cxx b/binfilter/bf_svx/source/unodraw/svx_unomod.cxx
index 2fa8658..5163edb 100644
--- a/binfilter/bf_svx/source/unodraw/svx_unomod.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_unomod.cxx
@@ -59,7 +59,7 @@
#include "unomodel.hxx"
#include "svdobj.hxx"
#include "unoshape.hxx"
-#include <hash_map>
+#include <boost/unordered_map.hpp>
namespace binfilter {
//-////////////////////////////////////////////////////////////////////
diff --git a/binfilter/bf_svx/source/unodraw/svx_unoprov.cxx b/binfilter/bf_svx/source/unodraw/svx_unoprov.cxx
index 751c9fe..ae2e49f 100644
--- a/binfilter/bf_svx/source/unodraw/svx_unoprov.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_unoprov.cxx
@@ -39,7 +39,7 @@
#include <vcl/svapp.hxx>
#include <sal/macros.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <comphelper/propertysetinfo.hxx>
@@ -666,7 +666,7 @@ comphelper::PropertyMapEntry* ImplGetSvxDrawingDefaultsPropertyMap()
* class UHashMap *
***********************************************************************/
-typedef ::std::hash_map< rtl::OUString, sal_uInt32, rtl::OUStringHash > UHashMapImpl;
+typedef ::boost::unordered_map< rtl::OUString, sal_uInt32, rtl::OUStringHash > UHashMapImpl;
namespace {
static const UHashMapImpl &GetUHashImpl()
diff --git a/binfilter/bf_sw/source/filter/xml/sw_xmltbli.cxx b/binfilter/bf_sw/source/filter/xml/sw_xmltbli.cxx
index 1de1681..7c2437e 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_xmltbli.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_xmltbli.cxx
@@ -98,7 +98,7 @@ using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::table;
using namespace ::com::sun::star::xml::sax;
using namespace ::binfilter::xmloff::token;
-using ::std::hash_map;
+using ::boost::unordered_map;
using rtl::OUString;
diff --git a/binfilter/bf_sw/source/filter/xml/xmltbli.hxx b/binfilter/bf_sw/source/filter/xml/xmltbli.hxx
index a04846d..73b6688 100644
--- a/binfilter/bf_sw/source/filter/xml/xmltbli.hxx
+++ b/binfilter/bf_sw/source/filter/xml/xmltbli.hxx
@@ -31,7 +31,7 @@
#include <bf_xmloff/XMLTextTableContext.hxx>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#if !defined(_SVSTDARR_USHORTS_DECL) || !defined(_SVSTDARR_BOOLS_DECL) || !defined(_SVSTDARR_STRINGSDTOR_DECL)
#define _SVSTDARR_USHORTS
@@ -86,7 +86,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/binfilter/bf_xmloff/source/core/xmloff_nmspmap.cxx b/binfilter/bf_xmloff/source/core/xmloff_nmspmap.cxx
index a3ae555..f5605c4 100644
--- a/binfilter/bf_xmloff/source/core/xmloff_nmspmap.cxx
+++ b/binfilter/bf_xmloff/source/core/xmloff_nmspmap.cxx
@@ -42,7 +42,7 @@ using ::binfilter::xmloff::token::GetXMLToken;
using ::binfilter::xmloff::token::XML_XMLNS;
/* The basic idea of this class is that we have two two ways to search our
- * data...by prefix and by key. We use an STL hash_map for fast prefix
+ * data...by prefix and by key. We use an STL boost::unordered_map for fast prefix
* searching and an STL map for fast key searching.
*
* The references to an 'Index' refer to an earlier implementation of the
diff --git a/binfilter/bf_xmloff/source/style/xmloff_xmlexppr.cxx b/binfilter/bf_xmloff/source/style/xmloff_xmlexppr.cxx
index 679f281..2bdb91f 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_xmlexppr.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_xmlexppr.cxx
@@ -35,7 +35,7 @@
#include <com/sun/star/beans/XMultiPropertySet.hpp>
#include <list>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
@@ -209,7 +209,7 @@ public:
// ----------------------------------------------------------------------------
-typedef ::std::hash_map
+typedef ::boost::unordered_map
<
PropertySetInfoKey,
FilterPropertiesInfo_Impl *,
diff --git a/binfilter/inc/bf_sc/addincol.hxx b/binfilter/inc/bf_sc/addincol.hxx
index 2fcb13c..778d9df 100644
--- a/binfilter/inc/bf_sc/addincol.hxx
+++ b/binfilter/inc/bf_sc/addincol.hxx
@@ -43,7 +43,7 @@
#include <rtl/ustring.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
class String;
namespace binfilter {
@@ -62,7 +62,7 @@ struct ScAddInStringHashCode
return rtl_ustr_hashCode_WithLength( rStr.GetBuffer(), rStr.Len() );
}
};
-typedef ::std::hash_map< String, const ScUnoAddInFuncData*, ScAddInStringHashCode, ::std::equal_to< String > > ScAddInHashMap;
+typedef ::boost::unordered_map< String, const ScUnoAddInFuncData*, ScAddInStringHashCode, ::std::equal_to< String > > ScAddInHashMap;
enum ScAddInArgumentType
diff --git a/binfilter/inc/bf_sc/compiler.hxx b/binfilter/inc/bf_sc/compiler.hxx
index dd45f4d..4f6dbc4 100644
--- a/binfilter/inc/bf_sc/compiler.hxx
+++ b/binfilter/inc/bf_sc/compiler.hxx
@@ -39,7 +39,7 @@
#include <unotools/charclass.hxx>
#include <rtl/ustrbuf.hxx>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
namespace binfilter {
@@ -408,7 +408,7 @@ struct ScStringHashCode
return rtl_ustr_hashCode_WithLength( rStr.GetBuffer(), rStr.Len() );
}
};
-typedef ::std::hash_map< String, OpCode, ScStringHashCode, ::std::equal_to< String > > ScOpCodeHashMap;
+typedef ::boost::unordered_map< String, OpCode, ScStringHashCode, ::std::equal_to< String > > ScOpCodeHashMap;
class ScCompiler
{
diff --git a/binfilter/inc/bf_sw/SwStyleNameMapper.hxx b/binfilter/inc/bf_sw/SwStyleNameMapper.hxx
index c7fed3c..9ffee1e 100644
--- a/binfilter/inc/bf_sw/SwStyleNameMapper.hxx
+++ b/binfilter/inc/bf_sw/SwStyleNameMapper.hxx
@@ -31,7 +31,7 @@
#include <sal/types.h>
#include <SwGetPoolIdFromName.hxx>
#include <tools/string.hxx>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
class String;
@@ -135,7 +135,7 @@ struct StringHash
};
-typedef ::std::hash_map < const String*, sal_uInt16, StringHash, StringEq > NameToIdHash;
+typedef ::boost::unordered_map < const String*, sal_uInt16, StringHash, StringEq > NameToIdHash;
class SwStyleNameMapper
{
diff --git a/binfilter/inc/bf_xmloff/SinglePropertySetInfoCache.hxx b/binfilter/inc/bf_xmloff/SinglePropertySetInfoCache.hxx
index 5c67db8..11c2bc8 100644
--- a/binfilter/inc/bf_xmloff/SinglePropertySetInfoCache.hxx
+++ b/binfilter/inc/bf_xmloff/SinglePropertySetInfoCache.hxx
@@ -31,12 +31,12 @@
#include <com/sun/star/beans/XPropertySet.hpp>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <bf_xmloff/PropertySetInfoHash.hxx>
namespace binfilter {
-typedef ::std::hash_map
+typedef ::boost::unordered_map
<
PropertySetInfoKey,
sal_Bool,
diff --git a/binfilter/inc/bf_xmloff/nmspmap.hxx b/binfilter/inc/bf_xmloff/nmspmap.hxx
index 23b1ec8..6223017 100644
--- a/binfilter/inc/bf_xmloff/nmspmap.hxx
+++ b/binfilter/inc/bf_xmloff/nmspmap.hxx
@@ -31,7 +31,7 @@
#include <limits.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#ifndef __SGI_STL_MAP
#include <map>
#endif
@@ -90,8 +90,8 @@ struct QNamePairEq
}
};
-typedef ::std::hash_map < QNamePair, ::rtl::OUString, QNamePairHash, QNamePairEq > QNameCache;
-typedef ::std::hash_map < ::rtl::OUString, ::rtl::Reference <NameSpaceEntry >, ::rtl::OUStringHash, OUStringEqFunc > NameSpaceHash;
+typedef ::boost::unordered_map < QNamePair, ::rtl::OUString, QNamePairHash, QNamePairEq > QNameCache;
+typedef ::boost::unordered_map < ::rtl::OUString, ::rtl::Reference <NameSpaceEntry >, ::rtl::OUStringHash, OUStringEqFunc > NameSpaceHash;
typedef ::std::map < sal_uInt16, ::rtl::Reference < NameSpaceEntry >, uInt32lt > NameSpaceMap;
class SvXMLNamespaceMap
diff --git a/binfilter/legacysmgr/source/legacy/legacy_binfilters_smgr.cxx b/binfilter/legacysmgr/source/legacy/legacy_binfilters_smgr.cxx
index 8994e5f..d977f1b 100644
--- a/binfilter/legacysmgr/source/legacy/legacy_binfilters_smgr.cxx
+++ b/binfilter/legacysmgr/source/legacy/legacy_binfilters_smgr.cxx
@@ -25,8 +25,8 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#include <hash_map>
-#include <hash_set>
+#include <boost/unordered_map.hpp>
+#include <boost/unordered_set.hpp>
#include <list>
#include "osl/diagnose.h"
@@ -266,7 +266,7 @@ struct equaltoRef_Impl
{ return rName1 == rName2; }
};
-typedef hash_set
+typedef boost::unordered_set
<
Reference<XInterface >,
hashRef_Impl,
@@ -433,14 +433,14 @@ struct hashOWString_Impl
{ return rName.hashCode(); }
};
-typedef hash_set
+typedef boost::unordered_set
<
OUString,
hashOWString_Impl,
equalOWString_Impl
> HashSet_OWString;
-typedef hash_multimap
+typedef boost::unordered_multimap
<
OUString,
Reference<XInterface >,
@@ -448,7 +448,7 @@ typedef hash_multimap
equalOWString_Impl
> HashMultimap_OWString_Interface;
-typedef hash_map
+typedef boost::unordered_map
<
OUString,
Reference<XInterface >,
diff --git a/filter/inc/filter/msfilter/msocximex.hxx b/filter/inc/filter/msfilter/msocximex.hxx
index afc7811..e88108d 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 ddcafd3..c6834bd 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 40f61d8..620a754 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 0d1e387..e8326e2 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 22b6996..72634f2 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 871af26..ea36539 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 6dec7a4..906a1c7 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 8cad135..60e6a6c 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 231c215..ceda422 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 3c07b10..de96b0b 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 9ec601e..9ccd3b7 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 e6db4b8..563c689 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 1a77036..2b04acf 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 678a4bb..f30e9e3 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 8d15e99..8c20d50 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 dfa5f59..040704e 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 0201333..a10ca4b 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 07fb336..3e39295 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 9c1b863..875234f 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 a3b7a43..7ec222e 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 bcad198..0417e6d 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 dd45e0e..d4127f9 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 75f1b0b..7cfa0af 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 7cad550..31dded2 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 582da59..fc1e452 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 57035ea..3297f1f 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 3a24f61..b415151 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 d6ff301..1578695 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 a2a5213..9c299a3 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 ba5a667..8361847 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 d4fd3e3..9259911 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 c3c0b90..b90bfa7 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 fd58bf1..ffe2dda 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 d84445a..881e09f 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 6da7b10..b9e58e1 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>
More information about the Libreoffice-commits
mailing list