[Libreoffice-commits] .: 2 commits - comphelper/inc comphelper/source l10ntools/inc l10ntools/source padmin/source rsc/inc rsc/source sax/source sot/source svl/inc svl/source svtools/inc svtools/source toolkit/inc toolkit/source tools/inc tools/source ucbhelper/source unotools/inc unotools/source vcl/aqua vcl/inc vcl/os2 vcl/source vcl/unx vcl/win
Fridrich Strba
fridrich at kemper.freedesktop.org
Thu Feb 3 16:10:37 PST 2011
comphelper/inc/comphelper/PropertyInfoHash.hxx | 6 -
comphelper/inc/comphelper/mediadescriptor.hxx | 2
comphelper/inc/comphelper/numberedcollection.hxx | 6 -
comphelper/inc/comphelper/sequenceashashmap.hxx | 4
comphelper/source/container/embeddedobjectcontainer.cxx | 4
comphelper/source/misc/namedvaluecollection.cxx | 4
l10ntools/inc/cfgmerge.hxx | 4
l10ntools/inc/export.hxx | 10 -
l10ntools/inc/inireader.hxx | 8 -
l10ntools/inc/tagtest.hxx | 4
l10ntools/inc/xmlparse.hxx | 10 -
l10ntools/source/help/HelpCompiler.hxx | 6 -
l10ntools/source/help/HelpLinker.cxx | 2
padmin/source/adddlg.cxx | 4
padmin/source/fontentry.cxx | 6 -
padmin/source/fontentry.hxx | 4
padmin/source/prtsetup.cxx | 4
rsc/inc/rschash.hxx | 6 -
rsc/source/parser/rscibas.cxx | 4
rsc/source/parser/rsclex.cxx | 2
rsc/source/parser/rsclex.hxx | 4
rsc/source/tools/rschash.cxx | 4
sax/source/fastparser/fastparser.hxx | 4
sot/source/sdstor/stgcache.cxx | 4
svl/inc/pch/precompiled_svl.hxx | 2
svl/source/items/itemprop.cxx | 4
svtools/inc/framestatuslistener.hxx | 4
svtools/inc/pch/precompiled_svtools.hxx | 2
svtools/inc/statusbarcontroller.hxx | 4
svtools/inc/svtools/toolboxcontroller.hxx | 4
svtools/source/uno/framestatuslistener.cxx | 2
svtools/source/uno/statusbarcontroller.cxx | 2
svtools/source/uno/toolboxcontroller.cxx | 2
toolkit/inc/toolkit/controls/eventcontainer.hxx | 4
toolkit/source/controls/dialogcontrol.cxx | 4
toolkit/source/controls/geometrycontrolmodel.cxx | 2
toolkit/source/layout/core/import.hxx | 2
toolkit/source/layout/core/root.hxx | 4
tools/inc/tools/pstm.hxx | 4
tools/source/rc/resmgr.cxx | 18 +--
ucbhelper/source/provider/contenthelper.cxx | 4
ucbhelper/source/provider/providerhelper.cxx | 4
unotools/inc/unotools/atom.hxx | 8 -
unotools/inc/unotools/eventcfg.hxx | 4
unotools/inc/unotools/fontcfg.hxx | 10 -
unotools/source/config/cmdoptions.cxx | 8 -
unotools/source/config/eventcfg.cxx | 2
unotools/source/config/extendedsecurityoptions.cxx | 4
unotools/source/config/fontcfg.cxx | 6 -
unotools/source/config/optionsdlg.cxx | 4
unotools/source/config/pathoptions.cxx | 8 -
unotools/source/config/viewoptions.cxx | 4
unotools/source/misc/atom.cxx | 26 ++--
unotools/source/misc/fontdefs.cxx | 4
vcl/aqua/inc/salatsuifontutils.hxx | 2
vcl/aqua/inc/saldata.hxx | 4
vcl/inc/cupsmgr.hxx | 6 -
vcl/inc/vcl/configsettings.hxx | 6 -
vcl/inc/vcl/fontcache.hxx | 6 -
vcl/inc/vcl/fontmanager.hxx | 36 +++---
vcl/inc/vcl/glyphcache.hxx | 10 -
vcl/inc/vcl/graphite_cache.hxx | 8 -
vcl/inc/vcl/image.h | 4
vcl/inc/vcl/impimagetree.hxx | 6 -
vcl/inc/vcl/jobset.h | 4
vcl/inc/vcl/lazydelete.hxx | 4
vcl/inc/vcl/outdev.h | 4
vcl/inc/vcl/outfont.hxx | 6 -
vcl/inc/vcl/ppdparser.hxx | 8 -
vcl/inc/vcl/print.h | 4
vcl/inc/vcl/print.hxx | 4
vcl/inc/vcl/printergfx.hxx | 4
vcl/inc/vcl/printerinfomanager.hxx | 10 -
vcl/os2/inc/salgdi.h | 4
vcl/os2/source/gdi/os2layout.cxx | 4
vcl/source/control/tabctrl.cxx | 10 -
vcl/source/gdi/configsettings.cxx | 4
vcl/source/gdi/impimagetree.cxx | 2
vcl/source/gdi/jobset.cxx | 4
vcl/source/gdi/pdfwriter_impl.cxx | 16 +-
vcl/source/gdi/pdfwriter_impl.hxx | 12 +-
vcl/source/gdi/print.cxx | 4
vcl/source/gdi/print3.cxx | 26 ++--
vcl/source/glyphs/gcach_ftyp.cxx | 4
vcl/source/glyphs/gcach_ftyp.hxx | 8 -
vcl/source/glyphs/graphite_adaptors.cxx | 2
vcl/source/helper/canvastools.cxx | 6 -
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 4
vcl/unx/headless/svpelement.cxx | 6 -
vcl/unx/headless/svpprn.cxx | 2
vcl/unx/headless/svppspgraphics.cxx | 2
vcl/unx/inc/saldisp.hxx | 4
vcl/unx/source/dtrans/X11_selection.cxx | 54 +++++-----
vcl/unx/source/dtrans/X11_selection.hxx | 14 +-
vcl/unx/source/dtrans/X11_service.cxx | 6 -
vcl/unx/source/fontmanager/fontconfig.cxx | 12 +-
vcl/unx/source/fontmanager/fontmanager.cxx | 86 ++++++++--------
vcl/unx/source/gdi/pspgraphics.cxx | 2
vcl/unx/source/gdi/salgdi3.cxx | 6 -
vcl/unx/source/gdi/salprnpsp.cxx | 8 -
vcl/unx/source/printer/cupsmgr.cxx | 20 +--
vcl/unx/source/printer/ppdparser.cxx | 14 +-
vcl/unx/source/printer/printerinfomanager.cxx | 38 +++----
vcl/unx/source/printergfx/common_gfx.cxx | 10 -
vcl/unx/source/printergfx/glyphset.hxx | 6 -
vcl/unx/source/printergfx/text_gfx.cxx | 4
vcl/win/inc/salgdi.h | 4
vcl/win/source/app/salinfo.cxx | 6 -
vcl/win/source/gdi/winlayout.cxx | 4
109 files changed, 415 insertions(+), 415 deletions(-)
New commits:
commit d3a2c05c6481755cc6e11dba5feee4e4a6aef26b
Author: Fridrich Strba <fridrich.strba at bluewin.ch>
Date: Thu Feb 3 17:07:03 2011 -0700
use boost::hash instead of std::hash
diff --git a/comphelper/inc/comphelper/numberedcollection.hxx b/comphelper/inc/comphelper/numberedcollection.hxx
index 39d1497..d4adccb 100644
--- a/comphelper/inc/comphelper/numberedcollection.hxx
+++ b/comphelper/inc/comphelper/numberedcollection.hxx
@@ -84,7 +84,7 @@ class COMPHELPER_DLLPUBLIC NumberedCollection : private ::cppu::BaseMutex
typedef ::boost::unordered_map<
long ,
TNumberedItem ,
- ::std::hash< long > ,
+ ::boost::hash< long > ,
::std::equal_to< long > > TNumberedItemHash;
typedef ::std::vector< long > TDeadItemList;
commit 7663a623e41406c16140a955003b0073dba2fdf3
Author: Fridrich Strba <fridrich.strba at bluewin.ch>
Date: Thu Feb 3 16:55:17 2011 -0700
Bulk move libs-gui to boost unordered containers
diff --git a/comphelper/inc/comphelper/PropertyInfoHash.hxx b/comphelper/inc/comphelper/PropertyInfoHash.hxx
index 3a675c1..627dbed 100644
--- a/comphelper/inc/comphelper/PropertyInfoHash.hxx
+++ b/comphelper/inc/comphelper/PropertyInfoHash.hxx
@@ -31,7 +31,7 @@
#include <rtl/ustring.hxx>
#include <comphelper/TypeGeneration.hxx>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
namespace comphelper
{
struct PropertyInfo
@@ -61,11 +61,11 @@ namespace comphelper
};
}
-typedef std::hash_map < ::rtl::OUString,
+typedef boost::unordered_map < ::rtl::OUString,
::comphelper::PropertyInfo*,
::rtl::OUStringHash,
::comphelper::eqFunc > PropertyInfoHash;
-typedef std::hash_map < ::rtl::OUString,
+typedef boost::unordered_map < ::rtl::OUString,
::comphelper::PropertyData*,
::rtl::OUStringHash,
::comphelper::eqFunc > PropertyDataHash;
diff --git a/comphelper/inc/comphelper/mediadescriptor.hxx b/comphelper/inc/comphelper/mediadescriptor.hxx
index 50e20f7..65b5946 100644
--- a/comphelper/inc/comphelper/mediadescriptor.hxx
+++ b/comphelper/inc/comphelper/mediadescriptor.hxx
@@ -51,7 +51,7 @@ namespace comphelper{
/** @short can be used to work with a <type scope="::com::sun::star::document">MediaDescriptor</type>
struct.
- @descr It wraps a ::std::hash_map around the Sequence< css::beans::PropertyValue >, which
+ @descr It wraps a ::boost::unordered_map around the Sequence< css::beans::PropertyValue >, which
represent the MediaDescriptor item.
Further this helper defines often used functions (as e.g. open of the required streams,
consistent checks etcpp.) and it defines all useable property names.
diff --git a/comphelper/inc/comphelper/numberedcollection.hxx b/comphelper/inc/comphelper/numberedcollection.hxx
index aa0cb6f..39d1497 100644
--- a/comphelper/inc/comphelper/numberedcollection.hxx
+++ b/comphelper/inc/comphelper/numberedcollection.hxx
@@ -44,7 +44,7 @@
#include <cppuhelper/implbase1.hxx>
#include <vector>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
//_______________________________________________
// namespace
@@ -81,7 +81,7 @@ class COMPHELPER_DLLPUBLIC NumberedCollection : private ::cppu::BaseMutex
::sal_Int32 nNumber;
};
- typedef ::std::hash_map<
+ typedef ::boost::unordered_map<
long ,
TNumberedItem ,
::std::hash< long > ,
diff --git a/comphelper/inc/comphelper/sequenceashashmap.hxx b/comphelper/inc/comphelper/sequenceashashmap.hxx
index 8f2c6f7..bff63cf 100644
--- a/comphelper/inc/comphelper/sequenceashashmap.hxx
+++ b/comphelper/inc/comphelper/sequenceashashmap.hxx
@@ -33,7 +33,7 @@
// includes
#ifndef INCLUDED_HASH_MAP
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#define INCLUDED_HASH_MAP
#endif
@@ -73,7 +73,7 @@ namespace comphelper{
such name sequences very easy ...
*/
-struct SequenceAsHashMapBase : public ::std::hash_map<
+struct SequenceAsHashMapBase : public ::boost::unordered_map<
::rtl::OUString ,
::com::sun::star::uno::Any ,
::rtl::OUStringHash ,
diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx
index f6ae031..8eb2529 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -52,7 +52,7 @@
#include <comphelper/embeddedobjectcontainer.hxx>
#include <comphelper/sequence.hxx>
#include <cppuhelper/weakref.hxx>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <algorithm>
#include <rtl/logfile.hxx>
@@ -78,7 +78,7 @@ struct eqObjectName_Impl
}
};
-typedef std::hash_map
+typedef boost::unordered_map
<
::rtl::OUString,
::com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >,
diff --git a/comphelper/source/misc/namedvaluecollection.cxx b/comphelper/source/misc/namedvaluecollection.cxx
index 2031a33..47b495d 100644
--- a/comphelper/source/misc/namedvaluecollection.cxx
+++ b/comphelper/source/misc/namedvaluecollection.cxx
@@ -40,7 +40,7 @@
#include <rtl/strbuf.hxx>
#include <osl/diagnose.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <functional>
#include <algorithm>
@@ -66,7 +66,7 @@ namespace comphelper
//====================================================================
//= NamedValueCollection_Impl
//====================================================================
- typedef ::std::hash_map< ::rtl::OUString, Any, ::rtl::OUStringHash > NamedValueRepository;
+ typedef ::boost::unordered_map< ::rtl::OUString, Any, ::rtl::OUStringHash > NamedValueRepository;
struct NamedValueCollection_Impl
{
diff --git a/l10ntools/inc/cfgmerge.hxx b/l10ntools/inc/cfgmerge.hxx
index 62dd70c..eaf4fc5 100644
--- a/l10ntools/inc/cfgmerge.hxx
+++ b/l10ntools/inc/cfgmerge.hxx
@@ -31,10 +31,10 @@
#include <tools/string.hxx>
#include <tools/list.hxx>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <vector>
-typedef std::hash_map<ByteString , ByteString , hashByteString,equalByteString>
+typedef boost::unordered_map<ByteString , ByteString , hashByteString,equalByteString>
ByteStringHashMap;
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index 1f196c9..90219b3 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -41,7 +41,7 @@
#include <osl/file.hxx>
#include <osl/file.h>
-#include <hash_map> /* std::hashmap*/
+#include <boost/unordered_map.hpp> /* std::hashmap*/
#include <iterator> /* std::iterator*/
#include <set> /* std::set*/
#include <vector> /* std::vector*/
@@ -85,16 +85,16 @@ class PFormEntrys;
class MergeData;
typedef std::set<ByteString , lessByteString > ByteStringSet;
-typedef std::hash_map<ByteString , ByteString , hashByteString,equalByteString>
+typedef boost::unordered_map<ByteString , ByteString , hashByteString,equalByteString>
ByteStringHashMap;
-typedef std::hash_map<ByteString , bool , hashByteString,equalByteString>
+typedef boost::unordered_map<ByteString , bool , hashByteString,equalByteString>
ByteStringBoolHashMap;
-typedef std::hash_map<ByteString , PFormEntrys* , hashByteString,equalByteString>
+typedef boost::unordered_map<ByteString , PFormEntrys* , hashByteString,equalByteString>
PFormEntrysHashMap;
-typedef std::hash_map<ByteString , MergeData* , hashByteString,equalByteString>
+typedef boost::unordered_map<ByteString , MergeData* , hashByteString,equalByteString>
MergeDataHashMap;
#define SOURCE_LANGUAGE ByteString("en-US")
diff --git a/l10ntools/inc/inireader.hxx b/l10ntools/inc/inireader.hxx
index fc996d2..0112c79 100644
--- a/l10ntools/inc/inireader.hxx
+++ b/l10ntools/inc/inireader.hxx
@@ -1,6 +1,6 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
#include <string>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <unicode/regex.h>
using namespace std;
@@ -16,8 +16,8 @@ struct eqstr
}
};
-typedef std::hash_map< string , string > stringmap;
-typedef std::hash_map< string, stringmap* > INImap;
+typedef boost::unordered_map< string , string > stringmap;
+typedef boost::unordered_map< string, stringmap* > INImap;
class INIreader
{
@@ -39,7 +39,7 @@ class INIreader
delete section_match;
delete parameter_match;
}
- // open "filename", fill hash_map with sections / paramaters
+ // open "filename", fill boost::unordered_map with sections / paramaters
bool read( INImap& myMap , string& filename );
private:
diff --git a/l10ntools/inc/tagtest.hxx b/l10ntools/inc/tagtest.hxx
index be45199..f5de8ea 100644
--- a/l10ntools/inc/tagtest.hxx
+++ b/l10ntools/inc/tagtest.hxx
@@ -31,7 +31,7 @@
#include <tools/string.hxx>
#include <tools/list.hxx>
-#include <hash_map> /* std::hashmap*/
+#include <boost/unordered_map.hpp> /* std::hashmap*/
#include <vector>
class GSILine;
@@ -65,7 +65,7 @@ struct hashByteString{
-typedef std::hash_map<ByteString , String , hashByteString,equalByteString>
+typedef boost::unordered_map<ByteString , String , hashByteString,equalByteString>
StringHashMap;
class TokenInfo
diff --git a/l10ntools/inc/xmlparse.hxx b/l10ntools/inc/xmlparse.hxx
index d320bca..348654c 100644
--- a/l10ntools/inc/xmlparse.hxx
+++ b/l10ntools/inc/xmlparse.hxx
@@ -51,7 +51,7 @@ class XMLElement;
using namespace ::rtl;
using namespace std;
-#include <hash_map> /* std::hashmap*/
+#include <boost/unordered_map.hpp> /* std::hashmap*/
#include <deque> /* std::deque*/
#include <iterator> /* std::iterator*/
#include <list> /* std::list*/
@@ -189,17 +189,17 @@ public:
//-------------------------------------------------------------------------
/// Mapping numeric Language code <-> XML Element
-typedef std::hash_map< ByteString ,XMLElement* , hashByteString,equalByteString > LangHashMap;
+typedef boost::unordered_map< ByteString ,XMLElement* , hashByteString,equalByteString > LangHashMap;
/// Mapping XML Element string identifier <-> Language Map
-typedef std::hash_map<ByteString , LangHashMap* ,
+typedef boost::unordered_map<ByteString , LangHashMap* ,
hashByteString,equalByteString> XMLHashMap;
/// Mapping iso alpha string code <-> iso numeric code
-typedef std::hash_map<ByteString, int, hashByteString,equalByteString> HashMap;
+typedef boost::unordered_map<ByteString, int, hashByteString,equalByteString> HashMap;
/// Mapping XML tag names <-> have localizable strings
-typedef std::hash_map<ByteString , BOOL ,
+typedef boost::unordered_map<ByteString , BOOL ,
hashByteString,equalByteString> TagMap;
/** Holds information of a XML file, is root node of tree
diff --git a/l10ntools/source/help/HelpCompiler.hxx b/l10ntools/source/help/HelpCompiler.hxx
index 4c9cc90..fa9c668 100644
--- a/l10ntools/source/help/HelpCompiler.hxx
+++ b/l10ntools/source/help/HelpCompiler.hxx
@@ -30,7 +30,7 @@
#define HELPCOMPILER_HXX
#include <string>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <vector>
#include <list>
#include <fstream>
@@ -215,11 +215,11 @@ struct SuperFastHash
#define pref_hash joaat_hash
-typedef std::hash_map<std::string, std::string, pref_hash> Stringtable;
+typedef boost::unordered_map<std::string, std::string, pref_hash> Stringtable;
typedef std::list<std::string> LinkedList;
typedef std::vector<std::string> HashSet;
-typedef std::hash_map<std::string, LinkedList, pref_hash> Hashtable;
+typedef boost::unordered_map<std::string, LinkedList, pref_hash> Hashtable;
class StreamTable
{
diff --git a/l10ntools/source/help/HelpLinker.cxx b/l10ntools/source/help/HelpLinker.cxx
index 64b011a..9d7508d 100644
--- a/l10ntools/source/help/HelpLinker.cxx
+++ b/l10ntools/source/help/HelpLinker.cxx
@@ -200,7 +200,7 @@ void writeKeyValue_DBHelp( FILE* pFile, const std::string& aKeyStr, const std::s
class HelpKeyword
{
private:
- typedef std::hash_map<std::string, Data, pref_hash> DataHashtable;
+ typedef boost::unordered_map<std::string, Data, pref_hash> DataHashtable;
DataHashtable _hash;
public:
diff --git a/padmin/source/adddlg.cxx b/padmin/source/adddlg.cxx
index bd2cf93..cb28fd6 100644
--- a/padmin/source/adddlg.cxx
+++ b/padmin/source/adddlg.cxx
@@ -38,7 +38,7 @@
#include "osl/thread.h"
-#include <hash_set>
+#include <boost/unordered_set.hpp>
using namespace rtl;
@@ -1073,7 +1073,7 @@ String AddPrinterDialog::uniquePrinterName( const String& rBase )
int nVersion = 1;
list< OUString > aPrinterList;
rManager.listPrinters( aPrinterList );
- hash_set< OUString, OUStringHash > aPrinters;
+ boost::unordered_set< OUString, OUStringHash > aPrinters;
for( list< OUString >::const_iterator it = aPrinterList.begin(); it != aPrinterList.end(); ++it )
aPrinters.insert( *it );
while( aPrinters.find( aResult ) != aPrinters.end() )
diff --git a/padmin/source/fontentry.cxx b/padmin/source/fontentry.cxx
index 5d4e37e..ac599ba 100644
--- a/padmin/source/fontentry.cxx
+++ b/padmin/source/fontentry.cxx
@@ -174,7 +174,7 @@ void FontNameDlg::init()
m_aRemoveButton.Enable( FALSE );
m_aRenameButton.Enable( FALSE );
- ::std::hash_map< OUString, int, OUStringHash > aFamilies;
+ ::boost::unordered_map< OUString, int, OUStringHash > aFamilies;
::std::list< fontID >::iterator font_it;
for( font_it = aFonts.begin(); font_it != aFonts.end(); ++font_it )
{
@@ -491,8 +491,8 @@ void FontImportDialog::fillFontBox()
rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
m_aNewFontsBox.Clear();
- ::std::hash_map< OUString, int, OUStringHash > aFamilies;
- ::std::hash_map< OString, ::std::list< FastPrintFontInfo >, OStringHash >::iterator it;
+ ::boost::unordered_map< OUString, int, OUStringHash > aFamilies;
+ ::boost::unordered_map< OString, ::std::list< FastPrintFontInfo >, OStringHash >::iterator it;
for( it = m_aNewFonts.begin(); it != m_aNewFonts.end(); ++it )
{
const OUString& rFamily( it->second.front().m_aFamilyName );
diff --git a/padmin/source/fontentry.hxx b/padmin/source/fontentry.hxx
index f76300c..d86bf39 100644
--- a/padmin/source/fontentry.hxx
+++ b/padmin/source/fontentry.hxx
@@ -74,7 +74,7 @@ namespace padmin {
String m_aNoWritableFontsDirText;
String m_aFontsImportedText;
- ::std::hash_map< ::rtl::OString, ::std::list< ::psp::FastPrintFontInfo >, ::rtl::OStringHash >
+ ::boost::unordered_map< ::rtl::OString, ::std::list< ::psp::FastPrintFontInfo >, ::rtl::OStringHash >
m_aNewFonts;
Timer m_aRefreshTimer;
@@ -119,7 +119,7 @@ namespace padmin {
::psp::PrintFontManager& m_rFontManager;
// maps fontID to XLFD
- ::std::hash_map< ::psp::fontID, String >
+ ::boost::unordered_map< ::psp::fontID, String >
m_aFonts;
void init();
public:
diff --git a/padmin/source/prtsetup.cxx b/padmin/source/prtsetup.cxx
index 04d58b5..9bf0ba1 100644
--- a/padmin/source/prtsetup.cxx
+++ b/padmin/source/prtsetup.cxx
@@ -614,7 +614,7 @@ RTSFontSubstPage::RTSFontSubstPage( RTSDialog* pParent ) :
::std::list< FastPrintFontInfo > aFonts;
rFontManager.getFontListWithFastInfo( aFonts, m_pParent->m_aJobData.m_pParser, false );
::std::list< FastPrintFontInfo >::const_iterator it;
- ::std::hash_map< OUString, int, OUStringHash > aToMap, aFromMap;
+ ::boost::unordered_map< OUString, int, OUStringHash > aToMap, aFromMap;
for( it = aFonts.begin(); it != aFonts.end(); ++it )
{
if( it->m_eType == fonttype::Builtin )
@@ -666,7 +666,7 @@ void RTSFontSubstPage::update()
m_aSubstitutionsBox.Clear();
m_aRemoveButton.Enable( FALSE );
// fill substitutions box
- ::std::hash_map< OUString, OUString, OUStringHash >::const_iterator it;
+ ::boost::unordered_map< OUString, OUString, OUStringHash >::const_iterator it;
for( it = m_pParent->m_aJobData.m_aFontSubstitutes.begin();
it != m_pParent->m_aJobData.m_aFontSubstitutes.end(); ++it )
{
diff --git a/rsc/inc/rschash.hxx b/rsc/inc/rschash.hxx
index 28fb79f..54d4b11 100644
--- a/rsc/inc/rschash.hxx
+++ b/rsc/inc/rschash.hxx
@@ -30,7 +30,7 @@
#include <sal/types.h>
#include <rtl/string.hxx>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
typedef sal_uInt32 Atom;
@@ -39,8 +39,8 @@ typedef sal_uInt32 Atom;
class AtomContainer
{
Atom m_nNextID;
- std::hash_map< rtl::OString, Atom, rtl::OStringHash > m_aStringToID;
- std::hash_map< Atom, rtl::OString > m_aIDToString;
+ boost::unordered_map< rtl::OString, Atom, rtl::OStringHash > m_aStringToID;
+ boost::unordered_map< Atom, rtl::OString > m_aIDToString;
public:
AtomContainer();
diff --git a/rsc/source/parser/rscibas.cxx b/rsc/source/parser/rscibas.cxx
index 8818244..094e15a 100644
--- a/rsc/source/parser/rscibas.cxx
+++ b/rsc/source/parser/rscibas.cxx
@@ -50,7 +50,7 @@
#include "rsclex.hxx"
#include <yyrscyacc.hxx>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
/****************** M A C R O S ******************************************/
void RscTypCont::SETCONST( RscConst * pClass, const char * szString, UINT32 nVal )
@@ -78,7 +78,7 @@ void RscTypCont::SETCONST( RscConst * pClass, Atom nName, UINT32 nVal )
|* Beschreibung
*************************************************************************/
-typedef std::hash_map< rtl::OString, sal_uInt32, rtl::OStringHash > langmap;
+typedef boost::unordered_map< rtl::OString, sal_uInt32, rtl::OStringHash > langmap;
static langmap ULong_Iso_map;
sal_uInt32 GetLangId( const ByteString& aLang )
diff --git a/rsc/source/parser/rsclex.cxx b/rsc/source/parser/rsclex.cxx
index fe3b33e..325d1be 100644
--- a/rsc/source/parser/rsclex.cxx
+++ b/rsc/source/parser/rsclex.cxx
@@ -56,7 +56,7 @@ const char* StringContainer::putString( const char* pString )
{
OString aString( static_cast<const sal_Char*>(pString) );
std::pair<
- std::hash_set< OString, OStringHash >::iterator,
+ boost::unordered_set< OString, OStringHash >::iterator,
bool > aInsert =
m_aStrings.insert( aString );
diff --git a/rsc/source/parser/rsclex.hxx b/rsc/source/parser/rsclex.hxx
index 510a13e..f53f993 100644
--- a/rsc/source/parser/rsclex.hxx
+++ b/rsc/source/parser/rsclex.hxx
@@ -27,14 +27,14 @@
************************************************************************/
#include <tools/stack.hxx>
-#include <hash_set>
+#include <boost/unordered_set.hpp>
#include <rtl/strbuf.hxx>
#include <rtl/string.hxx>
// a buffer for unique strings
class StringContainer
{
- std::hash_set< rtl::OString, rtl::OStringHash > m_aStrings;
+ boost::unordered_set< rtl::OString, rtl::OStringHash > m_aStrings;
public:
StringContainer() {}
~StringContainer() {}
diff --git a/rsc/source/tools/rschash.cxx b/rsc/source/tools/rschash.cxx
index 18e30a3..2456ea5 100644
--- a/rsc/source/tools/rschash.cxx
+++ b/rsc/source/tools/rschash.cxx
@@ -46,7 +46,7 @@ AtomContainer::~AtomContainer()
Atom AtomContainer::getID( const OString& rStr, bool bOnlyIfExists )
{
OString aKey = rStr.toAsciiLowerCase();
- std::hash_map< OString, Atom, OStringHash >::const_iterator it =
+ boost::unordered_map< OString, Atom, OStringHash >::const_iterator it =
m_aStringToID.find( aKey );
if( it != m_aStringToID.end() )
return it->second;
@@ -63,7 +63,7 @@ Atom AtomContainer::getID( const OString& rStr, bool bOnlyIfExists )
const OString& AtomContainer::getString( Atom nAtom )
{
- std::hash_map< Atom, OString >::const_iterator it =
+ boost::unordered_map< Atom, OString >::const_iterator it =
m_aIDToString.find( nAtom );
return (it != m_aIDToString.end()) ? it->second : m_aIDToString[0];
}
diff --git a/sax/source/fastparser/fastparser.hxx b/sax/source/fastparser/fastparser.hxx
index 7d5e9f7..980afbe 100644
--- a/sax/source/fastparser/fastparser.hxx
+++ b/sax/source/fastparser/fastparser.hxx
@@ -31,7 +31,7 @@
#include <vector>
#include <stack>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <boost/shared_ptr.hpp>
#include <rtl/ref.hxx>
#include <com/sun/star/xml/sax/XFastParser.hpp>
@@ -57,7 +57,7 @@ struct SaxContextImpl;
typedef ::boost::shared_ptr< SaxContextImpl > SaxContextImplPtr;
typedef ::boost::shared_ptr< NamespaceDefine > NamespaceDefineRef;
-typedef ::std::hash_map< ::rtl::OUString, sal_Int32,
+typedef ::boost::unordered_map< ::rtl::OUString, sal_Int32,
::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > NamespaceMap;
// --------------------------------------------------------------------
diff --git a/sot/source/sdstor/stgcache.cxx b/sot/source/sdstor/stgcache.cxx
index b5a5ca0..2c1dc71 100644
--- a/sot/source/sdstor/stgcache.cxx
+++ b/sot/source/sdstor/stgcache.cxx
@@ -32,7 +32,7 @@
#if defined(_MSC_VER) && (_MSC_VER<1200)
#include <tools/presys.h>
#endif
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#if defined(_MSC_VER) && (_MSC_VER<1200)
#include <tools/postsys.h>
#endif
@@ -50,7 +50,7 @@
/*************************************************************************/
//-----------------------------------------------------------------------------
-typedef std::hash_map
+typedef boost::unordered_map
<
INT32,
StgPage *,
diff --git a/svl/inc/pch/precompiled_svl.hxx b/svl/inc/pch/precompiled_svl.hxx
index 387ea36..9f7e56a 100644
--- a/svl/inc/pch/precompiled_svl.hxx
+++ b/svl/inc/pch/precompiled_svl.hxx
@@ -304,7 +304,7 @@
#include <algorithm>
#include <deque>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <limits>
#include <list>
diff --git a/svl/source/items/itemprop.cxx b/svl/source/items/itemprop.cxx
index 47bcd9d..02560d3 100644
--- a/svl/source/items/itemprop.cxx
+++ b/svl/source/items/itemprop.cxx
@@ -33,7 +33,7 @@
#include <svl/itempool.hxx>
#include <svl/itemset.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
/*************************************************************************
UNO III Implementation
*************************************************************************/
@@ -50,7 +50,7 @@ struct equalOUString
}
};
-typedef ::std::hash_map< ::rtl::OUString,
+typedef ::boost::unordered_map< ::rtl::OUString,
SfxItemPropertySimpleEntry,
::rtl::OUStringHash,
equalOUString > SfxItemPropertyHashMap_t;
diff --git a/svtools/inc/framestatuslistener.hxx b/svtools/inc/framestatuslistener.hxx
index fb524da..c321229 100644
--- a/svtools/inc/framestatuslistener.hxx
+++ b/svtools/inc/framestatuslistener.hxx
@@ -41,7 +41,7 @@
#include <comphelper/broadcasthelper.hxx>
#ifndef INCLUDED_HASH_MAP
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#define INCLUDED_HASH_MAP
#endif
@@ -100,7 +100,7 @@ class SVT_DLLPUBLIC FrameStatusListener : public ::com::sun::star::frame::XStatu
::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch;
};
- typedef ::std::hash_map< ::rtl::OUString,
+ typedef ::boost::unordered_map< ::rtl::OUString,
com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >,
::rtl::OUStringHash,
::std::equal_to< ::rtl::OUString > > URLToDispatchMap;
diff --git a/svtools/inc/pch/precompiled_svtools.hxx b/svtools/inc/pch/precompiled_svtools.hxx
index 22f4ac1..8a42f17 100644
--- a/svtools/inc/pch/precompiled_svtools.hxx
+++ b/svtools/inc/pch/precompiled_svtools.hxx
@@ -304,7 +304,7 @@
#include <algorithm>
#include <deque>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <limits>
#include <list>
diff --git a/svtools/inc/statusbarcontroller.hxx b/svtools/inc/statusbarcontroller.hxx
index 62abbab..1738aed 100644
--- a/svtools/inc/statusbarcontroller.hxx
+++ b/svtools/inc/statusbarcontroller.hxx
@@ -44,7 +44,7 @@
#include <comphelper/broadcasthelper.hxx>
#ifndef INCLUDED_HASH_MAP
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#define INCLUDED_HASH_MAP
#endif
@@ -125,7 +125,7 @@ class SVT_DLLPUBLIC StatusbarController : public ::com::sun::star::frame::XStatu
::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch;
};
- typedef ::std::hash_map< ::rtl::OUString,
+ typedef ::boost::unordered_map< ::rtl::OUString,
com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >,
::rtl::OUStringHash,
::std::equal_to< ::rtl::OUString > > URLToDispatchMap;
diff --git a/svtools/inc/svtools/toolboxcontroller.hxx b/svtools/inc/svtools/toolboxcontroller.hxx
index 8141f09..e9de271 100644
--- a/svtools/inc/svtools/toolboxcontroller.hxx
+++ b/svtools/inc/svtools/toolboxcontroller.hxx
@@ -51,7 +51,7 @@
#include <cppuhelper/interfacecontainer.hxx>
//end
#ifndef INCLUDED_HASH_MAP
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#define INCLUDED_HASH_MAP
#endif
@@ -145,7 +145,7 @@ class SVT_DLLPUBLIC ToolboxController : public ::com::sun::star::frame::XStatusL
::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch;
};
- typedef ::std::hash_map< ::rtl::OUString,
+ typedef ::boost::unordered_map< ::rtl::OUString,
com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >,
::rtl::OUStringHash,
::std::equal_to< ::rtl::OUString > > URLToDispatchMap;
diff --git a/svtools/source/uno/framestatuslistener.cxx b/svtools/source/uno/framestatuslistener.cxx
index a68f655..96c45a0 100644
--- a/svtools/source/uno/framestatuslistener.cxx
+++ b/svtools/source/uno/framestatuslistener.cxx
@@ -204,7 +204,7 @@ void FrameStatusListener::addStatusListener( const rtl::OUString& aCommandURL )
// intialize is called.
if ( !m_bInitialized )
{
- // Put into the hash_map of status listener. Will be activated when initialized is called
+ // Put into the boost::unordered_map of status listener. Will be activated when initialized is called
m_aListenerMap.insert( URLToDispatchMap::value_type( aCommandURL, Reference< XDispatch >() ));
return;
}
diff --git a/svtools/source/uno/statusbarcontroller.cxx b/svtools/source/uno/statusbarcontroller.cxx
index 49c7bf7..70a12a8 100644
--- a/svtools/source/uno/statusbarcontroller.cxx
+++ b/svtools/source/uno/statusbarcontroller.cxx
@@ -404,7 +404,7 @@ void StatusbarController::addStatusListener( const rtl::OUString& aCommandURL )
// intialize is called.
if ( !m_bInitialized )
{
- // Put into the hash_map of status listener. Will be activated when initialized is called
+ // Put into the boost::unordered_map of status listener. Will be activated when initialized is called
m_aListenerMap.insert( URLToDispatchMap::value_type( aCommandURL, Reference< XDispatch >() ));
return;
}
diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx
index b79ae18..730a0f3 100644
--- a/svtools/source/uno/toolboxcontroller.cxx
+++ b/svtools/source/uno/toolboxcontroller.cxx
@@ -447,7 +447,7 @@ void ToolboxController::addStatusListener( const rtl::OUString& aCommandURL )
// intialize is called.
if ( !m_bInitialized )
{
- // Put into the hash_map of status listener. Will be activated when initialized is called
+ // Put into the boost::unordered_map of status listener. Will be activated when initialized is called
m_aListenerMap.insert( URLToDispatchMap::value_type( aCommandURL, Reference< XDispatch >() ));
return;
}
diff --git a/toolkit/inc/toolkit/controls/eventcontainer.hxx b/toolkit/inc/toolkit/controls/eventcontainer.hxx
index 7094a39..121952f 100644
--- a/toolkit/inc/toolkit/controls/eventcontainer.hxx
+++ b/toolkit/inc/toolkit/controls/eventcontainer.hxx
@@ -33,7 +33,7 @@
#include <toolkit/helper/listenermultiplexer.hxx>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <cppuhelper/implbase2.hxx>
typedef ::cppu::WeakImplHelper2< ::com::sun::star::container::XNameContainer,
::com::sun::star::container::XContainer > NameContainerHelper;
@@ -59,7 +59,7 @@ struct eqName_Impl
}
};
-typedef std::hash_map
+typedef boost::unordered_map
<
::rtl::OUString,
sal_Int32,
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx
index 1fd1476..a8fa980 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -68,7 +68,7 @@
#include "grid/gridcontrol.hxx"
#include <map>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <algorithm>
#include <functional>
#include "tools/urlobj.hxx"
@@ -250,7 +250,7 @@ typedef ::cppu::WeakImplHelper1< container::XNameContainer > SimpleNameContainer
template< typename T >
class SimpleNamedThingContainer : public SimpleNameContainer_BASE
{
- typedef std::hash_map< rtl::OUString, Reference< T >, ::rtl::OUStringHash,
+ typedef boost::unordered_map< rtl::OUString, Reference< T >, ::rtl::OUStringHash,
::std::equal_to< ::rtl::OUString > > NamedThingsHash;
NamedThingsHash things;
::osl::Mutex m_aMutex;
diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx b/toolkit/source/controls/geometrycontrolmodel.cxx
index 5783122..baea429 100644
--- a/toolkit/source/controls/geometrycontrolmodel.cxx
+++ b/toolkit/source/controls/geometrycontrolmodel.cxx
@@ -453,7 +453,7 @@
//====================================================================
//--------------------------------------------------------------------
- typedef ::std::hash_map< ::rtl::OUString, sal_Int32, ::comphelper::UStringHash > HashMapString2Int;
+ typedef ::boost::unordered_map< ::rtl::OUString, sal_Int32, ::comphelper::UStringHash > HashMapString2Int;
typedef ::std::vector< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > > PropSeqArray;
typedef ::std::vector< ::std::vector< sal_Int32 > > IntArrayArray;
diff --git a/toolkit/source/layout/core/import.hxx b/toolkit/source/layout/core/import.hxx
index 8c9a6c5..8d3584a 100644
--- a/toolkit/source/layout/core/import.hxx
+++ b/toolkit/source/layout/core/import.hxx
@@ -32,7 +32,7 @@
#include <map>
#include <list>
#define _BACKWARD_BACKWARD_WARNING_H 1
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <com/sun/star/xml/input/XRoot.hpp>
diff --git a/toolkit/source/layout/core/root.hxx b/toolkit/source/layout/core/root.hxx
index b4e3fe6..1b56677 100644
--- a/toolkit/source/layout/core/root.hxx
+++ b/toolkit/source/layout/core/root.hxx
@@ -30,7 +30,7 @@
#define LAYOUT_CORE_ROOT_HXX
#define _BACKWARD_BACKWARD_WARNING_H 1
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <com/sun/star/awt/XLayoutRoot.hpp>
#include <com/sun/star/awt/XToolkit.hpp>
@@ -73,7 +73,7 @@ class TOOLKIT_DLLPUBLIC LayoutRoot : public ::cppu::WeakImplHelper3<
protected:
::osl::Mutex maMutex;
- typedef std::hash_map< rtl::OUString,
+ typedef boost::unordered_map< rtl::OUString,
css::uno::Reference< css::awt::XLayoutConstrains >,
::rtl::OUStringHash > ItemHash;
ItemHash maItems;
diff --git a/tools/inc/tools/pstm.hxx b/tools/inc/tools/pstm.hxx
index 1530474..c3ab2cd 100644
--- a/tools/inc/tools/pstm.hxx
+++ b/tools/inc/tools/pstm.hxx
@@ -28,7 +28,7 @@
#ifndef _PSTM_HXX
#define _PSTM_HXX
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include "tools/toolsdllapi.h"
#include <tools/table.hxx>
@@ -49,7 +49,7 @@ typedef void * (*SvCreateInstancePersist)( SvPersistBase ** );
class TOOLS_DLLPUBLIC SvClassManager
{
- typedef std::hash_map< USHORT, SvCreateInstancePersist > Map;
+ typedef boost::unordered_map< USHORT, SvCreateInstancePersist > Map;
Map aAssocTable;
public:
void Register( USHORT nClassId, SvCreateInstancePersist pFunc );
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index 0b350ac..bc1fb90 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -55,7 +55,7 @@
#include <functional>
#include <algorithm>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <list>
#include <set>
@@ -103,7 +103,7 @@ class InternalResMgr
OUString aResName;
bool bSingular;
com::sun::star::lang::Locale aLocale;
- std::hash_map<sal_uInt64, int>* pResUseDump;
+ boost::unordered_map<sal_uInt64, int>* pResUseDump;
InternalResMgr( const OUString& rFileURL,
const OUString& aPrefix,
@@ -141,7 +141,7 @@ class ResMgrContainer
{}
};
- std::hash_map< OUString, ContainerElement, OUStringHash> m_aResFiles;
+ boost::unordered_map< OUString, ContainerElement, OUStringHash> m_aResFiles;
com::sun::star::lang::Locale m_aDefLocale;
ResMgrContainer() { init(); }
@@ -178,7 +178,7 @@ ResMgrContainer& ResMgrContainer::get()
ResMgrContainer::~ResMgrContainer()
{
- for( std::hash_map< OUString, ContainerElement, OUStringHash >::iterator it =
+ for( boost::unordered_map< OUString, ContainerElement, OUStringHash >::iterator it =
m_aResFiles.begin(); it != m_aResFiles.end(); ++it )
{
OSL_TRACE( "Resource file %s loaded %d times\n",
@@ -263,7 +263,7 @@ void ResMgrContainer::init()
#endif
}
#if OSL_DEBUG_LEVEL > 1
- for( std::hash_map< OUString, ContainerElement, OUStringHash >::const_iterator it =
+ for( boost::unordered_map< OUString, ContainerElement, OUStringHash >::const_iterator it =
m_aResFiles.begin(); it != m_aResFiles.end(); ++it )
{
OSL_TRACE( "ResMgrContainer: %s -> %s\n",
@@ -284,7 +284,7 @@ InternalResMgr* ResMgrContainer::getResMgr( const OUString& rPrefix,
{
com::sun::star::lang::Locale aLocale( rLocale );
OUStringBuffer aSearch( rPrefix.getLength() + 16 );
- std::hash_map< OUString, ContainerElement, OUStringHash >::iterator it = m_aResFiles.end();
+ boost::unordered_map< OUString, ContainerElement, OUStringHash >::iterator it = m_aResFiles.end();
int nTries = 0;
if( aLocale.Language.getLength() > 0 )
@@ -466,7 +466,7 @@ void ResMgrContainer::freeResMgr( InternalResMgr* pResMgr )
delete pResMgr;
else
{
- std::hash_map< OUString, ContainerElement, OUStringHash >::iterator it =
+ boost::unordered_map< OUString, ContainerElement, OUStringHash >::iterator it =
m_aResFiles.find( pResMgr->aResName );
if( it != m_aResFiles.end() )
{
@@ -578,7 +578,7 @@ InternalResMgr::~InternalResMgr()
aLine.Append( ByteString( OUStringToOString( aFileName, RTL_TEXTENCODING_UTF8 ) ) );
aStm.WriteLine( aLine );
- for( std::hash_map<sal_uInt64, int>::const_iterator it = pResUseDump->begin();
+ for( boost::unordered_map<sal_uInt64, int>::const_iterator it = pResUseDump->begin();
it != pResUseDump->end(); ++it )
{
sal_uInt64 nKeyId = it->first;
@@ -635,7 +635,7 @@ BOOL InternalResMgr::Create()
const sal_Char* pLogFile = getenv( "STAR_RESOURCE_LOGGING" );
if ( pLogFile )
{
- pResUseDump = new std::hash_map<sal_uInt64, int>;
+ pResUseDump = new boost::unordered_map<sal_uInt64, int>;
for( sal_uInt32 i = 0; i < nEntries; ++i )
(*pResUseDump)[pContent[i].nTypeAndId] = 1;
}
diff --git a/ucbhelper/source/provider/contenthelper.cxx b/ucbhelper/source/provider/contenthelper.cxx
index c527ee5..72c6ac2 100644
--- a/ucbhelper/source/provider/contenthelper.cxx
+++ b/ucbhelper/source/provider/contenthelper.cxx
@@ -34,7 +34,7 @@
*************************************************************************/
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <com/sun/star/ucb/ContentAction.hpp>
#include <com/sun/star/ucb/CommandInfoChange.hpp>
#include <com/sun/star/ucb/XPersistentPropertySet.hpp>
@@ -102,7 +102,7 @@ struct hashPtr
}
};
-typedef std::hash_map
+typedef boost::unordered_map
<
XPropertiesChangeListenerPtr,
PropertyEventSequence*,
diff --git a/ucbhelper/source/provider/providerhelper.cxx b/ucbhelper/source/provider/providerhelper.cxx
index ef93395..e09d90c 100644
--- a/ucbhelper/source/provider/providerhelper.cxx
+++ b/ucbhelper/source/provider/providerhelper.cxx
@@ -35,7 +35,7 @@
*************************************************************************/
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <com/sun/star/beans/XPropertyAccess.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/container/XNamed.hpp>
@@ -77,7 +77,7 @@ struct hashString
}
};
-typedef std::hash_map
+typedef boost::unordered_map
<
rtl::OUString,
uno::WeakReference< ucb::XContent >,
diff --git a/unotools/inc/unotools/atom.hxx b/unotools/inc/unotools/atom.hxx
index 47a5d9d..0bb2606 100644
--- a/unotools/inc/unotools/atom.hxx
+++ b/unotools/inc/unotools/atom.hxx
@@ -33,7 +33,7 @@
#include <osl/mutex.hxx>
#include <cppuhelper/implbase1.hxx>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <list>
#include <com/sun/star/util/XAtomServer.hpp>
@@ -50,8 +50,8 @@ namespace utl {
class AtomProvider
{
int m_nAtoms;
- ::std::hash_map< int, ::rtl::OUString, ::std::hash< int > > m_aStringMap;
- ::std::hash_map< ::rtl::OUString, int, ::rtl::OUStringHash > m_aAtomMap;
+ ::boost::unordered_map< int, ::rtl::OUString, ::std::hash< int > > m_aStringMap;
+ ::boost::unordered_map< ::rtl::OUString, int, ::rtl::OUStringHash > m_aAtomMap;
public:
AtomProvider();
~AtomProvider();
@@ -72,7 +72,7 @@ namespace utl {
class UNOTOOLS_DLLPUBLIC MultiAtomProvider
{
- ::std::hash_map< int, AtomProvider*, ::std::hash< int > > m_aAtomLists;
+ ::boost::unordered_map< int, AtomProvider*, ::std::hash< int > > m_aAtomLists;
public:
MultiAtomProvider();
~MultiAtomProvider();
diff --git a/unotools/inc/unotools/eventcfg.hxx b/unotools/inc/unotools/eventcfg.hxx
index 30f5014..02c53ed 100644
--- a/unotools/inc/unotools/eventcfg.hxx
+++ b/unotools/inc/unotools/eventcfg.hxx
@@ -35,7 +35,7 @@
#include <com/sun/star/frame/XFrame.hpp>
#include <cppuhelper/weakref.hxx>
#include <cppuhelper/implbase2.hxx>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <vector>
#define STR_EVENT_STARTAPP 0
@@ -67,7 +67,7 @@
#define STR_EVENT_MODECHANGED 26
#define STR_EVENT_STORAGECHANGED 27
-typedef ::std::hash_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > EventBindingHash;
+typedef ::boost::unordered_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > EventBindingHash;
typedef ::std::vector< ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XFrame > > FrameVector;
typedef ::std::vector< ::rtl::OUString > SupportedEventsVector;
diff --git a/unotools/inc/unotools/fontcfg.hxx b/unotools/inc/unotools/fontcfg.hxx
index bc27cc4..6379a5f 100644
--- a/unotools/inc/unotools/fontcfg.hxx
+++ b/unotools/inc/unotools/fontcfg.hxx
@@ -35,8 +35,8 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
-#include <hash_map>
-#include <hash_set>
+#include <boost/unordered_map.hpp>
+#include <boost/unordered_set.hpp>
#include <vector>
namespace com {
@@ -86,7 +86,7 @@ class UNOTOOLS_DLLPUBLIC DefaultFontConfiguration
mutable com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > xAccess;
};
- std::hash_map< com::sun::star::lang::Locale,
+ boost::unordered_map< com::sun::star::lang::Locale,
LocaleAccess,
utl::LocaleHash >
m_aConfig;
@@ -192,8 +192,8 @@ private:
LocaleSubst() : bConfigRead( false ) {}
};
- std::hash_map< com::sun::star::lang::Locale, LocaleSubst, utl::LocaleHash > m_aSubst;
- typedef std::hash_set< rtl::OUString, rtl::OUStringHash > UniqueSubstHash;
+ boost::unordered_map< com::sun::star::lang::Locale, LocaleSubst, utl::LocaleHash > m_aSubst;
+ typedef boost::unordered_set< rtl::OUString, rtl::OUStringHash > UniqueSubstHash;
mutable UniqueSubstHash maSubstHash;
diff --git a/unotools/source/config/cmdoptions.cxx b/unotools/source/config/cmdoptions.cxx
index 5f8a571..460552b 100644
--- a/unotools/source/config/cmdoptions.cxx
+++ b/unotools/source/config/cmdoptions.cxx
@@ -46,7 +46,7 @@
#include <itemholder1.hxx>
#include <algorithm>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
//_________________________________________________________________________________________________________________
// namespaces
@@ -143,7 +143,7 @@ class SvtCmdOptions
}
private:
- class CommandHashMap : public ::std::hash_map< ::rtl::OUString ,
+ class CommandHashMap : public ::boost::unordered_map< ::rtl::OUString ,
sal_Int32 ,
OUStringHashCode ,
::std::equal_to< ::rtl::OUString > >
@@ -292,7 +292,7 @@ SvtCommandOptions_Impl::SvtCommandOptions_Impl()
sal_Int32 nItem = 0 ;
OUString sCmd ;
- // Set size of hash_map reach a used size of approx. 60%
+ // Set size of boost::unordered_map reach a used size of approx. 60%
m_aDisabledCommands.SetContainerSize( lNames.getLength() * 10 / 6 );
// Get names/values for disabled commands.
@@ -343,7 +343,7 @@ void SvtCommandOptions_Impl::Notify( const Sequence< OUString >& )
sal_Int32 nItem = 0 ;
OUString sCmd ;
- // Set size of hash_map reach a used size of approx. 60%
+ // Set size of boost::unordered_map reach a used size of approx. 60%
m_aDisabledCommands.Clear();
m_aDisabledCommands.SetContainerSize( lNames.getLength() * 10 / 6 );
diff --git a/unotools/source/config/eventcfg.cxx b/unotools/source/config/eventcfg.cxx
index d81e576..83dc8b5 100644
--- a/unotools/source/config/eventcfg.cxx
+++ b/unotools/source/config/eventcfg.cxx
@@ -38,7 +38,7 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include <cppuhelper/weakref.hxx>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <tools/urlobj.hxx>
#include <rtl/ustrbuf.hxx>
diff --git a/unotools/source/config/extendedsecurityoptions.cxx b/unotools/source/config/extendedsecurityoptions.cxx
index 6098ac0..09c8b8f 100644
--- a/unotools/source/config/extendedsecurityoptions.cxx
+++ b/unotools/source/config/extendedsecurityoptions.cxx
@@ -45,7 +45,7 @@
#include <unotools/pathoptions.hxx>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <rtl/logfile.hxx>
#include "itemholder1.hxx"
@@ -86,7 +86,7 @@ struct OUStringHashCode
}
};
-class ExtensionHashMap : public ::std::hash_map< ::rtl::OUString,
+class ExtensionHashMap : public ::boost::unordered_map< ::rtl::OUString,
sal_Int32,
OUStringHashCode,
::std::equal_to< ::rtl::OUString > >
diff --git a/unotools/source/config/fontcfg.cxx b/unotools/source/config/fontcfg.cxx
index 11e7aad..bf3eb75 100644
--- a/unotools/source/config/fontcfg.cxx
+++ b/unotools/source/config/fontcfg.cxx
@@ -193,7 +193,7 @@ OUString DefaultFontConfiguration::tryLocale( const Locale& rLocale, const OUStr
{
OUString aRet;
- std::hash_map< Locale, LocaleAccess, LocaleHash >::const_iterator it =
+ boost::unordered_map< Locale, LocaleAccess, LocaleHash >::const_iterator it =
m_aConfig.find( rLocale );
if( it != m_aConfig.end() )
{
@@ -1093,7 +1093,7 @@ unsigned long FontSubstConfiguration::getSubstType( const com::sun::star::uno::R
void FontSubstConfiguration::readLocaleSubst( const com::sun::star::lang::Locale& rLocale ) const
{
- std::hash_map< Locale, LocaleSubst, LocaleHash >::const_iterator it =
+ boost::unordered_map< Locale, LocaleSubst, LocaleHash >::const_iterator it =
m_aSubst.find( rLocale );
if( it != m_aSubst.end() )
{
@@ -1193,7 +1193,7 @@ const FontNameAttr* FontSubstConfiguration::getSubstInfo( const String& rFontNam
while( aLocale.Language.getLength() )
{
- std::hash_map< Locale, LocaleSubst, LocaleHash >::const_iterator lang = m_aSubst.find( aLocale );
+ boost::unordered_map< Locale, LocaleSubst, LocaleHash >::const_iterator lang = m_aSubst.find( aLocale );
if( lang != m_aSubst.end() )
{
if( ! lang->second.bConfigRead )
diff --git a/unotools/source/config/optionsdlg.cxx b/unotools/source/config/optionsdlg.cxx
index 0a10f72..80ffa83 100644
--- a/unotools/source/config/optionsdlg.cxx
+++ b/unotools/source/config/optionsdlg.cxx
@@ -38,7 +38,7 @@
#include <osl/mutex.hxx>
#include <comphelper/stl_types.hxx>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include "itemholder1.hxx"
using namespace utl;
@@ -66,7 +66,7 @@ private:
}
};
- typedef std::hash_map< OUString, sal_Bool, OUStringHashCode, ::std::equal_to< OUString > > OptionNodeList;
+ typedef boost::unordered_map< OUString, sal_Bool, OUStringHashCode, ::std::equal_to< OUString > > OptionNodeList;
OUString m_sPathDelimiter;
OptionNodeList m_aOptionNodeList;
diff --git a/unotools/source/config/pathoptions.cxx b/unotools/source/config/pathoptions.cxx
index b95289d..7ed2139 100644
--- a/unotools/source/config/pathoptions.cxx
+++ b/unotools/source/config/pathoptions.cxx
@@ -55,7 +55,7 @@
#include <itemholder1.hxx>
#include <vector>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
using namespace osl;
using namespace utl;
@@ -106,19 +106,19 @@ enum VarNameProperty
VAR_NEEDS_FILEURL
};
-class NameToHandleMap : public ::std::hash_map< ::rtl::OUString, sal_Int32, OUStringHashCode, ::std::equal_to< ::rtl::OUString > >
+class NameToHandleMap : public ::boost::unordered_map< ::rtl::OUString, sal_Int32, OUStringHashCode, ::std::equal_to< ::rtl::OUString > >
{
public:
inline void free() { NameToHandleMap().swap( *this ); }
};
-class EnumToHandleMap : public ::std::hash_map< sal_Int32, sal_Int32, std::hash< sal_Int32 >, std::equal_to< sal_Int32 > >
+class EnumToHandleMap : public ::boost::unordered_map< sal_Int32, sal_Int32, std::hash< sal_Int32 >, std::equal_to< sal_Int32 > >
{
public:
inline void free() { EnumToHandleMap().swap( *this ); }
};
-class VarNameToEnumMap : public ::std::hash_map< OUString, VarNameProperty, OUStringHashCode, ::std::equal_to< OUString > >
+class VarNameToEnumMap : public ::boost::unordered_map< OUString, VarNameProperty, OUStringHashCode, ::std::equal_to< OUString > >
{
public:
inline void free() { VarNameToEnumMap().swap( *this ); }
diff --git a/unotools/source/config/viewoptions.cxx b/unotools/source/config/viewoptions.cxx
index 57ac240..234312a 100644
--- a/unotools/source/config/viewoptions.cxx
+++ b/unotools/source/config/viewoptions.cxx
@@ -35,7 +35,7 @@
#include <unotools/viewoptions.hxx>
#include <com/sun/star/uno/Any.hxx>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
@@ -273,7 +273,7 @@ struct IMPL_TStringHashCode
}
};
-typedef ::std::hash_map< ::rtl::OUString ,
+typedef ::boost::unordered_map< ::rtl::OUString ,
IMPL_TViewData ,
IMPL_TStringHashCode ,
::std::equal_to< ::rtl::OUString > > IMPL_TViewHash;
diff --git a/unotools/source/misc/atom.cxx b/unotools/source/misc/atom.cxx
index 7ce38a3..37f04c3 100644
--- a/unotools/source/misc/atom.cxx
+++ b/unotools/source/misc/atom.cxx
@@ -47,7 +47,7 @@ AtomProvider::~AtomProvider()
int AtomProvider::getAtom( const ::rtl::OUString& rString, sal_Bool bCreate )
{
- ::std::hash_map< ::rtl::OUString, int, ::rtl::OUStringHash >::iterator it = m_aAtomMap.find( rString );
+ ::boost::unordered_map< ::rtl::OUString, int, ::rtl::OUStringHash >::iterator it = m_aAtomMap.find( rString );
if( it != m_aAtomMap.end() )
return it->second;
if( ! bCreate )
@@ -61,7 +61,7 @@ int AtomProvider::getAtom( const ::rtl::OUString& rString, sal_Bool bCreate )
void AtomProvider::getAll( ::std::list< ::utl::AtomDescription >& atoms )
{
atoms.clear();
- ::std::hash_map< ::rtl::OUString, int, ::rtl::OUStringHash >::const_iterator it = m_aAtomMap.begin();
+ ::boost::unordered_map< ::rtl::OUString, int, ::rtl::OUStringHash >::const_iterator it = m_aAtomMap.begin();
::utl::AtomDescription aDesc;
while( it != m_aAtomMap.end() )
@@ -77,7 +77,7 @@ void AtomProvider::getRecent( int atom, ::std::list< ::utl::AtomDescription >& a
{
atoms.clear();
- ::std::hash_map< ::rtl::OUString, int, ::rtl::OUStringHash >::const_iterator it = m_aAtomMap.begin();
+ ::boost::unordered_map< ::rtl::OUString, int, ::rtl::OUStringHash >::const_iterator it = m_aAtomMap.begin();
::utl::AtomDescription aDesc;
while( it != m_aAtomMap.end() )
@@ -95,7 +95,7 @@ void AtomProvider::getRecent( int atom, ::std::list< ::utl::AtomDescription >& a
const ::rtl::OUString& AtomProvider::getString( int nAtom ) const
{
static ::rtl::OUString aEmpty;
- ::std::hash_map< int, ::rtl::OUString, ::std::hash< int > >::const_iterator it = m_aStringMap.find( nAtom );
+ ::boost::unordered_map< int, ::rtl::OUString, ::std::hash< int > >::const_iterator it = m_aStringMap.find( nAtom );
return it == m_aStringMap.end() ? aEmpty : it->second;
}
@@ -121,14 +121,14 @@ MultiAtomProvider::MultiAtomProvider()
MultiAtomProvider::~MultiAtomProvider()
{
- for( ::std::hash_map< int, AtomProvider*, ::std::hash< int > >::iterator it = m_aAtomLists.begin(); it != m_aAtomLists.end(); ++it )
+ for( ::boost::unordered_map< int, AtomProvider*, ::std::hash< int > >::iterator it = m_aAtomLists.begin(); it != m_aAtomLists.end(); ++it )
delete it->second;
}
sal_Bool MultiAtomProvider::insertAtomClass( int atomClass )
{
- ::std::hash_map< int, AtomProvider*, ::std::hash< int > >::iterator it =
+ ::boost::unordered_map< int, AtomProvider*, ::std::hash< int > >::iterator it =
m_aAtomLists.find( atomClass );
if( it != m_aAtomLists.end() )
return sal_False;
@@ -138,7 +138,7 @@ sal_Bool MultiAtomProvider::insertAtomClass( int atomClass )
int MultiAtomProvider::getAtom( int atomClass, const ::rtl::OUString& rString, sal_Bool bCreate )
{
- ::std::hash_map< int, AtomProvider*, ::std::hash< int > >::iterator it =
+ ::boost::unordered_map< int, AtomProvider*, ::std::hash< int > >::iterator it =
m_aAtomLists.find( atomClass );
if( it != m_aAtomLists.end() )
return it->second->getAtom( rString, bCreate );
@@ -154,7 +154,7 @@ int MultiAtomProvider::getAtom( int atomClass, const ::rtl::OUString& rString, s
int MultiAtomProvider::getLastAtom( int atomClass ) const
{
- ::std::hash_map< int, AtomProvider*, ::std::hash< int > >::const_iterator it =
+ ::boost::unordered_map< int, AtomProvider*, ::std::hash< int > >::const_iterator it =
m_aAtomLists.find( atomClass );
return it != m_aAtomLists.end() ? it->second->getLastAtom() : INVALID_ATOM;
@@ -162,7 +162,7 @@ int MultiAtomProvider::getLastAtom( int atomClass ) const
void MultiAtomProvider::getRecent( int atomClass, int atom, ::std::list< ::utl::AtomDescription >& atoms )
{
- ::std::hash_map< int, AtomProvider*, ::std::hash< int > >::const_iterator it =
+ ::boost::unordered_map< int, AtomProvider*, ::std::hash< int > >::const_iterator it =
m_aAtomLists.find( atomClass );
if( it != m_aAtomLists.end() )
it->second->getRecent( atom, atoms );
@@ -172,7 +172,7 @@ void MultiAtomProvider::getRecent( int atomClass, int atom, ::std::list< ::utl::
const ::rtl::OUString& MultiAtomProvider::getString( int atomClass, int atom ) const
{
- ::std::hash_map< int, AtomProvider*, ::std::hash< int > >::const_iterator it =
+ ::boost::unordered_map< int, AtomProvider*, ::std::hash< int > >::const_iterator it =
m_aAtomLists.find( atomClass );
if( it != m_aAtomLists.end() )
return it->second->getString( atom );
@@ -183,13 +183,13 @@ const ::rtl::OUString& MultiAtomProvider::getString( int atomClass, int atom ) c
sal_Bool MultiAtomProvider::hasAtom( int atomClass, int atom ) const
{
- ::std::hash_map< int, AtomProvider*, ::std::hash< int > >::const_iterator it = m_aAtomLists.find( atomClass );
+ ::boost::unordered_map< int, AtomProvider*, ::std::hash< int > >::const_iterator it = m_aAtomLists.find( atomClass );
return it != m_aAtomLists.end() ? it->second->hasAtom( atom ) : sal_False;
}
void MultiAtomProvider::getClass( int atomClass, ::std::list< ::utl::AtomDescription >& atoms) const
{
- ::std::hash_map< int, AtomProvider*, ::std::hash< int > >::const_iterator it = m_aAtomLists.find( atomClass );
+ ::boost::unordered_map< int, AtomProvider*, ::std::hash< int > >::const_iterator it = m_aAtomLists.find( atomClass );
if( it != m_aAtomLists.end() )
it->second->getAll( atoms );
@@ -199,7 +199,7 @@ void MultiAtomProvider::getClass( int atomClass, ::std::list< ::utl::AtomDescrip
void MultiAtomProvider::overrideAtom( int atomClass, int atom, const ::rtl::OUString& description )
{
- ::std::hash_map< int, AtomProvider*, ::std::hash< int > >::const_iterator it = m_aAtomLists.find( atomClass );
+ ::boost::unordered_map< int, AtomProvider*, ::std::hash< int > >::const_iterator it = m_aAtomLists.find( atomClass );
if( it == m_aAtomLists.end() )
m_aAtomLists[ atomClass ] = new AtomProvider();
m_aAtomLists[ atomClass ]->overrideAtom( atom, description );
diff --git a/unotools/source/misc/fontdefs.cxx b/unotools/source/misc/fontdefs.cxx
index e216348..99a8f14 100644
--- a/unotools/source/misc/fontdefs.cxx
+++ b/unotools/source/misc/fontdefs.cxx
@@ -30,7 +30,7 @@
#include "precompiled_unotools.hxx"
#include <unotools/fontdefs.hxx>
#include <unotools/fontcfg.hxx>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
struct ImplLocalizedFontName
{
@@ -413,7 +413,7 @@ void GetEnglishSearchFontName( String& rName )
// translate normalized localized name to its normalized English ASCII name
if( bNeedTranslation )
{
- typedef std::hash_map<const String, const char*,FontNameHash> FontNameDictionary;
+ typedef boost::unordered_map<const String, const char*,FontNameHash> FontNameDictionary;
static FontNameDictionary aDictionary( sizeof(aImplLocalizedNamesList) / sizeof(*aImplLocalizedNamesList) );
// the font name dictionary needs to be intialized once
if( aDictionary.empty() )
diff --git a/vcl/aqua/inc/salatsuifontutils.hxx b/vcl/aqua/inc/salatsuifontutils.hxx
index 5a11e6a..8748e33 100644
--- a/vcl/aqua/inc/salatsuifontutils.hxx
+++ b/vcl/aqua/inc/salatsuifontutils.hxx
@@ -54,7 +54,7 @@ public:
ATSUFontFallbacks maFontFallbacks;
private:
- typedef std::hash_map<ATSUFontID,ImplMacFontData*> MacFontContainer;
+ typedef boost::unordered_map<ATSUFontID,ImplMacFontData*> MacFontContainer;
MacFontContainer maFontContainer;
void InitGlyphFallbacks();
diff --git a/vcl/aqua/inc/saldata.hxx b/vcl/aqua/inc/saldata.hxx
index 5915ec8..207a7d9 100644
--- a/vcl/aqua/inc/saldata.hxx
+++ b/vcl/aqua/inc/saldata.hxx
@@ -43,7 +43,7 @@
#include <list>
#include <vector>
#include <map>
-#include <hash_set>
+#include <boost/unordered_set.hpp>
#include <cstdio>
#include <cstdarg>
@@ -85,7 +85,7 @@ struct SalData
SALTIMERPROC mpTimerProc; // timer callback proc
AquaSalInstance *mpFirstInstance; // pointer of first instance
std::list<AquaSalFrame*> maFrames; // pointer of first frame
- std::hash_set<const AquaSalFrame*,FrameHash> maFrameCheck; // for fast check of frame existance
+ boost::unordered_set<const AquaSalFrame*,FrameHash> maFrameCheck; // for fast check of frame existance
SalObject *mpFirstObject; // pointer of first object window
SalVirtualDevice *mpFirstVD; // first VirDev
SalPrinter *mpFirstPrinter; // first printing printer
diff --git a/vcl/inc/cupsmgr.hxx b/vcl/inc/cupsmgr.hxx
index e7b835e..bbda2e3 100644
--- a/vcl/inc/cupsmgr.hxx
+++ b/vcl/inc/cupsmgr.hxx
@@ -49,13 +49,13 @@ struct FPtrHash
class CUPSManager : public PrinterInfoManager
{
CUPSWrapper* m_pCUPSWrapper;
- std::hash_map< FILE*, rtl::OString, FPtrHash > m_aSpoolFiles;
+ boost::unordered_map< FILE*, rtl::OString, FPtrHash > m_aSpoolFiles;
int m_nDests;
void* m_pDests;
bool m_bNewDests;
- std::hash_map< rtl::OUString, int, rtl::OUStringHash > m_aCUPSDestMap;
+ boost::unordered_map< rtl::OUString, int, rtl::OUStringHash > m_aCUPSDestMap;
- std::hash_map< rtl::OUString, PPDContext, rtl::OUStringHash > m_aDefaultContexts;
+ boost::unordered_map< rtl::OUString, PPDContext, rtl::OUStringHash > m_aDefaultContexts;
rtl::OString m_aUser;
// this is a security risk, but the CUPS API demands
diff --git a/vcl/inc/vcl/configsettings.hxx b/vcl/inc/vcl/configsettings.hxx
index e33e76d..e34bdc2 100644
--- a/vcl/inc/vcl/configsettings.hxx
+++ b/vcl/inc/vcl/configsettings.hxx
@@ -33,14 +33,14 @@
#include <unotools/configitem.hxx>
#include <vcl/dllapi.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
//........................................................................
namespace vcl
{
//........................................................................
- typedef std::hash_map< rtl::OUString, rtl::OUString, rtl::OUStringHash > OUStrMap;
+ typedef boost::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash > OUStrMap;
class SmallOUStrMap : public OUStrMap { public: SmallOUStrMap() : OUStrMap(1) {} };
//====================================================================
@@ -49,7 +49,7 @@ namespace vcl
class VCL_DLLPUBLIC SettingsConfigItem : public ::utl::ConfigItem
{
- std::hash_map< rtl::OUString, SmallOUStrMap, rtl::OUStringHash > m_aSettings;
+ boost::unordered_map< rtl::OUString, SmallOUStrMap, rtl::OUStringHash > m_aSettings;
virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& rPropertyNames );
diff --git a/vcl/inc/vcl/fontcache.hxx b/vcl/inc/vcl/fontcache.hxx
index 8beb1e4..fe86b7a 100644
--- a/vcl/inc/vcl/fontcache.hxx
+++ b/vcl/inc/vcl/fontcache.hxx
@@ -34,7 +34,7 @@
#include "tools/string.hxx"
-#include <hash_map>
+#include <boost/unordered_map.hpp>
namespace psp
{
@@ -52,7 +52,7 @@ class VCL_DLLPUBLIC FontCache
FontCacheEntry m_aEntry;
};
- typedef std::hash_map< ::rtl::OString, FontFile, ::rtl::OStringHash > FontDirMap;
+ typedef boost::unordered_map< ::rtl::OString, FontFile, ::rtl::OStringHash > FontDirMap;
struct FontDir
{
sal_Int64 m_nTimestamp;
@@ -63,7 +63,7 @@ class VCL_DLLPUBLIC FontCache
FontDir() : m_nTimestamp(0), m_bNoFiles(false), m_bUserOverrideOnly( false ) {}
};
- typedef std::hash_map< int, FontDir > FontCacheData;
+ typedef boost::unordered_map< int, FontDir > FontCacheData;
FontCacheData m_aCache;
String m_aCacheFile;
bool m_bDoFlush;
diff --git a/vcl/inc/vcl/fontmanager.hxx b/vcl/inc/vcl/fontmanager.hxx
index 8a97e04..a4066cb 100644
--- a/vcl/inc/vcl/fontmanager.hxx
+++ b/vcl/inc/vcl/fontmanager.hxx
@@ -29,7 +29,7 @@
#ifndef _PSPRINT_FONTMANAGER_HXX_
#define _PSPRINT_FONTMANAGER_HXX_
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <map>
#include <list>
#include <set>
@@ -242,7 +242,7 @@ class VCL_DLLPUBLIC PrintFontManager
// upper byte contains: 0 for horizontal metric
// 1 for vertical metric
// highest byte: 0 for now
- std::hash_map< int, CharacterMetric > m_aMetrics;
+ boost::unordered_map< int, CharacterMetric > m_aMetrics;
// contains the unicode blocks for which metrics were queried
// this implies that metrics should be queried in terms of
// unicode blocks. here a unicode block is identified
@@ -257,7 +257,7 @@ class VCL_DLLPUBLIC PrintFontManager
bool m_bKernPairsQueried;
std::list< KernPair > m_aXKernPairs;
std::list< KernPair > m_aYKernPairs;
- std::hash_map< sal_Unicode, bool > m_bVerticalSubstitutions;
+ boost::unordered_map< sal_Unicode, bool > m_bVerticalSubstitutions;
PrintFontMetrics() : m_bKernPairsQueried( false ) {}
@@ -371,8 +371,8 @@ class VCL_DLLPUBLIC PrintFontManager
static rtl::OString s_aEmptyOString;
fontID m_nNextFontID;
- std::hash_map< fontID, PrintFont* > m_aFonts;
- std::hash_map< int, family::type > m_aFamilyTypes;
+ boost::unordered_map< fontID, PrintFont* > m_aFonts;
+ boost::unordered_map< int, family::type > m_aFamilyTypes;
std::list< rtl::OUString > m_aPrinterDrivers;
std::list< rtl::OString > m_aFontDirectories;
std::list< int > m_aPrivateFontDirectories;
@@ -380,20 +380,20 @@ class VCL_DLLPUBLIC PrintFontManager
m_aXLFD_Aliases;
utl::MultiAtomProvider* m_pAtoms;
// for speeding up findFontFileID
- std::hash_map< rtl::OString, std::set< fontID >, rtl::OStringHash >
+ boost::unordered_map< rtl::OString, std::set< fontID >, rtl::OStringHash >
m_aFontFileToFontID;
- std::hash_map< rtl::OString, int, rtl::OStringHash >
+ boost::unordered_map< rtl::OString, int, rtl::OStringHash >
m_aDirToAtom;
- std::hash_map< int, rtl::OString > m_aAtomToDir;
+ boost::unordered_map< int, rtl::OString > m_aAtomToDir;
int m_nNextDirAtom;
- std::hash_multimap< rtl::OString, sal_Unicode, rtl::OStringHash >
+ boost::unordered_multimap< rtl::OString, sal_Unicode, rtl::OStringHash >
m_aAdobenameToUnicode;
- std::hash_multimap< sal_Unicode, rtl::OString >
+ boost::unordered_multimap< sal_Unicode, rtl::OString >
m_aUnicodeToAdobename;
- std::hash_multimap< sal_Unicode, sal_uInt8 > m_aUnicodeToAdobecode;
- std::hash_multimap< sal_uInt8, sal_Unicode > m_aAdobecodeToUnicode;
+ boost::unordered_multimap< sal_Unicode, sal_uInt8 > m_aUnicodeToAdobecode;
+ boost::unordered_multimap< sal_uInt8, sal_Unicode > m_aAdobecodeToUnicode;
mutable FontCache* m_pFontCache;
bool m_bFontconfigSuccess;
@@ -418,7 +418,7 @@ class VCL_DLLPUBLIC PrintFontManager
PrintFont* getFont( fontID nID ) const
{
- std::hash_map< fontID, PrintFont* >::const_iterator it;
+ boost::unordered_map< fontID, PrintFont* >::const_iterator it;
it = m_aFonts.find( nID );
return it == m_aFonts.end() ? NULL : it->second;
}
@@ -438,7 +438,7 @@ class VCL_DLLPUBLIC PrintFontManager
false else (e.g. no libfontconfig found)
*/
bool initFontconfig();
- int countFontconfigFonts( std::hash_map<rtl::OString, int, rtl::OStringHash>& o_rVisitedPaths );
+ int countFontconfigFonts( boost::unordered_map<rtl::OString, int, rtl::OStringHash>& o_rVisitedPaths );
/* deinitialize fontconfig
*/
void deinitFontconfig();
@@ -618,15 +618,15 @@ public:
// helper for type 1 fonts
std::list< rtl::OString > getAdobeNameFromUnicode( sal_Unicode aChar ) const;
- std::pair< std::hash_multimap< sal_Unicode, sal_uInt8 >::const_iterator,
- std::hash_multimap< sal_Unicode, sal_uInt8 >::const_iterator >
+ std::pair< boost::unordered_multimap< sal_Unicode, sal_uInt8 >::const_iterator,
+ boost::unordered_multimap< sal_Unicode, sal_uInt8 >::const_iterator >
getAdobeCodeFromUnicode( sal_Unicode aChar ) const
{
return m_aUnicodeToAdobecode.equal_range( aChar );
}
std::list< sal_Unicode > getUnicodeFromAdobeName( const rtl::OString& rName ) const;
- std::pair< std::hash_multimap< sal_uInt8, sal_Unicode >::const_iterator,
- std::hash_multimap< sal_uInt8, sal_Unicode >::const_iterator >
+ std::pair< boost::unordered_multimap< sal_uInt8, sal_Unicode >::const_iterator,
+ boost::unordered_multimap< sal_uInt8, sal_Unicode >::const_iterator >
getUnicodeFromAdobeCode( sal_uInt8 aChar ) const
{
return m_aAdobecodeToUnicode.equal_range( aChar );
diff --git a/vcl/inc/vcl/glyphcache.hxx b/vcl/inc/vcl/glyphcache.hxx
index 9731440..1224632 100644
--- a/vcl/inc/vcl/glyphcache.hxx
+++ b/vcl/inc/vcl/glyphcache.hxx
@@ -43,8 +43,8 @@ struct ImplKernPairData;
class ImplFontOptions;
#include <tools/gen.hxx>
-#include <hash_map>
-#include <hash_set>
+#include <boost/unordered_map.hpp>
+#include <boost/unordered_set.hpp>
namespace basegfx { class B2DPolyPolygon; }
@@ -98,7 +98,7 @@ private:
// the FontList key's mpFontData member is reinterpreted as integer font id
struct IFSD_Equal{ bool operator()( const ImplFontSelectData&, const ImplFontSelectData& ) const; };
struct IFSD_Hash{ size_t operator()( const ImplFontSelectData& ) const; };
- typedef ::std::hash_map<ImplFontSelectData,ServerFont*,IFSD_Hash,IFSD_Equal > FontList;
+ typedef ::boost::unordered_map<ImplFontSelectData,ServerFont*,IFSD_Hash,IFSD_Equal > FontList;
FontList maFontList;
ULONG mnMaxSize; // max overall cache size in bytes
mutable ULONG mnBytesUsed;
@@ -227,7 +227,7 @@ protected:
virtual ServerFontLayoutEngine* GetLayoutEngine() { return NULL; }
private:
- typedef ::std::hash_map<int,GlyphData> GlyphList;
+ typedef ::boost::unordered_map<int,GlyphData> GlyphList;
mutable GlyphList maGlyphList;
const ImplFontSelectData maFontSelData;
@@ -373,7 +373,7 @@ protected:
{ return (rA.mnChar1 == rB.mnChar1) && (rA.mnChar2 == rB.mnChar2); } };
struct PairHash{ int operator()(const ImplKernPairData& rA) const
{ return (rA.mnChar1) * 256 ^ rA.mnChar2; } };
- typedef std::hash_set< ImplKernPairData, PairHash, PairEqual > UnicodeKernPairs;
+ typedef boost::unordered_set< ImplKernPairData, PairHash, PairEqual > UnicodeKernPairs;
mutable UnicodeKernPairs maUnicodeKernPairs;
};
diff --git a/vcl/inc/vcl/graphite_cache.hxx b/vcl/inc/vcl/graphite_cache.hxx
index 1c2aff0..465f0e8 100644
--- a/vcl/inc/vcl/graphite_cache.hxx
+++ b/vcl/inc/vcl/graphite_cache.hxx
@@ -37,7 +37,7 @@
#define GRCACHE_REUSE_VECTORS 1
-#include <hash_map>
+#include <boost/unordered_map.hpp>
class TextSourceAdaptor;
/**
@@ -96,8 +96,8 @@ private:
friend class GraphiteSegmentCache;
};
-typedef std::hash_map<long, GrSegRecord*, std::hash<long> > GraphiteSegMap;
-typedef std::hash_multimap<size_t, GrSegRecord*> GraphiteRopeMap;
+typedef boost::unordered_map<long, GrSegRecord*, std::hash<long> > GraphiteSegMap;
+typedef boost::unordered_multimap<size_t, GrSegRecord*> GraphiteRopeMap;
typedef std::pair<GraphiteRopeMap::iterator, GraphiteRopeMap::iterator> GrRMEntry;
/**
@@ -230,7 +230,7 @@ private:
const xub_Unicode * m_prevKey;
};
-typedef std::hash_map<int, GraphiteSegmentCache *, std::hash<int> > GraphiteCacheMap;
+typedef boost::unordered_map<int, GraphiteSegmentCache *, std::hash<int> > GraphiteCacheMap;
/**
* GraphiteCacheHandler maps a particular font, style, size to a GraphiteSegmentCache
diff --git a/vcl/inc/vcl/image.h b/vcl/inc/vcl/image.h
index a7a9a22..bed6600 100644
--- a/vcl/inc/vcl/image.h
+++ b/vcl/inc/vcl/image.h
@@ -31,7 +31,7 @@
#include <vcl/bitmapex.hxx>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
// ----------------
// - ImplImageBmp -
@@ -112,7 +112,7 @@ struct ImageAryData
struct ImplImageList
{
typedef std::vector<ImageAryData *> ImageAryDataVec;
- typedef std::hash_map< rtl::OUString, ImageAryData *, rtl::OUStringHash >
+ typedef boost::unordered_map< rtl::OUString, ImageAryData *, rtl::OUStringHash >
ImageAryDataNameHash;
ImageAryDataVec maImages;
diff --git a/vcl/inc/vcl/impimagetree.hxx b/vcl/inc/vcl/impimagetree.hxx
index 68f9a73..39f878a 100644
--- a/vcl/inc/vcl/impimagetree.hxx
+++ b/vcl/inc/vcl/impimagetree.hxx
@@ -35,7 +35,7 @@
#include <utility>
#include <vector>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include "boost/noncopyable.hpp"
#include "com/sun/star/uno/Reference.hxx"
@@ -80,9 +80,9 @@ private:
com::sun::star::uno::Reference<
com::sun::star::container::XNameAccess > > > Zips;
- typedef std::hash_map<
+ typedef boost::unordered_map<
rtl::OUString, bool, rtl::OUStringHash > CheckStyleCache;
- typedef std::hash_map<
+ typedef boost::unordered_map<
rtl::OUString, std::pair< bool, BitmapEx >, rtl::OUStringHash > IconCache;
rtl::OUString m_style;
diff --git a/vcl/inc/vcl/jobset.h b/vcl/inc/vcl/jobset.h
index 096f310..4873948 100644
--- a/vcl/inc/vcl/jobset.h
+++ b/vcl/inc/vcl/jobset.h
@@ -32,7 +32,7 @@
#include <tools/string.hxx>
#include <vcl/sv.h>
#include <vcl/prntypes.hxx>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <rtl/ustring.hxx>
// ------------------
@@ -65,7 +65,7 @@ struct ImplJobSetup
long mnPaperHeight; // paper height (100th mm)
ULONG mnDriverDataLen; // length of system specific data
BYTE* mpDriverData; // system specific data (will be streamed a byte block)
- ::std::hash_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash > maValueMap;
+ ::boost::unordered_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash > maValueMap;
ImplJobSetup();
ImplJobSetup( const ImplJobSetup& rJobSetup );
diff --git a/vcl/inc/vcl/lazydelete.hxx b/vcl/inc/vcl/lazydelete.hxx
index 713e22e..b0e41d1 100644
--- a/vcl/inc/vcl/lazydelete.hxx
+++ b/vcl/inc/vcl/lazydelete.hxx
@@ -32,7 +32,7 @@
#include "dllapi.h"
#include <vector>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <algorithm>
#if OSL_DEBUG_LEVEL > 2
@@ -123,7 +123,7 @@ namespace vcl
};
std::vector< DeleteObjectEntry > m_aObjects;
- typedef std::hash_map< sal_IntPtr, unsigned int > PtrToIndexMap;
+ typedef boost::unordered_map< sal_IntPtr, unsigned int > PtrToIndexMap;
PtrToIndexMap m_aPtrToIndex;
/** strict weak ordering funtion to bring objects to be destroyed lazily
diff --git a/vcl/inc/vcl/outdev.h b/vcl/inc/vcl/outdev.h
index 3b9b07e..95444cb 100644
--- a/vcl/inc/vcl/outdev.h
+++ b/vcl/inc/vcl/outdev.h
@@ -218,11 +218,11 @@ private:
// cache of recently used font instances
struct IFSD_Equal { bool operator()( const ImplFontSelectData&, const ImplFontSelectData& ) const; };
struct IFSD_Hash { size_t operator()( const ImplFontSelectData& ) const; };
- typedef ::std::hash_map<ImplFontSelectData,ImplFontEntry*,IFSD_Hash,IFSD_Equal > FontInstanceList;
+ typedef ::boost::unordered_map<ImplFontSelectData,ImplFontEntry*,IFSD_Hash,IFSD_Equal > FontInstanceList;
FontInstanceList maFontInstanceList;
// cache of recently requested font names vs. selected font names
- typedef ::std::hash_map<String,String,FontNameHash> FontNameList;
+ typedef ::boost::unordered_map<String,String,FontNameHash> FontNameList;
FontNameList maFontNameList;
public:
diff --git a/vcl/inc/vcl/outfont.hxx b/vcl/inc/vcl/outfont.hxx
index 5555930..6e9a44a 100644
--- a/vcl/inc/vcl/outfont.hxx
+++ b/vcl/inc/vcl/outfont.hxx
@@ -38,7 +38,7 @@
#include <unotools/fontdefs.hxx>
#include <vcl/vclenum.hxx>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <com/sun/star/linguistic2/XLinguServiceManager.hpp>
@@ -193,7 +193,7 @@ private:
mutable bool mbMatchData; // true if matching attributes are initialized
bool mbMapNames; // true if MapNames are available
- typedef std::hash_map<const String, ImplDevFontListData*,FontNameHash> DevFontList;
+ typedef boost::unordered_map<const String, ImplDevFontListData*,FontNameHash> DevFontList;
DevFontList maDevFontList;
ImplPreMatchFontSubstitution* mpPreMatchHook; // device specific prematch substitution
@@ -352,7 +352,7 @@ private:
// TODO: at least the ones which just differ in orientation, stretching or height
typedef ::std::pair<sal_UCS4,FontWeight> GFBCacheKey;
struct GFBCacheKey_Hash{ size_t operator()( const GFBCacheKey& ) const; };
- typedef ::std::hash_map<GFBCacheKey,String,GFBCacheKey_Hash> UnicodeFallbackList;
+ typedef ::boost::unordered_map<GFBCacheKey,String,GFBCacheKey_Hash> UnicodeFallbackList;
UnicodeFallbackList* mpUnicodeFallbackList;
};
diff --git a/vcl/inc/vcl/ppdparser.hxx b/vcl/inc/vcl/ppdparser.hxx
index 8a882ba..7e7b17f 100644
--- a/vcl/inc/vcl/ppdparser.hxx
+++ b/vcl/inc/vcl/ppdparser.hxx
@@ -30,7 +30,7 @@
#include <list>
#include <vector>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include "tools/string.hxx"
#include "tools/stream.hxx"
@@ -63,7 +63,7 @@ class PPDKey
{
friend class PPDParser;
- typedef ::std::hash_map< ::rtl::OUString, PPDValue, ::rtl::OUStringHash > hash_type;
+ typedef ::boost::unordered_map< ::rtl::OUString, PPDValue, ::rtl::OUStringHash > hash_type;
typedef ::std::vector< PPDValue* > value_type;
String m_aKey;
@@ -127,7 +127,7 @@ class PPDParser
friend class CUPSManager;
friend class PPDCache;
- typedef ::std::hash_map< ::rtl::OUString, PPDKey*, ::rtl::OUStringHash > hash_type;
+ typedef ::boost::unordered_map< ::rtl::OUString, PPDKey*, ::rtl::OUStringHash > hash_type;
typedef ::std::vector< PPDKey* > value_type;
void insertKey( const String& rKey, PPDKey* pKey );
@@ -295,7 +295,7 @@ public:
class PPDContext
{
- typedef ::std::hash_map< const PPDKey*, const PPDValue*, PPDKeyhash > hash_type;
+ typedef ::boost::unordered_map< const PPDKey*, const PPDValue*, PPDKeyhash > hash_type;
hash_type m_aCurrentValues;
const PPDParser* m_pParser;
diff --git a/vcl/inc/vcl/print.h b/vcl/inc/vcl/print.h
index 57c4bf0..6fa015d 100644
--- a/vcl/inc/vcl/print.h
+++ b/vcl/inc/vcl/print.h
@@ -33,7 +33,7 @@
#include "vcl/dllapi.h"
#include <vector>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
struct SalPrinterQueueInfo;
class QueueInfo;
@@ -59,7 +59,7 @@ struct ImplPrnQueueData
class VCL_DLLPUBLIC ImplPrnQueueList
{
public:
- std::hash_map< rtl::OUString, sal_Int32, rtl::OUStringHash >
+ boost::unordered_map< rtl::OUString, sal_Int32, rtl::OUStringHash >
m_aNameToIndex;
std::vector< ImplPrnQueueData > m_aQueueInfos;
std::vector< rtl::OUString > m_aPrinterList;
diff --git a/vcl/inc/vcl/print.hxx b/vcl/inc/vcl/print.hxx
index 10c31a6..f0fe1e0 100644
--- a/vcl/inc/vcl/print.hxx
+++ b/vcl/inc/vcl/print.hxx
@@ -43,7 +43,7 @@
#include "com/sun/star/view/PrintableState.hpp"
#include <boost/shared_ptr.hpp>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <set>
struct SalPrinterInfoQueue;
@@ -540,7 +540,7 @@ public:
class VCL_DLLPUBLIC PrinterOptionsHelper
{
protected:
- std::hash_map< rtl::OUString, com::sun::star::uno::Any, rtl::OUStringHash > m_aPropertyMap;
+ boost::unordered_map< rtl::OUString, com::sun::star::uno::Any, rtl::OUStringHash > m_aPropertyMap;
com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > m_aUIProperties;
public:
diff --git a/vcl/inc/vcl/printergfx.hxx b/vcl/inc/vcl/printergfx.hxx
index e625cd9..72e5939 100644
--- a/vcl/inc/vcl/printergfx.hxx
+++ b/vcl/inc/vcl/printergfx.hxx
@@ -35,7 +35,7 @@
#include "tools/gen.hxx"
#include <list>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
namespace psp {
@@ -253,7 +253,7 @@ private:
/* font / font substitution */
friend class Font3;
- const ::std::hash_map< fontID, fontID >* mpFontSubstitutes;
+ const ::boost::unordered_map< fontID, fontID >* mpFontSubstitutes;
int getCharWidth (sal_Bool b_vert, sal_Unicode n_char,
CharacterMetric *p_bbox);
fontID getCharMetric (const Font3 &rFont, sal_Unicode n_char,
diff --git a/vcl/inc/vcl/printerinfomanager.hxx b/vcl/inc/vcl/printerinfomanager.hxx
index 9fe7c29..9ddbbf7 100644
--- a/vcl/inc/vcl/printerinfomanager.hxx
+++ b/vcl/inc/vcl/printerinfomanager.hxx
@@ -29,7 +29,7 @@
#ifndef _PSPRINT_PRINTERINFOMANAGER_HXX_
#define _PSPRINT_PRINTERINFOMANAGER_HXX_
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <list>
#include "vcl/dllapi.h"
@@ -70,9 +70,9 @@ struct PrinterInfo : JobData
// this vector is currently implicitly given by the adobe
// standard encoding
bool m_bPerformFontSubstitution;
- std::hash_map< rtl::OUString, rtl::OUString, rtl::OUStringHash >
+ boost::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash >
m_aFontSubstitutes;
- std::hash_map< fontID, fontID >
+ boost::unordered_map< fontID, fontID >
m_aFontSubstitutions;
PrinterInfo() :
@@ -122,7 +122,7 @@ protected:
PrinterInfo m_aInfo;
};
- std::hash_map< rtl::OUString, Printer, rtl::OUStringHash > m_aPrinters;
+ boost::unordered_map< rtl::OUString, Printer, rtl::OUStringHash > m_aPrinters;
PrinterInfo m_aGlobalDefaults;
std::list< WatchFile > m_aWatchFiles;
rtl::OUString m_aDefaultPrinter;
@@ -144,7 +144,7 @@ protected:
virtual void initialize();
// fill in font substitutions
- // the resulting hash_map maps from source to target font ids
+ // the resulting boost::unordered_map maps from source to target font ids
void fillFontSubstitutions( PrinterInfo& rInfo ) const;
// fill default paper if not configured in config file
diff --git a/vcl/os2/inc/salgdi.h b/vcl/os2/inc/salgdi.h
index d7be9a6..4f79ace 100644
--- a/vcl/os2/inc/salgdi.h
+++ b/vcl/os2/inc/salgdi.h
@@ -35,7 +35,7 @@
#include <vcl/outfont.hxx>
#include <vcl/impfont.hxx>
-#include <hash_set>
+#include <boost/unordered_set.hpp>
class ImplOs2FontEntry;
@@ -101,7 +101,7 @@ private:
#ifdef GNG_VERT_HACK
void ReadGsubTable( HDC ) const;
- typedef std::hash_set<int> IntHashSet;
+ typedef boost::unordered_set<int> IntHashSet;
mutable IntHashSet maGsubTable;
mutable bool mbGsubRead;
public:
diff --git a/vcl/os2/source/gdi/os2layout.cxx b/vcl/os2/source/gdi/os2layout.cxx
index 4724c9b..fbc1dec 100644
--- a/vcl/os2/source/gdi/os2layout.cxx
+++ b/vcl/os2/source/gdi/os2layout.cxx
@@ -49,8 +49,8 @@
// for GetMirroredChar
#include <vcl/svapp.hxx>
-#include <hash_map>
-typedef std::hash_map<int,int> IntMap;
+#include <boost/unordered_map.hpp>
+typedef boost::unordered_map<int,int> IntMap;
#define DROPPED_OUTGLYPH 0xFFFF
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index 3459e53..451d7da 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -47,7 +47,7 @@
#include "vcl/window.h"
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <vector>
// =======================================================================
@@ -79,8 +79,8 @@ struct ImplTabCtrlData
{
PushButton* mpLeftBtn;
PushButton* mpRightBtn;
- std::hash_map< int, int > maLayoutPageIdToLine;
- std::hash_map< int, int > maLayoutLineToPageId;
+ boost::unordered_map< int, int > maLayoutPageIdToLine;
+ boost::unordered_map< int, int > maLayoutLineToPageId;
std::vector< Rectangle > maTabRectangles;
Point maItemsOffset; // offset of the tabitems
std::vector< ImplTabItem > maItemList;
@@ -2238,7 +2238,7 @@ Rectangle TabControl::GetCharacterBounds( USHORT nPageId, long nIndex ) const
if( HasLayoutData() )
{
- std::hash_map< int, int >::const_iterator it = mpTabCtrlData->maLayoutPageIdToLine.find( (int)nPageId );
+ boost::unordered_map< int, int >::const_iterator it = mpTabCtrlData->maLayoutPageIdToLine.find( (int)nPageId );
if( it != mpTabCtrlData->maLayoutPageIdToLine.end() )
{
Pair aPair = mpControlData->mpLayoutData->GetLineStartEnd( it->second );
@@ -2303,7 +2303,7 @@ Rectangle TabControl::GetTabPageBounds( USHORT nPage ) const
if( HasLayoutData() )
{
- std::hash_map< int, int >::const_iterator it = mpTabCtrlData->maLayoutPageIdToLine.find( (int)nPage );
+ boost::unordered_map< int, int >::const_iterator it = mpTabCtrlData->maLayoutPageIdToLine.find( (int)nPage );
if( it != mpTabCtrlData->maLayoutPageIdToLine.end() )
{
if( it->second >= 0 && it->second < static_cast<int>(mpTabCtrlData->maTabRectangles.size()) )
diff --git a/vcl/source/gdi/configsettings.cxx b/vcl/source/gdi/configsettings.cxx
index 8cf7b49..0b1dcbb 100644
--- a/vcl/source/gdi/configsettings.cxx
+++ b/vcl/source/gdi/configsettings.cxx
@@ -89,7 +89,7 @@ void SettingsConfigItem::Commit()
if( ! IsValidConfigMgr() )
return;
- std::hash_map< OUString, SmallOUStrMap, rtl::OUStringHash >::const_iterator group;
+ boost::unordered_map< OUString, SmallOUStrMap, rtl::OUStringHash >::const_iterator group;
for( group = m_aSettings.begin(); group != m_aSettings.end(); ++group )
{
@@ -181,7 +181,7 @@ void SettingsConfigItem::getValues()
const OUString& SettingsConfigItem::getValue( const OUString& rGroup, const OUString& rKey ) const
{
- ::std::hash_map< OUString, SmallOUStrMap, rtl::OUStringHash >::const_iterator group = m_aSettings.find( rGroup );
+ ::boost::unordered_map< OUString, SmallOUStrMap, rtl::OUStringHash >::const_iterator group = m_aSettings.find( rGroup );
if( group == m_aSettings.end() || group->second.find( rKey ) == group->second.end() )
{
static OUString aEmpty;
diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx
index 4c7048e..7835c95 100644
--- a/vcl/source/gdi/impimagetree.cxx
+++ b/vcl/source/gdi/impimagetree.cxx
@@ -34,7 +34,7 @@
#include <utility>
#include <vector>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include "com/sun/star/container/XNameAccess.hpp"
#include "com/sun/star/io/XInputStream.hpp"
diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx
index 9809c9c..7d778f5 100644
--- a/vcl/source/gdi/jobset.cxx
+++ b/vcl/source/gdi/jobset.cxx
@@ -212,7 +212,7 @@ String JobSetup::GetValue( const String& rKey ) const
{
if( mpData )
{
- ::std::hash_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash >::const_iterator it;
+ ::boost::unordered_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash >::const_iterator it;
it = mpData->maValueMap.find( rKey );
return it != mpData->maValueMap.end() ? String( it->second ) : String();
}
@@ -420,7 +420,7 @@ SvStream& operator<<( SvStream& rOStream, const JobSetup& rJobSetup )
rOStream.Write( (char*)&aOldData, sizeof( aOldData ) );
rOStream.Write( (char*)&aOldJobData, nOldJobDataSize );
rOStream.Write( (char*)pJobData->mpDriverData, pJobData->mnDriverDataLen );
- ::std::hash_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash >::const_iterator it;
+ ::boost::unordered_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash >::const_iterator it;
for( it = pJobData->maValueMap.begin(); it != pJobData->maValueMap.end(); ++it )
{
rOStream.WriteByteString( it->first, RTL_TEXTENCODING_UTF8 );
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index d5d3a89..e319ffb 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -696,7 +696,7 @@ void PDFWriterImpl::createWidgetFieldName( sal_Int32 i_nWidgetIndex, const PDFWr
// find or create a hierarchical field
// first find the fully qualified name up to this field
aDomain = aFullName.copy( 0, nTokenIndex-1 );
- std::hash_map< rtl::OString, sal_Int32, rtl::OStringHash >::const_iterator it = m_aFieldNameMap.find( aDomain );
+ boost::unordered_map< rtl::OString, sal_Int32, rtl::OStringHash >::const_iterator it = m_aFieldNameMap.find( aDomain );
if( it == m_aFieldNameMap.end() )
{
// create new hierarchy field
@@ -757,7 +757,7 @@ void PDFWriterImpl::createWidgetFieldName( sal_Int32 i_nWidgetIndex, const PDFWr
// insert widget into its hierarchy field
if( aDomain.getLength() )
{
- std::hash_map< rtl::OString, sal_Int32, rtl::OStringHash >::const_iterator it = m_aFieldNameMap.find( aDomain );
+ boost::unordered_map< rtl::OString, sal_Int32, rtl::OStringHash >::const_iterator it = m_aFieldNameMap.find( aDomain );
if( it != m_aFieldNameMap.end() )
{
OSL_ENSURE( it->second >= 0 && it->second < sal_Int32( m_aWidgets.size() ), "invalid field index" );
@@ -784,11 +784,11 @@ void PDFWriterImpl::createWidgetFieldName( sal_Int32 i_nWidgetIndex, const PDFWr
if( ! m_aContext.AllowDuplicateFieldNames )
{
- std::hash_map<OString, sal_Int32, OStringHash>::iterator it = m_aFieldNameMap.find( aFullName );
+ boost::unordered_map<OString, sal_Int32, OStringHash>::iterator it = m_aFieldNameMap.find( aFullName );
if( it != m_aFieldNameMap.end() ) // not unique
{
- std::hash_map< OString, sal_Int32, OStringHash >::const_iterator check_it;
+ boost::unordered_map< OString, sal_Int32, OStringHash >::const_iterator check_it;
OString aTry;
sal_Int32 nTry = 2;
do
@@ -2804,7 +2804,7 @@ sal_Int32 PDFWriterImpl::emitStructure( PDFStructureElement& rEle )
if( ! m_aRoleMap.empty() )
{
aLine.append( "/RoleMap<<" );
- for( std::hash_map<OString,OString,OStringHash>::const_iterator
+ for( boost::unordered_map<OString,OString,OStringHash>::const_iterator
it = m_aRoleMap.begin(); it != m_aRoleMap.end(); ++it )
{
aLine.append( '/' );
@@ -6580,7 +6580,7 @@ void PDFWriterImpl::sortWidgets()
{
// sort widget annotations on each page as per their
// TabOrder attribute
- std::hash_map< sal_Int32, AnnotSortContainer > sorted;
+ boost::unordered_map< sal_Int32, AnnotSortContainer > sorted;
int nWidgets = m_aWidgets.size();
for( int nW = 0; nW < nWidgets; nW++ )
{
@@ -6600,7 +6600,7 @@ void PDFWriterImpl::sortWidgets()
}
}
}
- for( std::hash_map< sal_Int32, AnnotSortContainer >::iterator it = sorted.begin(); it != sorted.end(); ++it )
+ for( boost::unordered_map< sal_Int32, AnnotSortContainer >::iterator it = sorted.begin(); it != sorted.end(); ++it )
{
// append entries for non widget annotations
PDFPage& rPage = m_aPages[ it->first ];
@@ -11637,7 +11637,7 @@ void PDFWriterImpl::ensureUniqueRadioOnValues()
{
PDFWidget& rGroupWidget = m_aWidgets[ group->second ];
// check whether all kids have a unique OnValue
- std::hash_map< OUString, sal_Int32, OUStringHash > aOnValues;
+ boost::unordered_map< OUString, sal_Int32, OUStringHash > aOnValues;
int nChildren = rGroupWidget.m_aKidsIndex.size();
bool bIsUnique = true;
for( int nKid = 0; nKid < nChildren && bIsUnique; nKid++ )
diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx
index 4a9733d..3821307 100644
--- a/vcl/source/gdi/pdfwriter_impl.hxx
+++ b/vcl/source/gdi/pdfwriter_impl.hxx
@@ -51,7 +51,7 @@
#include <vector>
#include <map>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <list>
#include <boost/shared_array.hpp>
@@ -439,8 +439,8 @@ public:
{}
};
- typedef std::hash_map< rtl::OString, SvMemoryStream*, rtl::OStringHash > PDFAppearanceStreams;
- typedef std::hash_map< rtl::OString, PDFAppearanceStreams, rtl::OStringHash > PDFAppearanceMap;
+ typedef boost::unordered_map< rtl::OString, SvMemoryStream*, rtl::OStringHash > PDFAppearanceStreams;
+ typedef boost::unordered_map< rtl::OString, PDFAppearanceStreams, rtl::OStringHash > PDFAppearanceMap;
struct PDFWidget : public PDFAnnotation
{
@@ -645,7 +645,7 @@ private:
bool m_bEmitStructure;
bool m_bNewMCID;
/* role map of struct tree root */
- std::hash_map< rtl::OString, rtl::OString, rtl::OStringHash >
+ boost::unordered_map< rtl::OString, rtl::OString, rtl::OStringHash >
m_aRoleMap;
/* contains all widgets used in the PDF
@@ -655,8 +655,8 @@ private:
std::map< sal_Int32, sal_Int32 > m_aRadioGroupWidgets;
/* used to store control id during beginControlAppearance/endControlAppearance */
sal_Int32 m_nCurrentControl;
- /* hash_map for field names, used to ensure unique field names */
- std::hash_map< rtl::OString, sal_Int32, rtl::OStringHash > m_aFieldNameMap;
+ /* boost::unordered_map for field names, used to ensure unique field names */
+ boost::unordered_map< rtl::OString, sal_Int32, rtl::OStringHash > m_aFieldNameMap;
/* contains Bitmaps for gradient functions until they are written
* to the file stream */
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index 27d6b9f..5515681 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -233,7 +233,7 @@ ImplPrnQueueList::~ImplPrnQueueList()
void ImplPrnQueueList::Add( SalPrinterQueueInfo* pData )
{
- std::hash_map< rtl::OUString, sal_Int32, rtl::OUStringHash >::iterator it =
+ boost::unordered_map< rtl::OUString, sal_Int32, rtl::OUStringHash >::iterator it =
m_aNameToIndex.find( pData->maPrinterName );
if( it == m_aNameToIndex.end() )
{
@@ -258,7 +258,7 @@ void ImplPrnQueueList::Add( SalPrinterQueueInfo* pData )
ImplPrnQueueData* ImplPrnQueueList::Get( const rtl::OUString& rPrinter )
{
ImplPrnQueueData* pData = NULL;
- std::hash_map<rtl::OUString,sal_Int32,rtl::OUStringHash>::iterator it =
+ boost::unordered_map<rtl::OUString,sal_Int32,rtl::OUStringHash>::iterator it =
m_aNameToIndex.find( rPrinter );
if( it != m_aNameToIndex.end() )
pData = &m_aQueueInfos[it->second];
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index ce14bce..8de02ad 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -50,8 +50,8 @@
#include "com/sun/star/awt/Size.hpp"
#include "comphelper/processfactory.hxx"
-#include <hash_map>
-#include <hash_set>
+#include <boost/unordered_map.hpp>
+#include <boost/unordered_set.hpp>
using namespace com::sun::star;
using namespace com::sun::star::uno;
@@ -144,8 +144,8 @@ public:
ControlDependency() : mnDependsOnEntry( -1 ) {}
};
- typedef std::hash_map< rtl::OUString, size_t, rtl::OUStringHash > PropertyToIndexMap;
- typedef std::hash_map< rtl::OUString, ControlDependency, rtl::OUStringHash > ControlDependencyMap;
+ typedef boost::unordered_map< rtl::OUString, size_t, rtl::OUStringHash > PropertyToIndexMap;
+ typedef boost::unordered_map< rtl::OUString, ControlDependency, rtl::OUStringHash > ControlDependencyMap;
boost::shared_ptr<Printer> mpPrinter;
Sequence< PropertyValue > maUIOptions;
@@ -1221,7 +1221,7 @@ bool PrinterController::getReversePrint() const
Sequence< PropertyValue > PrinterController::getJobProperties( const Sequence< PropertyValue >& i_rMergeList ) const
{
- std::hash_set< rtl::OUString, rtl::OUStringHash > aMergeSet;
+ boost::unordered_set< rtl::OUString, rtl::OUStringHash > aMergeSet;
size_t nResultLen = size_t(i_rMergeList.getLength()) + mpImplData->maUIProperties.size() + 3;
for( int i = 0; i < i_rMergeList.getLength(); i++ )
aMergeSet.insert( i_rMergeList[i].Name );
@@ -1270,14 +1270,14 @@ const Sequence< beans::PropertyValue >& PrinterController::getUIOptions() const
beans::PropertyValue* PrinterController::getValue( const rtl::OUString& i_rProperty )
{
- std::hash_map< rtl::OUString, size_t, rtl::OUStringHash >::const_iterator it =
+ boost::unordered_map< rtl::OUString, size_t, rtl::OUStringHash >::const_iterator it =
mpImplData->maPropertyToIndex.find( i_rProperty );
return it != mpImplData->maPropertyToIndex.end() ? &mpImplData->maUIProperties[it->second] : NULL;
}
const beans::PropertyValue* PrinterController::getValue( const rtl::OUString& i_rProperty ) const
{
- std::hash_map< rtl::OUString, size_t, rtl::OUStringHash >::const_iterator it =
+ boost::unordered_map< rtl::OUString, size_t, rtl::OUStringHash >::const_iterator it =
mpImplData->maPropertyToIndex.find( i_rProperty );
return it != mpImplData->maPropertyToIndex.end() ? &mpImplData->maUIProperties[it->second] : NULL;
}
@@ -1307,7 +1307,7 @@ void PrinterController::setValue( const rtl::OUString& i_rName, const Any& i_rVa
void PrinterController::setValue( const beans::PropertyValue& i_rValue )
{
- std::hash_map< rtl::OUString, size_t, rtl::OUStringHash >::const_iterator it =
+ boost::unordered_map< rtl::OUString, size_t, rtl::OUStringHash >::const_iterator it =
mpImplData->maPropertyToIndex.find( i_rValue.Name );
if( it != mpImplData->maPropertyToIndex.end() )
mpImplData->maUIProperties[ it->second ] = i_rValue;
@@ -1379,7 +1379,7 @@ void PrinterController::setUIOptions( const Sequence< beans::PropertyValue >& i_
void PrinterController::enableUIOption( const rtl::OUString& i_rProperty, bool i_bEnable )
{
- std::hash_map< rtl::OUString, size_t, rtl::OUStringHash >::const_iterator it =
+ boost::unordered_map< rtl::OUString, size_t, rtl::OUStringHash >::const_iterator it =
mpImplData->maPropertyToIndex.find( i_rProperty );
if( it != mpImplData->maPropertyToIndex.end() )
{
@@ -1397,7 +1397,7 @@ void PrinterController::enableUIOption( const rtl::OUString& i_rProperty, bool i
bool PrinterController::isUIOptionEnabled( const rtl::OUString& i_rProperty ) const
{
bool bEnabled = false;
- std::hash_map< rtl::OUString, size_t, rtl::OUStringHash >::const_iterator prop_it =
+ boost::unordered_map< rtl::OUString, size_t, rtl::OUStringHash >::const_iterator prop_it =
mpImplData->maPropertyToIndex.find( i_rProperty );
if( prop_it != mpImplData->maPropertyToIndex.end() )
{
@@ -1604,7 +1604,7 @@ sal_Bool PrinterController::getBoolProperty( const rtl::OUString& i_rProperty, s
Any PrinterOptionsHelper::getValue( const rtl::OUString& i_rPropertyName ) const
{
Any aRet;
- std::hash_map< rtl::OUString, Any, rtl::OUStringHash >::const_iterator it =
+ boost::unordered_map< rtl::OUString, Any, rtl::OUStringHash >::const_iterator it =
m_aPropertyMap.find( i_rPropertyName );
if( it != m_aPropertyMap.end() )
aRet = it->second;
@@ -1619,7 +1619,7 @@ void PrinterOptionsHelper::setValue( const rtl::OUString& i_rPropertyName, const
bool PrinterOptionsHelper::hasProperty( const rtl::OUString& i_rPropertyName ) const
{
Any aRet;
- std::hash_map< rtl::OUString, Any, rtl::OUStringHash >::const_iterator it =
+ boost::unordered_map< rtl::OUString, Any, rtl::OUStringHash >::const_iterator it =
m_aPropertyMap.find( i_rPropertyName );
return it != m_aPropertyMap.end();
}
@@ -1659,7 +1659,7 @@ bool PrinterOptionsHelper::processProperties( const Sequence< PropertyValue >& i
for( sal_Int32 i = 0; i < nElements; i++ )
{
bool bElementChanged = false;
- std::hash_map< rtl::OUString, Any, rtl::OUStringHash >::iterator it =
+ boost::unordered_map< rtl::OUString, Any, rtl::OUStringHash >::iterator it =
m_aPropertyMap.find( pVals[ i ].Name );
if( it != m_aPropertyMap.end() )
{
diff --git a/vcl/source/glyphs/gcach_ftyp.cxx b/vcl/source/glyphs/gcach_ftyp.cxx
index 729b2e9..a650b75 100644
--- a/vcl/source/glyphs/gcach_ftyp.cxx
+++ b/vcl/source/glyphs/gcach_ftyp.cxx
@@ -136,7 +136,7 @@ FT_Error (*pFTOblique)(FT_GlyphSlot);
static bool bEnableSizeFT = false;
struct EqStr{ bool operator()(const char* a, const char* b) const { return !strcmp(a,b); } };
-typedef ::std::hash_map<const char*,FtFontFile*,::std::hash<const char*>, EqStr> FontFileList;
+typedef ::boost::unordered_map<const char*,FtFontFile*,::std::hash<const char*>, EqStr> FontFileList;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list