[Libreoffice-commits] .: 5 commits - basic/source connectivity/source desktop/source editeng/inc editeng/source formula/inc fpicker/source framework/inc framework/source framework/test linguistic/source scripting/source sfx2/source svx/inc svx/source ucb/source ucb/workben uui/source vbahelper/source xmlhelp/source xmloff/inc xmloff/source xmlscript/source
Fridrich Strba
fridrich at kemper.freedesktop.org
Sat Feb 5 09:35:02 PST 2011
basic/source/classes/sb.cxx | 4 +-
basic/source/classes/sbunoobj.cxx | 6 +--
basic/source/inc/namecont.hxx | 4 +-
basic/source/inc/sbunoobj.hxx | 4 +-
basic/source/inc/scriptcont.hxx | 2 -
basic/source/runtime/stdobj.cxx | 4 +-
connectivity/source/drivers/mozab/MColumnAlias.hxx | 4 +-
connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx | 4 +-
connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx | 4 +-
connectivity/source/inc/TSkipDeletedSet.hxx | 2 -
desktop/source/app/dispatchwatcher.hxx | 4 +-
desktop/source/deployment/inc/dp_persmap.h | 4 +-
desktop/source/deployment/manager/dp_activepackages.cxx | 2 -
desktop/source/deployment/manager/dp_extensionmanager.cxx | 2 -
desktop/source/deployment/manager/dp_extensionmanager.hxx | 2 -
desktop/source/deployment/manager/dp_managerfac.cxx | 2 -
desktop/source/deployment/registry/component/dp_component.cxx | 4 +-
desktop/source/deployment/registry/dp_registry.cxx | 10 ++---
desktop/source/deployment/registry/executable/dp_executable.cxx | 2 -
desktop/source/deployment/registry/inc/dp_backend.h | 4 +-
desktop/source/migration/migration_impl.hxx | 4 +-
editeng/inc/pch/precompiled_editeng.hxx | 2 -
editeng/source/misc/unolingu.cxx | 2 -
editeng/source/uno/unoipset.cxx | 2 -
formula/inc/formula/FormulaCompiler.hxx | 6 +--
fpicker/source/win32/filepicker/propmap.hxx | 4 +-
framework/inc/classes/filtercachedata.hxx | 6 +--
framework/inc/helper/titlehelper.hxx | 2 -
framework/inc/services/substitutepathvars.hxx | 6 +--
framework/inc/services/tabwindowservice.hxx | 2 -
framework/inc/stdtypes.h | 6 +--
framework/inc/uiconfiguration/globalsettings.hxx | 2 -
framework/inc/uiconfiguration/imagemanager.hxx | 2 -
framework/inc/uiconfiguration/imagetype.hxx | 6 +--
framework/inc/uiconfiguration/moduleimagemanager.hxx | 2 -
framework/inc/uiconfiguration/moduleuicfgsupplier.hxx | 4 +-
framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx | 6 +--
framework/inc/uiconfiguration/uicategorydescription.hxx | 2 -
framework/inc/uiconfiguration/uiconfigurationmanager.hxx | 6 +--
framework/inc/uiconfiguration/windowstateconfiguration.hxx | 6 +--
framework/inc/uielement/controlmenucontroller.hxx | 2 -
framework/inc/uielement/menubarmanager.hxx | 2 -
framework/inc/uielement/menubarwrapper.hxx | 2 -
framework/inc/uielement/newmenucontroller.hxx | 4 +-
framework/inc/uielement/simpletextstatusbarcontroller.hxx | 2 -
framework/inc/uielement/toolbarmanager.hxx | 4 +-
framework/inc/uielement/uicommanddescription.hxx | 6 +--
framework/inc/uifactory/factoryconfiguration.hxx | 2 -
framework/inc/uifactory/uielementfactorymanager.hxx | 2 -
framework/inc/xml/eventsdocumenthandler.hxx | 4 +-
framework/inc/xml/imagesdocumenthandler.hxx | 4 +-
framework/inc/xml/statusbardocumenthandler.hxx | 4 +-
framework/inc/xml/toolboxdocumenthandler.hxx | 2 -
framework/source/classes/addonsoptions.cxx | 8 ++--
framework/source/inc/accelerators/acceleratorcache.hxx | 2 -
framework/source/inc/accelerators/keymapping.hxx | 2 -
framework/source/inc/accelerators/storageholder.hxx | 2 -
framework/source/services/desktop.cxx | 2 -
framework/source/services/frame.cxx | 2 -
framework/source/uiconfiguration/imagemanagerimpl.hxx | 4 +-
framework/source/uiconfiguration/moduleuicfgsupplier.cxx | 2 -
framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx | 8 ++--
framework/source/uiconfiguration/uicategorydescription.cxx | 2 -
framework/source/uiconfiguration/uiconfigurationmanager.cxx | 4 +-
framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx | 8 ++--
framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx | 6 +--
framework/source/uiconfiguration/windowstateconfiguration.cxx | 2 -
framework/source/uielement/newmenucontroller.cxx | 2 -
framework/source/uielement/toolbarsmenucontroller.cxx | 2 -
framework/source/uielement/uicommanddescription.cxx | 2 -
framework/test/typecfg/cfgview.cxx | 2 -
linguistic/source/convdic.hxx | 6 +--
scripting/source/dlgprov/dlgevtatt.hxx | 4 +-
scripting/source/provider/ActiveMSPList.hxx | 4 +-
scripting/source/provider/BrowseNodeFactoryImpl.cxx | 2 -
scripting/source/provider/ProviderCache.hxx | 4 +-
scripting/source/storage/ScriptData.hxx | 8 ++--
scripting/source/storage/ScriptInfo.cxx | 4 +-
scripting/source/storage/ScriptSecurityManager.hxx | 4 +-
scripting/source/storage/ScriptStorage.hxx | 10 ++---
scripting/source/storage/ScriptStorageManager.cxx | 2 -
scripting/source/storage/ScriptStorageManager.hxx | 4 +-
scripting/source/stringresource/stringresource.hxx | 6 +--
scripting/source/vbaevents/eventhelper.cxx | 6 +--
sfx2/source/appl/imagemgr.cxx | 4 +-
sfx2/source/appl/newhelp.cxx | 4 +-
sfx2/source/appl/workwin.cxx | 4 +-
sfx2/source/control/bindings.cxx | 4 +-
sfx2/source/doc/Metadatable.cxx | 14 +++----
sfx2/source/toolbox/imgmgr.cxx | 4 +-
sfx2/source/view/sfxbasecontroller.cxx | 4 +-
svx/inc/pch/precompiled_svx.hxx | 2 -
svx/inc/svx/ShapeTypeHandler.hxx | 4 +-
svx/inc/svx/sdasitm.hxx | 10 ++---
svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx | 4 +-
svx/source/inc/DGColorNameLookUp.hxx | 4 +-
svx/source/table/accessibletableshape.cxx | 2 -
svx/source/table/propertyset.hxx | 4 +-
svx/source/unodraw/shapepropertynotifier.cxx | 4 +-
svx/source/unodraw/unoprov.cxx | 4 +-
ucb/source/core/ucbstore.cxx | 4 +-
ucb/source/ucp/file/filnot.hxx | 4 +-
ucb/source/ucp/file/filtask.hxx | 4 +-
ucb/source/ucp/file/shell.hxx | 8 ++--
ucb/source/ucp/hierarchy/hierarchyprovider.hxx | 4 +-
ucb/source/ucp/package/pkgprovider.cxx | 4 +-
ucb/source/ucp/webdav/ContentProperties.hxx | 4 +-
ucb/source/ucp/webdav/NeonSession.cxx | 4 +-
ucb/source/ucp/webdav/PropertyMap.hxx | 4 +-
ucb/workben/cachemap/cachemapobjectcontainer2.hxx | 7 +--
uui/source/iahndl.hxx | 4 +-
vbahelper/source/msforms/vbacontrols.cxx | 4 +-
vbahelper/source/vbahelper/vbaapplicationbase.cxx | 4 +-
vbahelper/source/vbahelper/vbadocumentsbase.cxx | 4 +-
xmlhelp/source/cxxhelp/provider/databases.hxx | 20 +++++-----
xmlhelp/source/cxxhelp/provider/db.hxx | 6 +--
xmloff/inc/StyleMap.hxx | 4 +-
xmloff/inc/xmloff/SinglePropertySetInfoCache.hxx | 4 +-
xmloff/inc/xmloff/nmspmap.hxx | 6 +--
xmloff/source/core/nmspmap.cxx | 2 -
xmloff/source/draw/EnhancedCustomShapeToken.cxx | 4 +-
xmloff/source/draw/ximpcustomshape.cxx | 4 +-
xmloff/source/style/xmlexppr.cxx | 4 +-
xmloff/source/text/txtparae.cxx | 4 +-
xmloff/source/transform/EventOASISTContext.cxx | 6 +--
xmloff/source/transform/EventOOoTContext.cxx | 6 +--
xmloff/source/transform/TransformerActions.cxx | 4 +-
xmloff/source/transform/TransformerActions.hxx | 4 +-
xmloff/source/transform/TransformerTokenMap.hxx | 4 +-
xmlscript/source/xml_helper/xml_impctx.cxx | 8 ++--
130 files changed, 272 insertions(+), 275 deletions(-)
New commits:
commit a561da2d5bbd699aa28d0fab3904b2769508bcb8
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Sat Feb 5 18:25:20 2011 +0100
Fix a typo and one visibility cook-up
diff --git a/editeng/inc/pch/precompiled_editeng.hxx b/editeng/inc/pch/precompiled_editeng.hxx
index 2f52320..8097d23 100644
--- a/editeng/inc/pch/precompiled_editeng.hxx
+++ b/editeng/inc/pch/precompiled_editeng.hxx
@@ -1,4 +1,4 @@
-slis/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/svx/inc/svx/sdasitm.hxx b/svx/inc/svx/sdasitm.hxx
index cc6cc1b..fcca03f 100644
--- a/svx/inc/svx/sdasitm.hxx
+++ b/svx/inc/svx/sdasitm.hxx
@@ -68,9 +68,9 @@ private:
{
bool operator()( const SdrCustomShapeGeometryItem::PropertyPair&, const SdrCustomShapeGeometryItem::PropertyPair& ) const;
};
- struct SVX_DLLPRIVATE PropertyPairHash
+ struct PropertyPairHash
{
- size_t operator()( const SdrCustomShapeGeometryItem::PropertyPair &r1 ) const;
+ size_t operator()( const SdrCustomShapeGeometryItem::PropertyPair& ) const;
};
typedef boost::unordered_map < PropertyPair, sal_Int32, PropertyPairHash, PropertyPairEq > PropertyPairHashMap;
typedef boost::unordered_map< rtl::OUString, sal_Int32, rtl::OUStringHash, PropertyEq > PropertyHashMap;
commit 7d53b7256fb40ce181452b33ebcbf84d0c205b8f
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Sat Feb 5 15:44:26 2011 +0100
data_type -> mapped_type
diff --git a/xmloff/source/transform/EventOASISTContext.cxx b/xmloff/source/transform/EventOASISTContext.cxx
index 2639cad..a158ce8 100644
--- a/xmloff/source/transform/EventOASISTContext.cxx
+++ b/xmloff/source/transform/EventOASISTContext.cxx
@@ -66,7 +66,7 @@ XMLTransformerOASISEventMap_Impl::XMLTransformerOASISEventMap_Impl( XMLTransform
if( pInit )
{
XMLTransformerOASISEventMap_Impl::key_type aKey;
- XMLTransformerOASISEventMap_Impl::data_type aData;
+ XMLTransformerOASISEventMap_Impl::mapped_type aData;
while( pInit->m_pOASISName )
{
aKey.m_nPrefix = pInit->m_nOASISPrefix;
diff --git a/xmloff/source/transform/EventOOoTContext.cxx b/xmloff/source/transform/EventOOoTContext.cxx
index 5a1eb20..5e6bc69 100644
--- a/xmloff/source/transform/EventOOoTContext.cxx
+++ b/xmloff/source/transform/EventOOoTContext.cxx
@@ -63,7 +63,7 @@ public:
void XMLTransformerOOoEventMap_Impl::AddMap( XMLTransformerEventMapEntry *pInit )
{
XMLTransformerOOoEventMap_Impl::key_type aKey;
- XMLTransformerOOoEventMap_Impl::data_type aData;
+ XMLTransformerOOoEventMap_Impl::mapped_type aData;
while( pInit->m_pOOoName )
{
aKey = OUString::createFromAscii(pInit->m_pOOoName);
diff --git a/xmloff/source/transform/TransformerActions.cxx b/xmloff/source/transform/TransformerActions.cxx
index 407b7ae..a5d3350 100644
--- a/xmloff/source/transform/TransformerActions.cxx
+++ b/xmloff/source/transform/TransformerActions.cxx
@@ -42,7 +42,7 @@ XMLTransformerActions::XMLTransformerActions( XMLTransformerActionInit *pInit )
if( pInit )
{
XMLTransformerActions::key_type aKey;
- XMLTransformerActions::data_type aData;
+ XMLTransformerActions::mapped_type aData;
while( pInit->m_nActionType != XML_TACTION_EOT )
{
aKey.m_nPrefix = pInit->m_nPrefix;
@@ -71,7 +71,7 @@ void XMLTransformerActions::Add( XMLTransformerActionInit *pInit )
if( pInit )
{
XMLTransformerActions::key_type aKey;
- XMLTransformerActions::data_type aData;
+ XMLTransformerActions::mapped_type aData;
while( pInit->m_nActionType != XML_TACTION_EOT )
{
aKey.m_nPrefix = pInit->m_nPrefix;
commit 8a478e795a7e73b762ec6a21a8ff2e32aa1fc39a
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Sat Feb 5 15:43:58 2011 +0100
some more unordered containers
diff --git a/ucb/source/ucp/webdav/PropertyMap.hxx b/ucb/source/ucp/webdav/PropertyMap.hxx
index 4067bab..01d5dd0 100644
--- a/ucb/source/ucp/webdav/PropertyMap.hxx
+++ b/ucb/source/ucp/webdav/PropertyMap.hxx
@@ -29,7 +29,7 @@
#ifndef _WEBDAV_UCP_PROPERTYMAP_HXX
#define _WEBDAV_UCP_PROPERTYMAP_HXX
-#include <hash_set>
+#include <boost/unordered_set.hpp>
#include <com/sun/star/beans/Property.hpp>
namespace webdav_ucp {
@@ -53,7 +53,7 @@ struct hashPropertyName
}
};
-typedef std::hash_set
+typedef boost::unordered_set
<
::com::sun::star::beans::Property,
hashPropertyName,
commit 0c817e6924da466ed28aa9ce1199c978ec76c616
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Sat Feb 5 13:34:36 2011 +0100
remove includes for <slist>
diff --git a/editeng/inc/pch/precompiled_editeng.hxx b/editeng/inc/pch/precompiled_editeng.hxx
index 1eb2954..2f52320 100644
--- a/editeng/inc/pch/precompiled_editeng.hxx
+++ b/editeng/inc/pch/precompiled_editeng.hxx
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+slis/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -686,7 +686,7 @@
#include "sot/formats.hxx"
#include <map>
#include <set>
-#include <slist>
+#include <list>
#include <vector>
#include "svtools/FilterConfigItem.hxx"
#include "svtools/accessibilityoptions.hxx"
diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx
index a35dd21..5ebdbc6 100644
--- a/editeng/source/misc/unolingu.cxx
+++ b/editeng/source/misc/unolingu.cxx
@@ -32,7 +32,7 @@
#include <map>
#include <set>
#include <vector>
-#include <slist>
+#include <list>
#include <memory>
#include <editeng/unolingu.hxx>
#include <tools/debug.hxx>
diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx
index 676979c..3b46d5e 100644
--- a/svx/inc/pch/precompiled_svx.hxx
+++ b/svx/inc/pch/precompiled_svx.hxx
@@ -750,7 +750,7 @@
#include "sot/formats.hxx"
#include <map>
#include <set>
-#include <slist>
+#include <list>
#include <vector>
#include "svtools/FilterConfigItem.hxx"
#include "svtools/accessibilityoptions.hxx"
commit 9b64ddded6e9bc4ba06c215f94c9e27def16ffe9
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Sat Feb 5 13:18:52 2011 +0100
migrate to use boost unordered containers
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 7b8c8c9..e12b2b6 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -56,7 +56,7 @@
#include <osl/mutex.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include "errobject.hxx"
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <com/sun/star/script/ModuleType.hpp>
#include <com/sun/star/script/ModuleInfo.hpp>
@@ -946,7 +946,7 @@ struct ClassModuleRunInitItem
{}
};
-typedef std::hash_map< ::rtl::OUString, ClassModuleRunInitItem,
+typedef boost::unordered_map< ::rtl::OUString, ClassModuleRunInitItem,
::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ModuleInitDependencyMap;
static ModuleInitDependencyMap* GpMIDMap = NULL;
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index c80bc99..256af0a 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -94,7 +94,7 @@ using namespace cppu;
#include<runtime.hxx>
#include<math.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <com/sun/star/reflection/XTypeDescriptionEnumerationAccess.hpp>
#include <com/sun/star/reflection/XConstantsTypeDescription.hpp>
@@ -3218,7 +3218,7 @@ void RTL_Impl_EqualUnoObjects( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
refVar->PutBool( TRUE );
}
-typedef std::hash_map< ::rtl::OUString, std::vector< ::rtl::OUString >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ModuleHash;
+typedef boost::unordered_map< ::rtl::OUString, std::vector< ::rtl::OUString >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ModuleHash;
// helper wrapper function to interact with TypeProvider and
@@ -3245,7 +3245,7 @@ getTypeDescriptorEnumeration( const ::rtl::OUString& sSearchRoot,
return xEnum;
}
-typedef std::hash_map< ::rtl::OUString, Any, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > VBAConstantsHash;
+typedef boost::unordered_map< ::rtl::OUString, Any, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > VBAConstantsHash;
VBAConstantHelper&
VBAConstantHelper::instance()
diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx
index 14ac05e..3d4a1ff 100644
--- a/basic/source/inc/namecont.hxx
+++ b/basic/source/inc/namecont.hxx
@@ -29,7 +29,7 @@
#ifndef BASIC_NAMECONTAINER_HXX
#define BASIC_NAMECONTAINER_HXX
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
@@ -101,7 +101,7 @@ struct eqName_Impl
}
};
-typedef std::hash_map
+typedef boost::unordered_map
<
::rtl::OUString,
sal_Int32,
diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx
index 54e2106..19450be 100644
--- a/basic/source/inc/sbunoobj.hxx
+++ b/basic/source/inc/sbunoobj.hxx
@@ -42,7 +42,7 @@
#include <com/sun/star/reflection/XServiceTypeDescription2.hpp>
#include <com/sun/star/reflection/XSingletonTypeDescription.hpp>
#include <rtl/ustring.hxx>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
class SbUnoObject: public SbxObject
{
@@ -321,7 +321,7 @@ public:
virtual void Clear();
};
-typedef std::hash_map< ::rtl::OUString, ::com::sun::star::uno::Any, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > VBAConstantsHash;
+typedef boost::unordered_map< ::rtl::OUString, ::com::sun::star::uno::Any, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > VBAConstantsHash;
typedef std::vector< rtl::OUString > VBAConstantsVector;
diff --git a/basic/source/inc/scriptcont.hxx b/basic/source/inc/scriptcont.hxx
index 657c8c6..790d624 100644
--- a/basic/source/inc/scriptcont.hxx
+++ b/basic/source/inc/scriptcont.hxx
@@ -142,7 +142,7 @@ public:
};
//============================================================================
-typedef std::hash_map< ::rtl::OUString, ::com::sun::star::script::ModuleInfo, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ModuleInfoMap;
+typedef boost::unordered_map< ::rtl::OUString, ::com::sun::star::script::ModuleInfo, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ModuleInfoMap;
typedef ::cppu::ImplHelper1 < ::com::sun::star::script::vba::XVBAModuleInfo
> SfxScriptLibrary_BASE;
diff --git a/basic/source/runtime/stdobj.cxx b/basic/source/runtime/stdobj.cxx
index 4cf2120..9332a93 100644
--- a/basic/source/runtime/stdobj.cxx
+++ b/basic/source/runtime/stdobj.cxx
@@ -35,7 +35,7 @@
#include <sal/macros.h>
#include "rtlproto.hxx"
#include "sbintern.hxx"
-#include <hash_map>
+#include <boost/unordered_map.hpp>
// Das nArgs-Feld eines Tabelleneintrags ist wie folgt verschluesselt:
// Zur Zeit wird davon ausgegangen, dass Properties keine Parameter
// benoetigen!
@@ -82,7 +82,7 @@ struct StringHashCode
class VBABlacklist
{
friend class VBABlackListQuery;
- std::hash_map< String, bool, StringHashCode > mBlackList;
+ boost::unordered_map< String, bool, StringHashCode > mBlackList;
VBABlacklist()
{
const char* list[] = { "Red" };
diff --git a/connectivity/source/drivers/mozab/MColumnAlias.hxx b/connectivity/source/drivers/mozab/MColumnAlias.hxx
index b668bba..4aa9c07 100644
--- a/connectivity/source/drivers/mozab/MColumnAlias.hxx
+++ b/connectivity/source/drivers/mozab/MColumnAlias.hxx
@@ -34,7 +34,7 @@
#include <osl/mutex.hxx>
#include <vector>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
namespace connectivity
{
@@ -59,7 +59,7 @@ namespace connectivity
{
}
};
- typedef ::std::hash_map< ::rtl::OUString, AliasEntry, ::rtl::OUStringHash > AliasMap;
+ typedef ::boost::unordered_map< ::rtl::OUString, AliasEntry, ::rtl::OUStringHash > AliasMap;
private:
AliasMap m_aAliasMap;
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
index 0064cca..772390a 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
@@ -39,7 +39,7 @@
#include <tools/diagnose_ex.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
//........................................................................
namespace connectivity { namespace mozab {
@@ -72,7 +72,7 @@ namespace connectivity { namespace mozab {
}
};
- typedef ::std::hash_map< ::rtl::OString, CardPropertyData, ::rtl::OStringHash > MapPropertiesToAttributes;
+ typedef ::boost::unordered_map< ::rtl::OString, CardPropertyData, ::rtl::OStringHash > MapPropertiesToAttributes;
#define DEF_CARD_ACCESS( PropertyName ) \
&nsIAbCard::Get##PropertyName, &nsIAbCard::Set##PropertyName
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx
index 2384919..870e959 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx
@@ -38,7 +38,7 @@
#include <comphelper/stl_types.hxx>
#include <osl/thread.hxx>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
namespace connectivity
{
@@ -47,7 +47,7 @@ namespace connectivity
class MQueryHelperResultEntry
{
private:
- typedef ::std::hash_map< ::rtl::OString, ::rtl::OUString, ::rtl::OStringHash > FieldMap;
+ typedef ::boost::unordered_map< ::rtl::OString, ::rtl::OUString, ::rtl::OStringHash > FieldMap;
mutable ::osl::Mutex m_aMutex;
FieldMap m_Fields;
diff --git a/connectivity/source/inc/TSkipDeletedSet.hxx b/connectivity/source/inc/TSkipDeletedSet.hxx
index ef2f4e5..48e0b9b 100644
--- a/connectivity/source/inc/TSkipDeletedSet.hxx
+++ b/connectivity/source/inc/TSkipDeletedSet.hxx
@@ -30,7 +30,7 @@
#include "TResultSetHelper.hxx"
#include <rtl/alloc.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <vector>
#include "connectivity/dbtoolsdllapi.hxx"
diff --git a/desktop/source/app/dispatchwatcher.hxx b/desktop/source/app/dispatchwatcher.hxx
index 6dc2d93..a787c1e 100644
--- a/desktop/source/app/dispatchwatcher.hxx
+++ b/desktop/source/app/dispatchwatcher.hxx
@@ -34,7 +34,7 @@
#include <com/sun/star/frame/XDispatchResultListener.hpp>
#include "officeipcthread.hxx"
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <vector>
namespace desktop
@@ -56,7 +56,7 @@ struct OUStringHashCode
}
};
-class DispatchWatcherHashMap : public ::std::hash_map< ::rtl::OUString, sal_Int32, OUStringHashCode, ::std::equal_to< ::rtl::OUString > >
+class DispatchWatcherHashMap : public ::boost::unordered_map< ::rtl::OUString, sal_Int32, OUStringHashCode, ::std::equal_to< ::rtl::OUString > >
{
public:
inline void free()
diff --git a/desktop/source/deployment/inc/dp_persmap.h b/desktop/source/deployment/inc/dp_persmap.h
index b1597f3..8af0384 100644
--- a/desktop/source/deployment/inc/dp_persmap.h
+++ b/desktop/source/deployment/inc/dp_persmap.h
@@ -31,14 +31,14 @@
#include "rtl/ustring.hxx"
#include "db.hxx"
-#include <hash_map>
+#include <boost/unordered_map.hpp>
using namespace berkeleydbproxy;
namespace dp_misc
{
-typedef ::std::hash_map<
+typedef ::boost::unordered_map<
::rtl::OString, ::rtl::OString, ::rtl::OStringHash > t_string2string_map;
//==============================================================================
diff --git a/desktop/source/deployment/manager/dp_activepackages.cxx b/desktop/source/deployment/manager/dp_activepackages.cxx
index 950e461..94a16f6 100644
--- a/desktop/source/deployment/manager/dp_activepackages.cxx
+++ b/desktop/source/deployment/manager/dp_activepackages.cxx
@@ -41,7 +41,7 @@
#include "rtl/uri.h"
#include "rtl/uri.hxx"
#include "rtl/ustring.hxx"
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include "dp_identifier.hxx"
#include "dp_persmap.h"
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index 0f84988..fac5289 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -65,7 +65,7 @@
#include "boost/bind.hpp"
#include <list>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <algorithm>
namespace deploy = com::sun::star::deployment;
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.hxx b/desktop/source/deployment/manager/dp_extensionmanager.hxx
index 8677f96..6bb8fa6 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.hxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.hxx
@@ -45,7 +45,7 @@ namespace css = ::com::sun::star;
namespace dp_manager {
-typedef ::std::hash_map<
+typedef ::boost::unordered_map<
::rtl::OUString,
::std::vector<css::uno::Reference<css::deployment::XPackage> >,
::rtl::OUStringHash > id2extensions;
diff --git a/desktop/source/deployment/manager/dp_managerfac.cxx b/desktop/source/deployment/manager/dp_managerfac.cxx
index ccbaadc..707a061 100644
--- a/desktop/source/deployment/manager/dp_managerfac.cxx
+++ b/desktop/source/deployment/manager/dp_managerfac.cxx
@@ -55,7 +55,7 @@ class PackageManagerFactoryImpl : private MutexHolder, public t_pmfac_helper
Reference<deployment::XPackageManager> m_xUserMgr;
Reference<deployment::XPackageManager> m_xSharedMgr;
Reference<deployment::XPackageManager> m_xBundledMgr;
- typedef ::std::hash_map<
+ typedef ::boost::unordered_map<
OUString, WeakReference<deployment::XPackageManager>,
::rtl::OUStringHash > t_string2weakref;
t_string2weakref m_managers;
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx
index 4fa67b6..b7fe0b1 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -55,7 +55,7 @@
#include "com/sun/star/ucb/NameClash.hpp"
#include "com/sun/star/util/XMacroExpander.hpp"
#include <list>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <vector>
#include <memory>
#include <algorithm>
@@ -203,7 +203,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
bool m_unorc_modified;
bool bSwitchedRdbFiles;
- typedef ::std::hash_map< OUString, Reference<XInterface>,
+ typedef ::boost::unordered_map< OUString, Reference<XInterface>,
::rtl::OUStringHash > t_string2object;
t_string2object m_backendObjects;
diff --git a/desktop/source/deployment/registry/dp_registry.cxx b/desktop/source/deployment/registry/dp_registry.cxx
index a90f64b..26cf6d7 100644
--- a/desktop/source/deployment/registry/dp_registry.cxx
+++ b/desktop/source/deployment/registry/dp_registry.cxx
@@ -50,9 +50,9 @@
#include "com/sun/star/util/XUpdatable.hpp"
#include "com/sun/star/container/XContentEnumerationAccess.hpp"
#include "com/sun/star/deployment/PackageRegistryBackend.hpp"
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <set>
-#include <hash_set>
+#include <boost/unordered_set.hpp>
#include <memory>
using namespace ::dp_misc;
@@ -91,10 +91,10 @@ class PackageRegistryImpl : private MutexHolder, public t_helper
return str1.equalsIgnoreAsciiCase( str2 );
}
};
- typedef ::std::hash_map<
+ typedef ::boost::unordered_map<
OUString, Reference<deployment::XPackageRegistry>,
ci_string_hash, ci_string_equals > t_string2registry;
- typedef ::std::hash_map<
+ typedef ::boost::unordered_map<
OUString, OUString,
ci_string_hash, ci_string_equals > t_string2string;
typedef ::std::set<
@@ -190,7 +190,7 @@ void PackageRegistryImpl::insertBackend(
Reference<deployment::XPackageRegistry> const & xBackend )
{
m_allBackends.insert( xBackend );
- typedef ::std::hash_set<OUString, ::rtl::OUStringHash> t_stringset;
+ typedef ::boost::unordered_set<OUString, ::rtl::OUStringHash> t_stringset;
t_stringset ambiguousFilters;
const Sequence< Reference<deployment::XPackageTypeInfo> > packageTypes(
diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx b/desktop/source/deployment/registry/executable/dp_executable.cxx
index 673d7c7..4ed1ea2 100644
--- a/desktop/source/deployment/registry/executable/dp_executable.cxx
+++ b/desktop/source/deployment/registry/executable/dp_executable.cxx
@@ -84,7 +84,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
};
friend class ExecutablePackageImpl;
- typedef ::std::hash_map< OUString, Reference<XInterface>,
+ typedef ::boost::unordered_map< OUString, Reference<XInterface>,
::rtl::OUStringHash > t_string2object;
// PackageRegistryBackend
diff --git a/desktop/source/deployment/registry/inc/dp_backend.h b/desktop/source/deployment/registry/inc/dp_backend.h
index 723bf23..5d8c60e 100644
--- a/desktop/source/deployment/registry/inc/dp_backend.h
+++ b/desktop/source/deployment/registry/inc/dp_backend.h
@@ -43,7 +43,7 @@
#include "com/sun/star/deployment/XPackageManager.hpp"
#include "com/sun/star/deployment/InvalidRemovedParameterException.hpp"
#include <memory>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <list>
#include "dp_registry.hrc"
@@ -283,7 +283,7 @@ class PackageRegistryBackend
// XPackageManager::getDeployedPackages is called often. This results in a lot
//of bindPackage calls which are costly. Therefore we keep hard references in
//the map now.
- typedef ::std::hash_map<
+ typedef ::boost::unordered_map<
::rtl::OUString, css::uno::Reference<css::deployment::XPackage>,
::rtl::OUStringHash > t_string2ref;
t_string2ref m_bound;
diff --git a/desktop/source/migration/migration_impl.hxx b/desktop/source/migration/migration_impl.hxx
index d66caba..564e2d7 100644
--- a/desktop/source/migration/migration_impl.hxx
+++ b/desktop/source/migration/migration_impl.hxx
@@ -31,7 +31,7 @@
#include <vector>
#include <algorithm>
#include <memory>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include "migration.hxx"
@@ -138,7 +138,7 @@ struct MigrationItem
::rtl::OUString GetPrevSibling() const { return m_sPrevSibling; }
};
-typedef ::std::hash_map< ::rtl::OUString,
+typedef ::boost::unordered_map< ::rtl::OUString,
::std::vector< MigrationItem >,
::rtl::OUStringHash,
::std::equal_to< ::rtl::OUString > > MigrationHashMap;
diff --git a/editeng/source/uno/unoipset.cxx b/editeng/source/uno/unoipset.cxx
index 61879da..31c81aa 100644
--- a/editeng/source/uno/unoipset.cxx
+++ b/editeng/source/uno/unoipset.cxx
@@ -32,7 +32,7 @@
#include <svl/eitem.hxx>
#include <tools/list.hxx>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <svl/itemprop.hxx>
#include <editeng/unoipset.hxx>
diff --git a/formula/inc/formula/FormulaCompiler.hxx b/formula/inc/formula/FormulaCompiler.hxx
index 75a00f3..f5f1e71 100644
--- a/formula/inc/formula/FormulaCompiler.hxx
+++ b/formula/inc/formula/FormulaCompiler.hxx
@@ -35,7 +35,7 @@
#include <rtl/ustrbuf.hxx>
#include <boost/shared_ptr.hpp>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <com/sun/star/uno/Sequence.hxx>
@@ -77,8 +77,8 @@ struct FORMULA_DLLPUBLIC StringHashCode
}
};
-typedef ::std::hash_map< String, OpCode, StringHashCode, ::std::equal_to< String > > OpCodeHashMap;
-typedef ::std::hash_map< String, String, StringHashCode, ::std::equal_to< String > > ExternalHashMap;
+typedef ::boost::unordered_map< String, OpCode, StringHashCode, ::std::equal_to< String > > OpCodeHashMap;
+typedef ::boost::unordered_map< String, String, StringHashCode, ::std::equal_to< String > > ExternalHashMap;
class FORMULA_DLLPUBLIC FormulaCompiler
{
diff --git a/fpicker/source/win32/filepicker/propmap.hxx b/fpicker/source/win32/filepicker/propmap.hxx
index 2eed6fc..904f8fa 100644
--- a/fpicker/source/win32/filepicker/propmap.hxx
+++ b/fpicker/source/win32/filepicker/propmap.hxx
@@ -29,11 +29,11 @@
#ifndef _PROPMAP_HXX_
#define _PROPMAP_HXX_
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <rtl/ustring.hxx>
#include <sal/types.h>
-typedef ::std::hash_map< ::rtl::OUString ,
+typedef ::boost::unordered_map< ::rtl::OUString ,
void* ,
::rtl::OUStringHash ,
::std::equal_to< ::rtl::OUString > > TPropMapBase;
diff --git a/framework/inc/classes/filtercachedata.hxx b/framework/inc/classes/filtercachedata.hxx
index 3df41f9..317bbd2 100644
--- a/framework/inc/classes/filtercachedata.hxx
+++ b/framework/inc/classes/filtercachedata.hxx
@@ -32,7 +32,7 @@
/** Attention: stl headers must(!) be included at first. Otherwhise it can make trouble
with solaris headers ...
*/
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <vector>
#include <iterator>
@@ -470,7 +470,7 @@ struct ContentHandler
// and could be used in a generic way
//*****************************************************************************************************************
template< class HashType >
-class SetNodeHash : public ::std::hash_map< ::rtl::OUString ,
+class SetNodeHash : public ::boost::unordered_map< ::rtl::OUString ,
HashType ,
OUStringHashCode ,
::std::equal_to< ::rtl::OUString > >
@@ -511,7 +511,7 @@ class SetNodeHash : public ::std::hash_map< ::rtl::OUString ,
// It's an optimism to find registered services faster!
// The preferred hash maps file extensions to preferred types to find these ones faster.
//*****************************************************************************************************************
-class PerformanceHash : public ::std::hash_map< ::rtl::OUString ,
+class PerformanceHash : public ::boost::unordered_map< ::rtl::OUString ,
OUStringList ,
OUStringHashCode ,
::std::equal_to< ::rtl::OUString > >
diff --git a/framework/inc/helper/titlehelper.hxx b/framework/inc/helper/titlehelper.hxx
index 8832ea1..f6404c5 100644
--- a/framework/inc/helper/titlehelper.hxx
+++ b/framework/inc/helper/titlehelper.hxx
@@ -51,7 +51,7 @@
#include <rtl/ustrbuf.hxx>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
//_______________________________________________
// namespace
diff --git a/framework/inc/services/substitutepathvars.hxx b/framework/inc/services/substitutepathvars.hxx
index ec4799d..7ffd863 100644
--- a/framework/inc/services/substitutepathvars.hxx
+++ b/framework/inc/services/substitutepathvars.hxx
@@ -34,7 +34,7 @@
*/
#include <vector>
#include <list>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
//_________________________________________________________________________________________________________________
// my own includes
@@ -110,7 +110,7 @@ struct SubstitutePathNotify
const com::sun::star::uno::Sequence<rtl::OUString> aPropertyNames;
};
-class SubstituteVariables : public ::std::hash_map< ::rtl::OUString,
+class SubstituteVariables : public ::boost::unordered_map< ::rtl::OUString,
SubstituteRule,
OUStringHashCode,
::std::equal_to< ::rtl::OUString > >
@@ -277,7 +277,7 @@ class SubstitutePathVariables : private ThreadHelpBase , // Struct for ri
throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
private:
- class VarNameToIndexMap : public std::hash_map< ::rtl::OUString,
+ class VarNameToIndexMap : public boost::unordered_map< ::rtl::OUString,
PreDefVariable,
OUStringHashCode,
::std::equal_to< ::rtl::OUString > >
diff --git a/framework/inc/services/tabwindowservice.hxx b/framework/inc/services/tabwindowservice.hxx
index 88750b0..3df7d18 100644
--- a/framework/inc/services/tabwindowservice.hxx
+++ b/framework/inc/services/tabwindowservice.hxx
@@ -104,7 +104,7 @@ struct TTabPageInfo
css::uno::Sequence< css::beans::NamedValue > m_lProperties;
};
-typedef ::std::hash_map< ::sal_Int32 ,
+typedef ::boost::unordered_map< ::sal_Int32 ,
TTabPageInfo ,
Int32HashCode ,
::std::equal_to< ::sal_Int32 > > TTabPageInfoHash;
diff --git a/framework/inc/stdtypes.h b/framework/inc/stdtypes.h
index f6fa590..9dd454f 100644
--- a/framework/inc/stdtypes.h
+++ b/framework/inc/stdtypes.h
@@ -31,7 +31,7 @@
#include <vector>
#include <queue>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
//_________________________________________________________________________________________________________________
// own includes
@@ -162,12 +162,12 @@ typedef ::std::queue< ::rtl::OUString > OUStringQueue;
//_________________________________________________________________________________________________________________
/**
- Basic hash based on a std::hash_map() which provides key=[OUString] and value=[template type] pairs
+ Basic hash based on a boost::unordered_map() which provides key=[OUString] and value=[template type] pairs
It implements some additional funtionality which can be usefull but
is missing at the normal hash implementation.
*/
template< class TType >
-class BaseHash : public ::std::hash_map< ::rtl::OUString ,
+class BaseHash : public ::boost::unordered_map< ::rtl::OUString ,
TType ,
OUStringHashCode ,
::std::equal_to< ::rtl::OUString > >
diff --git a/framework/inc/uiconfiguration/globalsettings.hxx b/framework/inc/uiconfiguration/globalsettings.hxx
index 1577f1f..8bb5508 100644
--- a/framework/inc/uiconfiguration/globalsettings.hxx
+++ b/framework/inc/uiconfiguration/globalsettings.hxx
@@ -34,7 +34,7 @@
*/
#include <vector>
#include <list>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
//_________________________________________________________________________________________________________________
// my own includes
diff --git a/framework/inc/uiconfiguration/imagemanager.hxx b/framework/inc/uiconfiguration/imagemanager.hxx
index e5f0ff6..04257f0 100644
--- a/framework/inc/uiconfiguration/imagemanager.hxx
+++ b/framework/inc/uiconfiguration/imagemanager.hxx
@@ -35,7 +35,7 @@
*/
#include <vector>
#include <list>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <memory>
//_________________________________________________________________________________________________________________
diff --git a/framework/inc/uiconfiguration/imagetype.hxx b/framework/inc/uiconfiguration/imagetype.hxx
index 1199010..bc9848f 100644
--- a/framework/inc/uiconfiguration/imagetype.hxx
+++ b/framework/inc/uiconfiguration/imagetype.hxx
@@ -29,7 +29,7 @@
#ifndef __FRAMEWORK_UICONFIGURATION_IMAGETYPE_HXX_
#define __FRAMEWORK_UICONFIGURATION_IMAGETYPE_HXX_
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <rtl/ustring.hxx>
namespace framework
@@ -42,11 +42,11 @@ enum ImageType
ImageType_COUNT
};
-typedef std::hash_map< rtl::OUString,
+typedef boost::unordered_map< rtl::OUString,
rtl::OUString,
OUStringHashCode,
::std::equal_to< ::rtl::OUString > > CommandToImageNameMap;
-typedef std::hash_map< rtl::OUString,
+typedef boost::unordered_map< rtl::OUString,
bool,
OUStringHashCode,
::std::equal_to< ::rtl::OUString > > CommandMap;
diff --git a/framework/inc/uiconfiguration/moduleimagemanager.hxx b/framework/inc/uiconfiguration/moduleimagemanager.hxx
index 760dd4b..2e385e5 100644
--- a/framework/inc/uiconfiguration/moduleimagemanager.hxx
+++ b/framework/inc/uiconfiguration/moduleimagemanager.hxx
@@ -35,7 +35,7 @@
*/
#include <vector>
#include <list>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <memory>
//_________________________________________________________________________________________________________________
diff --git a/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx b/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx
index 0fcae93..48eb9cf 100644
--- a/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx
+++ b/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx
@@ -35,7 +35,7 @@
*/
#include <vector>
#include <list>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
//_________________________________________________________________________________________________________________
// my own includes
@@ -98,7 +98,7 @@ namespace framework
throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
private:
- typedef ::std::hash_map< rtl::OUString, com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager >, OUStringHashCode, ::std::equal_to< rtl::OUString > > ModuleToModuleCfgMgr;
+ typedef ::boost::unordered_map< rtl::OUString, com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager >, OUStringHashCode, ::std::equal_to< rtl::OUString > > ModuleToModuleCfgMgr;
//TODO_AS void impl_initStorages();
diff --git a/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx b/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx
index 2e1c968..374194f 100644
--- a/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx
+++ b/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx
@@ -35,7 +35,7 @@
*/
#include <vector>
#include <list>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
//_________________________________________________________________________________________________________________
// my own includes
@@ -169,7 +169,7 @@ namespace framework
struct UIElementType;
friend struct UIElementType;
- typedef ::std::hash_map< rtl::OUString, UIElementData, OUStringHashCode, ::std::equal_to< rtl::OUString > > UIElementDataHashMap;
+ typedef ::boost::unordered_map< rtl::OUString, UIElementData, OUStringHashCode, ::std::equal_to< rtl::OUString > > UIElementDataHashMap;
struct UIElementType
{
@@ -189,7 +189,7 @@ namespace framework
typedef ::std::vector< UIElementType > UIElementTypesVector;
typedef ::std::vector< ::com::sun::star::ui::ConfigurationEvent > ConfigEventNotifyContainer;
- typedef ::std::hash_map< rtl::OUString, UIElementInfo, OUStringHashCode, ::std::equal_to< rtl::OUString > > UIElementInfoHashMap;
+ typedef ::boost::unordered_map< rtl::OUString, UIElementInfo, OUStringHashCode, ::std::equal_to< rtl::OUString > > UIElementInfoHashMap;
// private methods
void impl_Initialize();
diff --git a/framework/inc/uiconfiguration/uicategorydescription.hxx b/framework/inc/uiconfiguration/uicategorydescription.hxx
index 4c75eb2..1225a84 100644
--- a/framework/inc/uiconfiguration/uicategorydescription.hxx
+++ b/framework/inc/uiconfiguration/uicategorydescription.hxx
@@ -34,7 +34,7 @@
*/
#include <vector>
#include <list>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
//_________________________________________________________________________________________________________________
// my own includes
diff --git a/framework/inc/uiconfiguration/uiconfigurationmanager.hxx b/framework/inc/uiconfiguration/uiconfigurationmanager.hxx
index 6d8d8e1..2d8d642 100644
--- a/framework/inc/uiconfiguration/uiconfigurationmanager.hxx
+++ b/framework/inc/uiconfiguration/uiconfigurationmanager.hxx
@@ -35,7 +35,7 @@
*/
#include <vector>
#include <list>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
//_________________________________________________________________________________________________________________
// my own includes
@@ -155,7 +155,7 @@ namespace framework
struct UIElementType;
friend struct UIElementType;
- typedef ::std::hash_map< rtl::OUString, UIElementData, OUStringHashCode, ::std::equal_to< rtl::OUString > > UIElementDataHashMap;
+ typedef ::boost::unordered_map< rtl::OUString, UIElementData, OUStringHashCode, ::std::equal_to< rtl::OUString > > UIElementDataHashMap;
struct UIElementType
{
@@ -175,7 +175,7 @@ namespace framework
typedef ::std::vector< UIElementType > UIElementTypesVector;
typedef ::std::vector< ::com::sun::star::ui::ConfigurationEvent > ConfigEventNotifyContainer;
- typedef ::std::hash_map< rtl::OUString, UIElementInfo, OUStringHashCode, ::std::equal_to< rtl::OUString > > UIElementInfoHashMap;
+ typedef ::boost::unordered_map< rtl::OUString, UIElementInfo, OUStringHashCode, ::std::equal_to< rtl::OUString > > UIElementInfoHashMap;
// private methods
void impl_Initialize();
diff --git a/framework/inc/uiconfiguration/windowstateconfiguration.hxx b/framework/inc/uiconfiguration/windowstateconfiguration.hxx
index dab5882..6cb52b6 100644
--- a/framework/inc/uiconfiguration/windowstateconfiguration.hxx
+++ b/framework/inc/uiconfiguration/windowstateconfiguration.hxx
@@ -34,7 +34,7 @@
*/
#include <vector>
#include <list>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
//_________________________________________________________________________________________________________________
// my own includes
@@ -109,12 +109,12 @@ class WindowStateConfiguration : private ThreadHelpBase , // Struct for ri
virtual sal_Bool SAL_CALL hasElements()
throw (::com::sun::star::uno::RuntimeException);
- typedef ::std::hash_map< ::rtl::OUString,
+ typedef ::boost::unordered_map< ::rtl::OUString,
::rtl::OUString,
OUStringHashCode,
::std::equal_to< ::rtl::OUString > > ModuleToWindowStateFileMap;
- typedef ::std::hash_map< ::rtl::OUString,
+ typedef ::boost::unordered_map< ::rtl::OUString,
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >,
OUStringHashCode,
::std::equal_to< ::rtl::OUString > > ModuleToWindowStateConfigHashMap;
diff --git a/framework/inc/uielement/controlmenucontroller.hxx b/framework/inc/uielement/controlmenucontroller.hxx
index 55fe00a..319272a 100644
--- a/framework/inc/uielement/controlmenucontroller.hxx
+++ b/framework/inc/uielement/controlmenucontroller.hxx
@@ -91,7 +91,7 @@ namespace framework
virtual void impl_setPopupMenu();
virtual void impl_select(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aURL);
- class UrlToDispatchMap : public ::std::hash_map< ::rtl::OUString,
+ class UrlToDispatchMap : public ::boost::unordered_map< ::rtl::OUString,
com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >,
OUStringHashCode,
::std::equal_to< ::rtl::OUString > >
diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx
index 26291bf..ac7db06 100644
--- a/framework/inc/uielement/menubarmanager.hxx
+++ b/framework/inc/uielement/menubarmanager.hxx
@@ -83,7 +83,7 @@ struct PopupControllerEntry
::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XDispatchProvider > m_xDispatchProvider;
};
-typedef std::hash_map< rtl::OUString, PopupControllerEntry, OUStringHashCode, ::std::equal_to< rtl::OUString > > PopupControllerCache;
+typedef boost::unordered_map< rtl::OUString, PopupControllerEntry, OUStringHashCode, ::std::equal_to< rtl::OUString > > PopupControllerCache;
class BmkMenu;
class AddonMenu;
diff --git a/framework/inc/uielement/menubarwrapper.hxx b/framework/inc/uielement/menubarwrapper.hxx
index 70dd456..211ba10 100644
--- a/framework/inc/uielement/menubarwrapper.hxx
+++ b/framework/inc/uielement/menubarwrapper.hxx
@@ -49,7 +49,7 @@
// other includes
//_________________________________________________________________________________________________________________
-#include <hash_map>
+#include <boost/unordered_map.hpp>
namespace framework
{
diff --git a/framework/inc/uielement/newmenucontroller.hxx b/framework/inc/uielement/newmenucontroller.hxx
index e0cfa75..6e31f04 100644
--- a/framework/inc/uielement/newmenucontroller.hxx
+++ b/framework/inc/uielement/newmenucontroller.hxx
@@ -60,7 +60,7 @@
#include <rtl/ustring.hxx>
#include <vcl/accel.hxx>
#include <vcl/menu.hxx>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
namespace framework
{
@@ -105,7 +105,7 @@ namespace framework
rtl::OUString aImageId;
};
- typedef ::std::hash_map< int, AddInfo > AddInfoForId;
+ typedef ::boost::unordered_map< int, AddInfo > AddInfoForId;
void fillPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu );
void retrieveShortcutsFromConfiguration( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration >& rAccelCfg,
diff --git a/framework/inc/uielement/simpletextstatusbarcontroller.hxx b/framework/inc/uielement/simpletextstatusbarcontroller.hxx
index 870cb97..b03770d 100644
--- a/framework/inc/uielement/simpletextstatusbarcontroller.hxx
+++ b/framework/inc/uielement/simpletextstatusbarcontroller.hxx
@@ -35,7 +35,7 @@
#include <macros/xserviceinfo.hxx>
#include <stdtypes.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <svtools/statusbarcontroller.hxx>
#include <vcl/image.hxx>
diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx
index 47b999d..3e36760 100644
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
@@ -209,11 +209,11 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener
bool RetrieveShortcut( const rtl::OUString& rCommandURL, rtl::OUString& rShortCut );
protected:
- typedef ::std::hash_map< sal_uInt16, ::com::sun::star::uno::Reference< com::sun::star::frame::XStatusListener > > ToolBarControllerMap;
+ typedef ::boost::unordered_map< sal_uInt16, ::com::sun::star::uno::Reference< com::sun::star::frame::XStatusListener > > ToolBarControllerMap;
typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XSubToolbarController > > SubToolBarControllerVector;
typedef BaseHash< SubToolBarControllerVector > SubToolBarToSubToolBarControllerMap;
- typedef ::std::hash_map< sal_uInt16, ::com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > > MenuDescriptionMap;
+ typedef ::boost::unordered_map< sal_uInt16, ::com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > > MenuDescriptionMap;
sal_Bool m_bDisposed : 1,
m_bSmallSymbols : 1,
m_bModuleIdentified : 1,
diff --git a/framework/inc/uielement/uicommanddescription.hxx b/framework/inc/uielement/uicommanddescription.hxx
index ee5a5f5..0331069 100644
--- a/framework/inc/uielement/uicommanddescription.hxx
+++ b/framework/inc/uielement/uicommanddescription.hxx
@@ -34,7 +34,7 @@
*/
#include <vector>
#include <list>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
//_________________________________________________________________________________________________________________
// my own includes
@@ -90,12 +90,12 @@ private:
throw (::com::sun::star::uno::RuntimeException);
public:
- typedef ::std::hash_map< ::rtl::OUString,
+ typedef ::boost::unordered_map< ::rtl::OUString,
::rtl::OUString,
OUStringHashCode,
::std::equal_to< ::rtl::OUString > > ModuleToCommandFileMap;
- typedef ::std::hash_map< ::rtl::OUString,
+ typedef ::boost::unordered_map< ::rtl::OUString,
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >,
OUStringHashCode,
::std::equal_to< ::rtl::OUString > > UICommandsHashMap;
diff --git a/framework/inc/uifactory/factoryconfiguration.hxx b/framework/inc/uifactory/factoryconfiguration.hxx
index 4030155..4ec38b4 100644
--- a/framework/inc/uifactory/factoryconfiguration.hxx
+++ b/framework/inc/uifactory/factoryconfiguration.hxx
@@ -95,7 +95,7 @@ private:
ControllerInfo(const ::rtl::OUString& _aImplementationName,const ::rtl::OUString& _aValue) : m_aImplementationName(_aImplementationName),m_aValue(_aValue){}
ControllerInfo(){}
};
- class MenuControllerMap : public std::hash_map< rtl::OUString,
+ class MenuControllerMap : public boost::unordered_map< rtl::OUString,
ControllerInfo,
OUStringHashCode,
::std::equal_to< ::rtl::OUString > >
diff --git a/framework/inc/uifactory/uielementfactorymanager.hxx b/framework/inc/uifactory/uielementfactorymanager.hxx
index 55eeda6..f10368a 100644
--- a/framework/inc/uifactory/uielementfactorymanager.hxx
+++ b/framework/inc/uifactory/uielementfactorymanager.hxx
@@ -91,7 +91,7 @@ namespace framework
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException);
private:
- class FactoryManagerMap : public std::hash_map< rtl::OUString,
+ class FactoryManagerMap : public boost::unordered_map< rtl::OUString,
rtl::OUString,
OUStringHashCode,
::std::equal_to< ::rtl::OUString > >
diff --git a/framework/inc/xml/eventsdocumenthandler.hxx b/framework/inc/xml/eventsdocumenthandler.hxx
index fcd01a6..7a8400c 100644
--- a/framework/inc/xml/eventsdocumenthandler.hxx
+++ b/framework/inc/xml/eventsdocumenthandler.hxx
@@ -44,7 +44,7 @@
#include <rtl/ustring.hxx>
#include <cppuhelper/implbase1.hxx>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <stdtypes.h>
//_________________________________________________________________________________________________________________
@@ -126,7 +126,7 @@ class OReadEventsDocumentHandler : private ThreadHelpBase, // Struct for right i
private:
::rtl::OUString getErrorLineString();
- class EventsHashMap : public ::std::hash_map< ::rtl::OUString ,
+ class EventsHashMap : public ::boost::unordered_map< ::rtl::OUString ,
Events_XML_Entry ,
OUStringHashCode ,
::std::equal_to< ::rtl::OUString > >
diff --git a/framework/inc/xml/imagesdocumenthandler.hxx b/framework/inc/xml/imagesdocumenthandler.hxx
index dad1275..616dc58 100644
--- a/framework/inc/xml/imagesdocumenthandler.hxx
+++ b/framework/inc/xml/imagesdocumenthandler.hxx
@@ -43,7 +43,7 @@
#include <rtl/ustring.hxx>
#include <cppuhelper/implbase1.hxx>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <stdtypes.h>
//_________________________________________________________________________________________________________________
@@ -127,7 +127,7 @@ class OReadImagesDocumentHandler : private ThreadHelpBase, // Struct for right i
private:
::rtl::OUString getErrorLineString();
- class ImageHashMap : public ::std::hash_map< ::rtl::OUString ,
+ class ImageHashMap : public ::boost::unordered_map< ::rtl::OUString ,
Image_XML_Entry ,
OUStringHashCode ,
::std::equal_to< ::rtl::OUString > >
diff --git a/framework/inc/xml/statusbardocumenthandler.hxx b/framework/inc/xml/statusbardocumenthandler.hxx
index 797c308..2c76741 100644
--- a/framework/inc/xml/statusbardocumenthandler.hxx
+++ b/framework/inc/xml/statusbardocumenthandler.hxx
@@ -44,7 +44,7 @@
#include <rtl/ustring.hxx>
#include <cppuhelper/implbase1.hxx>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <stdtypes.h>
//_________________________________________________________________________________________________________________
@@ -125,7 +125,7 @@ class OReadStatusBarDocumentHandler : private ThreadHelpBase, // Struct for righ
private:
::rtl::OUString getErrorLineString();
- class StatusBarHashMap : public ::std::hash_map< ::rtl::OUString ,
+ class StatusBarHashMap : public ::boost::unordered_map< ::rtl::OUString ,
StatusBar_XML_Entry ,
OUStringHashCode ,
::std::equal_to< ::rtl::OUString > >
diff --git a/framework/inc/xml/toolboxdocumenthandler.hxx b/framework/inc/xml/toolboxdocumenthandler.hxx
index 1bf1c53..683a79c 100644
--- a/framework/inc/xml/toolboxdocumenthandler.hxx
+++ b/framework/inc/xml/toolboxdocumenthandler.hxx
@@ -129,7 +129,7 @@ class OReadToolBoxDocumentHandler : private ThreadHelpBase, // Struct for right
private:
::rtl::OUString getErrorLineString();
- class ToolBoxHashMap : public ::std::hash_map< ::rtl::OUString ,
+ class ToolBoxHashMap : public ::boost::unordered_map< ::rtl::OUString ,
ToolBox_XML_Entry ,
OUStringHashCode ,
::std::equal_to< ::rtl::OUString > >
diff --git a/framework/source/classes/addonsoptions.cxx b/framework/source/classes/addonsoptions.cxx
index 7b78d98..217a447 100644
--- a/framework/source/classes/addonsoptions.cxx
+++ b/framework/source/classes/addonsoptions.cxx
@@ -50,7 +50,7 @@
#include <vcl/graph.hxx>
#include <svtools/filter.hxx>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <algorithm>
#include <vector>
@@ -297,10 +297,10 @@ class AddonsOptions_Impl : public ConfigItem
Image aImageBigNoScale;
};
- typedef std::hash_map< ::rtl::OUString, ImageEntry, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > ImageManager;
- typedef std::hash_map< ::rtl::OUString, sal_uInt32, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > StringToIndexMap;
+ typedef boost::unordered_map< ::rtl::OUString, ImageEntry, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > ImageManager;
+ typedef boost::unordered_map< ::rtl::OUString, sal_uInt32, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > StringToIndexMap;
typedef std::vector< Sequence< Sequence< PropertyValue > > > AddonToolBars;
- typedef ::std::hash_map< ::rtl::OUString, MergeToolbarInstructionContainer, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > ToolbarMergingInstructions;
+ typedef ::boost::unordered_map< ::rtl::OUString, MergeToolbarInstructionContainer, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > ToolbarMergingInstructions;
enum ImageSize
{
diff --git a/framework/source/inc/accelerators/acceleratorcache.hxx b/framework/source/inc/accelerators/acceleratorcache.hxx
index 286b74e..b998fd1 100644
--- a/framework/source/inc/accelerators/acceleratorcache.hxx
+++ b/framework/source/inc/accelerators/acceleratorcache.hxx
@@ -79,7 +79,7 @@ class AcceleratorCache : public ThreadHelpBase // attention! Must be the first b
/** TODO document me
keys -> commands
*/
- typedef ::std::hash_map< css::awt::KeyEvent ,
+ typedef ::boost::unordered_map< css::awt::KeyEvent ,
::rtl::OUString ,
KeyEventHashCode ,
KeyEventEqualsFunc > TKey2Commands;
diff --git a/framework/source/inc/accelerators/keymapping.hxx b/framework/source/inc/accelerators/keymapping.hxx
index 4214806..3e70d16 100644
--- a/framework/source/inc/accelerators/keymapping.hxx
+++ b/framework/source/inc/accelerators/keymapping.hxx
@@ -77,7 +77,7 @@ class KeyMapping
//---------------------------------------
/** @short hash structure to map key codes to identifier. */
- typedef ::std::hash_map< sal_Int16 ,
+ typedef ::boost::unordered_map< sal_Int16 ,
::rtl::OUString ,
ShortHashCode ,
::std::equal_to< sal_Int16 > > Code2IdentifierHash;
diff --git a/framework/source/inc/accelerators/storageholder.hxx b/framework/source/inc/accelerators/storageholder.hxx
index c85f915..2beb836 100644
--- a/framework/source/inc/accelerators/storageholder.hxx
+++ b/framework/source/inc/accelerators/storageholder.hxx
@@ -91,7 +91,7 @@ class StorageHolder : private ThreadHelpBase // attention! Must be the first bas
};
/** @short TODO */
- typedef ::std::hash_map< ::rtl::OUString ,
+ typedef ::boost::unordered_map< ::rtl::OUString ,
TStorageInfo ,
::rtl::OUStringHash ,
::std::equal_to< ::rtl::OUString > > TPath2StorageInfo;
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index d0a4a8e..9547123 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -750,7 +750,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL Desktop::queryDispatch( co
if ( aURL.Protocol.equalsIgnoreAsciiCaseAsciiL( UNO_PROTOCOL, sizeof( UNO_PROTOCOL )-1 ))
aCommand = aURL.Path;
- // Make hash_map lookup if the current URL is in the disabled list
+ // Make boost::unordered_map lookup if the current URL is in the disabled list
if ( m_aCommandOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, aCommand ) )
return css::uno::Reference< css::frame::XDispatch >();
else
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index 5562cf6..0c76fec 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -2089,7 +2089,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL Frame::queryDispatch( cons
if ( aURL.Protocol.equalsIgnoreAsciiCaseAsciiL( UNO_PROTOCOL, sizeof( UNO_PROTOCOL )-1 ))
aCommand = aURL.Path;
- // Make hash_map lookup if the current URL is in the disabled list
+ // Make boost::unordered_map lookup if the current URL is in the disabled list
if ( m_aCommandOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, aCommand ) )
return css::uno::Reference< css::frame::XDispatch >();
else
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx b/framework/source/uiconfiguration/imagemanagerimpl.hxx
index 768f32a..20cfd5d 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.hxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx
@@ -35,7 +35,7 @@
*/
#include <vector>
#include <list>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
//_________________________________________________________________________________________________________________
// my own includes
@@ -162,7 +162,7 @@ namespace framework
void clear();
- typedef std::hash_map< rtl::OUString,
+ typedef boost::unordered_map< rtl::OUString,
sal_Bool,
OUStringHashCode,
::std::equal_to< ::rtl::OUString > > ImageNameMap;
diff --git a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
index 1043a26..1174c60 100644
--- a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
+++ b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
@@ -122,7 +122,7 @@ ModuleUIConfigurationManagerSupplier::ModuleUIConfigurationManagerSupplier( cons
, m_aListenerContainer( m_aLock.getShareableOslMutex() )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "ModuleUIConfigurationManagerSupplier::ModuleUIConfigurationManagerSupplier" );
- // Retrieve known modules and insert them into our hash_map to speed-up access time.
+ // Retrieve known modules and insert them into our boost::unordered_map to speed-up access time.
Reference< XNameAccess > xNameAccess( m_xModuleMgr, UNO_QUERY );
const Sequence< ::rtl::OUString > aNameSeq = xNameAccess->getElementNames();
const ::rtl::OUString* pNameSeq = aNameSeq.getConstArray();
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index be93db9..3245495 100644
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -287,7 +287,7 @@ void ModuleUIConfigurationManager::impl_preloadUIElementTypeList( Layer eLayer,
aUIElementData.bDefaultNode = false;
}
- // Create hash_map entries for all user interface elements inside the storage. We don't load the
+ // Create boost::unordered_map entries for all user interface elements inside the storage. We don't load the
// settings to speed up the process.
rHashMap.insert( UIElementDataHashMap::value_type( aUIElementData.aResourceURL, aUIElementData ));
}
@@ -408,7 +408,7 @@ ModuleUIConfigurationManager::UIElementData* ModuleUIConfigurationManager::impl
impl_preloadUIElementTypeList( LAYER_USERDEFINED, nElementType );
impl_preloadUIElementTypeList( LAYER_DEFAULT, nElementType );
- // first try to look into our user-defined vector/hash_map combination
+ // first try to look into our user-defined vector/boost::unordered_map combination
UIElementDataHashMap& rUserHashMap = m_aUIElements[LAYER_USERDEFINED][nElementType].aElementsHashMap;
UIElementDataHashMap::iterator pIter = rUserHashMap.find( aResourceURL );
if ( pIter != rUserHashMap.end() )
@@ -422,7 +422,7 @@ ModuleUIConfigurationManager::UIElementData* ModuleUIConfigurationManager::impl
}
}
- // Not successfull, we have to look into our default vector/hash_map combination
+ // Not successfull, we have to look into our default vector/boost::unordered_map combination
UIElementDataHashMap& rDefaultHashMap = m_aUIElements[LAYER_DEFAULT][nElementType].aElementsHashMap;
pIter = rDefaultHashMap.find( aResourceURL );
if ( pIter != rDefaultHashMap.end() )
@@ -1446,7 +1446,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la
// preload list of element types on demand
impl_preloadUIElementTypeList( LAYER_DEFAULT, nElementType );
- // Look into our default vector/hash_map combination
+ // Look into our default vector/boost::unordered_map combination
UIElementDataHashMap& rDefaultHashMap = m_aUIElements[LAYER_DEFAULT][nElementType].aElementsHashMap;
UIElementDataHashMap::iterator pIter = rDefaultHashMap.find( ResourceURL );
if ( pIter != rDefaultHashMap.end() )
diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx
index 1bc66fc..9ac42e5 100644
--- a/framework/source/uiconfiguration/uicategorydescription.cxx
+++ b/framework/source/uiconfiguration/uicategorydescription.cxx
@@ -137,7 +137,7 @@ class ConfigurationAccess_UICategory : // Order is neccessary for right initiali
sal_Bool fillCache();
private:
- typedef ::std::hash_map< ::rtl::OUString,
+ typedef ::boost::unordered_map< ::rtl::OUString,
::rtl::OUString,
OUStringHashCode,
::std::equal_to< ::rtl::OUString > > IdToInfoCache;
diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
index 5ba910d..93f9e9c 100644
--- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
@@ -225,7 +225,7 @@ void UIConfigurationManager::impl_preloadUIElementTypeList( sal_Int16 nElementTy
aUIElementData.bModified = false;
aUIElementData.bDefault = false;
- // Create hash_map entries for all user interface elements inside the storage. We don't load the
+ // Create boost::unordered_map entries for all user interface elements inside the storage. We don't load the
// settings to speed up the process.
rHashMap.insert( UIElementDataHashMap::value_type( aUIElementData.aResourceURL, aUIElementData ));
}
@@ -344,7 +344,7 @@ UIConfigurationManager::UIElementData* UIConfigurationManager::impl_findUIElemen
// preload list of element types on demand
impl_preloadUIElementTypeList( nElementType );
- // try to look into our document vector/hash_map combination
+ // try to look into our document vector/boost::unordered_map combination
UIElementDataHashMap& rUserHashMap = m_aUIElements[nElementType].aElementsHashMap;
UIElementDataHashMap::iterator pIter = rUserHashMap.find( aResourceURL );
if ( pIter != rUserHashMap.end() )
diff --git a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx
index be669d2..a60cd01 100644
--- a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx
@@ -257,7 +257,7 @@ void UIConfigurationManagerImpl::impl_preloadUIElementTypeList( Layer eLayer, sa
aUIElementData.bDefaultNode = false;
}
- // Create hash_map entries for all user interface elements inside the storage. We don't load the
+ // Create boost::unordered_map entries for all user interface elements inside the storage. We don't load the
// settings to speed up the process.
rHashMap.insert( UIElementDataHashMap::value_type( aUIElementData.aResourceURL, aUIElementData ));
}
@@ -378,7 +378,7 @@ UIConfigurationManagerImpl::UIElementData* UIConfigurationManagerImpl::impl_fin
if ( m_bUseDefault )
impl_preloadUIElementTypeList( LAYER_DEFAULT, nElementType );
- // first try to look into our user-defined vector/hash_map combination
+ // first try to look into our user-defined vector/boost::unordered_map combination
UIElementDataHashMap& rUserHashMap = m_aUIElements[LAYER_USERDEFINED][nElementType].aElementsHashMap;
UIElementDataHashMap::iterator pIter = rUserHashMap.find( aResourceURL );
if ( pIter != rUserHashMap.end() )
@@ -394,7 +394,7 @@ UIConfigurationManagerImpl::UIElementData* UIConfigurationManagerImpl::impl_fin
if ( m_bUseDefault )
{
- // Not successfull, we have to look into our default vector/hash_map combination
+ // Not successfull, we have to look into our default vector/boost::unordered_map combination
UIElementDataHashMap& rDefaultHashMap = m_aUIElements[LAYER_DEFAULT][nElementType].aElementsHashMap;
pIter = rDefaultHashMap.find( aResourceURL );
if ( pIter != rDefaultHashMap.end() )
@@ -1536,7 +1536,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la
// preload list of element types on demand
impl_preloadUIElementTypeList( LAYER_DEFAULT, nElementType );
- // Look into our default vector/hash_map combination
+ // Look into our default vector/boost::unordered_map combination
UIElementDataHashMap& rDefaultHashMap = m_aUIElements[LAYER_DEFAULT][nElementType].aElementsHashMap;
UIElementDataHashMap::iterator pIter = rDefaultHashMap.find( ResourceURL );
if ( pIter != rDefaultHashMap.end() )
diff --git a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx
index d7673e0..540bc3f 100644
--- a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx
@@ -35,7 +35,7 @@
*/
#include <vector>
#include <list>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
//_________________________________________________________________________________________________________________
// my own includes
@@ -159,7 +159,7 @@ namespace framework
struct UIElementType;
friend struct UIElementType;
- typedef ::std::hash_map< rtl::OUString, UIElementData, OUStringHashCode, ::std::equal_to< rtl::OUString > > UIElementDataHashMap;
+ typedef ::boost::unordered_map< rtl::OUString, UIElementData, OUStringHashCode, ::std::equal_to< rtl::OUString > > UIElementDataHashMap;
struct UIElementType
{
@@ -179,7 +179,7 @@ namespace framework
typedef ::std::vector< UIElementType > UIElementTypesVector;
typedef ::std::vector< ::com::sun::star::ui::ConfigurationEvent > ConfigEventNotifyContainer;
- typedef ::std::hash_map< rtl::OUString, UIElementInfo, OUStringHashCode, ::std::equal_to< rtl::OUString > > UIElementInfoHashMap;
+ typedef ::boost::unordered_map< rtl::OUString, UIElementInfo, OUStringHashCode, ::std::equal_to< rtl::OUString > > UIElementInfoHashMap;
// private methods
void impl_Initialize();
diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx
index 600e9cf..4d9c39a 100644
--- a/framework/source/uiconfiguration/windowstateconfiguration.cxx
+++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx
@@ -257,7 +257,7 @@ class ConfigurationAccess_WindowState : // interfaces
sal_Bool impl_initializeConfigAccess();
private:
- typedef ::std::hash_map< ::rtl::OUString,
+ typedef ::boost::unordered_map< ::rtl::OUString,
WindowStateInfo,
OUStringHashCode,
::std::equal_to< ::rtl::OUString > > ResourceURLToInfoCache;
diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx
index 77fa03d..f9d6920 100644
--- a/framework/source/uielement/newmenucontroller.cxx
+++ b/framework/source/uielement/newmenucontroller.cxx
@@ -368,7 +368,7 @@ void NewMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopup
AddInfo aAddInfo;
// retrieve additional parameters from bookmark menu and
- // store it in a hash_map.
+ // store it in a boost::unordered_map.
for ( USHORT i = 0; i < pSubMenu->GetItemCount(); i++ )
{
USHORT nItemId = pSubMenu->GetItemId( sal::static_int_cast<USHORT>( i ) );
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx
index fcf575b..3bca816 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -108,7 +108,7 @@ static const char STATIC_INTERNAL_CMD_PART[] = ".cmd:";
namespace framework
{
-typedef std::hash_map< rtl::OUString, rtl::OUString, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > ToolbarHashMap;
+typedef boost::unordered_map< rtl::OUString, rtl::OUString, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > ToolbarHashMap;
struct ToolBarEntry
{
diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx
index 8a9ec11..4594f3a 100644
--- a/framework/source/uielement/uicommanddescription.cxx
+++ b/framework/source/uielement/uicommanddescription.cxx
@@ -172,7 +172,7 @@ class ConfigurationAccess_UICommand : // Order is neccessary for right initializ
std::vector< ::rtl::OUString >& aImageMirrorVector);
private:
- typedef ::std::hash_map< ::rtl::OUString,
+ typedef ::boost::unordered_map< ::rtl::OUString,
CmdToInfoMap,
OUStringHashCode,
::std::equal_to< ::rtl::OUString > > CommandToInfoCache;
diff --git a/framework/test/typecfg/cfgview.cxx b/framework/test/typecfg/cfgview.cxx
index 5aad6e1..bbad8a3 100644
--- a/framework/test/typecfg/cfgview.cxx
+++ b/framework/test/typecfg/cfgview.cxx
@@ -55,7 +55,7 @@
#include <rtl/ustring.hxx>
#include <rtl/ustrbuf.hxx>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <vcl/event.hxx>
#include <vcl/svapp.hxx>
diff --git a/linguistic/source/convdic.hxx b/linguistic/source/convdic.hxx
index d2f21a5..67527ba 100644
--- a/linguistic/source/convdic.hxx
+++ b/linguistic/source/convdic.hxx
@@ -36,7 +36,7 @@
#include <cppuhelper/interfacecontainer.h>
#include <tools/string.hxx>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <set>
#include <memory>
#include "misc.hxx"
@@ -73,12 +73,12 @@ struct StrEQ
}
};
-typedef std::hash_multimap< const rtl::OUString, rtl::OUString,
+typedef boost::unordered_multimap< const rtl::OUString, rtl::OUString,
const rtl::OUStringHash, StrEQ > ConvMap;
typedef std::set< rtl::OUString, StrLT > ConvMapKeySet;
-typedef std::hash_multimap< const rtl::OUString, sal_Int16,
+typedef boost::unordered_multimap< const rtl::OUString, sal_Int16,
rtl::OUStringHash, StrEQ > PropTypeMap;
///////////////////////////////////////////////////////////////////////////
diff --git a/scripting/source/dlgprov/dlgevtatt.hxx b/scripting/source/dlgprov/dlgevtatt.hxx
index 4e1321f..88e64ad 100644
--- a/scripting/source/dlgprov/dlgevtatt.hxx
+++ b/scripting/source/dlgprov/dlgevtatt.hxx
@@ -41,7 +41,7 @@
#include <com/sun/star/script/XScriptEventsSupplier.hpp>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
//.........................................................................
namespace dlgprov
@@ -51,7 +51,7 @@ namespace dlgprov
// =============================================================================
// class DialogEventsAttacherImpl
// =============================================================================
- typedef std::hash_map< rtl::OUString,
+ typedef boost::unordered_map< rtl::OUString,
::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptListener >,
::rtl::OUStringHash,
::std::equal_to< ::rtl::OUString > > ListenerHash;
diff --git a/scripting/source/provider/ActiveMSPList.hxx b/scripting/source/provider/ActiveMSPList.hxx
index fdc3ae4..850d37e 100644
--- a/scripting/source/provider/ActiveMSPList.hxx
+++ b/scripting/source/provider/ActiveMSPList.hxx
@@ -28,7 +28,7 @@
#ifndef _FRAMEWORK_SCRIPT_PROVIDER_OPENDOCUMENTLIST_HXX_
#define _FRAMEWORK_SCRIPT_PROVIDER_OPENDOCUMENTLIST_HXX_
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <map>
#include <osl/mutex.hxx>
@@ -59,7 +59,7 @@ typedef ::std::map < css::uno::Reference< css::uno::XInterface >
, ::comphelper::OInterfaceCompare< css::uno::XInterface >
> ScriptComponent_map;
-typedef ::std::hash_map< ::rtl::OUString,
+typedef ::boost::unordered_map< ::rtl::OUString,
css::uno::Reference< css::script::provider::XScriptProvider >,
::rtl::OUStringHash,
::std::equal_to< ::rtl::OUString > > Msp_hash;
diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.cxx b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
index 1d49ede..198a71a 100644
--- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx
+++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
@@ -170,7 +170,7 @@ public:
//typedef ::std::map< ::rtl::OUString, Reference< browse::XBrowseNode > >
-typedef ::std::hash_map< ::rtl::OUString, Reference< browse::XBrowseNode >,
+typedef ::boost::unordered_map< ::rtl::OUString, Reference< browse::XBrowseNode >,
::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > >
BrowseNodeAggregatorHash;
typedef ::std::vector< ::rtl::OUString > vString;
diff --git a/scripting/source/provider/ProviderCache.hxx b/scripting/source/provider/ProviderCache.hxx
index 04bb50d..a0c729d 100644
--- a/scripting/source/provider/ProviderCache.hxx
+++ b/scripting/source/provider/ProviderCache.hxx
@@ -29,7 +29,7 @@
#ifndef _FRAMEWORK_SCRIPT_PROVIDER_PROVIDERCACHE_HXX_
#define _FRAMEWORK_SCRIPT_PROVIDER_PROVIDERCACHE_HXX_
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <osl/mutex.hxx>
#include <rtl/ustring.hxx>
#include <cppuhelper/implbase1.hxx>
@@ -58,7 +58,7 @@ struct ProviderDetails
css::uno::Reference< css::lang::XSingleComponentFactory > factory;
css::uno::Reference< css::script::provider::XScriptProvider > provider;
};
-typedef ::std::hash_map < ::rtl::OUString, ProviderDetails , ::rtl::OUStringHash,
+typedef ::boost::unordered_map < ::rtl::OUString, ProviderDetails , ::rtl::OUStringHash,
::std::equal_to< ::rtl::OUString > > ProviderDetails_hash;
diff --git a/scripting/source/storage/ScriptData.hxx b/scripting/source/storage/ScriptData.hxx
index 4efb93e..3374e21 100644
--- a/scripting/source/storage/ScriptData.hxx
+++ b/scripting/source/storage/ScriptData.hxx
@@ -30,7 +30,7 @@
#define _SCRIPTING_STORAGE_SCRIPTDATA_HXX_
#include <vector>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <cppu/macros.hxx>
#include <rtl/ustring.hxx>
@@ -42,11 +42,11 @@ namespace scripting_impl
typedef ::std::pair< ::rtl::OUString, ::rtl::OUString > str_pair;
typedef ::std::vector< str_pair > props_vec;
-typedef ::std::hash_map< ::rtl::OUString, props_vec, ::rtl::OUStringHash,
+typedef ::boost::unordered_map< ::rtl::OUString, props_vec, ::rtl::OUStringHash,
::std::equal_to< ::rtl::OUString > > strpairvec_map;
-typedef ::std::hash_map< ::rtl::OUString, ::std::pair< ::rtl::OUString,
+typedef ::boost::unordered_map< ::rtl::OUString, ::std::pair< ::rtl::OUString,
::rtl::OUString >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > strpair_map;
-typedef ::std::hash_map< ::rtl::OUString, ::std::pair< props_vec, strpairvec_map >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > filesets_map;
+typedef ::boost::unordered_map< ::rtl::OUString, ::std::pair< props_vec, strpairvec_map >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > filesets_map;
struct ScriptData
{
diff --git a/scripting/source/storage/ScriptInfo.cxx b/scripting/source/storage/ScriptInfo.cxx
index 2a9d868..02c9c1d 100644
--- a/scripting/source/storage/ScriptInfo.cxx
+++ b/scripting/source/storage/ScriptInfo.cxx
@@ -30,7 +30,7 @@
#include "precompiled_scripting.hxx"
#include <cppuhelper/implementationentry.hxx>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <osl/file.hxx>
#include <cppuhelper/implbase1.hxx>
@@ -52,7 +52,7 @@ using namespace ::drafts::com::sun::star::script::framework::storage;
namespace scripting_impl
{
-typedef ::std::hash_map < ::rtl::OUString, css::uno::Any, ::rtl::OUStringHash,
+typedef ::boost::unordered_map < ::rtl::OUString, css::uno::Any, ::rtl::OUStringHash,
::std::equal_to< ::rtl::OUString > > PropertySet_hash;
class PropertySetImpl : public ::cppu::WeakImplHelper1< css::beans::XPropertySet >
diff --git a/scripting/source/storage/ScriptSecurityManager.hxx b/scripting/source/storage/ScriptSecurityManager.hxx
index 8e59496..92b6699 100644
--- a/scripting/source/storage/ScriptSecurityManager.hxx
+++ b/scripting/source/storage/ScriptSecurityManager.hxx
@@ -30,7 +30,7 @@
#ifndef _FRAMEWORK_SCRIPT_SCRIPTSECURITYMANAGER_HXX_
#define _FRAMEWORK_SCRIPT_SCRIPTSECURITYMANAGER_HXX_
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <rtl/ustring.hxx>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/uno/RuntimeException.hpp>
@@ -50,7 +50,7 @@ struct StoragePerm {
sal_Bool execPermission;
};
-typedef ::std::hash_map< ::rtl::OUString, StoragePerm, ::rtl::OUStringHash,
+typedef ::boost::unordered_map< ::rtl::OUString, StoragePerm, ::rtl::OUStringHash,
::std::equal_to< ::rtl::OUString > > Permission_Hash;
/**
* Class responsible for managing the ScriptSecurity.
diff --git a/scripting/source/storage/ScriptStorage.hxx b/scripting/source/storage/ScriptStorage.hxx
index 064b929..995a0b2 100644
--- a/scripting/source/storage/ScriptStorage.hxx
+++ b/scripting/source/storage/ScriptStorage.hxx
@@ -29,7 +29,7 @@
#define __SCRIPTING_STORAGE_SCRIPTSTORAGE_HXX_
#include <vector>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <osl/mutex.hxx>
#include <cppuhelper/implbase5.hxx> // helper for component factory
@@ -58,20 +58,20 @@ namespace scripting_impl
typedef ::std::vector< ScriptData > Datas_vec;
//-----------------------------------------------------------------------------
// function name -> ScriptData
-typedef ::std::hash_map < ::rtl::OUString, ScriptData, ::rtl::OUStringHash,
+typedef ::boost::unordered_map < ::rtl::OUString, ScriptData, ::rtl::OUStringHash,
::std::equal_to< ::rtl::OUString > > ScriptFunction_hash;
//-----------------------------------------------------------------------------
// language -> hash of function name -> ScriptData
-typedef ::std::hash_map < ::rtl::OUString, ScriptFunction_hash,
+typedef ::boost::unordered_map < ::rtl::OUString, ScriptFunction_hash,
::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > >
ScriptData_hash;
//-----------------------------------------------------------------------------
-typedef ::std::hash_map < ::rtl::OUString,
+typedef ::boost::unordered_map < ::rtl::OUString,
css::uno::Reference< css::xml::sax::XExtendedDocumentHandler >,
::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > >
ScriptOutput_hash;
//-----------------------------------------------------------------------------
-typedef ::std::hash_map < ::rtl::OUString,
+typedef ::boost::unordered_map < ::rtl::OUString,
::rtl::OUString, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > >
ScriptLanguages_hash;
diff --git a/scripting/source/storage/ScriptStorageManager.cxx b/scripting/source/storage/ScriptStorageManager.cxx
index 02c0e1f..768c63e 100644
--- a/scripting/source/storage/ScriptStorageManager.cxx
+++ b/scripting/source/storage/ScriptStorageManager.cxx
@@ -171,7 +171,7 @@ SAL_THROW ( ( RuntimeException ) )
validateXRef( xInterface, "ScriptStorageManager:: setupAnyStorage: Can't create ScriptStorage for share" );
- // and place it in the hash_map. Increment the counter
+ // and place it in the boost::unordered_map. Increment the counter
m_ScriptStorageMap[ m_count++ ] = xInterface;
sal_Int32 sid = m_count - 1;
diff --git a/scripting/source/storage/ScriptStorageManager.hxx b/scripting/source/storage/ScriptStorageManager.hxx
index a06409b..6c067a6 100644
--- a/scripting/source/storage/ScriptStorageManager.hxx
+++ b/scripting/source/storage/ScriptStorageManager.hxx
@@ -30,7 +30,7 @@
#ifndef _DRAFTS_COM_SUN_STAR_SCRIPT_FRAMEWORK_STORAGE_SCRIPTSTORAGEMANAGER_HXX_
#define _DRAFTS_COM_SUN_STAR_SCRIPT_FRAMEWORK_STORAGE_SCRIPTSTORAGEMANAGER_HXX_
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <map>
#include <osl/mutex.hxx>
@@ -59,7 +59,7 @@ namespace scripting_impl
typedef ::std::map < sal_Int32, css::uno::Reference < css::uno::XInterface > >
ScriptStorage_map;
-typedef ::std::hash_map < ::rtl::OUString, sal_Int32, ::rtl::OUStringHash>
+typedef ::boost::unordered_map < ::rtl::OUString, sal_Int32, ::rtl::OUStringHash>
StorageId_hash;
class ScriptStorageManager : public
diff --git a/scripting/source/stringresource/stringresource.hxx b/scripting/source/stringresource/stringresource.hxx
index 656a872..4ad9dbd 100644
--- a/scripting/source/stringresource/stringresource.hxx
+++ b/scripting/source/stringresource/stringresource.hxx
@@ -43,7 +43,7 @@
#include <osl/mutex.hxx>
#include <vector>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
//.........................................................................
namespace stringresource
@@ -78,7 +78,7 @@ struct eqName_Impl
}
};
-typedef std::hash_map
+typedef boost::unordered_map
<
::rtl::OUString,
::rtl::OUString,
@@ -87,7 +87,7 @@ typedef std::hash_map
>
IdToStringMap;
-typedef std::hash_map
+typedef boost::unordered_map
<
::rtl::OUString,
sal_Int32,
diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx
index 881b9af..c5e29c0 100644
--- a/scripting/source/vbaevents/eventhelper.cxx
+++ b/scripting/source/vbaevents/eventhelper.cxx
@@ -95,7 +95,7 @@
#include <set>
#include <list>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#define ASYNC 0
// primitive support for asynchronous handling of
@@ -250,7 +250,7 @@ struct TranslateInfo
};
-typedef std::hash_map< rtl::OUString,
+typedef boost::unordered_map< rtl::OUString,
std::list< TranslateInfo >,
::rtl::OUStringHash,
::std::equal_to< ::rtl::OUString > > EventInfoHash;
@@ -546,7 +546,7 @@ public:
{ return ( ( m_hEvents.size() > 0 ? sal_True : sal_False ) ); }
private:
-typedef std::hash_map< rtl::OUString, Any, ::rtl::OUStringHash,
+typedef boost::unordered_map< rtl::OUString, Any, ::rtl::OUStringHash,
::std::equal_to< ::rtl::OUString > > EventSupplierHash;
EventSupplierHash m_hEvents;
diff --git a/sfx2/source/appl/imagemgr.cxx b/sfx2/source/appl/imagemgr.cxx
index 569c14c..c9c5234 100644
--- a/sfx2/source/appl/imagemgr.cxx
+++ b/sfx2/source/appl/imagemgr.cxx
@@ -53,7 +53,7 @@
#include <sfx2/objsh.hxx>
#include <sfx2/docfac.hxx>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::frame;
@@ -62,7 +62,7 @@ using namespace ::com::sun::star::util;
using namespace ::com::sun::star::ui;
using namespace ::com::sun::star::frame;
-typedef std::hash_map< ::rtl::OUString,
+typedef boost::unordered_map< ::rtl::OUString,
WeakReference< XImageManager >,
::rtl::OUStringHash,
::std::equal_to< ::rtl::OUString > > ModuleIdToImagegMgr;
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index da3b530..4b5df02 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -46,7 +46,7 @@
#include "newhelp.hrc"
#include "helpid.hrc"
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <rtl/ustrbuf.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/configurationhelper.hxx>
@@ -605,7 +605,7 @@ namespace sfx2 {
}
};
- typedef ::std::hash_map< ::rtl::OUString, int, hashOUString, equalOUString > KeywordInfo;
+ typedef ::boost::unordered_map< ::rtl::OUString, int, hashOUString, equalOUString > KeywordInfo;
}
#define UNIFY_AND_INSERT_TOKEN( aToken ) \
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 6675274..4dc917d 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -30,7 +30,7 @@
#include "precompiled_sfx2.hxx"
#include <stdio.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <sfx2/docfile.hxx>
#include <sfx2/objsh.hxx>
@@ -325,7 +325,7 @@ throw (css::uno::RuntimeException)
//====================================================================
-typedef std::hash_map< sal_Int32, rtl::OUString > ToolBarResIdToResourceURLMap;
+typedef boost::unordered_map< sal_Int32, rtl::OUString > ToolBarResIdToResourceURLMap;
static sal_Bool bMapInitialized = sal_False;
static ToolBarResIdToResourceURLMap aResIdToResourceURLMap;
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index ae4ce08..291d377 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -29,7 +29,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sfx2.hxx"
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <svl/itempool.hxx>
#include <svl/itemiter.hxx>
#include <svl/eitem.hxx>
@@ -99,7 +99,7 @@ static USHORT nTimeOut = 300;
static sal_uInt32 nCache1 = 0;
static sal_uInt32 nCache2 = 0;
-typedef std::hash_map< USHORT, bool > InvalidateSlotMap;
+typedef boost::unordered_map< USHORT, bool > InvalidateSlotMap;
//====================================================================
diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx
index d095509..696e9fb 100644
--- a/sfx2/source/doc/Metadatable.cxx
+++ b/sfx2/source/doc/Metadatable.cxx
@@ -39,7 +39,7 @@
#include <boost/bind.hpp>
#include <memory>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <list>
#include <algorithm>
#if OSL_DEBUG_LEVEL > 0
@@ -402,11 +402,11 @@ XmlIdRegistry::GetXmlIdForElement(const Metadatable& i_rObject) const
/// generate unique xml:id
template< typename T >
/*static*/ ::rtl::OUString create_id(const
- ::std::hash_map< ::rtl::OUString, T, ::rtl::OUStringHash > & i_rXmlIdMap)
+ ::boost::unordered_map< ::rtl::OUString, T, ::rtl::OUStringHash > & i_rXmlIdMap)
{
static rtlRandomPool s_Pool( rtl_random_createPool() );
const ::rtl::OUString prefix(RTL_CONSTASCII_USTRINGPARAM(s_prefix));
- typename ::std::hash_map< ::rtl::OUString, T, ::rtl::OUStringHash >
+ typename ::boost::unordered_map< ::rtl::OUString, T, ::rtl::OUStringHash >
::const_iterator iter;
::rtl::OUString id;
do
@@ -427,7 +427,7 @@ template< typename T >
typedef ::std::list< Metadatable* > XmlIdList_t;
/// Idref -> (content.xml element list, styles.xml element list)
-typedef ::std::hash_map< ::rtl::OUString,
+typedef ::boost::unordered_map< ::rtl::OUString,
::std::pair< XmlIdList_t, XmlIdList_t >, ::rtl::OUStringHash > XmlIdMap_t;
/// pointer hash template
@@ -440,7 +440,7 @@ template<typename T> struct PtrHash
};
/// element -> (stream name, idref)
-typedef ::std::hash_map< const Metadatable*,
+typedef ::boost::unordered_map< const Metadatable*,
::std::pair< ::rtl::OUString, ::rtl::OUString>, PtrHash<Metadatable> >
XmlIdReverseMap_t;
@@ -923,13 +923,13 @@ struct RMapEntry
};
/// element -> (stream name, idref, source)
-typedef ::std::hash_map< const Metadatable*,
+typedef ::boost::unordered_map< const Metadatable*,
struct RMapEntry,
PtrHash<Metadatable> >
ClipboardXmlIdReverseMap_t;
/// Idref -> (content.xml element, styles.xml element)
-typedef ::std::hash_map< ::rtl::OUString,
+typedef ::boost::unordered_map< ::rtl::OUString,
::std::pair< Metadatable*, Metadatable* >, ::rtl::OUStringHash >
ClipboardXmlIdMap_t;
diff --git a/sfx2/source/toolbox/imgmgr.cxx b/sfx2/source/toolbox/imgmgr.cxx
index ac3c008..dbb135a 100644
--- a/sfx2/source/toolbox/imgmgr.cxx
+++ b/sfx2/source/toolbox/imgmgr.cxx
@@ -30,7 +30,7 @@
#include "precompiled_sfx2.hxx"
#include <stdio.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include "imgmgr.hxx"
#include <sfx2/sfx.hrc>
@@ -78,7 +78,7 @@ public:
~SfxImageManager_Impl();
};
-typedef std::hash_map< sal_Int64, sal_Int64 > SfxImageManagerMap;
+typedef boost::unordered_map< sal_Int64, sal_Int64 > SfxImageManagerMap;
// global image lists
static SfxImageManager_Impl* pGlobalImageManager = 0;
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx
index f641a4a..cd2b0a5 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -91,7 +91,7 @@
#include <comphelper/processfactory.hxx>
#include <tools/diagnose_ex.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <sfx2/event.hxx>
#include "viewfac.hxx"
@@ -178,7 +178,7 @@ static GroupIDToCommandGroup GroupIDCommandGroupMap[] =
{ 0 , 0 }
};
-typedef std::hash_map< sal_Int16, sal_Int16 > GroupHashMap;
+typedef boost::unordered_map< sal_Int16, sal_Int16 > GroupHashMap;
sal_Int16 MapGroupIDToCommandGroup( sal_Int16 nGroupID )
diff --git a/svx/inc/svx/ShapeTypeHandler.hxx b/svx/inc/svx/ShapeTypeHandler.hxx
index 55bd2df..9b0237c 100644
--- a/svx/inc/svx/ShapeTypeHandler.hxx
+++ b/svx/inc/svx/ShapeTypeHandler.hxx
@@ -41,7 +41,7 @@
#include <rtl/ustring.hxx>
#include <vector>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
namespace accessibility {
@@ -204,7 +204,7 @@ private:
/** This hash map allows the fast look up of a type descriptor for a
given service name.
*/
- typedef ::std::hash_map<
+ typedef ::boost::unordered_map<
::rtl::OUString,ShapeTypeId,
::rtl::OUStringHash,
// ::comphelper::UStringHash,
diff --git a/svx/inc/svx/sdasitm.hxx b/svx/inc/svx/sdasitm.hxx
index 3f8a599..cc6cc1b 100644
--- a/svx/inc/svx/sdasitm.hxx
+++ b/svx/inc/svx/sdasitm.hxx
@@ -36,7 +36,7 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/uno/Any.hxx>
#include <rtl/ustring.hxx>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <map>
#include "svx/svxdllapi.h"
@@ -72,8 +72,8 @@ private:
{
size_t operator()( const SdrCustomShapeGeometryItem::PropertyPair &r1 ) const;
};
- typedef std::hash_map < PropertyPair, sal_Int32, PropertyPairHash, PropertyPairEq > PropertyPairHashMap;
- typedef std::hash_map< rtl::OUString, sal_Int32, rtl::OUStringHash, PropertyEq > PropertyHashMap;
+ typedef boost::unordered_map < PropertyPair, sal_Int32, PropertyPairHash, PropertyPairEq > PropertyPairHashMap;
+ typedef boost::unordered_map< rtl::OUString, sal_Int32, rtl::OUStringHash, PropertyEq > PropertyHashMap;
PropertyHashMap aPropHashMap;
PropertyPairHashMap aPropPairHashMap;
diff --git a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
index 9b266dc..54663e2 100644
--- a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
@@ -30,7 +30,7 @@
#include "precompiled_svx.hxx"
#include "EnhancedCustomShapeTypeNames.hxx"
#include <osl/mutex.hxx>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
struct TCheck
{
@@ -39,7 +39,7 @@ struct TCheck
return strcmp( s1, s2 ) == 0;
}
};
-typedef std::hash_map< const char*, MSO_SPT, std::hash<const char*>, TCheck> TypeNameHashMap;
+typedef boost::unordered_map< const char*, MSO_SPT, std::hash<const char*>, TCheck> TypeNameHashMap;
static TypeNameHashMap* pHashMap = NULL;
static ::osl::Mutex& getHashMapMutex()
{
diff --git a/svx/source/inc/DGColorNameLookUp.hxx b/svx/source/inc/DGColorNameLookUp.hxx
index 808e51f..ffc75f4 100644
--- a/svx/source/inc/DGColorNameLookUp.hxx
+++ b/svx/source/inc/DGColorNameLookUp.hxx
@@ -30,7 +30,7 @@
#define _SVX_ACCESSIBILITY_DG_COLOR_NAME_LOOK_UP_HXX
#include <rtl/ustrbuf.hxx>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
namespace accessibility {
@@ -71,7 +71,7 @@ public:
private:
/// Define hash map type to convert numerical color values to names.
- typedef std::hash_map<long int, ::rtl::OUString>
+ typedef boost::unordered_map<long int, ::rtl::OUString>
tColorValueToNameMap;
/// This ma translates from numerical color values to names.
diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx
index 5b3890f..2941614 100644
--- a/svx/source/table/accessibletableshape.cxx
+++ b/svx/source/table/accessibletableshape.cxx
@@ -72,7 +72,7 @@ struct hash
}
};
-typedef std::hash_map< Reference< XCell >, rtl::Reference< AccessibleCell >, hash > AccessibleCellMap;
+typedef boost::unordered_map< Reference< XCell >, rtl::Reference< AccessibleCell >, hash > AccessibleCellMap;
//-----------------------------------------------------------------------------
// AccessibleTableShapeImpl
diff --git a/svx/source/table/propertyset.hxx b/svx/source/table/propertyset.hxx
index ae07d03..213867a 100644
--- a/svx/source/table/propertyset.hxx
+++ b/svx/source/table/propertyset.hxx
@@ -34,7 +34,7 @@
#include <com/sun/star/beans/XFastPropertySet.hpp>
#include <rtl/ref.hxx>
#include <functional>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <vector>
#include <cppuhelper/implbase1.hxx>
@@ -45,7 +45,7 @@ namespace comphelper {
// -----------------------------------------------------------------------------
typedef std::vector< ::com::sun::star::beans::Property > PropertyVector;
-typedef std::hash_map< ::rtl::OUString, ::sal_uInt32, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > PropertyMap;
+typedef boost::unordered_map< ::rtl::OUString, ::sal_uInt32, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > PropertyMap;
// -----------------------------------------------------------------------------
diff --git a/svx/source/unodraw/shapepropertynotifier.cxx b/svx/source/unodraw/shapepropertynotifier.cxx
index 4e249ea..1e2f91e 100644
--- a/svx/source/unodraw/shapepropertynotifier.cxx
+++ b/svx/source/unodraw/shapepropertynotifier.cxx
@@ -39,7 +39,7 @@
#include <cppuhelper/weak.hxx>
#include <tools/diagnose_ex.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
namespace
{
@@ -76,7 +76,7 @@ namespace svx
using ::com::sun::star::beans::XPropertySet;
/** === end UNO using === **/
- typedef ::std::hash_map< ShapeProperty, PPropertyValueProvider, ShapePropertyHash > PropertyProviders;
+ typedef ::boost::unordered_map< ShapeProperty, PPropertyValueProvider, ShapePropertyHash > PropertyProviders;
typedef ::cppu::OMultiTypeInterfaceContainerHelperVar < ::rtl::OUString
, ::comphelper::UStringHash
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index 6a8344a..59e8aa3 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -42,7 +42,7 @@
#include <com/sun/star/media/ZoomLevel.hpp>
#include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <vcl/fldunit.hxx>
#include <tools/shl.hxx>
#include <osl/mutex.hxx>
@@ -839,7 +839,7 @@ comphelper::PropertyMapEntry* ImplGetAdditionalWriterDrawingDefaultsPropertyMap(
* 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/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx
index 51642aa..20a4dfd 100644
--- a/ucb/source/core/ucbstore.cxx
+++ b/ucb/source/core/ucbstore.cxx
@@ -36,7 +36,7 @@
*************************************************************************/
#include <list>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <osl/diagnose.h>
#include <rtl/ustrbuf.hxx>
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list