diff options
238 files changed, 781 insertions, 823 deletions
diff --git a/accessibility/inc/pch/precompiled_acc.hxx b/accessibility/inc/pch/precompiled_acc.hxx index 43dffacb19db..353903b5d56f 100644 --- a/accessibility/inc/pch/precompiled_acc.hxx +++ b/accessibility/inc/pch/precompiled_acc.hxx @@ -16,7 +16,6 @@ #include <algorithm> #include <boost/noncopyable.hpp> -#include <boost/unordered_map.hpp> #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleRelationType.hpp> #include <com/sun/star/accessibility/AccessibleRole.hpp> diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx index bb58ae68d5e2..2dd16ace0380 100644 --- a/accessibility/source/extended/textwindowaccessibility.cxx +++ b/accessibility/source/extended/textwindowaccessibility.cxx @@ -26,7 +26,6 @@ #include <algorithm> #include <vector> -#include <boost/unordered_map.hpp> namespace accessibility { diff --git a/canvas/source/opengl/ogl_texturecache.hxx b/canvas/source/opengl/ogl_texturecache.hxx index 8fa14fe88d56..b8c384f09330 100644 --- a/canvas/source/opengl/ogl_texturecache.hxx +++ b/canvas/source/opengl/ogl_texturecache.hxx @@ -11,7 +11,7 @@ #define INCLUDED_CANVAS_SOURCE_OPENGL_OGL_TEXTURECACHE_HXX #include <sal/types.h> -#include <boost/unordered_map.hpp> +#include <unordered_map> namespace com { namespace sun { namespace star { namespace geometry { struct IntegerSize2D; } @@ -52,7 +52,7 @@ namespace oglcanvas unsigned int nTexture; bool bOld; }; - typedef boost::unordered_map<sal_uInt32,CacheEntry> TextureCacheMapT; + typedef std::unordered_map<sal_uInt32,CacheEntry> TextureCacheMapT; mutable TextureCacheMapT maCache; mutable sal_uInt32 mnMissCount; mutable sal_uInt32 mnHitCount; diff --git a/chart2/source/inc/DataSeriesHelper.hxx b/chart2/source/inc/DataSeriesHelper.hxx index 13ea4bce7dbd..1c1e6c0c98b1 100644 --- a/chart2/source/inc/DataSeriesHelper.hxx +++ b/chart2/source/inc/DataSeriesHelper.hxx @@ -29,9 +29,8 @@ #include "StackMode.hxx" #include "charttoolsdllapi.hxx" -#include <vector> #include <functional> -#include <boost/unordered_map.hpp> +#include <vector> namespace chart { diff --git a/chart2/source/inc/PropertyHelper.hxx b/chart2/source/inc/PropertyHelper.hxx index be066ca04603..9d52c07a4022 100644 --- a/chart2/source/inc/PropertyHelper.hxx +++ b/chart2/source/inc/PropertyHelper.hxx @@ -25,17 +25,17 @@ #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <comphelper/property.hxx> -#include <map> #include "charttoolsdllapi.hxx" -#include <boost/unordered_map.hpp> +#include <map> +#include <unordered_map> namespace chart { typedef int tPropertyValueMapKey; -typedef boost::unordered_map<tPropertyValueMapKey, com::sun::star::uno::Any> tPropertyValueMap; +typedef std::unordered_map<tPropertyValueMapKey, css::uno::Any> tPropertyValueMap; namespace PropertyHelper { diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx index 3716797c4d82..8acf4273e1d8 100644 --- a/chart2/source/view/charttypes/VSeriesPlotter.cxx +++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx @@ -70,6 +70,7 @@ #include <functional> #include <map> +#include <unordered_map> #include <boost/ptr_container/ptr_map.hpp> @@ -1584,7 +1585,7 @@ class PerXMinMaxCalculator typedef std::pair<double, double> MinMaxType; typedef std::map<size_t, MinMaxType> SeriesMinMaxType; typedef boost::ptr_map<double, SeriesMinMaxType> GroupMinMaxType; - typedef boost::unordered_map<double, MinMaxType> TotalStoreType; + typedef std::unordered_map<double, MinMaxType> TotalStoreType; GroupMinMaxType maSeriesGroup; size_t mnCurSeries; diff --git a/chart2/source/view/main/DummyXShape.hxx b/chart2/source/view/main/DummyXShape.hxx index 6b03733f39f8..64149d3c3d2c 100644 --- a/chart2/source/view/main/DummyXShape.hxx +++ b/chart2/source/view/main/DummyXShape.hxx @@ -58,9 +58,9 @@ #include <rtl/ustring.hxx> -#include <vector> #include <map> -#include <boost/unordered_map.hpp> +#include <unordered_map> +#include <vector> namespace chart { @@ -96,7 +96,7 @@ public: private: - boost::unordered_map<TextCacheKey, BitmapEx, TextCacheKeyHash> maCache; + std::unordered_map<TextCacheKey, BitmapEx, TextCacheKeyHash> maCache; }; class DummyXShape : public cppu::WeakAggImplHelper6< diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 328f8bf7207f..c3d32dd96881 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -3659,10 +3659,8 @@ bool EntrySort( SvxConfigEntry* a, SvxConfigEntry* b ) SvxEntries* ToolbarSaveInData::GetEntries() { - typedef ::boost::unordered_map< OUString, - bool, - OUStringHash, - ::std::equal_to< OUString > > ToolbarInfo; + typedef std::unordered_map<OUString, bool, + OUStringHash, std::equal_to< OUString > > ToolbarInfo; ToolbarInfo aToolbarInfo; @@ -3721,7 +3719,7 @@ SvxEntries* ToolbarSaveInData::GetEntries() pEntry->SetStyle( GetSystemStyle( url ) ); - // insert into boost::unordered_map to filter duplicates from the parent + // insert into std::unordered_map to filter duplicates from the parent aToolbarInfo.insert( ToolbarInfo::value_type( systemname, true )); OUString custom(CUSTOM_TOOLBAR_STR); @@ -4741,10 +4739,8 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( vcl::Window *pWindow, pTbSymbol->set_height_request(aTbSize.Height()); pTbSymbol->SetStyle(pTbSymbol->GetStyle() | WB_SCROLL | WB_LINESPACING); - typedef ::boost::unordered_map< OUString, - bool, - OUStringHash, - ::std::equal_to< OUString > > ImageInfo; + typedef std::unordered_map< OUString, bool, + OUStringHash, std::equal_to< OUString > > ImageInfo; pTbSymbol->SetPageScroll( true ); diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx index f151c36ba6e7..c1cded175f5e 100644 --- a/cui/source/inc/macropg.hxx +++ b/cui/source/inc/macropg.hxx @@ -30,10 +30,11 @@ #include <vcl/lstbox.hxx> #include <rtl/ustring.hxx> -#include <boost/unordered_map.hpp> +#include <unordered_map> #include <vector> -typedef ::boost::unordered_map< OUString, ::std::pair< OUString, OUString >, OUStringHash, ::std::equal_to< OUString > > EventsHash; +typedef std::unordered_map< OUString, std::pair< OUString, OUString >, + OUStringHash, std::equal_to< OUString > > EventsHash; struct EventDisplayName { diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx index a3d3f0df267b..0a734a9d2f84 100644 --- a/cui/source/inc/scriptdlg.hxx +++ b/cui/source/inc/scriptdlg.hxx @@ -32,7 +32,7 @@ #include <com/sun/star/script/browse/XBrowseNode.hpp> #include <com/sun/star/frame/XModel.hpp> -#include <boost/unordered_map.hpp> +#include <unordered_map> #define OBJTYPE_BASICMANAGER 1L #define OBJTYPE_METHOD 2L @@ -43,8 +43,8 @@ #define INPUTMODE_NEWMACRO 2 #define INPUTMODE_RENAME 3 -typedef ::boost::unordered_map < OUString, OUString , - OUStringHash, ::std::equal_to< OUString > > Selection_hash; +typedef std::unordered_map < OUString, OUString, + OUStringHash, std::equal_to< OUString > > Selection_hash; class SFEntry; diff --git a/dbaccess/inc/pch/precompiled_dbu.hxx b/dbaccess/inc/pch/precompiled_dbu.hxx index bdcebd7460f6..fbdb795f00fc 100644 --- a/dbaccess/inc/pch/precompiled_dbu.hxx +++ b/dbaccess/inc/pch/precompiled_dbu.hxx @@ -35,8 +35,8 @@ #include <boost/scoped_array.hpp> #include <boost/scoped_ptr.hpp> #include <boost/shared_ptr.hpp> -#include <boost/unordered_map.hpp> #include <cassert> +#include <unordered_map> #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleRelationType.hpp> #include <com/sun/star/accessibility/AccessibleRole.hpp> diff --git a/dbaccess/source/core/recovery/subcomponents.hxx b/dbaccess/source/core/recovery/subcomponents.hxx index dfa944e19ddb..e48d32be6392 100644 --- a/dbaccess/source/core/recovery/subcomponents.hxx +++ b/dbaccess/source/core/recovery/subcomponents.hxx @@ -26,8 +26,8 @@ #include <rtl/ustring.hxx> -#include <boost/unordered_map.hpp> #include <map> +#include <unordered_map> namespace dbaccess { @@ -62,8 +62,8 @@ namespace dbaccess } }; - typedef ::boost::unordered_map< OUString, SubComponentDescriptor, OUStringHash > MapStringToCompDesc; - typedef ::std::map< SubComponentType, MapStringToCompDesc > MapCompTypeToCompDescs; + typedef std::unordered_map< OUString, SubComponentDescriptor, OUStringHash > MapStringToCompDesc; + typedef std::map< SubComponentType, MapStringToCompDesc > MapCompTypeToCompDescs; } // namespace dbaccess diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx index 310078bb2010..99e2fd778fb4 100644 --- a/dbaccess/source/ui/browser/genericcontroller.cxx +++ b/dbaccess/source/ui/browser/genericcontroller.cxx @@ -56,9 +56,9 @@ #include <algorithm> #include <o3tl/compat_functional.hxx> #include <boost/scoped_ptr.hpp> -#include <boost/unordered_map.hpp> #include <cppuhelper/implbase1.hxx> #include <limits> +#include <unordered_map> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -79,7 +79,7 @@ using namespace ::comphelper; #define FIRST_USER_DEFINED_FEATURE ( ::std::numeric_limits< sal_uInt16 >::max() - 1000 ) #define LAST_USER_DEFINED_FEATURE ( ::std::numeric_limits< sal_uInt16 >::max() ) -typedef ::boost::unordered_map< sal_Int16, sal_Int16 > CommandHashMap; +typedef std::unordered_map< sal_Int16, sal_Int16 > CommandHashMap; typedef ::std::list< DispatchInformation > DispatchInfoList; namespace dbaui diff --git a/desktop/inc/pch/precompiled_deployment.hxx b/desktop/inc/pch/precompiled_deployment.hxx index 4a2220fcad83..fe14641f5929 100644 --- a/desktop/inc/pch/precompiled_deployment.hxx +++ b/desktop/inc/pch/precompiled_deployment.hxx @@ -17,9 +17,9 @@ #include <algorithm> #include <boost/bind.hpp> #include <boost/optional.hpp> -#include <boost/unordered_map.hpp> -#include <boost/unordered_set.hpp> #include <cassert> +#include <unordered_map> +#include <unordered_set> #include <com/sun/star/beans/Ambiguous.hpp> #include <com/sun/star/beans/Optional.hpp> #include <com/sun/star/beans/StringPair.hpp> diff --git a/desktop/source/app/dispatchwatcher.hxx b/desktop/source/app/dispatchwatcher.hxx index 228b6a191428..4b9940734c77 100644 --- a/desktop/source/app/dispatchwatcher.hxx +++ b/desktop/source/app/dispatchwatcher.hxx @@ -25,7 +25,7 @@ #include <com/sun/star/frame/XDispatchResultListener.hpp> #include "officeipcthread.hxx" -#include <boost/unordered_map.hpp> +#include <unordered_map> #include <vector> namespace desktop @@ -39,7 +39,7 @@ namespace desktop running office without UI. */ -class DispatchWatcherHashMap : public ::boost::unordered_map< OUString, sal_Int32, OUStringHash, ::std::equal_to< OUString > > +class DispatchWatcherHashMap : public std::unordered_map< OUString, sal_Int32, OUStringHash, std::equal_to< OUString > > { public: inline void free() diff --git a/desktop/source/deployment/inc/dp_persmap.h b/desktop/source/deployment/inc/dp_persmap.h index dcbc4d10c80b..9a86fffcffc9 100644 --- a/desktop/source/deployment/inc/dp_persmap.h +++ b/desktop/source/deployment/inc/dp_persmap.h @@ -22,12 +22,12 @@ #include <rtl/ustring.hxx> #include <osl/file.hxx> -#include <boost/unordered_map.hpp> +#include <unordered_map> namespace dp_misc { -typedef ::boost::unordered_map< +typedef std::unordered_map< OString, OString, OStringHash > t_string2string_map; // Class to read obsolete registered extensions diff --git a/desktop/source/deployment/manager/dp_activepackages.cxx b/desktop/source/deployment/manager/dp_activepackages.cxx index 42f6b4122bc7..d19337f856dc 100644 --- a/desktop/source/deployment/manager/dp_activepackages.cxx +++ b/desktop/source/deployment/manager/dp_activepackages.cxx @@ -32,7 +32,6 @@ #include <rtl/uri.h> #include <rtl/uri.hxx> #include <rtl/ustring.hxx> -#include <boost/unordered_map.hpp> #include "dp_identifier.hxx" #include "dp_activepackages.hxx" diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx index 72dab66b9231..4643794625e3 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.cxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx @@ -54,7 +54,6 @@ #include <boost/bind.hpp> #include <list> -#include <boost/unordered_map.hpp> #include <algorithm> #include <set> diff --git a/desktop/source/deployment/manager/dp_extensionmanager.hxx b/desktop/source/deployment/manager/dp_extensionmanager.hxx index f905c2550812..32856ca68f2e 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.hxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.hxx @@ -31,13 +31,13 @@ #include <com/sun/star/deployment/XPackageManager.hpp> #include <osl/mutex.hxx> #include <list> -#include <boost/unordered_map.hpp> +#include <unordered_map> namespace dp_manager { -typedef ::boost::unordered_map< +typedef std::unordered_map< OUString, - ::std::vector<css::uno::Reference<css::deployment::XPackage> >, + std::vector<css::uno::Reference<css::deployment::XPackage> >, OUStringHash > id2extensions; class ExtensionManager : private ::dp_misc::MutexHolder, diff --git a/desktop/source/deployment/manager/dp_managerfac.cxx b/desktop/source/deployment/manager/dp_managerfac.cxx index 91c39755f4f2..49238f948209 100644 --- a/desktop/source/deployment/manager/dp_managerfac.cxx +++ b/desktop/source/deployment/manager/dp_managerfac.cxx @@ -23,8 +23,7 @@ #include <cppuhelper/compbase1.hxx> #include <comphelper/servicedecl.hxx> #include <com/sun/star/deployment/thePackageManagerFactory.hpp> -#include <boost/unordered_map.hpp> - +#include <unordered_map> using namespace ::dp_misc; using namespace ::com::sun::star; @@ -46,7 +45,7 @@ class PackageManagerFactoryImpl : private MutexHolder, public t_pmfac_helper Reference<deployment::XPackageManager> m_xBundledMgr; Reference<deployment::XPackageManager> m_xTmpMgr; Reference<deployment::XPackageManager> m_xBakMgr; - typedef ::boost::unordered_map< + typedef std::unordered_map< OUString, WeakReference<deployment::XPackageManager>, OUStringHash > t_string2weakref; t_string2weakref m_managers; diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx index 4b69637413b0..5a3cce31349f 100644 --- a/desktop/source/deployment/registry/component/dp_component.cxx +++ b/desktop/source/deployment/registry/component/dp_component.cxx @@ -42,11 +42,11 @@ #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/ucb/NameClash.hpp> #include <com/sun/star/util/theMacroExpander.hpp> +#include <algorithm> #include <list> -#include <boost/unordered_map.hpp> -#include <vector> #include <memory> -#include <algorithm> +#include <unordered_map> +#include <vector> #include "dp_compbackenddb.hxx" using namespace ::dp_misc; @@ -265,8 +265,8 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend bool m_unorc_modified; bool bSwitchedRdbFiles; - typedef ::boost::unordered_map< OUString, Reference<XInterface>, - OUStringHash > t_string2object; + typedef std::unordered_map< OUString, Reference<XInterface>, + OUStringHash > t_string2object; t_string2object m_backendObjects; // PackageRegistryBackend diff --git a/desktop/source/deployment/registry/dp_registry.cxx b/desktop/source/deployment/registry/dp_registry.cxx index a5d364da63e1..b603682865a7 100644 --- a/desktop/source/deployment/registry/dp_registry.cxx +++ b/desktop/source/deployment/registry/dp_registry.cxx @@ -42,9 +42,9 @@ #include <com/sun/star/util/XUpdatable.hpp> #include <com/sun/star/container/XContentEnumerationAccess.hpp> #include <com/sun/star/deployment/PackageRegistryBackend.hpp> -#include <boost/unordered_map.hpp> #include <set> -#include <boost/unordered_set.hpp> +#include <unordered_map> +#include <unordered_set> using namespace ::dp_misc; using namespace ::com::sun::star; @@ -72,13 +72,13 @@ class PackageRegistryImpl : private MutexHolder, public t_helper return str1.equalsIgnoreAsciiCase( str2 ); } }; - typedef ::boost::unordered_map< + typedef std::unordered_map< OUString, Reference<deployment::XPackageRegistry>, ci_string_hash, ci_string_equals > t_string2registry; - typedef ::boost::unordered_map< + typedef std::unordered_map< OUString, OUString, ci_string_hash, ci_string_equals > t_string2string; - typedef ::std::set< + typedef std::set< Reference<deployment::XPackageRegistry> > t_registryset; t_string2registry m_mediaType2backend; @@ -189,7 +189,7 @@ void PackageRegistryImpl::insertBackend( Reference<deployment::XPackageRegistry> const & xBackend ) { m_allBackends.insert( xBackend ); - typedef ::boost::unordered_set<OUString, OUStringHash> t_stringset; + typedef std::unordered_set<OUString, OUStringHash> t_stringset; t_stringset ambiguousFilters; const Sequence< Reference<deployment::XPackageTypeInfo> > packageTypes( diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx b/desktop/source/deployment/registry/executable/dp_executable.cxx index 034ccb2bb3e8..cdc61649a374 100644 --- a/desktop/source/deployment/registry/executable/dp_executable.cxx +++ b/desktop/source/deployment/registry/executable/dp_executable.cxx @@ -73,8 +73,8 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend }; friend class ExecutablePackageImpl; - typedef ::boost::unordered_map< OUString, Reference<XInterface>, - OUStringHash > t_string2object; + typedef std::unordered_map< OUString, Reference<XInterface>, + OUStringHash > t_string2object; // PackageRegistryBackend virtual Reference<deployment::XPackage> bindPackage_( diff --git a/desktop/source/deployment/registry/inc/dp_backend.h b/desktop/source/deployment/registry/inc/dp_backend.h index 99ae4f41d716..e5ee57c2a1be 100644 --- a/desktop/source/deployment/registry/inc/dp_backend.h +++ b/desktop/source/deployment/registry/inc/dp_backend.h @@ -33,8 +33,8 @@ #include <com/sun/star/deployment/XPackageRegistry.hpp> #include <com/sun/star/deployment/XPackageManager.hpp> #include <com/sun/star/deployment/InvalidRemovedParameterException.hpp> -#include <boost/unordered_map.hpp> #include <list> +#include <unordered_map> #include "dp_registry.hrc" namespace dp_registry @@ -277,7 +277,7 @@ class PackageRegistryBackend // XPackageManager::getDeployedPackages is called often. This results in a lot //of bindPackage calls which are costly. Therefore we keep hard references in //the map now. - typedef ::boost::unordered_map< + typedef std::unordered_map< OUString, css::uno::Reference<css::deployment::XPackage>, OUStringHash > t_string2ref; t_string2ref m_bound; diff --git a/desktop/source/migration/migration_impl.hxx b/desktop/source/migration/migration_impl.hxx index 4bb99e431e19..4f304fbb305e 100644 --- a/desktop/source/migration/migration_impl.hxx +++ b/desktop/source/migration/migration_impl.hxx @@ -19,10 +19,10 @@ #ifndef INCLUDED_DESKTOP_SOURCE_MIGRATION_MIGRATION_IMPL_HXX #define INCLUDED_DESKTOP_SOURCE_MIGRATION_MIGRATION_IMPL_HXX -#include <vector> #include <algorithm> #include <memory> -#include <boost/unordered_map.hpp> +#include <unordered_map> +#include <vector> #include "migration.hxx" @@ -125,10 +125,8 @@ struct MigrationItem OUString GetPrevSibling() const { return m_sPrevSibling; } }; -typedef ::boost::unordered_map< OUString, - ::std::vector< MigrationItem >, - OUStringHash, - ::std::equal_to< OUString > > MigrationHashMap; +typedef std::unordered_map< OUString, std::vector< MigrationItem >, + OUStringHash, std::equal_to< OUString > > MigrationHashMap; struct MigrationItemInfo { diff --git a/editeng/inc/pch/precompiled_editeng.hxx b/editeng/inc/pch/precompiled_editeng.hxx index 30fed2f37736..b7da7d29304b 100644 --- a/editeng/inc/pch/precompiled_editeng.hxx +++ b/editeng/inc/pch/precompiled_editeng.hxx @@ -26,8 +26,8 @@ #include <boost/ref.hpp> #include <boost/scoped_array.hpp> #include <boost/scoped_ptr.hpp> -#include <boost/unordered_map.hpp> #include <cassert> +#include <unordered_map> #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleRelationType.hpp> #include <com/sun/star/accessibility/AccessibleRole.hpp> diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index f75d85c7ad49..63932c9a811a 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -76,10 +76,10 @@ #include <svtools/rtfkeywd.hxx> #include <editeng/edtdlg.hxx> -#include <vector> #include <boost/scoped_ptr.hpp> #include <boost/make_shared.hpp> -#include <boost/unordered_map.hpp> +#include <unordered_map> +#include <vector> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -454,7 +454,7 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel ) rOutput.WriteChar( '}' ); rOutput << endl; - boost::unordered_map<SfxStyleSheetBase*, sal_uInt32> aStyleSheetToIdMap; + std::unordered_map<SfxStyleSheetBase*, sal_uInt32> aStyleSheetToIdMap; // StyleSheets... if ( GetStyleSheetPool() ) { diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index 0003029c4f4a..a2754c48c7d1 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -64,6 +64,8 @@ #include <com/sun/star/ucb/NameClash.hpp> #include <xmloff/xmltoken.hxx> #include <vcl/help.hxx> +#include <set> +#include <unordered_map> using namespace ::com::sun::star::ucb; using namespace ::com::sun::star::uno; @@ -2697,7 +2699,7 @@ struct CompareSvxAutocorrWordList namespace { typedef std::set<SvxAutocorrWord*, CompareSvxAutocorrWordList> AutocorrWordSetType; -typedef boost::unordered_map<OUString, SvxAutocorrWord*, OUStringHash> AutocorrWordHashType; +typedef std::unordered_map<OUString, SvxAutocorrWord*, OUStringHash> AutocorrWordHashType; } diff --git a/editeng/source/uno/unoipset.cxx b/editeng/source/uno/unoipset.cxx index 070000054569..59f08cdb5144 100644 --- a/editeng/source/uno/unoipset.cxx +++ b/editeng/source/uno/unoipset.cxx @@ -20,7 +20,6 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <svl/eitem.hxx> -#include <boost/unordered_map.hpp> #include <svl/itemprop.hxx> #include <editeng/unoipset.hxx> diff --git a/filter/source/config/cache/cacheitem.hxx b/filter/source/config/cache/cacheitem.hxx index 7aac754451b9..06214e6d662c 100644 --- a/filter/source/config/cache/cacheitem.hxx +++ b/filter/source/config/cache/cacheitem.hxx @@ -20,9 +20,9 @@ #ifndef INCLUDED_FILTER_SOURCE_CONFIG_CACHE_CACHEITEM_HXX #define INCLUDED_FILTER_SOURCE_CONFIG_CACHE_CACHEITEM_HXX -#include <boost/unordered_map.hpp> #include <deque> #include <list> +#include <unordered_map> #include <com/sun/star/uno/Any.h> #include <com/sun/star/uno/Sequence.h> #include <com/sun/star/beans/PropertyValue.hpp> @@ -172,10 +172,10 @@ class CacheItem : public ::comphelper::SequenceAsHashMap /** @short represent an item list of a FilterCache instance. */ -typedef ::boost::unordered_map< OUString , - CacheItem , - OUStringHash , - ::std::equal_to< OUString > > CacheItemList; +typedef std::unordered_map< OUString , + CacheItem , + OUStringHash , + std::equal_to< OUString > > CacheItemList; @@ -191,10 +191,10 @@ typedef ::boost::unordered_map< OUString , there we need key-value pairs too, which can't be provided by a pure vector! */ -typedef ::boost::unordered_map< OUString , - OUStringList , - OUStringHash , - ::std::equal_to< OUString > > CacheItemRegistration; +typedef std::unordered_map< OUString , + OUStringList , + OUStringHash , + std::equal_to< OUString > > CacheItemRegistration; diff --git a/filter/source/config/cache/querytokenizer.hxx b/filter/source/config/cache/querytokenizer.hxx index 914700cc62e3..2ad810cfefb1 100644 --- a/filter/source/config/cache/querytokenizer.hxx +++ b/filter/source/config/cache/querytokenizer.hxx @@ -20,8 +20,8 @@ #ifndef INCLUDED_FILTER_SOURCE_CONFIG_CACHE_QUERYTOKENIZER_HXX #define INCLUDED_FILTER_SOURCE_CONFIG_CACHE_QUERYTOKENIZER_HXX -#include <boost/unordered_map.hpp> #include <rtl/ustring.hxx> +#include <unordered_map> namespace filter{ @@ -45,10 +45,10 @@ namespace filter{ @attention This class is not threadsafe implemented. Because its not necessary. But you have to make sure, that ist not used as such :-) */ -class QueryTokenizer : public ::boost::unordered_map< OUString , - OUString , - OUStringHash , - ::std::equal_to< OUString > > +class QueryTokenizer : public std::unordered_map< OUString , + OUString , + OUStringHash , + std::equal_to< OUString > > { // member diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx index fcb4a51de059..686eee4f5369 100644 --- a/filter/source/msfilter/util.cxx +++ b/filter/source/msfilter/util.cxx @@ -14,7 +14,7 @@ #include <vcl/svapp.hxx> #include <filter/msfilter/util.hxx> #include <boost/scoped_ptr.hpp> -#include <boost/unordered_map.hpp> +#include <unordered_map> namespace msfilter { namespace util { @@ -1301,7 +1301,7 @@ static struct { {"textBox", mso_sptTextBox}, }; -typedef boost::unordered_map< const char*, const char*, rtl::CStringHash, rtl::CStringEqual> CustomShapeTypeTranslationHashMap; +typedef std::unordered_map< const char*, const char*, rtl::CStringHash, rtl::CStringEqual> CustomShapeTypeTranslationHashMap; static CustomShapeTypeTranslationHashMap* pCustomShapeTypeTranslationHashMap = NULL; const char* GetOOXMLPresetGeometry( const char* sShapeType ) @@ -1319,7 +1319,7 @@ const char* GetOOXMLPresetGeometry( const char* sShapeType ) return i == pCustomShapeTypeTranslationHashMap->end() ? "rect" : i->second; } -typedef boost::unordered_map< const char*, MSO_SPT, rtl::CStringHash, rtl::CStringEqual> DMLToVMLTranslationHashMap; +typedef std::unordered_map< const char*, MSO_SPT, rtl::CStringHash, rtl::CStringEqual> DMLToVMLTranslationHashMap; static DMLToVMLTranslationHashMap* pDMLToVMLMap; MSO_SPT GETVMLShapeType(const OString& aType) diff --git a/filter/source/svg/gfxtypes.hxx b/filter/source/svg/gfxtypes.hxx index 01aa9e189490..d93df82ea77d 100644 --- a/filter/source/svg/gfxtypes.hxx +++ b/filter/source/svg/gfxtypes.hxx @@ -12,10 +12,9 @@ #include <basegfx/range/b2drange.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/polygon/b2dlinegeometry.hxx> - -#include <boost/unordered_set.hpp> -#include <boost/unordered_map.hpp> #include <rtl/ustring.hxx> +#include <unordered_set> +#include <unordered_map> namespace svgi { @@ -336,8 +335,8 @@ struct StateHash } }; -typedef boost::unordered_set<State, StateHash> StatePool; -typedef boost::unordered_map<sal_Int32, State> StateMap; +typedef std::unordered_set<State, StateHash> StatePool; +typedef std::unordered_map<sal_Int32, State> StateMap; } // namespace svgi diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx index c0df48b51567..e42fbb1f4605 100644 --- a/filter/source/svg/svgfilter.hxx +++ b/filter/source/svg/svgfilter.hxx @@ -43,8 +43,6 @@ #include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/xml/sax/XWriter.hpp> -#include <boost/unordered_set.hpp> -#include <boost/unordered_map.hpp> #include <osl/diagnose.h> #include <sal/log.hxx> #include <rtl/process.h> @@ -63,9 +61,9 @@ #include <svx/svdxcgv.hxx> #include <svx/svdobj.hxx> #include <xmloff/xmlexp.hxx> - #include <cstdio> - +#include <unordered_set> +#include <unordered_map> using namespace ::com::sun::star::animations; using namespace ::com::sun::star::beans; @@ -201,18 +199,18 @@ class SVGFilter : public cppu::WeakImplHelper4 < XFilter, XExtendedFilterDetection > { public: - typedef ::boost::unordered_map< Reference< XInterface >, ObjectRepresentation, HashReferenceXInterface > ObjectMap; - typedef ::boost::unordered_set< Reference< XInterface >, HashReferenceXInterface > ObjectSet; + typedef std::unordered_map< Reference< XInterface >, ObjectRepresentation, HashReferenceXInterface > ObjectMap; + typedef std::unordered_set< Reference< XInterface >, HashReferenceXInterface > ObjectSet; typedef Sequence< Reference< XInterface > > ObjectSequence; typedef Sequence< Reference< XDrawPage > > XDrawPageSequence; - typedef ::boost::unordered_set< sal_Unicode, HashUChar > UCharSet; - typedef ::boost::unordered_map< OUString, UCharSet, OUStringHash > UCharSetMap; - typedef ::boost::unordered_map< Reference< XInterface >, UCharSetMap, HashReferenceXInterface > UCharSetMapMap; + typedef std::unordered_set< sal_Unicode, HashUChar > UCharSet; + typedef std::unordered_map< OUString, UCharSet, OUStringHash > UCharSetMap; + typedef std::unordered_map< Reference< XInterface >, UCharSetMap, HashReferenceXInterface > UCharSetMapMap; - typedef ::boost::unordered_map< Reference< XInterface >, OUString, HashReferenceXInterface > UOStringMap; + typedef std::unordered_map< Reference< XInterface >, OUString, HashReferenceXInterface > UOStringMap; - typedef ::boost::unordered_set< ObjectRepresentation, HashBitmap, EqualityBitmap > MetaBitmapActionSet; + typedef std::unordered_set< ObjectRepresentation, HashBitmap, EqualityBitmap > MetaBitmapActionSet; private: diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx index db506e11616b..41cdd984ce94 100644 --- a/filter/source/svg/svgreader.cxx +++ b/filter/source/svg/svgreader.cxx @@ -43,7 +43,6 @@ #include <tools/zcodec.hxx> #include <boost/bind.hpp> -#include <boost/unordered_set.hpp> #include <map> #include <string.h> diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx index 459978caf6d1..0a77dd765711 100644 --- a/filter/source/svg/svgwriter.hxx +++ b/filter/source/svg/svgwriter.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_FILTER_SOURCE_SVG_SVGWRITER_HXX #define INCLUDED_FILTER_SOURCE_SVG_SVGWRITER_HXX -#include <stack> #include <cppuhelper/implbase1.hxx> #include <rtl/ustring.hxx> #include <tools/stream.hxx> @@ -59,7 +58,8 @@ #include <com/sun/star/style/NumberingType.hpp> #include <com/sun/star/svg/XSVGWriter.hpp> - +#include <stack> +#include <unordered_map> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::container; @@ -175,7 +175,7 @@ struct BulletListItemInfo class SVGTextWriter { public: - typedef ::boost::unordered_map< OUString, BulletListItemInfo, OUStringHash > BulletListItemInfoMap; + typedef std::unordered_map< OUString, BulletListItemInfo, OUStringHash > BulletListItemInfoMap; private: SVGExport& mrExport; diff --git a/forms/inc/pch/precompiled_frm.hxx b/forms/inc/pch/precompiled_frm.hxx index 173b0b9e74ab..829ed3b3568d 100644 --- a/forms/inc/pch/precompiled_frm.hxx +++ b/forms/inc/pch/precompiled_frm.hxx @@ -25,7 +25,6 @@ #include <algorithm> #include <boost/optional.hpp> #include <boost/scoped_ptr.hpp> -#include <boost/unordered_map.hpp> #include <com/sun/star/awt/ActionEvent.hpp> #include <com/sun/star/awt/FontEmphasisMark.hpp> #include <com/sun/star/awt/FontRelief.hpp> @@ -339,6 +338,7 @@ #include <ucbhelper/activedatasink.hxx> #include <ucbhelper/content.hxx> #include <uno/mapping.hxx> +#include <unordered_map> #include <unotools/datetime.hxx> #include <unotools/desktopterminationobserver.hxx> #include <unotools/lingucfg.hxx> diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index f1b97365785a..fe0c0d6176f4 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -82,7 +82,7 @@ #include <osl/mutex.hxx> #include <ctype.h> -#include <boost/unordered_map.hpp> +#include <unordered_map> // compatibility: DatabaseCursorType is dead, but for compatibility reasons we still have to write it ... namespace com { diff --git a/forms/source/component/Filter.hxx b/forms/source/component/Filter.hxx index 4ea3502077de..cf979d4111ae 100644 --- a/forms/source/component/Filter.hxx +++ b/forms/source/component/Filter.hxx @@ -38,7 +38,7 @@ #include <connectivity/sqlparse.hxx> #include <svx/ParseContext.hxx> -#include <boost/unordered_map.hpp> +#include <unordered_map> namespace frm @@ -68,7 +68,7 @@ namespace frm ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xMessageParent; - typedef ::boost::unordered_map< OUString, OUString, OUStringHash > MapString2String; + typedef std::unordered_map< OUString, OUString, OUStringHash > MapString2String; MapString2String m_aDisplayItemToValueItem; OUString m_aText; diff --git a/forms/source/inc/InterfaceContainer.hxx b/forms/source/inc/InterfaceContainer.hxx index 36a219a38bab..d04c020e9238 100644 --- a/forms/source/inc/InterfaceContainer.hxx +++ b/forms/source/inc/InterfaceContainer.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_FORMS_SOURCE_INC_INTERFACECONTAINER_HXX #define INCLUDED_FORMS_SOURCE_INC_INTERFACECONTAINER_HXX -#include <boost/unordered_map.hpp> #include <comphelper/types.hxx> #include <comphelper/uno3.hxx> #include <com/sun/star/container/XNameReplace.hpp> @@ -45,6 +44,7 @@ #include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/component.hxx> #include <cppuhelper/implbase8.hxx> +#include <unordered_map> namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; @@ -76,8 +76,8 @@ namespace frm ElementDescription& operator=( const ElementDescription& ); // never implemented }; -typedef ::std::vector<InterfaceRef> OInterfaceArray; -typedef ::boost::unordered_multimap< OUString, InterfaceRef, OUStringHash > OInterfaceMap; +typedef std::vector<InterfaceRef> OInterfaceArray; +typedef std::unordered_multimap< OUString, InterfaceRef, OUStringHash > OInterfaceMap; // OInterfaceContainer diff --git a/framework/inc/classes/filtercachedata.hxx b/framework/inc/classes/filtercachedata.hxx index 31222930867a..8825a6b8fee8 100644 --- a/framework/inc/classes/filtercachedata.hxx +++ b/framework/inc/classes/filtercachedata.hxx @@ -20,13 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_INC_CLASSES_FILTERCACHEDATA_HXX #define INCLUDED_FRAMEWORK_INC_CLASSES_FILTERCACHEDATA_HXX -/** Attention: stl headers must(!) be included at first. Otherwise it can make trouble - with solaris headers ... -*/ -#include <boost/unordered_map.hpp> -#include <vector> -#include <iterator> - #include <classes/checkediterator.hxx> #include <classes/wildcard.hxx> #include <classes/converter.hxx> @@ -45,6 +38,10 @@ #include <cppuhelper/weak.hxx> #include <rtl/ustring.hxx> +#include <iterator> +#include <unordered_map> +#include <vector> + namespace framework{ #define DEFAULT_FILTERCACHE_VERSION 6 /// these implmentation of FilterCache support different version of TypeDetection.xml! This define the current set default one. @@ -323,10 +320,10 @@ struct ContentHandler // and could be used in a generic way template< class HashType > -class SetNodeHash : public ::boost::unordered_map< OUString , - HashType , - OUStringHash , - ::std::equal_to< OUString > > +class SetNodeHash : public std::unordered_map< OUString , + HashType , + OUStringHash , + std::equal_to< OUString > > { // interface @@ -361,10 +358,10 @@ class SetNodeHash : public ::boost::unordered_map< OUString , // It's an optimism to find registered services faster! // The preferred hash maps file extensions to preferred types to find these ones faster. -class PerformanceHash : public ::boost::unordered_map< OUString , +class PerformanceHash : public std::unordered_map< OUString , OUStringList , OUStringHash , - ::std::equal_to< OUString > > + std::equal_to< OUString > > { public: diff --git a/framework/inc/pch/precompiled_fwe.hxx b/framework/inc/pch/precompiled_fwe.hxx index 41ae73f5e67d..1747dc065f8a 100644 --- a/framework/inc/pch/precompiled_fwe.hxx +++ b/framework/inc/pch/precompiled_fwe.hxx @@ -16,7 +16,7 @@ #include <algorithm> #include <boost/function.hpp> -#include <boost/unordered_map.hpp> +#include <unordered_map> #include <com/sun/star/awt/XBitmap.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/framework/inc/pch/precompiled_fwk.hxx b/framework/inc/pch/precompiled_fwk.hxx index c37deaf69d9c..ee59e9094fcb 100644 --- a/framework/inc/pch/precompiled_fwk.hxx +++ b/framework/inc/pch/precompiled_fwk.hxx @@ -16,10 +16,10 @@ #include "officecfg/Office/Common.hxx" #include <algorithm> +#include <unordered_map> #include <boost/bind.hpp> #include <boost/noncopyable.hpp> #include <boost/scoped_ptr.hpp> -#include <boost/unordered_map.hpp> #include <boost/utility.hpp> #include <com/sun/star/awt/Command.hpp> #include <com/sun/star/awt/ContainerWindowProvider.hpp> diff --git a/framework/inc/stdtypes.h b/framework/inc/stdtypes.h index 3ff9e0d69170..8e9dfaf868f8 100644 --- a/framework/inc/stdtypes.h +++ b/framework/inc/stdtypes.h @@ -20,9 +20,9 @@ #ifndef INCLUDED_FRAMEWORK_INC_STDTYPES_H #define INCLUDED_FRAMEWORK_INC_STDTYPES_H -#include <vector> #include <queue> -#include <boost/unordered_map.hpp> +#include <unordered_map> +#include <vector> #include "general.h" @@ -120,15 +120,15 @@ class OUStringList : public ::comphelper::SequenceAsVector< OUString > typedef ::std::queue< OUString > OUStringQueue; /** - Basic hash based on a boost::unordered_map() which provides key=[OUString] and value=[template type] pairs + Basic hash based on a std::unordered_map() which provides key=[OUString] and value=[template type] pairs It implements some additional funtionality which can be useful but is missing at the normal hash implementation. */ template< class TType > -class BaseHash : public ::boost::unordered_map< OUString , - TType , - OUStringHash , - ::std::equal_to< OUString > > +class BaseHash : public std::unordered_map< OUString , + TType , + OUStringHash , + std::equal_to< OUString > > { public: diff --git a/framework/inc/uiconfiguration/globalsettings.hxx b/framework/inc/uiconfiguration/globalsettings.hxx index acff40510c39..f949f3cbc03d 100644 --- a/framework/inc/uiconfiguration/globalsettings.hxx +++ b/framework/inc/uiconfiguration/globalsettings.hxx @@ -20,13 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_INC_UICONFIGURATION_GLOBALSETTINGS_HXX #define INCLUDED_FRAMEWORK_INC_UICONFIGURATION_GLOBALSETTINGS_HXX -/** Attention: stl headers must(!) be included at first. Otherwise it can make trouble - with solaris headers ... -*/ -#include <vector> -#include <list> -#include <boost/unordered_map.hpp> - #include <macros/generic.hxx> #include <macros/xinterface.hxx> #include <macros/xtypeprovider.hxx> @@ -40,6 +33,9 @@ #include <cppuhelper/weak.hxx> #include <rtl/ustring.hxx> +#include <vector> +#include <list> + namespace framework { diff --git a/framework/inc/uiconfiguration/imagemanager.hxx b/framework/inc/uiconfiguration/imagemanager.hxx index 250a50533147..1a5ee6d91144 100644 --- a/framework/inc/uiconfiguration/imagemanager.hxx +++ b/framework/inc/uiconfiguration/imagemanager.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_INC_UICONFIGURATION_IMAGEMANAGER_HXX #define INCLUDED_FRAMEWORK_INC_UICONFIGURATION_IMAGEMANAGER_HXX -#include <boost/unordered_map.hpp> #include <memory> #include <stdtypes.h> diff --git a/framework/inc/uiconfiguration/imagetype.hxx b/framework/inc/uiconfiguration/imagetype.hxx index 46b61ad8fca0..6c3cf3217a55 100644 --- a/framework/inc/uiconfiguration/imagetype.hxx +++ b/framework/inc/uiconfiguration/imagetype.hxx @@ -20,8 +20,8 @@ #ifndef INCLUDED_FRAMEWORK_INC_UICONFIGURATION_IMAGETYPE_HXX #define INCLUDED_FRAMEWORK_INC_UICONFIGURATION_IMAGETYPE_HXX -#include <boost/unordered_map.hpp> #include <rtl/ustring.hxx> +#include <unordered_map> namespace framework { @@ -33,14 +33,14 @@ enum ImageType ImageType_COUNT }; -typedef boost::unordered_map< OUString, - OUString, - OUStringHash, - ::std::equal_to< OUString > > CommandToImageNameMap; -typedef boost::unordered_map< OUString, - bool, - OUStringHash, - ::std::equal_to< OUString > > CommandMap; +typedef std::unordered_map< OUString, + OUString, + OUStringHash, + std::equal_to< OUString > > CommandToImageNameMap; +typedef std::unordered_map< OUString, + bool, + OUStringHash, + std::equal_to< OUString > > CommandMap; } diff --git a/framework/inc/uiconfiguration/moduleimagemanager.hxx b/framework/inc/uiconfiguration/moduleimagemanager.hxx index 7cd3c13d3f9a..ab6e9c2184d6 100644 --- a/framework/inc/uiconfiguration/moduleimagemanager.hxx +++ b/framework/inc/uiconfiguration/moduleimagemanager.hxx @@ -20,14 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_INC_UICONFIGURATION_MODULEIMAGEMANAGER_HXX #define INCLUDED_FRAMEWORK_INC_UICONFIGURATION_MODULEIMAGEMANAGER_HXX -/** Attention: stl headers must(!) be included at first. Otherwise it can make trouble - with solaris headers ... -*/ -#include <vector> -#include <list> -#include <boost/unordered_map.hpp> -#include <memory> - #include <macros/generic.hxx> #include <macros/xinterface.hxx> #include <macros/xtypeprovider.hxx> @@ -53,6 +45,10 @@ #include <vcl/image.hxx> #include <rtl/ref.hxx> +#include <list> +#include <memory> +#include <vector> + namespace framework { class ImageManagerImpl; diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx index 4f069bbb9e7b..3f3e362fca0f 100644 --- a/framework/inc/uielement/menubarmanager.hxx +++ b/framework/inc/uielement/menubarmanager.hxx @@ -64,7 +64,7 @@ struct PopupControllerEntry ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XDispatchProvider > m_xDispatchProvider; }; -typedef boost::unordered_map< OUString, PopupControllerEntry, OUStringHash, ::std::equal_to< OUString > > PopupControllerCache; +typedef std::unordered_map< OUString, PopupControllerEntry, OUStringHash, std::equal_to< OUString > > PopupControllerCache; class BmkMenu; class AddonMenu; diff --git a/framework/inc/uielement/menubarwrapper.hxx b/framework/inc/uielement/menubarwrapper.hxx index 58cfe489131c..5d47fc81861a 100644 --- a/framework/inc/uielement/menubarwrapper.hxx +++ b/framework/inc/uielement/menubarwrapper.hxx @@ -29,8 +29,6 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/container/XNameAccess.hpp> -#include <boost/unordered_map.hpp> - namespace framework { diff --git a/framework/inc/uielement/newmenucontroller.hxx b/framework/inc/uielement/newmenucontroller.hxx index c812d0c78029..4f1502a75cf0 100644 --- a/framework/inc/uielement/newmenucontroller.hxx +++ b/framework/inc/uielement/newmenucontroller.hxx @@ -41,7 +41,7 @@ #include <rtl/ustring.hxx> #include <vcl/accel.hxx> #include <vcl/menu.hxx> -#include <boost/unordered_map.hpp> +#include <unordered_map> namespace framework { @@ -86,7 +86,7 @@ namespace framework OUString aImageId; }; - typedef ::boost::unordered_map< int, AddInfo > AddInfoForId; + typedef std::unordered_map< int, AddInfo > AddInfoForId; void fillPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu ); void retrieveShortcutsFromConfiguration( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration >& rAccelCfg, diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx index 462f48ee8eb2..90b68ac4a139 100644 --- a/framework/inc/uielement/toolbarmanager.hxx +++ b/framework/inc/uielement/toolbarmanager.hxx @@ -52,6 +52,8 @@ #include <vcl/window.hxx> #include <vcl/timer.hxx> +#include <unordered_map> + class PopupMenu; class ToolBox; @@ -170,11 +172,11 @@ class ToolBarManager : public ToolbarManager_Base bool RetrieveShortcut( const OUString& rCommandURL, OUString& rShortCut ); protected: - typedef ::boost::unordered_map< sal_uInt16, ::com::sun::star::uno::Reference< com::sun::star::frame::XStatusListener > > ToolBarControllerMap; + typedef std::unordered_map< sal_uInt16, ::com::sun::star::uno::Reference< com::sun::star::frame::XStatusListener > > ToolBarControllerMap; typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XSubToolbarController > > SubToolBarControllerVector; typedef BaseHash< SubToolBarControllerVector > SubToolBarToSubToolBarControllerMap; - typedef ::boost::unordered_map< sal_uInt16, ::com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > > MenuDescriptionMap; + typedef std::unordered_map< sal_uInt16, ::com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > > MenuDescriptionMap; bool m_bDisposed : 1, m_bSmallSymbols : 1, diff --git a/framework/inc/uielement/uicommanddescription.hxx b/framework/inc/uielement/uicommanddescription.hxx index 112a1e8a3cd0..c00507ba8a09 100644 --- a/framework/inc/uielement/uicommanddescription.hxx +++ b/framework/inc/uielement/uicommanddescription.hxx @@ -20,10 +20,8 @@ #ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_UICOMMANDDESCRIPTION_HXX #define INCLUDED_FRAMEWORK_INC_UIELEMENT_UICOMMANDDESCRIPTION_HXX -#include <boost/unordered_map.hpp> - +#include <unordered_map> #include <stdtypes.h> - #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/frame/XModuleManager2.hpp> @@ -84,15 +82,15 @@ private: throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; public: - typedef ::boost::unordered_map< OUString, - OUString, - OUStringHash, - ::std::equal_to< OUString > > ModuleToCommandFileMap; - - typedef ::boost::unordered_map< OUString, - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >, - OUStringHash, - ::std::equal_to< OUString > > UICommandsHashMap; + typedef std::unordered_map< OUString, + OUString, + OUStringHash, + std::equal_to< OUString > > ModuleToCommandFileMap; + + typedef std::unordered_map< OUString, + css::uno::Reference< css::container::XNameAccess >, + OUStringHash, + std::equal_to< OUString > > UICommandsHashMap; protected: UICommandDescription( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& rxContext, bool ); diff --git a/framework/inc/uifactory/configurationaccessfactorymanager.hxx b/framework/inc/uifactory/configurationaccessfactorymanager.hxx index 365a44359980..26349235e8ec 100644 --- a/framework/inc/uifactory/configurationaccessfactorymanager.hxx +++ b/framework/inc/uifactory/configurationaccessfactorymanager.hxx @@ -31,7 +31,7 @@ #include <cppuhelper/implbase1.hxx> #include <rtl/ustring.hxx> -#include <boost/unordered_map.hpp> +#include <unordered_map> namespace framework { @@ -57,10 +57,10 @@ namespace framework { virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: - class FactoryManagerMap : public boost::unordered_map< OUString, - OUString, - OUStringHash, - ::std::equal_to< OUString > > + class FactoryManagerMap : public std::unordered_map<OUString, + OUString, + OUStringHash, + std::equal_to< OUString > > { inline void free() { diff --git a/framework/inc/uifactory/factoryconfiguration.hxx b/framework/inc/uifactory/factoryconfiguration.hxx index 2df76a283503..d2313f4e750f 100644 --- a/framework/inc/uifactory/factoryconfiguration.hxx +++ b/framework/inc/uifactory/factoryconfiguration.hxx @@ -33,6 +33,7 @@ #include <cppuhelper/implbase1.hxx> #include <rtl/ustring.hxx> +#include <unordered_map> // Namespace @@ -73,10 +74,10 @@ private: ControllerInfo(const OUString& _aImplementationName,const OUString& _aValue) : m_aImplementationName(_aImplementationName),m_aValue(_aValue){} ControllerInfo(){} }; - class MenuControllerMap : public boost::unordered_map< OUString, + class MenuControllerMap : public std::unordered_map< OUString, ControllerInfo, OUStringHash, - ::std::equal_to< OUString > > + std::equal_to< OUString > > { inline void free() { diff --git a/framework/inc/xml/imagesdocumenthandler.hxx b/framework/inc/xml/imagesdocumenthandler.hxx index b984ced00801..921f3eb6d026 100644 --- a/framework/inc/xml/imagesdocumenthandler.hxx +++ b/framework/inc/xml/imagesdocumenthandler.hxx @@ -28,7 +28,7 @@ #include <rtl/ustring.hxx> #include <cppuhelper/implbase1.hxx> -#include <boost/unordered_map.hpp> +#include <unordered_map> #include <stdtypes.h> namespace framework{ @@ -108,10 +108,10 @@ class OReadImagesDocumentHandler : public ::cppu::WeakImplHelper1< ::com::sun::s private: OUString getErrorLineString(); - class ImageHashMap : public ::boost::unordered_map< OUString , - Image_XML_Entry , - OUStringHash, - ::std::equal_to< OUString > > + class ImageHashMap : public std::unordered_map< OUString , + Image_XML_Entry , + OUStringHash, + std::equal_to< OUString > > { public: inline void free() diff --git a/framework/inc/xml/statusbardocumenthandler.hxx b/framework/inc/xml/statusbardocumenthandler.hxx index 8242874e1728..dfe8ef9c9a6b 100644 --- a/framework/inc/xml/statusbardocumenthandler.hxx +++ b/framework/inc/xml/statusbardocumenthandler.hxx @@ -27,7 +27,7 @@ #include <rtl/ustring.hxx> #include <cppuhelper/implbase1.hxx> -#include <boost/unordered_map.hpp> +#include <unordered_map> #include <stdtypes.h> #include <framework/fwedllapi.h> @@ -104,10 +104,10 @@ class FWE_DLLPUBLIC OReadStatusBarDocumentHandler : private: OUString getErrorLineString(); - class StatusBarHashMap : public ::boost::unordered_map< OUString , - StatusBar_XML_Entry , - OUStringHash, - ::std::equal_to< OUString > > + class StatusBarHashMap : public std::unordered_map<OUString , + StatusBar_XML_Entry , + OUStringHash, + std::equal_to< OUString > > { public: inline void free() diff --git a/framework/inc/xml/toolboxdocumenthandler.hxx b/framework/inc/xml/toolboxdocumenthandler.hxx index 9e643fc041f4..e50df109378b 100644 --- a/framework/inc/xml/toolboxdocumenthandler.hxx +++ b/framework/inc/xml/toolboxdocumenthandler.hxx @@ -109,10 +109,10 @@ class FWE_DLLPUBLIC OReadToolBoxDocumentHandler : private: OUString getErrorLineString(); - class ToolBoxHashMap : public ::boost::unordered_map< OUString , - ToolBox_XML_Entry , - OUStringHash, - ::std::equal_to< OUString > > + class ToolBoxHashMap : public std::unordered_map<OUString , + ToolBox_XML_Entry , + OUStringHash, + std::equal_to< OUString > > { public: inline void free() diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx index 0fd7091a6d87..95b096d460f9 100644 --- a/framework/source/fwe/classes/addonsoptions.cxx +++ b/framework/source/fwe/classes/addonsoptions.cxx @@ -32,8 +32,8 @@ #include <vcl/graphicfilter.hxx> #include <vcl/toolbox.hxx> -#include <boost/unordered_map.hpp> #include <algorithm> +#include <unordered_map> #include <vector> // namespaces @@ -234,10 +234,10 @@ class AddonsOptions_Impl : public ConfigItem void addImage(ImageSize eSize, const Image &rImage, const OUString &rURL); }; - typedef boost::unordered_map< OUString, ImageEntry, OUStringHash, ::std::equal_to< OUString > > ImageManager; - typedef boost::unordered_map< OUString, sal_uInt32, OUStringHash, ::std::equal_to< OUString > > StringToIndexMap; + typedef std::unordered_map< OUString, ImageEntry, OUStringHash, std::equal_to< OUString > > ImageManager; + typedef std::unordered_map< OUString, sal_uInt32, OUStringHash, std::equal_to< OUString > > StringToIndexMap; typedef std::vector< Sequence< Sequence< PropertyValue > > > AddonToolBars; - typedef ::boost::unordered_map< OUString, MergeToolbarInstructionContainer, OUStringHash, ::std::equal_to< OUString > > ToolbarMergingInstructions; + typedef std::unordered_map< OUString, MergeToolbarInstructionContainer, OUStringHash, std::equal_to< OUString > > ToolbarMergingInstructions; /*-**************************************************************************************************** @short return list of key names of our configuration management which represent oue module tree diff --git a/framework/source/inc/accelerators/acceleratorcache.hxx b/framework/source/inc/accelerators/acceleratorcache.hxx index e9779f770824..790ab0e03896 100644 --- a/framework/source/inc/accelerators/acceleratorcache.hxx +++ b/framework/source/inc/accelerators/acceleratorcache.hxx @@ -57,10 +57,10 @@ class AcceleratorCache /** TODO document me keys -> commands */ - typedef ::boost::unordered_map< css::awt::KeyEvent , - OUString , - KeyEventHashCode , - KeyEventEqualsFunc > TKey2Commands; + typedef std::unordered_map< css::awt::KeyEvent , + OUString , + KeyEventHashCode , + KeyEventEqualsFunc > TKey2Commands; // member diff --git a/framework/source/inc/accelerators/keymapping.hxx b/framework/source/inc/accelerators/keymapping.hxx index 9d79e3188775..90670d45327d 100644 --- a/framework/source/inc/accelerators/keymapping.hxx +++ b/framework/source/inc/accelerators/keymapping.hxx @@ -55,10 +55,10 @@ class KeyMapping typedef BaseHash< sal_Int16 > Identifier2CodeHash; /** @short hash structure to map key codes to identifier. */ - typedef ::boost::unordered_map< sal_Int16 , - OUString , - ShortHashCode , - ::std::equal_to< sal_Int16 > > Code2IdentifierHash; + typedef std::unordered_map< sal_Int16 , + OUString , + ShortHashCode , + std::equal_to< sal_Int16 > > Code2IdentifierHash; // member diff --git a/framework/source/inc/accelerators/storageholder.hxx b/framework/source/inc/accelerators/storageholder.hxx index 5662e498aef2..344318460e94 100644 --- a/framework/source/inc/accelerators/storageholder.hxx +++ b/framework/source/inc/accelerators/storageholder.hxx @@ -56,10 +56,10 @@ class StorageHolder }; /** @short TODO */ - typedef ::boost::unordered_map< OUString , - TStorageInfo , - OUStringHash , - ::std::equal_to< OUString > > TPath2StorageInfo; + typedef std::unordered_map< OUString , + TStorageInfo , + OUStringHash , + std::equal_to< OUString > > TPath2StorageInfo; // member private: diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index b08b9f815444..379551b3c3ca 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -647,7 +647,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL Desktop::queryDispatch( co if ( aURL.Protocol.equalsIgnoreAsciiCase(".uno:") ) aCommand = aURL.Path; - // Make boost::unordered_map lookup if the current URL is in the disabled list + // Make std::unordered_map lookup if the current URL is in the disabled list if ( m_aCommandOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, aCommand ) ) return css::uno::Reference< css::frame::XDispatch >(); else diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index 519bf109b66b..7e50b817cd7c 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -2215,7 +2215,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL Frame::queryDispatch( cons if ( aURL.Protocol.equalsIgnoreAsciiCase(".uno:") ) aCommand = aURL.Path; - // Make boost::unordered_map lookup if the current URL is in the disabled list + // Make std::unordered_map lookup if the current URL is in the disabled list if ( m_aCommandOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, aCommand ) ) return css::uno::Reference< css::frame::XDispatch >(); else diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index 5057959fdc64..98e9b0f6d339 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -50,7 +50,7 @@ #include <com/sun/star/container/XHierarchicalNameAccess.hpp> #include <com/sun/star/util/XStringSubstitution.hpp> -#include <boost/unordered_map.hpp> +#include <unordered_map> #include <string.h> using namespace com::sun::star::uno; @@ -107,7 +107,7 @@ struct SubstituteRule EnvironmentType aEnvType; }; -typedef boost::unordered_map<OUString, SubstituteRule, OUStringHash> +typedef std::unordered_map<OUString, SubstituteRule, OUStringHash> SubstituteVariables; typedef std::vector< SubstituteRule > SubstituteRuleVector; @@ -282,7 +282,7 @@ protected: throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); private: - typedef boost::unordered_map<OUString, PreDefVariable, OUStringHash> + typedef std::unordered_map<OUString, PreDefVariable, OUStringHash> VarNameToIndexMap; VarNameToIndexMap m_aPreDefVarMap; // Mapping from pre-def variable names to enum for array access diff --git a/framework/source/services/tabwindowservice.cxx b/framework/source/services/tabwindowservice.cxx index 3fc7c9c4b7ee..dd9c46e58235 100644 --- a/framework/source/services/tabwindowservice.cxx +++ b/framework/source/services/tabwindowservice.cxx @@ -73,10 +73,10 @@ struct TTabPageInfo css::uno::Sequence< css::beans::NamedValue > m_lProperties; }; -typedef ::boost::unordered_map< ::sal_Int32 , - TTabPageInfo , - Int32HashCode , - ::std::equal_to< ::sal_Int32 > > TTabPageInfoHash; +typedef std::unordered_map< ::sal_Int32 , + TTabPageInfo , + Int32HashCode , + std::equal_to< ::sal_Int32 > > TTabPageInfoHash; /*-************************************************************************************************************ @short implements a helper service providing a dockable tab control window diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx b/framework/source/uiconfiguration/imagemanagerimpl.hxx index 40ba09792961..9b5ee93daa49 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.hxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx @@ -20,13 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_SOURCE_UICONFIGURATION_IMAGEMANAGERIMPL_HXX #define INCLUDED_FRAMEWORK_SOURCE_UICONFIGURATION_IMAGEMANAGERIMPL_HXX -/** Attention: stl headers must(!) be included at first. Otherwise it can make trouble - with solaris headers ... -*/ -#include <vector> -#include <list> -#include <boost/unordered_map.hpp> - #include <macros/generic.hxx> #include <macros/xinterface.hxx> #include <macros/xtypeprovider.hxx> @@ -53,6 +46,10 @@ #include <rtl/ref.hxx> #include <salhelper/simplereferenceobject.hxx> +#include <list> +#include <unordered_map> +#include <vector> + namespace framework { class CmdImageList @@ -137,10 +134,10 @@ namespace framework void clear(); - typedef boost::unordered_map< OUString, - sal_Bool, - OUStringHash, - ::std::equal_to< OUString > > ImageNameMap; + typedef std::unordered_map< OUString, + sal_Bool, + OUStringHash, + std::equal_to< OUString > > ImageNameMap; enum Layer { diff --git a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx index 658297fb8e84..49fd22ca81a5 100644 --- a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx +++ b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx @@ -39,7 +39,7 @@ #include <cppuhelper/supportsservice.hxx> #include <vcl/svapp.hxx> -#include <boost/unordered_map.hpp> +#include <unordered_map> using namespace com::sun::star::uno; using namespace com::sun::star::io; @@ -92,7 +92,7 @@ public: private: virtual void SAL_CALL disposing() SAL_OVERRIDE; - typedef ::boost::unordered_map< OUString, css::uno::Reference< css::ui::XModuleUIConfigurationManager2 >, OUStringHash, ::std::equal_to< OUString > > ModuleToModuleCfgMgr; + typedef std::unordered_map< OUString, css::uno::Reference< css::ui::XModuleUIConfigurationManager2 >, OUStringHash, std::equal_to< OUString > > ModuleToModuleCfgMgr; //TODO_AS void impl_initStorages(); @@ -108,7 +108,7 @@ ModuleUIConfigurationManagerSupplier::ModuleUIConfigurationManagerSupplier( cons { try { - // Retrieve known modules and insert them into our boost::unordered_map to speed-up access time. + // Retrieve known modules and insert them into our unordered_map to speed-up access time. Reference< XNameAccess > xNameAccess( m_xModuleMgr, UNO_QUERY_THROW ); const Sequence< OUString > aNameSeq = xNameAccess->getElementNames(); const OUString* pNameSeq = aNameSeq.getConstArray(); diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx index 63e25a30dfaf..e4030b766d43 100644 --- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx @@ -168,7 +168,7 @@ private: css::uno::Reference< css::container::XIndexAccess > xSettings; }; - typedef ::boost::unordered_map< OUString, UIElementData, OUStringHash, ::std::equal_to< OUString > > UIElementDataHashMap; + typedef std::unordered_map< OUString, UIElementData, OUStringHash, std::equal_to< OUString > > UIElementDataHashMap; struct UIElementType { @@ -185,9 +185,9 @@ private: css::uno::Reference< css::embed::XStorage > xStorage; }; - typedef ::std::vector< UIElementType > UIElementTypesVector; - typedef ::std::vector< css::ui::ConfigurationEvent > ConfigEventNotifyContainer; - typedef ::boost::unordered_map< OUString, UIElementInfo, OUStringHash, ::std::equal_to< OUString > > UIElementInfoHashMap; + typedef std::vector< UIElementType > UIElementTypesVector; + typedef std::vector< css::ui::ConfigurationEvent > ConfigEventNotifyContainer; + typedef std::unordered_map< OUString, UIElementInfo, OUStringHash, std::equal_to< OUString > > UIElementInfoHashMap; void impl_Initialize(); void implts_notifyContainerListener( const css::ui::ConfigurationEvent& aEvent, NotifyOp eOp ); @@ -397,7 +397,7 @@ void ModuleUIConfigurationManager::impl_preloadUIElementTypeList( Layer eLayer, aUIElementData.bDefaultNode = false; } - // Create boost::unordered_map entries for all user interface elements inside the storage. We don't load the + // Create std::unordered_map entries for all user interface elements inside the storage. We don't load the // settings to speed up the process. rHashMap.insert( UIElementDataHashMap::value_type( aUIElementData.aResourceURL, aUIElementData )); } @@ -517,7 +517,7 @@ ModuleUIConfigurationManager::UIElementData* ModuleUIConfigurationManager::impl impl_preloadUIElementTypeList( LAYER_USERDEFINED, nElementType ); impl_preloadUIElementTypeList( LAYER_DEFAULT, nElementType ); - // first try to look into our user-defined vector/boost::unordered_map combination + // first try to look into our user-defined vector/unordered_map combination UIElementDataHashMap& rUserHashMap = m_aUIElements[LAYER_USERDEFINED][nElementType].aElementsHashMap; UIElementDataHashMap::iterator pIter = rUserHashMap.find( aResourceURL ); if ( pIter != rUserHashMap.end() ) @@ -531,7 +531,7 @@ ModuleUIConfigurationManager::UIElementData* ModuleUIConfigurationManager::impl } } - // Not successful, we have to look into our default vector/boost::unordered_map combination + // Not successful, we have to look into our default vector/unordered_map combination UIElementDataHashMap& rDefaultHashMap = m_aUIElements[LAYER_DEFAULT][nElementType].aElementsHashMap; pIter = rDefaultHashMap.find( aResourceURL ); if ( pIter != rDefaultHashMap.end() ) @@ -1547,7 +1547,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la // preload list of element types on demand impl_preloadUIElementTypeList( LAYER_DEFAULT, nElementType ); - // Look into our default vector/boost::unordered_map combination + // Look into our default vector/unordered_map combination UIElementDataHashMap& rDefaultHashMap = m_aUIElements[LAYER_DEFAULT][nElementType].aElementsHashMap; UIElementDataHashMap::iterator pIter = rDefaultHashMap.find( ResourceURL ); if ( pIter != rDefaultHashMap.end() ) diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx index bc25adf131f2..44a1a37a5c43 100644 --- a/framework/source/uiconfiguration/uicategorydescription.cxx +++ b/framework/source/uiconfiguration/uicategorydescription.cxx @@ -39,7 +39,7 @@ #include <vcl/mnemonic.hxx> #include <comphelper/sequence.hxx> -#include <boost/unordered_map.hpp> +#include <unordered_map> using namespace com::sun::star::uno; using namespace com::sun::star::lang; @@ -101,10 +101,10 @@ class ConfigurationAccess_UICategory : public ::cppu::WeakImplHelper2<XNameAcces bool fillCache(); private: - typedef ::boost::unordered_map< OUString, - OUString, - OUStringHash, - ::std::equal_to< OUString > > IdToInfoCache; + typedef std::unordered_map< OUString, + OUString, + OUStringHash, + std::equal_to< OUString > > IdToInfoCache; bool initializeConfigAccess(); diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx index 3bb30e4ca45b..2e720def5f45 100644 --- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx @@ -46,7 +46,7 @@ #include <rtl/ref.hxx> #include <rtl/ustrbuf.hxx> -#include <boost/unordered_map.hpp> +#include <unordered_map> using namespace com::sun::star::uno; using namespace com::sun::star::io; @@ -150,7 +150,7 @@ private: struct UIElementType; friend struct UIElementType; - typedef ::boost::unordered_map< OUString, UIElementData, OUStringHash, ::std::equal_to< OUString > > UIElementDataHashMap; + typedef std::unordered_map< OUString, UIElementData, OUStringHash, std::equal_to< OUString > > UIElementDataHashMap; struct UIElementType { @@ -167,9 +167,9 @@ private: css::uno::Reference< css::embed::XStorage > xStorage; }; - typedef ::std::vector< UIElementType > UIElementTypesVector; - typedef ::std::vector< css::ui::ConfigurationEvent > ConfigEventNotifyContainer; - typedef ::boost::unordered_map< OUString, UIElementInfo, OUStringHash, ::std::equal_to< OUString > > UIElementInfoHashMap; + typedef std::vector< UIElementType > UIElementTypesVector; + typedef std::vector< css::ui::ConfigurationEvent > ConfigEventNotifyContainer; + typedef std::unordered_map< OUString, UIElementInfo, OUStringHash, std::equal_to< OUString > > UIElementInfoHashMap; void impl_Initialize(); void implts_notifyContainerListener( const css::ui::ConfigurationEvent& aEvent, NotifyOp eOp ); @@ -315,7 +315,7 @@ void UIConfigurationManager::impl_preloadUIElementTypeList( sal_Int16 nElementTy aUIElementData.bModified = false; aUIElementData.bDefault = false; - // Create boost::unordered_map entries for all user interface elements inside the storage. We don't load the + // Create unordered_map entries for all user interface elements inside the storage. We don't load the // settings to speed up the process. rHashMap.insert( UIElementDataHashMap::value_type( aUIElementData.aResourceURL, aUIElementData )); } @@ -434,7 +434,7 @@ UIConfigurationManager::UIElementData* UIConfigurationManager::impl_findUIElemen // preload list of element types on demand impl_preloadUIElementTypeList( nElementType ); - // try to look into our document vector/boost::unordered_map combination + // try to look into our document vector/unordered_map combination UIElementDataHashMap& rUserHashMap = m_aUIElements[nElementType].aElementsHashMap; UIElementDataHashMap::iterator pIter = rUserHashMap.find( aResourceURL ); if ( pIter != rUserHashMap.end() ) diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx index 50d958646202..a6dee5c6d5d3 100644 --- a/framework/source/uiconfiguration/windowstateconfiguration.cxx +++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx @@ -42,8 +42,8 @@ #include <cppuhelper/supportsservice.hxx> #include <tools/debug.hxx> +#include <unordered_map> #include <vector> -#include <boost/unordered_map.hpp> using namespace com::sun::star::uno; using namespace com::sun::star::lang; @@ -215,10 +215,10 @@ class ConfigurationAccess_WindowState : public ::cppu::WeakImplHelper2< XNameCo bool impl_initializeConfigAccess(); private: - typedef ::boost::unordered_map< OUString, - WindowStateInfo, - OUStringHash, - ::std::equal_to< OUString > > ResourceURLToInfoCache; + typedef std::unordered_map< OUString, + WindowStateInfo, + OUStringHash, + std::equal_to< OUString > > ResourceURLToInfoCache; osl::Mutex m_aMutex; OUString m_aConfigWindowAccess; @@ -1320,15 +1320,15 @@ public: virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - typedef ::boost::unordered_map< OUString, - OUString, - OUStringHash, - ::std::equal_to< OUString > > ModuleToWindowStateFileMap; + typedef std::unordered_map< OUString, + OUString, + OUStringHash, + std::equal_to< OUString > > ModuleToWindowStateFileMap; - typedef ::boost::unordered_map< OUString, - css::uno::Reference< css::container::XNameAccess >, - OUStringHash, - ::std::equal_to< OUString > > ModuleToWindowStateConfigHashMap; + typedef std::unordered_map< OUString, + css::uno::Reference< css::container::XNameAccess >, + OUStringHash, + std::equal_to< OUString > > ModuleToWindowStateConfigHashMap; private: css::uno::Reference< css::uno::XComponentContext> m_xContext; diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx index 514e3737e93e..2d48f92ef1bb 100644 --- a/framework/source/uielement/controlmenucontroller.cxx +++ b/framework/source/uielement/controlmenucontroller.cxx @@ -221,10 +221,10 @@ private: virtual void impl_setPopupMenu() SAL_OVERRIDE; virtual void impl_select(const uno::Reference< frame::XDispatch >& _xDispatch,const util::URL& aURL) SAL_OVERRIDE; - class UrlToDispatchMap : public ::boost::unordered_map< OUString, - uno::Reference< frame::XDispatch >, - OUStringHash, - ::std::equal_to< OUString > > + class UrlToDispatchMap : public std::unordered_map< OUString, + uno::Reference< frame::XDispatch >, + OUStringHash, + std::equal_to< OUString > > { public: inline void free() diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx index 08a787dba40c..3abad04ebee9 100644 --- a/framework/source/uielement/newmenucontroller.cxx +++ b/framework/source/uielement/newmenucontroller.cxx @@ -339,7 +339,7 @@ void NewMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopup AddInfo aAddInfo; // retrieve additional parameters from bookmark menu and - // store it in a boost::unordered_map. + // store it in a unordered_map. for ( sal_uInt16 i = 0; i < pSubMenu->GetItemCount(); i++ ) { sal_uInt16 nItemId = pSubMenu->GetItemId( sal::static_int_cast<sal_uInt16>( i ) ); diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index ac16ea6b251f..1972713abf41 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -82,7 +82,7 @@ static const char STATIC_INTERNAL_CMD_PART[] = ".cmd:"; namespace framework { -typedef boost::unordered_map< OUString, OUString, OUStringHash, ::std::equal_to< OUString > > ToolbarHashMap; +typedef std::unordered_map< OUString, OUString, OUStringHash, std::equal_to< OUString > > ToolbarHashMap; struct ToolBarEntry { diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx index cafd7a4f7755..b83e31cf1bbe 100644 --- a/framework/source/uielement/uicommanddescription.cxx +++ b/framework/source/uielement/uicommanddescription.cxx @@ -140,10 +140,10 @@ class ConfigurationAccess_UICommand : // Order is necessary for right initializa std::vector< OUString >& aImageMirrorVector); private: - typedef ::boost::unordered_map< OUString, - CmdToInfoMap, - OUStringHash, - ::std::equal_to< OUString > > CommandToInfoCache; + typedef std::unordered_map< OUString, + CmdToInfoMap, + OUStringHash, + std::equal_to< OUString > > CommandToInfoCache; bool initializeConfigAccess(); diff --git a/helpcompiler/inc/HelpCompiler.hxx b/helpcompiler/inc/HelpCompiler.hxx index b66248e99ce4..e686c7454522 100644 --- a/helpcompiler/inc/HelpCompiler.hxx +++ b/helpcompiler/inc/HelpCompiler.hxx @@ -23,7 +23,7 @@ #include <sal/config.h> #include <string> -#include <boost/unordered_map.hpp> +#include <unordered_map> #include <vector> #include <list> #include <fstream> @@ -154,11 +154,11 @@ struct joaat_hash #define pref_hash joaat_hash -typedef boost::unordered_map<std::string, std::string, pref_hash> Stringtable; +typedef std::unordered_map<std::string, std::string, pref_hash> Stringtable; typedef std::list<std::string> LinkedList; typedef std::vector<std::string> HashSet; -typedef boost::unordered_map<std::string, LinkedList, pref_hash> Hashtable; +typedef std::unordered_map<std::string, LinkedList, pref_hash> Hashtable; class StreamTable { diff --git a/helpcompiler/source/HelpLinker.cxx b/helpcompiler/source/HelpLinker.cxx index b28529342953..cb3d6a699f6d 100644 --- a/helpcompiler/source/HelpLinker.cxx +++ b/helpcompiler/source/HelpLinker.cxx @@ -177,7 +177,7 @@ void writeKeyValue_DBHelp( FILE* pFile, const std::string& aKeyStr, const std::s class HelpKeyword { private: - typedef boost::unordered_map<std::string, Data, pref_hash> DataHashtable; + typedef std::unordered_map<std::string, Data, pref_hash> DataHashtable; DataHashtable _hash; public: diff --git a/idlc/inc/idlc/idlctypes.hxx b/idlc/inc/idlc/idlctypes.hxx index 7766f837b3a5..e9e4c0c8d6b5 100644 --- a/idlc/inc/idlc/idlctypes.hxx +++ b/idlc/inc/idlc/idlctypes.hxx @@ -21,11 +21,11 @@ #include <stdio.h> -#include <boost/unordered_map.hpp> #include <list> -#include <vector> -#include <string> #include <set> +#include <string> +#include <unordered_map> +#include <vector> #include <sal/types.h> #include <rtl/ustring.hxx> @@ -44,8 +44,8 @@ typedef ::std::set< OString, LessString > StringSet; class AstDeclaration; -typedef ::boost::unordered_map< OString, AstDeclaration*, OStringHash > DeclMap; -typedef ::std::list< AstDeclaration* > DeclList; +typedef std::unordered_map< OString, AstDeclaration*, OStringHash > DeclMap; +typedef std::list< AstDeclaration* > DeclList; class AstScope; AstDeclaration* SAL_CALL scopeAsDecl(AstScope* pScope); diff --git a/idlc/inc/idlc/options.hxx b/idlc/inc/idlc/options.hxx index 08d839e736f1..ccd2d01639d5 100644 --- a/idlc/inc/idlc/options.hxx +++ b/idlc/inc/idlc/options.hxx @@ -22,7 +22,7 @@ #include <idlc/idlctypes.hxx> -typedef ::boost::unordered_map< OString, +typedef std::unordered_map< OString, OString, OStringHash > OptionMap; diff --git a/idlc/source/idlc.cxx b/idlc/source/idlc.cxx index f6a449506cc6..27cb47d93423 100644 --- a/idlc/source/idlc.cxx +++ b/idlc/source/idlc.cxx @@ -38,6 +38,8 @@ #include <osl/file.hxx> #include <osl/thread.h> +#include <algorithm> + AstDeclaration* SAL_CALL scopeAsDecl(AstScope* pScope) { if (pScope == NULL) return NULL; diff --git a/include/basic/codecompletecache.hxx b/include/basic/codecompletecache.hxx index 3721b9692f94..dad54f082b2c 100644 --- a/include/basic/codecompletecache.hxx +++ b/include/basic/codecompletecache.hxx @@ -24,14 +24,14 @@ #include <basic/sbxobj.hxx> #include <basic/sbxdef.hxx> #include <boost/utility.hpp> -#include <boost/unordered_map.hpp> #include <rtl/ustring.hxx> #include <svtools/miscopt.hxx> +#include <unordered_map> #include <vector> -typedef boost::unordered_map< OUString, OUString, OUStringHash > CodeCompleteVarTypes; +typedef std::unordered_map< OUString, OUString, OUStringHash > CodeCompleteVarTypes; /* variable name, type */ -typedef boost::unordered_map< OUString, CodeCompleteVarTypes, OUStringHash > CodeCompleteVarScopes; +typedef std::unordered_map< OUString, CodeCompleteVarTypes, OUStringHash > CodeCompleteVarScopes; /* procedure, CodeCompleteVarTypes */ class BASIC_DLLPUBLIC CodeCompleteOptions diff --git a/include/codemaker/generatedtypeset.hxx b/include/codemaker/generatedtypeset.hxx index ee27e6f71ec4..cbe5dc38c2c4 100644 --- a/include/codemaker/generatedtypeset.hxx +++ b/include/codemaker/generatedtypeset.hxx @@ -22,7 +22,7 @@ #include <rtl/string.hxx> -#include <boost/unordered_set.hpp> +#include <unordered_set> /// @HTML @@ -63,7 +63,7 @@ private: GeneratedTypeSet(GeneratedTypeSet &); // not implemented void operator =(const GeneratedTypeSet&); // not implemented - boost::unordered_set< OString, OStringHash > m_set; + std::unordered_set< OString, OStringHash > m_set; }; } diff --git a/include/codemaker/options.hxx b/include/codemaker/options.hxx index d322a7443022..2d7ddbf1d07e 100644 --- a/include/codemaker/options.hxx +++ b/include/codemaker/options.hxx @@ -20,11 +20,10 @@ #ifndef INCLUDED_CODEMAKER_OPTIONS_HXX #define INCLUDED_CODEMAKER_OPTIONS_HXX -#include <boost/unordered_map.hpp> - #include <codemaker/global.hxx> +#include <unordered_map> -typedef ::boost::unordered_map +typedef std::unordered_map < ::rtl::OString, ::rtl::OString, diff --git a/include/filter/msfilter/svxmsbas.hxx b/include/filter/msfilter/svxmsbas.hxx index 22853fbe95db..10ea1207ed16 100644 --- a/include/filter/msfilter/svxmsbas.hxx +++ b/include/filter/msfilter/svxmsbas.hxx @@ -25,7 +25,7 @@ #include <sot/storage.hxx> #include <map> -#include <boost/unordered_map.hpp> +#include <unordered_map> class SfxObjectShell; @@ -44,7 +44,7 @@ class SfxObjectShell; * probably what the user expects to see when viewing the code */ -typedef boost::unordered_map< sal_Int32, OUString > ObjIdToName; +typedef std::unordered_map< sal_Int32, OUString > ObjIdToName; typedef std::map< OUString, ObjIdToName > ControlAttributeInfo; diff --git a/include/framework/titlehelper.hxx b/include/framework/titlehelper.hxx index 839e57ce30ef..63d86e5e6e8d 100644 --- a/include/framework/titlehelper.hxx +++ b/include/framework/titlehelper.hxx @@ -40,7 +40,6 @@ #include <rtl/ustrbuf.hxx> -#include <boost/unordered_map.hpp> #include <framework/fwedllapi.h> diff --git a/include/oox/export/chartexport.hxx b/include/oox/export/chartexport.hxx index 4560bb40456e..3d5604753c1c 100644 --- a/include/oox/export/chartexport.hxx +++ b/include/oox/export/chartexport.hxx @@ -26,8 +26,6 @@ #include <oox/token/tokens.hxx> #include <sax/fshelper.hxx> #include <vcl/mapmod.hxx> -#include <boost/unordered_map.hpp> -#include <map> namespace com { namespace sun { namespace star { namespace chart { diff --git a/include/oox/export/shapes.hxx b/include/oox/export/shapes.hxx index 6403aec59a8b..b754b674b870 100644 --- a/include/oox/export/shapes.hxx +++ b/include/oox/export/shapes.hxx @@ -26,7 +26,7 @@ #include <sax/fshelper.hxx> #include <vcl/mapmod.hxx> #include <tools/fract.hxx> -#include <boost/unordered_map.hpp> +#include <unordered_map> namespace com { namespace sun { namespace star { namespace beans { @@ -58,7 +58,7 @@ private: }; public: - typedef boost::unordered_map< const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape>, sal_Int32, ShapeHash, ShapeCheck> ShapeHashMap; + typedef std::unordered_map< const css::uno::Reference< css::drawing::XShape>, sal_Int32, ShapeHash, ShapeCheck> ShapeHashMap; protected: sal_Int32 mnShapeIdMax, mnPictureIdMax; diff --git a/include/sfx2/sidebar/Theme.hxx b/include/sfx2/sidebar/Theme.hxx index 4123a786cdcf..ba3d49107118 100644 --- a/include/sfx2/sidebar/Theme.hxx +++ b/include/sfx2/sidebar/Theme.hxx @@ -31,8 +31,8 @@ #include <com/sun/star/beans/XPropertySet.hpp> -#include <boost/unordered_map.hpp> #include <map> +#include <unordered_map> #include <boost/optional.hpp> class SvBorder; @@ -210,27 +210,27 @@ public: private: static Theme& GetCurrentTheme(); - ::std::vector<Image> maImages; - ::std::vector<Color> maColors; - ::std::vector<Paint> maPaints; - ::std::vector<sal_Int32> maIntegers; - ::std::vector<bool> maBooleans; - ::std::vector<Rectangle> maRectangles; + std::vector<Image> maImages; + std::vector<Color> maColors; + std::vector<Paint> maPaints; + std::vector<sal_Int32> maIntegers; + std::vector<bool> maBooleans; + std::vector<Rectangle> maRectangles; bool mbIsHighContrastMode; bool mbIsHighContrastModeSetManually; - typedef ::boost::unordered_map<rtl::OUString,ThemeItem, rtl::OUStringHash> PropertyNameToIdMap; + typedef std::unordered_map<rtl::OUString,ThemeItem, rtl::OUStringHash> PropertyNameToIdMap; PropertyNameToIdMap maPropertyNameToIdMap; - typedef ::std::vector<rtl::OUString> PropertyIdToNameMap; + typedef std::vector<rtl::OUString> PropertyIdToNameMap; PropertyIdToNameMap maPropertyIdToNameMap; typedef ::std::vector<css::uno::Any> RawValueContainer; RawValueContainer maRawValues; - typedef ::std::vector<css::uno::Reference<css::beans::XPropertyChangeListener> > ChangeListenerContainer; - typedef ::std::map<ThemeItem,ChangeListenerContainer> ChangeListeners; + typedef std::vector<css::uno::Reference<css::beans::XPropertyChangeListener> > ChangeListenerContainer; + typedef std::map<ThemeItem,ChangeListenerContainer> ChangeListeners; ChangeListeners maChangeListeners; - typedef ::std::vector<css::uno::Reference<css::beans::XVetoableChangeListener> > VetoableListenerContainer; - typedef ::std::map<ThemeItem,VetoableListenerContainer> VetoableListeners; + typedef std::vector<css::uno::Reference<css::beans::XVetoableChangeListener> > VetoableListenerContainer; + typedef std::map<ThemeItem,VetoableListenerContainer> VetoableListeners; VetoableListeners maVetoableListeners; enum PropertyType diff --git a/include/svl/IndexedStyleSheets.hxx b/include/svl/IndexedStyleSheets.hxx index 8cd8de46b182..7fcbfae59c9a 100644 --- a/include/svl/IndexedStyleSheets.hxx +++ b/include/svl/IndexedStyleSheets.hxx @@ -18,7 +18,7 @@ #include <svl/svldllapi.h> -#include <boost/unordered_map.hpp> +#include <unordered_map> #include <vector> class SfxStyleSheetBase; @@ -178,7 +178,7 @@ private: * * @internal * Must be an unordered map. A regular map is too slow for some files. */ - typedef boost::unordered_multimap<rtl::OUString, unsigned, rtl::OUStringHash> MapType; + typedef std::unordered_multimap<rtl::OUString, unsigned, rtl::OUStringHash> MapType; /** A map which stores the positions of style sheets by their name */ MapType mPositionsByName; diff --git a/include/svl/listener.hxx b/include/svl/listener.hxx index 8b47fda968b4..a148c959fe72 100644 --- a/include/svl/listener.hxx +++ b/include/svl/listener.hxx @@ -21,14 +21,14 @@ #include <svl/svldllapi.h> -#include <boost/unordered_set.hpp> +#include <unordered_set> class SvtBroadcaster; class SfxHint; class SVL_DLLPUBLIC SvtListener { - typedef boost::unordered_set<SvtBroadcaster*> BroadcastersType; + typedef std::unordered_set<SvtBroadcaster*> BroadcastersType; BroadcastersType maBroadcasters; const SvtListener& operator=(const SvtListener &); // n.i., ist verboten diff --git a/include/svtools/framestatuslistener.hxx b/include/svtools/framestatuslistener.hxx index 22babad68288..d585ec4b82c9 100644 --- a/include/svtools/framestatuslistener.hxx +++ b/include/svtools/framestatuslistener.hxx @@ -31,7 +31,7 @@ #include <cppuhelper/interfacecontainer.hxx> #include <comphelper/broadcasthelper.hxx> -#include <boost/unordered_map.hpp> +#include <unordered_map> namespace svt { @@ -82,10 +82,10 @@ class SVT_DLLPUBLIC FrameStatusListener : public ::com::sun::star::frame::XStatu ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch; }; - typedef ::boost::unordered_map< OUString, - com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >, - OUStringHash, - ::std::equal_to< OUString > > URLToDispatchMap; + typedef std::unordered_map< OUString, + css::uno::Reference< css::frame::XDispatch >, + OUStringHash, + std::equal_to< OUString > > URLToDispatchMap; bool m_bInitialized : 1, m_bDisposed : 1; diff --git a/include/svtools/statusbarcontroller.hxx b/include/svtools/statusbarcontroller.hxx index 1101d2c3750b..ece18a315129 100644 --- a/include/svtools/statusbarcontroller.hxx +++ b/include/svtools/statusbarcontroller.hxx @@ -31,10 +31,8 @@ #include <cppuhelper/weak.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <comphelper/broadcasthelper.hxx> - -#include <boost/unordered_map.hpp> - #include <tools/gen.hxx> +#include <unordered_map> namespace svt { @@ -103,10 +101,10 @@ class SVT_DLLPUBLIC StatusbarController : ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch; }; - typedef ::boost::unordered_map< OUString, - com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >, - OUStringHash, - ::std::equal_to< OUString > > URLToDispatchMap; + typedef std::unordered_map< OUString, + css::uno::Reference< css::frame::XDispatch >, + OUStringHash, + std::equal_to< OUString > > URLToDispatchMap; // methods to support status forwarder, known by the old sfx2 toolbox controller implementation void addStatusListener( const OUString& aCommandURL ); diff --git a/include/svtools/toolboxcontroller.hxx b/include/svtools/toolboxcontroller.hxx index 352a645ed0e1..fb61f2171756 100644 --- a/include/svtools/toolboxcontroller.hxx +++ b/include/svtools/toolboxcontroller.hxx @@ -39,7 +39,7 @@ #include <cppuhelper/propshlp.hxx> #include <tools/link.hxx> -#include <boost/unordered_map.hpp> +#include <unordered_map> class ToolBox; @@ -151,10 +151,10 @@ class SVT_DLLPUBLIC ToolboxController : DECL_STATIC_LINK( ToolboxController, ExecuteHdl_Impl, DispatchInfo* ); - typedef ::boost::unordered_map< OUString, - com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >, - OUStringHash, - ::std::equal_to< OUString > > URLToDispatchMap; + typedef std::unordered_map< OUString, + css::uno::Reference< css::frame::XDispatch >, + OUStringHash, + std::equal_to< OUString > > URLToDispatchMap; // methods to support status forwarder, known by the old sfx2 toolbox controller implementation void addStatusListener( const OUString& aCommandURL ); diff --git a/include/svx/ShapeTypeHandler.hxx b/include/svx/ShapeTypeHandler.hxx index 7a3729711d91..ee84c34109f5 100644 --- a/include/svx/ShapeTypeHandler.hxx +++ b/include/svx/ShapeTypeHandler.hxx @@ -30,8 +30,8 @@ #include <svx/svxdllapi.h> #include <rtl/ustring.hxx> +#include <unordered_map> #include <vector> -#include <boost/unordered_map.hpp> namespace accessibility { @@ -184,9 +184,8 @@ private: /** This hash map allows the fast look up of a type descriptor for a given service name. */ - typedef ::boost::unordered_map< - OUString,ShapeTypeId, - OUStringHash> tServiceNameToSlotId; + typedef std::unordered_map<OUString,ShapeTypeId, + OUStringHash> tServiceNameToSlotId; mutable tServiceNameToSlotId maServiceNameToSlotId; /** Determine the slot id of the specified shape type. With this id diff --git a/include/svx/sdasitm.hxx b/include/svx/sdasitm.hxx index 6ecb277a7d23..346772e21676 100644 --- a/include/svx/sdasitm.hxx +++ b/include/svx/sdasitm.hxx @@ -27,9 +27,9 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/uno/Any.hxx> #include <rtl/ustring.hxx> -#include <boost/unordered_map.hpp> -#include <map> #include <svx/svxdllapi.h> +#include <map> +#include <unordered_map> class SdrCustomShapeEngineItem : public SfxStringItem { @@ -53,8 +53,8 @@ private: { size_t operator()( const SdrCustomShapeGeometryItem::PropertyPair& ) const; }; - typedef boost::unordered_map <PropertyPair, sal_Int32, PropertyPairHash> PropertyPairHashMap; - typedef boost::unordered_map<OUString, sal_Int32, OUStringHash> PropertyHashMap; + typedef std::unordered_map <PropertyPair, sal_Int32, PropertyPairHash> PropertyPairHashMap; + typedef std::unordered_map<OUString, sal_Int32, OUStringHash> PropertyHashMap; PropertyHashMap aPropHashMap; PropertyPairHashMap aPropPairHashMap; diff --git a/include/toolkit/controls/eventcontainer.hxx b/include/toolkit/controls/eventcontainer.hxx index 9ba2391638ce..be41bdd6fc69 100644 --- a/include/toolkit/controls/eventcontainer.hxx +++ b/include/toolkit/controls/eventcontainer.hxx @@ -26,8 +26,9 @@ #include <toolkit/helper/listenermultiplexer.hxx> -#include <boost/unordered_map.hpp> #include <cppuhelper/implbase2.hxx> +#include <unordered_map> + typedef ::cppu::WeakImplHelper2< ::com::sun::star::container::XNameContainer, ::com::sun::star::container::XContainer > NameContainerHelper; @@ -36,7 +37,7 @@ namespace toolkit { // Hashtable to optimize -typedef boost::unordered_map +typedef std::unordered_map < OUString, sal_Int32, diff --git a/include/tools/pstm.hxx b/include/tools/pstm.hxx index d5b1572250f6..6f6fd7d0f8b1 100644 --- a/include/tools/pstm.hxx +++ b/include/tools/pstm.hxx @@ -19,13 +19,13 @@ #ifndef INCLUDED_TOOLS_PSTM_HXX #define INCLUDED_TOOLS_PSTM_HXX -#include <boost/unordered_map.hpp> #include <tools/toolsdllapi.h> #include <tools/unqidx.hxx> #include <tools/ref.hxx> #include <tools/rtti.hxx> #include <tools/stream.hxx> #include <map> +#include <unordered_map> #define ERRCODE_IO_NOFACTORY ERRCODE_IO_WRONGFORMAT @@ -38,7 +38,7 @@ typedef void * (*SvCreateInstancePersist)( SvPersistBase ** ); class TOOLS_DLLPUBLIC SvClassManager { - typedef boost::unordered_map<sal_Int32, SvCreateInstancePersist> Map; + typedef std::unordered_map<sal_Int32, SvCreateInstancePersist> Map; Map aAssocTable; public: diff --git a/include/unotools/atom.hxx b/include/unotools/atom.hxx index 871085199881..96f1574ecae1 100644 --- a/include/unotools/atom.hxx +++ b/include/unotools/atom.hxx @@ -22,11 +22,11 @@ #include <unotools/unotoolsdllapi.h> #include <rtl/ustring.hxx> #include <osl/mutex.hxx> +#include <com/sun/star/util/XAtomServer.hpp> #include <cppuhelper/implbase1.hxx> - -#include <boost/unordered_map.hpp> +#include <boost/functional/hash.hpp> #include <list> -#include <com/sun/star/util/XAtomServer.hpp> +#include <unordered_map> #define INVALID_ATOM 0 @@ -41,8 +41,8 @@ namespace utl { class AtomProvider { int m_nAtoms; - ::boost::unordered_map< int, OUString, ::boost::hash< int > > m_aStringMap; - ::boost::unordered_map< OUString, int, OUStringHash > m_aAtomMap; + std::unordered_map< int, OUString, ::boost::hash< int > > m_aStringMap; + std::unordered_map< OUString, int, OUStringHash > m_aAtomMap; public: AtomProvider(); ~AtomProvider(); @@ -53,7 +53,7 @@ namespace utl { class UNOTOOLS_DLLPUBLIC MultiAtomProvider { - ::boost::unordered_map< int, AtomProvider*, ::boost::hash< int > > m_aAtomLists; + std::unordered_map< int, AtomProvider*, ::boost::hash< int > > m_aAtomLists; public: MultiAtomProvider(); ~MultiAtomProvider(); diff --git a/include/unotools/eventcfg.hxx b/include/unotools/eventcfg.hxx index 347cc67a1fea..7185aef49695 100644 --- a/include/unotools/eventcfg.hxx +++ b/include/unotools/eventcfg.hxx @@ -26,7 +26,7 @@ #include <com/sun/star/frame/XFrame.hpp> #include <cppuhelper/weakref.hxx> #include <cppuhelper/implbase2.hxx> -#include <boost/unordered_map.hpp> +#include <unordered_map> #include <vector> #define STR_EVENT_STARTAPP 0 @@ -58,9 +58,9 @@ #define STR_EVENT_MODECHANGED 26 #define STR_EVENT_STORAGECHANGED 27 -typedef ::boost::unordered_map< OUString, OUString, OUStringHash, ::std::equal_to< OUString > > EventBindingHash; -typedef ::std::vector< ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XFrame > > FrameVector; -typedef ::std::vector< OUString > SupportedEventsVector; +typedef std::unordered_map< OUString, OUString, OUStringHash, std::equal_to< OUString > > EventBindingHash; +typedef std::vector< css::uno::WeakReference< css::frame::XFrame > > FrameVector; +typedef std::vector< OUString > SupportedEventsVector; class GlobalEventConfig_Impl : public utl::ConfigItem { diff --git a/include/unotools/fontcfg.hxx b/include/unotools/fontcfg.hxx index 6b843a13fde5..37bf896837ae 100644 --- a/include/unotools/fontcfg.hxx +++ b/include/unotools/fontcfg.hxx @@ -27,8 +27,8 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/container/XNameAccess.hpp> -#include <boost/unordered_map.hpp> -#include <boost/unordered_set.hpp> +#include <unordered_map> +#include <unordered_set> #include <vector> namespace utl @@ -50,7 +50,7 @@ class UNOTOOLS_DLLPUBLIC DefaultFontConfiguration mutable com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > xAccess; }; - boost::unordered_map< OUString, LocaleAccess, OUStringHash > m_aConfig; + std::unordered_map< OUString, LocaleAccess, OUStringHash > m_aConfig; OUString tryLocale( const OUString& rBcp47, const OUString& rType ) const; @@ -153,8 +153,8 @@ private: LocaleSubst() : bConfigRead( false ) {} }; - boost::unordered_map< OUString, LocaleSubst, OUStringHash > m_aSubst; - typedef boost::unordered_set< OUString, OUStringHash > UniqueSubstHash; + std::unordered_map< OUString, LocaleSubst, OUStringHash > m_aSubst; + typedef std::unordered_set< OUString, OUStringHash > UniqueSubstHash; mutable UniqueSubstHash maSubstHash; void fillSubstVector( const com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > xFont, diff --git a/include/unotools/mediadescriptor.hxx b/include/unotools/mediadescriptor.hxx index 35f839c1da10..e88b20d1f8fc 100644 --- a/include/unotools/mediadescriptor.hxx +++ b/include/unotools/mediadescriptor.hxx @@ -39,7 +39,7 @@ namespace utl { /** @short can be used to work with a ::com::sun::star::document::MediaDescriptor struct. - @descr It wraps a ::boost::unordered_map around the Sequence< css::beans::PropertyValue >, which + @descr It wraps a 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/include/vbahelper/vbaeventshelperbase.hxx b/include/vbahelper/vbaeventshelperbase.hxx index 8641f067c334..c94ae3c95047 100644 --- a/include/vbahelper/vbaeventshelperbase.hxx +++ b/include/vbahelper/vbaeventshelperbase.hxx @@ -22,7 +22,7 @@ #include <deque> #include <map> -#include <boost/unordered_map.hpp> +#include <unordered_map> #include <com/sun/star/document/XEventListener.hpp> #include <com/sun/star/script/vba/XVBAEventProcessor.hpp> #include <com/sun/star/util/XChangesListener.hpp> @@ -169,8 +169,8 @@ protected: SfxObjectShell* mpShell; private: - typedef ::std::map< sal_Int32, EventHandlerInfo > EventHandlerInfoMap; - typedef boost::unordered_map< OUString, ModulePathMap, OUStringHash > EventHandlerPathMap; + typedef std::map< sal_Int32, EventHandlerInfo > EventHandlerInfoMap; + typedef std::unordered_map< OUString, ModulePathMap, OUStringHash > EventHandlerPathMap; EventHandlerInfoMap maEventInfos; EventHandlerPathMap maEventPaths; diff --git a/include/vcl/configsettings.hxx b/include/vcl/configsettings.hxx index ae0c0e28e25c..b721f25ea380 100644 --- a/include/vcl/configsettings.hxx +++ b/include/vcl/configsettings.hxx @@ -24,14 +24,11 @@ #include <unotools/configitem.hxx> #include <vcl/dllapi.h> -#include <boost/unordered_map.hpp> - +#include <unordered_map> namespace vcl { - - - typedef boost::unordered_map< OUString, OUString, OUStringHash > OUStrMap; + typedef std::unordered_map< OUString, OUString, OUStringHash > OUStrMap; class SmallOUStrMap : public OUStrMap { public: SmallOUStrMap() : OUStrMap(1) {} }; @@ -39,8 +36,7 @@ namespace vcl class VCL_DLLPUBLIC SettingsConfigItem : public ::utl::ConfigItem { - - boost::unordered_map< OUString, SmallOUStrMap, OUStringHash > m_aSettings; + std::unordered_map< OUString, SmallOUStrMap, OUStringHash > m_aSettings; virtual void Notify( const com::sun::star::uno::Sequence< OUString >& rPropertyNames ) SAL_OVERRIDE; diff --git a/include/vcl/lazydelete.hxx b/include/vcl/lazydelete.hxx index 5196117a9315..531d64051e8b 100644 --- a/include/vcl/lazydelete.hxx +++ b/include/vcl/lazydelete.hxx @@ -22,8 +22,8 @@ #include <vcl/dllapi.h> +#include <unordered_map> #include <vector> -#include <boost/unordered_map.hpp> #include <algorithm> #if OSL_DEBUG_LEVEL > 2 @@ -116,7 +116,7 @@ namespace vcl }; std::vector< DeleteObjectEntry > m_aObjects; - typedef boost::unordered_map< sal_IntPtr, unsigned int > PtrToIndexMap; + typedef std::unordered_map< sal_IntPtr, unsigned int > PtrToIndexMap; PtrToIndexMap m_aPtrToIndex; /** strict weak ordering function to bring objects to be destroyed lazily diff --git a/include/vcl/opengl/OpenGLContext.hxx b/include/vcl/opengl/OpenGLContext.hxx index bab85c2fed6f..b93c12cc17fd 100644 --- a/include/vcl/opengl/OpenGLContext.hxx +++ b/include/vcl/opengl/OpenGLContext.hxx @@ -51,7 +51,6 @@ class NSOpenGLView; #include <vcl/vclopengl_dllapi.hxx> #include <boost/scoped_ptr.hpp> -#include <boost/unordered_map.hpp> #include <boost/ptr_container/ptr_map.hpp> #include <vcl/window.hxx> #include <tools/gen.hxx> diff --git a/include/vcl/ppdparser.hxx b/include/vcl/ppdparser.hxx index ddd18622e823..c9a10efcf5a9 100644 --- a/include/vcl/ppdparser.hxx +++ b/include/vcl/ppdparser.hxx @@ -20,8 +20,8 @@ #define INCLUDED_VCL_PPDPARSER_HXX #include <list> +#include <unordered_map> #include <vector> -#include <boost/unordered_map.hpp> #include <tools/stream.hxx> #include <rtl/string.hxx> @@ -62,8 +62,8 @@ class VCL_DLLPUBLIC PPDKey { friend class PPDParser; - typedef ::boost::unordered_map< OUString, PPDValue, OUStringHash > hash_type; - typedef ::std::vector< PPDValue* > value_type; + typedef std::unordered_map< OUString, PPDValue, OUStringHash > hash_type; + typedef std::vector< PPDValue* > value_type; OUString m_aKey; hash_type m_aValues; @@ -126,8 +126,8 @@ class VCL_DLLPUBLIC PPDParser friend class CUPSManager; friend class PPDCache; - typedef ::boost::unordered_map< OUString, PPDKey*, OUStringHash > hash_type; - typedef ::std::vector< PPDKey* > value_type; + typedef std::unordered_map< OUString, PPDKey*, OUStringHash > hash_type; + typedef std::vector< PPDKey* > value_type; void insertKey( const OUString& rKey, PPDKey* pKey ); public: @@ -268,7 +268,7 @@ public: class VCL_DLLPUBLIC PPDContext { - typedef ::boost::unordered_map< const PPDKey*, const PPDValue*, PPDKeyhash > hash_type; + typedef std::unordered_map< const PPDKey*, const PPDValue*, PPDKeyhash > hash_type; hash_type m_aCurrentValues; const PPDParser* m_pParser; diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index 99d781e60f30..3a9ad1d3c236 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -36,8 +36,8 @@ #include <com/sun/star/view/PrintableState.hpp> #include <boost/shared_ptr.hpp> -#include <boost/unordered_map.hpp> #include <set> +#include <unordered_map> class SalInfoPrinter; struct SalPrinterQueueInfo; @@ -569,7 +569,7 @@ public: class VCL_DLLPUBLIC PrinterOptionsHelper { protected: - boost::unordered_map< OUString, css::uno::Any, OUStringHash > m_aPropertyMap; + std::unordered_map< OUString, css::uno::Any, OUStringHash > m_aPropertyMap; css::uno::Sequence< css::beans::PropertyValue > m_aUIProperties; public: diff --git a/include/vcl/printerinfomanager.hxx b/include/vcl/printerinfomanager.hxx index 66d5d282f23a..d99afbe1d7c6 100644 --- a/include/vcl/printerinfomanager.hxx +++ b/include/vcl/printerinfomanager.hxx @@ -20,8 +20,8 @@ #ifndef INCLUDED_VCL_PRINTERINFOMANAGER_HXX #define INCLUDED_VCL_PRINTERINFOMANAGER_HXX -#include <boost/unordered_map.hpp> #include <list> +#include <unordered_map> #include <vcl/dllapi.h> #include <vcl/helper.hxx> @@ -97,7 +97,7 @@ protected: PrinterInfo m_aInfo; }; - boost::unordered_map< OUString, Printer, OUStringHash > m_aPrinters; + std::unordered_map< OUString, Printer, OUStringHash > m_aPrinters; PrinterInfo m_aGlobalDefaults; std::list< WatchFile > m_aWatchFiles; OUString m_aDefaultPrinter; diff --git a/include/xmloff/nmspmap.hxx b/include/xmloff/nmspmap.hxx index 70913f893391..e72be961c891 100644 --- a/include/xmloff/nmspmap.hxx +++ b/include/xmloff/nmspmap.hxx @@ -23,12 +23,12 @@ #include <sal/config.h> #include <map> +#include <unordered_map> #include <utility> #include <xmloff/dllapi.h> #include <sal/types.h> #include <rtl/ustring.hxx> -#include <boost/unordered_map.hpp> #include <rtl/ref.hxx> #include <cppuhelper/weak.hxx> @@ -67,9 +67,9 @@ struct QNamePairHash } }; -typedef ::boost::unordered_map < QNamePair, OUString, QNamePairHash > QNameCache; -typedef ::boost::unordered_map < OUString, ::rtl::Reference <NameSpaceEntry >, OUStringHash > NameSpaceHash; -typedef ::std::map < sal_uInt16, ::rtl::Reference < NameSpaceEntry >, uInt32lt > NameSpaceMap; +typedef std::unordered_map < QNamePair, OUString, QNamePairHash > QNameCache; +typedef std::unordered_map < OUString, ::rtl::Reference <NameSpaceEntry >, OUStringHash > NameSpaceHash; +typedef std::map < sal_uInt16, ::rtl::Reference < NameSpaceEntry >, uInt32lt > NameSpaceMap; class XMLOFF_DLLPUBLIC SvXMLNamespaceMap { diff --git a/include/xmloff/prstylei.hxx b/include/xmloff/prstylei.hxx index 3a94650d00af..6f85fb1af756 100644 --- a/include/xmloff/prstylei.hxx +++ b/include/xmloff/prstylei.hxx @@ -27,7 +27,7 @@ #include <xmloff/xmlstyle.hxx> //UUUU -#include <boost/unordered_set.hpp> +#include <unordered_set> struct XMLPropertyState; class SvXMLStylesContext; @@ -37,7 +37,7 @@ namespace com { namespace sun { namespace star { } } } //UUUU -typedef boost::unordered_set<OUString, OUStringHash> OldFillStyleDefinitionSet; +typedef std::unordered_set<OUString, OUStringHash> OldFillStyleDefinitionSet; class XMLOFF_DLLPUBLIC XMLPropStyleContext : public SvXMLStyleContext { diff --git a/io/source/acceptor/acc_socket.cxx b/io/source/acceptor/acc_socket.cxx index d98e79c3b076..830a9b36375d 100644 --- a/io/source/acceptor/acc_socket.cxx +++ b/io/source/acceptor/acc_socket.cxx @@ -19,8 +19,8 @@ #include "acceptor.hxx" -#include <boost/unordered_set.hpp> #include <algorithm> +#include <unordered_set> #include <osl/mutex.hxx> #include <rtl/ustrbuf.hxx> @@ -57,7 +57,7 @@ namespace io_acceptor { }; - typedef ::boost::unordered_set< ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>, + typedef std::unordered_set< ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>, ReferenceHash< ::com::sun::star::io::XStreamListener>, ReferenceEqual< ::com::sun::star::io::XStreamListener> > XStreamListener_hash_set; diff --git a/io/source/connector/connector.hxx b/io/source/connector/connector.hxx index cf24e18c9cda..8c439ad5e28e 100644 --- a/io/source/connector/connector.hxx +++ b/io/source/connector/connector.hxx @@ -26,7 +26,7 @@ #include <com/sun/star/connection/XConnection.hpp> #include <com/sun/star/connection/XConnectionBroadcaster.hpp> -#include <boost/unordered_set.hpp> +#include <unordered_set> #include <osl/socket.hxx> #include <osl/pipe.hxx> @@ -51,7 +51,7 @@ namespace stoc_connector } }; - typedef ::boost::unordered_set< ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>, + typedef std::unordered_set< ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>, ReferenceHash< ::com::sun::star::io::XStreamListener>, ReferenceEqual< ::com::sun::star::io::XStreamListener> > XStreamListener_hash_set; diff --git a/io/source/stm/odata.cxx b/io/source/stm/odata.cxx index 41ecd1193b2e..358d226c9e79 100644 --- a/io/source/stm/odata.cxx +++ b/io/source/stm/odata.cxx @@ -17,9 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <boost/unordered_map.hpp> -#include <vector> #include <string.h> +#include <unordered_map> +#include <vector> #include <cppuhelper/weak.hxx> #include <cppuhelper/factory.hxx> @@ -912,7 +912,7 @@ struct hashObjectContainer_Impl } }; -typedef boost::unordered_map +typedef std::unordered_map < Reference< XInterface >, sal_Int32, diff --git a/l10ntools/inc/cfgmerge.hxx b/l10ntools/inc/cfgmerge.hxx index 1eb5f55a2e58..868b01dd0983 100644 --- a/l10ntools/inc/cfgmerge.hxx +++ b/l10ntools/inc/cfgmerge.hxx @@ -23,12 +23,11 @@ #include "sal/config.h" #include <fstream> +#include <unordered_map> #include <vector> - -#include "boost/unordered_map.hpp" #include "po.hxx" -typedef boost::unordered_map<OString, OString, OStringHash> OStringHashMap; +typedef std::unordered_map<OString, OString, OStringHash> OStringHashMap; diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx index 20102930c93c..f625b30a1ac8 100644 --- a/l10ntools/inc/export.hxx +++ b/l10ntools/inc/export.hxx @@ -29,9 +29,9 @@ #include <osl/file.hxx> #include <osl/file.h> -#include <boost/unordered_map.hpp> #include <iterator> #include <set> +#include <unordered_map> #include <vector> #include <queue> #include <string> @@ -46,10 +46,10 @@ class MergeEntrys; -typedef boost::unordered_map<OString, OString, OStringHash> +typedef std::unordered_map<OString, OString, OStringHash> OStringHashMap; -typedef boost::unordered_map<OString, bool, OStringHash> +typedef std::unordered_map<OString, bool, OStringHash> OStringBoolHashMap; #define SOURCE_LANGUAGE "en-US" @@ -247,7 +247,7 @@ class MergeData; class MergeDataHashMap { private: - typedef boost::unordered_map<OString, MergeData*, OStringHash> HashMap_t; + typedef std::unordered_map<OString, MergeData*, OStringHash> HashMap_t; public: MergeDataHashMap():bFirstSearch(true){}; diff --git a/l10ntools/inc/xmlparse.hxx b/l10ntools/inc/xmlparse.hxx index bca92c1c726e..474bee685f95 100644 --- a/l10ntools/inc/xmlparse.hxx +++ b/l10ntools/inc/xmlparse.hxx @@ -32,8 +32,8 @@ #include <rtl/string.hxx> #include <rtl/strbuf.hxx> -#include "boost/unordered_map.hpp" #include "export.hxx" +#include <unordered_map> class XMLParentNode; class XMLElement; @@ -135,13 +135,13 @@ public: }; /// Mapping numeric Language code <-> XML Element -typedef boost::unordered_map<OString, XMLElement*, OStringHash> LangHashMap; +typedef std::unordered_map<OString, XMLElement*, OStringHash> LangHashMap; /// Mapping XML Element string identifier <-> Language Map -typedef boost::unordered_map<OString, LangHashMap*, OStringHash> XMLHashMap; +typedef std::unordered_map<OString, LangHashMap*, OStringHash> XMLHashMap; /// Mapping XML tag names <-> have localizable strings -typedef boost::unordered_map<OString, sal_Bool, OStringHash> TagMap; +typedef std::unordered_map<OString, sal_Bool, OStringHash> TagMap; /** Holds information of a XML file, is root node of tree */ diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx index 7411c55b89da..dd31a3a04d52 100644 --- a/l10ntools/source/helpmerge.cxx +++ b/l10ntools/source/helpmerge.cxx @@ -21,6 +21,7 @@ #include <fstream> #include <functional> +#include <memory> #include <osl/file.hxx> #include <sal/log.hxx> diff --git a/linguistic/source/convdic.hxx b/linguistic/source/convdic.hxx index 9831557a4327..73948f20b57a 100644 --- a/linguistic/source/convdic.hxx +++ b/linguistic/source/convdic.hxx @@ -26,9 +26,9 @@ #include <cppuhelper/implbase4.hxx> #include <cppuhelper/interfacecontainer.h> -#include <boost/unordered_map.hpp> -#include <set> #include <memory> +#include <set> +#include <unordered_map> #include "linguistic/misc.hxx" #include "defs.hxx" @@ -57,12 +57,12 @@ struct StrEQ } }; -typedef boost::unordered_multimap< const OUString, OUString, +typedef std::unordered_multimap< const OUString, OUString, const OUStringHash, StrEQ > ConvMap; typedef std::set< OUString, StrLT > ConvMapKeySet; -typedef boost::unordered_multimap< const OUString, sal_Int16, +typedef std::unordered_multimap< const OUString, sal_Int16, OUStringHash, StrEQ > PropTypeMap; diff --git a/lotuswordpro/source/filter/lwpfoundry.hxx b/lotuswordpro/source/filter/lwpfoundry.hxx index 51fbf50e1aea..b0d9af4b552a 100644 --- a/lotuswordpro/source/filter/lwpfoundry.hxx +++ b/lotuswordpro/source/filter/lwpfoundry.hxx @@ -72,6 +72,7 @@ #include "lwpbasetype.hxx" #include "lwpfont.hxx" #include "lwpdropcapmgr.hxx" +#include <unordered_map> class LwpDocument; class LwpBookMark; @@ -309,7 +310,7 @@ private: } }; - typedef boost::unordered_map<LwpObjectID, IXFStyle*, hashFunc, eqFunc> LwpStyleMap; + typedef std::unordered_map<LwpObjectID, IXFStyle*, hashFunc, eqFunc> LwpStyleMap; LwpStyleMap m_StyleList; public: void SetFoundry(LwpFoundry* pFoundry){m_pFoundry = pFoundry;} diff --git a/lotuswordpro/source/filter/lwpheader.hxx b/lotuswordpro/source/filter/lwpheader.hxx index b09ce259254d..0643a9918209 100644 --- a/lotuswordpro/source/filter/lwpheader.hxx +++ b/lotuswordpro/source/filter/lwpheader.hxx @@ -63,10 +63,9 @@ #include <config_lgpl.h> #include <math.h> -#include <vector> #include <memory> -#include <boost/unordered_map.hpp> #include <map> +#include <vector> #include <assert.h> #include <string> diff --git a/lotuswordpro/source/filter/lwpobjfactory.hxx b/lotuswordpro/source/filter/lwpobjfactory.hxx index 1819db3819f9..4feab65239a3 100644 --- a/lotuswordpro/source/filter/lwpobjfactory.hxx +++ b/lotuswordpro/source/filter/lwpobjfactory.hxx @@ -75,6 +75,8 @@ #include "lwpobjhdr.hxx" #include "lwpidxmgr.hxx" +#include <unordered_map> + /** * @brief object factory used for lwp object creation and maintenance */ @@ -105,7 +107,7 @@ private: return(rKey1==rKey2); } }; - typedef boost::unordered_map<LwpObjectID, rtl::Reference<LwpObject>, hashFunc, eqFunc> LwpIdToObjMap; + typedef std::unordered_map<LwpObjectID, rtl::Reference<LwpObject>, hashFunc, eqFunc> LwpIdToObjMap; LwpIdToObjMap m_IdToObjList; LwpIndexManager m_IndexMgr; void ClearObjectMap(); diff --git a/oox/inc/drawingml/customshapeproperties.hxx b/oox/inc/drawingml/customshapeproperties.hxx index ff80b5265589..d5fbd88a047d 100644 --- a/oox/inc/drawingml/customshapeproperties.hxx +++ b/oox/inc/drawingml/customshapeproperties.hxx @@ -21,7 +21,7 @@ #define INCLUDED_OOX_DRAWINGML_CUSTOMSHAPEPROPERTIES_HXX #include <boost/shared_ptr.hpp> -#include <boost/unordered_map.hpp> +#include <unordered_map> #include <vector> #include <map> #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp> @@ -154,7 +154,7 @@ private: bool mbMirroredY; sal_Int32 mnTextRotateAngle; - typedef boost::unordered_map< sal_Int32, PropertyMap > PresetDataMap; + typedef std::unordered_map< sal_Int32, PropertyMap > PresetDataMap; static PresetDataMap maPresetDataMap; static void initializePresetDataMap(); diff --git a/oox/inc/pch/precompiled_oox.hxx b/oox/inc/pch/precompiled_oox.hxx index d0acc055bb92..6b6d99129ee9 100644 --- a/oox/inc/pch/precompiled_oox.hxx +++ b/oox/inc/pch/precompiled_oox.hxx @@ -34,8 +34,6 @@ #include <boost/noncopyable.hpp> #include <boost/optional.hpp> #include <boost/scoped_ptr.hpp> -#include <boost/unordered_map.hpp> -#include <boost/unordered_set.hpp> #include <boost/utility.hpp> #include <cassert> #include <com/sun/star/animations/AnimationCalcMode.hpp> @@ -409,6 +407,8 @@ #include <tools/multisel.hxx> #include <tools/stream.hxx> #include <tools/time.hxx> +#include <unordered_map> +#include <unordered_set> #include <unotools/docinfohelper.hxx> #include <unotools/fltrcfg.hxx> #include <unotools/fontcvt.hxx> diff --git a/oox/source/drawingml/customshapegeometry.cxx b/oox/source/drawingml/customshapegeometry.cxx index 9d6db8f5852f..b8857c02b9cb 100644 --- a/oox/source/drawingml/customshapegeometry.cxx +++ b/oox/source/drawingml/customshapegeometry.cxx @@ -22,10 +22,10 @@ #include <com/sun/star/xml/sax/FastToken.hpp> #include <osl/diagnose.h> -#include <boost/unordered_map.hpp> #include "oox/helper/helper.hxx" #include "oox/helper/attributelist.hxx" #include "oox/helper/propertymap.hxx" +#include <unordered_map> using namespace ::oox::core; using namespace ::com::sun::star::uno; @@ -84,7 +84,7 @@ static const FormularCommandNameTable pFormularCommandNameTable[] = { "val", FC_VAL } }; -typedef boost::unordered_map< OUString, FormularCommand, OUStringHash > FormulaCommandHMap; +typedef std::unordered_map< OUString, FormularCommand, OUStringHash > FormulaCommandHMap; static const FormulaCommandHMap* pCommandHashMap; diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index 56d6c1f02a42..727d3072fea9 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -88,7 +88,7 @@ #include <xmloff/SchXMLSeriesHelper.hxx> #include "ColorPropertySet.hxx" #include <set> -#include <boost/unordered_set.hpp> +#include <unordered_set> #include <rtl/math.hxx> @@ -2543,7 +2543,7 @@ struct LabelPlacementParam bool mbExport; sal_Int32 meDefault; - boost::unordered_set<sal_Int32> maAllowedValues; + std::unordered_set<sal_Int32> maAllowedValues; LabelPlacementParam() : mbExport(true), diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx index 35266360edf1..71968b91ade9 100644 --- a/oox/source/export/shapes.cxx +++ b/oox/source/export/shapes.cxx @@ -748,7 +748,7 @@ ShapeExport& ShapeExport::WriteRectangleShape( Reference< XShape > xShape ) } typedef ShapeExport& (ShapeExport::*ShapeConverter)( Reference< XShape > ); -typedef boost::unordered_map< const char*, ShapeConverter, rtl::CStringHash, rtl::CStringEqual> NameToConvertMapType; +typedef std::unordered_map< const char*, ShapeConverter, rtl::CStringHash, rtl::CStringEqual> NameToConvertMapType; static const NameToConvertMapType& lcl_GetConverters(DrawingML::DocumentType eDocumentType) { diff --git a/oox/source/ole/vbacontrol.cxx b/oox/source/ole/vbacontrol.cxx index ddfb303035d0..b59094f916f0 100644 --- a/oox/source/ole/vbacontrol.cxx +++ b/oox/source/ole/vbacontrol.cxx @@ -37,7 +37,7 @@ #include "oox/helper/storagebase.hxx" #include "oox/helper/textinputstream.hxx" #include "oox/ole/vbahelper.hxx" -#include <boost/unordered_map.hpp> +#include <unordered_map> namespace oox { namespace ole { @@ -419,7 +419,7 @@ void VbaFormControl::importStorage( StorageBase& rStrg, const AxClassTable& rCla BinaryXInputStream aXStrm( rStrg.openInputStream( "x" ), true ); pMultiPage->importPageAndMultiPageProperties( aXStrm, maControls.size() ); } - typedef boost::unordered_map< sal_uInt32, ::boost::shared_ptr< VbaFormControl > > IdToPageMap; + typedef std::unordered_map< sal_uInt32, ::boost::shared_ptr< VbaFormControl > > IdToPageMap; IdToPageMap idToPage; VbaFormControlVector::iterator it = maControls.begin(); VbaFormControlVector::iterator it_end = maControls.end(); diff --git a/oox/source/ole/vbamodule.cxx b/oox/source/ole/vbamodule.cxx index 15291b80055e..8a0c83e175a1 100644 --- a/oox/source/ole/vbamodule.cxx +++ b/oox/source/ole/vbamodule.cxx @@ -18,7 +18,6 @@ */ #include "oox/ole/vbamodule.hxx" -#include <boost/unordered_map.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/script/ModuleInfo.hpp> diff --git a/package/inc/HashMaps.hxx b/package/inc/HashMaps.hxx index 55b1c183ecd9..a8855090fc47 100644 --- a/package/inc/HashMaps.hxx +++ b/package/inc/HashMaps.hxx @@ -21,7 +21,7 @@ #include <ZipEntry.hxx> #include <rtl/ref.hxx> -#include <boost/unordered_map.hpp> +#include <unordered_map> struct eqFunc { @@ -37,17 +37,17 @@ namespace com { namespace sun { namespace star { namespace packages { class ContentInfo; } } } } -typedef boost::unordered_map < OUString, +typedef std::unordered_map < OUString, ZipPackageFolder *, OUStringHash, eqFunc > FolderHash; -typedef boost::unordered_map < OUString, +typedef std::unordered_map < OUString, rtl::Reference < com::sun::star::packages::ContentInfo >, OUStringHash, eqFunc > ContentHash; -typedef boost::unordered_map < OUString, +typedef std::unordered_map < OUString, ZipEntry, OUStringHash, eqFunc > EntryHash; diff --git a/package/source/manifest/ManifestImport.hxx b/package/source/manifest/ManifestImport.hxx index 4f2815d9bc34..965a33b3953a 100644 --- a/package/source/manifest/ManifestImport.hxx +++ b/package/source/manifest/ManifestImport.hxx @@ -32,7 +32,7 @@ namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } } -typedef ::boost::unordered_map< OUString, OUString, OUStringHash, eqFunc > StringHashMap; +typedef std::unordered_map< OUString, OUString, OUStringHash, eqFunc > StringHashMap; struct ManifestScopeEntry { diff --git a/package/source/xstor/ohierarchyholder.hxx b/package/source/xstor/ohierarchyholder.hxx index 75aa3477c7b9..d680b434dd6a 100644 --- a/package/source/xstor/ohierarchyholder.hxx +++ b/package/source/xstor/ohierarchyholder.hxx @@ -29,8 +29,8 @@ #include <rtl/ref.hxx> -#include <boost/unordered_map.hpp> #include <list> +#include <unordered_map> #include <vector> struct OHierarchyElement_Impl; @@ -43,7 +43,7 @@ struct eqFunc return r1 == r2; } }; -typedef ::boost::unordered_map< OUString, +typedef std::unordered_map< OUString, ::rtl::Reference< OHierarchyElement_Impl >, OUStringHash, eqFunc > OHierarchyElementList_Impl; diff --git a/package/source/zippackage/ZipPackageFolderEnumeration.hxx b/package/source/zippackage/ZipPackageFolderEnumeration.hxx index 4be55b29abd3..569714665509 100644 --- a/package/source/zippackage/ZipPackageFolderEnumeration.hxx +++ b/package/source/zippackage/ZipPackageFolderEnumeration.hxx @@ -34,7 +34,7 @@ protected: ContentHash& rContents; ContentHash::const_iterator aIterator; public: - //ZipPackageFolderEnumeration (boost::unordered_map < OUString, com::sun::star::uno::Reference < com::sun::star::container::XNamed >, hashFunc, eqFunc > &rInput); + //ZipPackageFolderEnumeration (unordered_map < OUString, com::sun::star::uno::Reference < com::sun::star::container::XNamed >, hashFunc, eqFunc > &rInput); ZipPackageFolderEnumeration (ContentHash &rInput); virtual ~ZipPackageFolderEnumeration( void ); diff --git a/pyuno/source/module/pyuno_impl.hxx b/pyuno/source/module/pyuno_impl.hxx index 0060a186a7a3..83fbda5206cb 100644 --- a/pyuno/source/module/pyuno_impl.hxx +++ b/pyuno/source/module/pyuno_impl.hxx @@ -33,8 +33,8 @@ #include <pyuno/pyuno.hxx> -#include <boost/unordered_map.hpp> -#include <boost/unordered_set.hpp> +#include <unordered_map> +#include <unordered_set> #include <com/sun/star/beans/XIntrospection.hpp> #include <com/sun/star/script/XTypeConverter.hpp> @@ -163,7 +163,7 @@ static const sal_Int32 VAL2STR_MODE_SHALLOW = 1; OUString val2str( const void * pVal, typelib_TypeDescriptionReference * pTypeRef, sal_Int32 mode = VAL2STR_MODE_DEEP ); -typedef ::boost::unordered_map +typedef std::unordered_map < PyRef, com::sun::star::uno::WeakReference< com::sun::star::script::XInvocation >, @@ -172,7 +172,7 @@ typedef ::boost::unordered_map > PyRef2Adapter; -typedef ::boost::unordered_map +typedef std::unordered_map < OUString, PyRef, @@ -180,7 +180,7 @@ OUStringHash, std::equal_to<OUString> > ExceptionClassMap; -typedef ::boost::unordered_map +typedef std::unordered_map < OUString, com::sun::star::uno::Sequence< sal_Int16 >, @@ -188,7 +188,7 @@ typedef ::boost::unordered_map std::equal_to< OUString > > MethodOutIndexMap; -typedef ::boost::unordered_set< PyRef , PyRef::Hash , std::equal_to<PyRef> > ClassSet; +typedef std::unordered_set< PyRef , PyRef::Hash , std::equal_to<PyRef> > ClassSet; int PyUNO_initType(); diff --git a/pyuno/source/module/pyuno_module.cxx b/pyuno/source/module/pyuno_module.cxx index c2ca67b28bac..a214062c6a41 100644 --- a/pyuno/source/module/pyuno_module.cxx +++ b/pyuno/source/module/pyuno_module.cxx @@ -22,7 +22,7 @@ #include "pyuno_impl.hxx" -#include <boost/unordered_map.hpp> +#include <unordered_map> #include <utility> #include <osl/module.hxx> @@ -84,7 +84,7 @@ class fillStructState // Keyword arguments used PyObject *used; // Which structure members are initialised - boost::unordered_map <const OUString, bool, OUStringHash> initialised; + std::unordered_map <const OUString, bool, OUStringHash> initialised; // How many positional arguments are consumed // This is always the so-many first ones sal_Int32 nPosConsumed; diff --git a/registry/source/regimpl.hxx b/registry/source/regimpl.hxx index 3b306c06e98c..f05dd1e9f5ea 100644 --- a/registry/source/regimpl.hxx +++ b/registry/source/regimpl.hxx @@ -21,7 +21,7 @@ #define INCLUDED_REGISTRY_SOURCE_REGIMPL_HXX #include <set> -#include <boost/unordered_map.hpp> +#include <unordered_map> #include <registry/registry.h> #include <rtl/ustring.hxx> @@ -156,7 +156,7 @@ private: const OUString& sName, sal_Int16 nSpace) const; - typedef boost::unordered_map< OUString, ORegKey*, OUStringHash > KeyMap; + typedef std::unordered_map< OUString, ORegKey*, OUStringHash > KeyMap; sal_uInt32 m_refCount; osl::Mutex m_mutex; diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx b/reportdesign/source/core/sdr/UndoEnv.cxx index e1efd7a3ee9c..bb9287f690a0 100644 --- a/reportdesign/source/core/sdr/UndoEnv.cxx +++ b/reportdesign/source/core/sdr/UndoEnv.cxx @@ -72,7 +72,7 @@ struct PropertyInfo } }; -typedef ::boost::unordered_map< OUString, PropertyInfo, OUStringHash > PropertiesInfo; +typedef std::unordered_map< OUString, PropertyInfo, OUStringHash > PropertiesInfo; struct ObjectInfo { diff --git a/rsc/inc/rschash.hxx b/rsc/inc/rschash.hxx index 9eced4737414..898969e7c14c 100644 --- a/rsc/inc/rschash.hxx +++ b/rsc/inc/rschash.hxx @@ -21,7 +21,7 @@ #include <sal/types.h> #include <rtl/string.hxx> -#include <boost/unordered_map.hpp> +#include <unordered_map> typedef sal_uInt32 Atom; @@ -30,8 +30,8 @@ typedef sal_uInt32 Atom; class AtomContainer { Atom m_nNextID; - boost::unordered_map< OString, Atom, OStringHash > m_aStringToID; - boost::unordered_map< Atom, OString > m_aIDToString; + std::unordered_map< OString, Atom, OStringHash > m_aStringToID; + std::unordered_map< Atom, OString > m_aIDToString; public: AtomContainer(); diff --git a/rsc/inc/rsclex.hxx b/rsc/inc/rsclex.hxx index 46cd468a7d84..70fda227f10f 100644 --- a/rsc/inc/rsclex.hxx +++ b/rsc/inc/rsclex.hxx @@ -20,14 +20,14 @@ #ifndef INCLUDED_RSC_INC_RSCLEX_HXX #define INCLUDED_RSC_INC_RSCLEX_HXX -#include <boost/unordered_set.hpp> #include <rtl/strbuf.hxx> #include <rtl/string.hxx> +#include <unordered_set> // a buffer for unique strings class StringContainer { - boost::unordered_set< OString, OStringHash > m_aStrings; + std::unordered_set< OString, OStringHash > m_aStrings; public: StringContainer() {} ~StringContainer() {} diff --git a/rsc/source/parser/rscibas.cxx b/rsc/source/parser/rscibas.cxx index 92babd05fd3a..3836b4748d3e 100644 --- a/rsc/source/parser/rscibas.cxx +++ b/rsc/source/parser/rscibas.cxx @@ -43,7 +43,7 @@ #include <rsclex.hxx> #include <rscyacc.hxx> -#include <boost/unordered_map.hpp> +#include <unordered_map> void RscTypCont::SETCONST( RscConst * pClass, const char * szString, sal_uInt32 nVal ) { @@ -64,7 +64,7 @@ void RscTypCont::SETCONST( RscConst * pClass, Atom nName, sal_uInt32 nVal ) } -typedef boost::unordered_map< OString, sal_uInt32, OStringHash > langmap; +typedef std::unordered_map< OString, sal_uInt32, OStringHash > langmap; static langmap ULong_Iso_map; sal_uInt32 GetLangId(const OString &rLang) diff --git a/rsc/source/parser/rsclex.cxx b/rsc/source/parser/rsclex.cxx index 858ee84a0e17..c5d3a195e646 100644 --- a/rsc/source/parser/rsclex.cxx +++ b/rsc/source/parser/rsclex.cxx @@ -42,7 +42,7 @@ const char* StringContainer::putString( const char* pString ) { OString aString( static_cast<const sal_Char*>(pString) ); std::pair< - boost::unordered_set< OString, OStringHash >::iterator, + std::unordered_set< OString, OStringHash >::iterator, bool > aInsert = m_aStrings.insert( aString ); diff --git a/rsc/source/tools/rschash.cxx b/rsc/source/tools/rschash.cxx index 005c058916c0..65388ec91ca2 100644 --- a/rsc/source/tools/rschash.cxx +++ b/rsc/source/tools/rschash.cxx @@ -34,7 +34,7 @@ AtomContainer::~AtomContainer() Atom AtomContainer::getID( const OString& rStr, bool bOnlyIfExists ) { OString aKey = rStr.toAsciiLowerCase(); - boost::unordered_map< OString, Atom, OStringHash >::const_iterator it = + std::unordered_map< OString, Atom, OStringHash >::const_iterator it = m_aStringToID.find( aKey ); if( it != m_aStringToID.end() ) return it->second; @@ -51,7 +51,7 @@ Atom AtomContainer::getID( const OString& rStr, bool bOnlyIfExists ) const OString& AtomContainer::getString( Atom nAtom ) { - boost::unordered_map< Atom, OString >::const_iterator it = + std::unordered_map< Atom, OString >::const_iterator it = m_aIDToString.find( nAtom ); return (it != m_aIDToString.end()) ? it->second : m_aIDToString[0]; } diff --git a/sal/osl/all/debugbase.cxx b/sal/osl/all/debugbase.cxx index c2dc2b68f74e..ae097ee891b1 100644 --- a/sal/osl/all/debugbase.cxx +++ b/sal/osl/all/debugbase.cxx @@ -24,6 +24,7 @@ #include "osl/diagnose.hxx" #include "sal/log.hxx" #include "boost/bind.hpp" +#include <algorithm> #include <vector> namespace { diff --git a/svl/inc/pch/precompiled_svl.hxx b/svl/inc/pch/precompiled_svl.hxx index e99ee639bf59..1d0dbdf55491 100644 --- a/svl/inc/pch/precompiled_svl.hxx +++ b/svl/inc/pch/precompiled_svl.hxx @@ -23,7 +23,6 @@ #include <boost/ptr_container/ptr_vector.hpp> #include <boost/scoped_array.hpp> #include <boost/scoped_ptr.hpp> -#include <boost/unordered_map.hpp> #include <cassert> #include <cmath> #include <com/sun/star/awt/Point.hpp> @@ -162,6 +161,7 @@ #include <tools/vcompat.hxx> #include <tools/wldcrd.hxx> #include <ucbhelper/content.hxx> +#include <unordered_map> #include <unotools/bootstrap.hxx> #include <unotools/calendarwrapper.hxx> #include <unotools/charclass.hxx> diff --git a/svl/source/inc/poolio.hxx b/svl/source/inc/poolio.hxx index bdca925f3645..a73ba0ec59cb 100644 --- a/svl/source/inc/poolio.hxx +++ b/svl/source/inc/poolio.hxx @@ -22,8 +22,8 @@ #include <svl/SfxBroadcaster.hxx> #include <boost/shared_ptr.hpp> -#include <boost/unordered_map.hpp> #include <deque> +#include <unordered_map> #include <vector> class SfxPoolItem; @@ -72,7 +72,7 @@ typedef std::deque< SfxPoolVersion_ImplPtr > SfxPoolVersionArr_Impl; struct SfxPoolItemArray_Impl: public SfxPoolItemArrayBase_Impl { typedef std::vector<sal_uInt32> FreeList; - typedef boost::unordered_map<SfxPoolItem*,sal_uInt32> Hash; + typedef std::unordered_map<SfxPoolItem*,sal_uInt32> Hash; public: /// Track list of indices into our array that contain an empty slot diff --git a/svl/source/items/itemprop.cxx b/svl/source/items/itemprop.cxx index 53f948455687..7428925c9525 100644 --- a/svl/source/items/itemprop.cxx +++ b/svl/source/items/itemprop.cxx @@ -23,7 +23,7 @@ #include <svl/itemset.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <boost/scoped_ptr.hpp> -#include <boost/unordered_map.hpp> +#include <unordered_map> /* * UNO III Implementation */ @@ -40,10 +40,10 @@ struct equalOUString } }; -typedef ::boost::unordered_map< OUString, - SfxItemPropertySimpleEntry, - OUStringHash, - equalOUString > SfxItemPropertyHashMap_t; +typedef std::unordered_map< OUString, + SfxItemPropertySimpleEntry, + OUStringHash, + equalOUString > SfxItemPropertyHashMap_t; class SfxItemPropertyMap_Impl : public SfxItemPropertyHashMap_t { diff --git a/svl/source/misc/sharedstringpool.cxx b/svl/source/misc/sharedstringpool.cxx index 6d0e80083e6e..e1dfe94453fd 100644 --- a/svl/source/misc/sharedstringpool.cxx +++ b/svl/source/misc/sharedstringpool.cxx @@ -12,8 +12,8 @@ #include <unotools/charclass.hxx> #include <osl/mutex.hxx> -#include <boost/unordered_map.hpp> -#include <boost/unordered_set.hpp> +#include <unordered_map> +#include <unordered_set> namespace svl { @@ -24,9 +24,9 @@ inline sal_Int32 getRefCount( const rtl_uString* p ) return (p->refCount & 0x3FFFFFFF); } -typedef boost::unordered_set<OUString, OUStringHash> StrHashType; +typedef std::unordered_set<OUString, OUStringHash> StrHashType; typedef std::pair<StrHashType::iterator, bool> InsertResultType; -typedef boost::unordered_map<const rtl_uString*, OUString> StrStoreType; +typedef std::unordered_map<const rtl_uString*, OUString> StrStoreType; InsertResultType findOrInsert( StrHashType& rPool, const OUString& rStr ) { diff --git a/svl/source/notify/broadcast.cxx b/svl/source/notify/broadcast.cxx index 8399a79d40a5..b7415ad39006 100644 --- a/svl/source/notify/broadcast.cxx +++ b/svl/source/notify/broadcast.cxx @@ -20,6 +20,7 @@ #include <svl/broadcast.hxx> #include <svl/listener.hxx> #include <svl/smplhint.hxx> +#include <algorithm> void SvtBroadcaster::Normalize() const { diff --git a/svtools/inc/pch/precompiled_svt.hxx b/svtools/inc/pch/precompiled_svt.hxx index 55bb37032560..6d703ea81dfd 100644 --- a/svtools/inc/pch/precompiled_svt.hxx +++ b/svtools/inc/pch/precompiled_svt.hxx @@ -28,7 +28,6 @@ #include <boost/scoped_ptr.hpp> #include <boost/shared_ptr.hpp> #include <boost/static_assert.hpp> -#include <boost/unordered_map.hpp> #include <cassert> #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleEventObject.hpp> @@ -391,6 +390,7 @@ #include <ucbhelper/commandenvironment.hxx> #include <ucbhelper/content.hxx> #include <uno/mapping.hxx> +#include <unordered_map> #include <unotools/accessiblerelationsethelper.hxx> #include <unotools/accessiblestatesethelper.hxx> #include <unotools/calendarwrapper.hxx> diff --git a/svtools/source/table/cellvalueconversion.cxx b/svtools/source/table/cellvalueconversion.cxx index b18b05043d4d..a5eb77097e92 100644 --- a/svtools/source/table/cellvalueconversion.cxx +++ b/svtools/source/table/cellvalueconversion.cxx @@ -36,8 +36,7 @@ #include <comphelper/processfactory.hxx> #include <boost/shared_ptr.hpp> -#include <boost/unordered_map.hpp> - +#include <unordered_map> namespace svt { @@ -98,7 +97,7 @@ namespace svt }; typedef ::boost::shared_ptr< IValueNormalization > PValueNormalization; - typedef ::boost::unordered_map< OUString, PValueNormalization, OUStringHash > NormalizerCache; + typedef std::unordered_map< OUString, PValueNormalization, OUStringHash > NormalizerCache; //= CellValueConversion_Data diff --git a/svtools/source/uno/framestatuslistener.cxx b/svtools/source/uno/framestatuslistener.cxx index 3d99d5ef4e16..8173c10d1ad7 100644 --- a/svtools/source/uno/framestatuslistener.cxx +++ b/svtools/source/uno/framestatuslistener.cxx @@ -174,7 +174,7 @@ void FrameStatusListener::addStatusListener( const OUString& aCommandURL ) // intialize is called. if ( !m_bInitialized ) { - // Put into the boost::unordered_map of status listener. Will be activated when initialized is called + // Put into the 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 d0f6eecf1d65..766b02128e9f 100644 --- a/svtools/source/uno/statusbarcontroller.cxx +++ b/svtools/source/uno/statusbarcontroller.cxx @@ -372,7 +372,7 @@ void StatusbarController::addStatusListener( const OUString& aCommandURL ) // intialize is called. if ( !m_bInitialized ) { - // Put into the boost::unordered_map of status listener. Will be activated when initialized is called + // Put into the 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 fd02c9dc561b..16abb72f8879 100644 --- a/svtools/source/uno/toolboxcontroller.cxx +++ b/svtools/source/uno/toolboxcontroller.cxx @@ -407,7 +407,7 @@ void ToolboxController::addStatusListener( const OUString& aCommandURL ) // intialize is called. if ( !m_bInitialized ) { - // Put into the boost::unordered_map of status listener. Will be activated when initialized is called + // Put into the 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/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx index 98ee9c62b650..a05e1e0e95ff 100644 --- a/svx/source/table/accessibletableshape.cxx +++ b/svx/source/table/accessibletableshape.cxx @@ -59,7 +59,7 @@ struct hash } }; -typedef boost::unordered_map< Reference< XCell >, rtl::Reference< AccessibleCell >, hash > AccessibleCellMap; +typedef std::unordered_map< Reference< XCell >, rtl::Reference< AccessibleCell >, hash > AccessibleCellMap; class AccessibleTableShapeImpl : public cppu::WeakImplHelper1< XModifyListener > { diff --git a/testtools/source/performance/ubtest.cxx b/testtools/source/performance/ubtest.cxx index 688a84102210..552eb4b49077 100644 --- a/testtools/source/performance/ubtest.cxx +++ b/testtools/source/performance/ubtest.cxx @@ -21,8 +21,8 @@ #include <stdio.h> #include <math.h> #include <string> -#include <boost/unordered_map.hpp> #include <map> +#include <unordered_map> #include <osl/diagnose.h> #include <osl/mutex.hxx> @@ -550,9 +550,7 @@ void TimingSheet::insert( const sal_Char * pText, sal_Int64 nLoop, sal_uInt32 nT _entries[ pText ] = TimeEntry( nLoop, nTicks ); } - -typedef boost::unordered_map< std::string, TimingSheet > t_TimingSheetMap; - +typedef std::unordered_map< std::string, TimingSheet > t_TimingSheetMap; static void benchmark( TimingSheet & rSheet, const Reference< XInterface > & xInstance, sal_Int64 nLoop ) diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx index eae95dab7ed7..5d84922ac517 100644 --- a/toolkit/source/controls/dialogcontrol.cxx +++ b/toolkit/source/controls/dialogcontrol.cxx @@ -42,11 +42,11 @@ #include <unotools/ucbstreamhelper.hxx> #include <vcl/graph.hxx> #include <vcl/image.hxx> -#include <map> -#include <boost/unordered_map.hpp> #include <cppuhelper/implbase1.hxx> #include <algorithm> #include <functional> +#include <map> +#include <unordered_map> #include "osl/file.hxx" #include <vcl/tabctrl.hxx> @@ -77,8 +77,8 @@ typedef ::cppu::WeakImplHelper1< container::XNameContainer > SimpleNameContainer template< typename T > class SimpleNamedThingContainer : public SimpleNameContainer_BASE { - typedef boost::unordered_map< OUString, Reference< T >, OUStringHash, - ::std::equal_to< OUString > > NamedThingsHash; + typedef std::unordered_map< OUString, Reference< T >, OUStringHash, + std::equal_to< OUString > > NamedThingsHash; NamedThingsHash things; ::osl::Mutex m_aMutex; public: diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx b/toolkit/source/controls/geometrycontrolmodel.cxx index 43d410faa9a0..64faae381c91 100644 --- a/toolkit/source/controls/geometrycontrolmodel.cxx +++ b/toolkit/source/controls/geometrycontrolmodel.cxx @@ -440,9 +440,9 @@ - typedef ::boost::unordered_map< OUString, sal_Int32, OUStringHash > HashMapString2Int; - typedef ::std::vector< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > > PropSeqArray; - typedef ::std::vector< ::std::vector< sal_Int32 > > IntArrayArray; + typedef std::unordered_map< OUString, sal_Int32, OUStringHash > HashMapString2Int; + typedef std::vector< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > > PropSeqArray; + typedef std::vector< ::std::vector< sal_Int32 > > IntArrayArray; // for creating class-unique PropertySetInfo's, we need some info: namespace { struct ServiceSpecifierMap : public rtl::Static< HashMapString2Int, ServiceSpecifierMap > {}; } diff --git a/tools/inc/pch/precompiled_tl.hxx b/tools/inc/pch/precompiled_tl.hxx index c74b9b81b6fc..6a47b833a628 100644 --- a/tools/inc/pch/precompiled_tl.hxx +++ b/tools/inc/pch/precompiled_tl.hxx @@ -24,7 +24,6 @@ #include <basegfx/vector/b2dvector.hxx> #include <boost/checked_delete.hpp> #include <boost/static_assert.hpp> -#include <boost/unordered_map.hpp> #include <cassert> #include <cmath> #include <com/sun/star/task/ErrorCodeIOException.hpp> @@ -83,6 +82,7 @@ #include <stdlib.h> #include <string.h> #include <time.h> +#include <unordered_map> #include <vector> #include <zlib.h> diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx index 39daa7d1b19d..a5a1d2c96a1c 100644 --- a/tools/source/rc/resmgr.cxx +++ b/tools/source/rc/resmgr.cxx @@ -47,12 +47,11 @@ #include <i18nlangtag/mslangid.hxx> #include <tools/simplerm.hxx> -#include <functional> #include <algorithm> -#include <boost/unordered_map.hpp> +#include <functional> #include <list> #include <set> - +#include <unordered_map> using namespace osl; @@ -89,7 +88,7 @@ class InternalResMgr OUString aResName; bool bSingular; LanguageTag aLocale; - boost::unordered_map<sal_uInt64, int>* pResUseDump; + std::unordered_map<sal_uInt64, int>* pResUseDump; InternalResMgr( const OUString& rFileURL, const OUString& aPrefix, @@ -123,7 +122,7 @@ class ResMgrContainer {} }; - boost::unordered_map< OUString, ContainerElement, OUStringHash> m_aResFiles; + std::unordered_map< OUString, ContainerElement, OUStringHash> m_aResFiles; LanguageTag m_aDefLocale; ResMgrContainer() : m_aDefLocale( LANGUAGE_SYSTEM) { init(); } @@ -160,7 +159,7 @@ ResMgrContainer& ResMgrContainer::get() ResMgrContainer::~ResMgrContainer() { - for( boost::unordered_map< OUString, ContainerElement, OUStringHash >::iterator it = + for( std::unordered_map< OUString, ContainerElement, OUStringHash >::iterator it = m_aResFiles.begin(); it != m_aResFiles.end(); ++it ) { OSL_TRACE( "Resource file %s loaded %d times", @@ -231,7 +230,7 @@ InternalResMgr* ResMgrContainer::getResMgr( const OUString& rPrefix, ) { LanguageTag aLocale( rLocale ); - boost::unordered_map< OUString, ContainerElement, OUStringHash >::iterator it = m_aResFiles.end(); + std::unordered_map< OUString, ContainerElement, OUStringHash >::iterator it = m_aResFiles.end(); ::std::vector< OUString > aFallbacks( aLocale.getFallbackStrings( true)); if (!isAlreadyPureenUS( aLocale)) @@ -378,7 +377,7 @@ void ResMgrContainer::freeResMgr( InternalResMgr* pResMgr ) delete pResMgr; else { - boost::unordered_map< OUString, ContainerElement, OUStringHash >::iterator it = + std::unordered_map< OUString, ContainerElement, OUStringHash >::iterator it = m_aResFiles.find( pResMgr->aResName ); if( it != m_aResFiles.end() ) { @@ -456,7 +455,7 @@ InternalResMgr::~InternalResMgr() RTL_TEXTENCODING_UTF8)); aStm.WriteLine(aLine.makeStringAndClear()); - for( boost::unordered_map<sal_uInt64, int>::const_iterator it = pResUseDump->begin(); + for( std::unordered_map<sal_uInt64, int>::const_iterator it = pResUseDump->begin(); it != pResUseDump->end(); ++it ) { sal_uInt64 nKeyId = it->first; @@ -509,7 +508,7 @@ bool InternalResMgr::Create() const sal_Char* pLogFile = getenv( "STAR_RESOURCE_LOGGING" ); if ( pLogFile ) { - pResUseDump = new boost::unordered_map<sal_uInt64, int>; + pResUseDump = new std::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 11570b59731f..280d2422354c 100644 --- a/ucbhelper/source/provider/contenthelper.cxx +++ b/ucbhelper/source/provider/contenthelper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#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> @@ -34,6 +33,8 @@ #include "osl/mutex.hxx" #include "rtl/ref.hxx" +#include <unordered_map> + using namespace com::sun::star; namespace ucbhelper_impl @@ -74,7 +75,7 @@ struct hashPtr } }; -typedef boost::unordered_map +typedef std::unordered_map < XPropertiesChangeListenerPtr, PropertyEventSequence*, diff --git a/ucbhelper/source/provider/providerhelper.cxx b/ucbhelper/source/provider/providerhelper.cxx index c7fa7caba7d1..67357d687ddd 100644 --- a/ucbhelper/source/provider/providerhelper.cxx +++ b/ucbhelper/source/provider/providerhelper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#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> @@ -33,12 +32,14 @@ #include "osl/mutex.hxx" #include "cppuhelper/weakref.hxx" +#include <unordered_map> + using namespace com::sun::star; namespace ucbhelper_impl { -typedef boost::unordered_map +typedef std::unordered_map < OUString, uno::WeakReference< ucb::XContent >, diff --git a/unotools/inc/pch/precompiled_utl.hxx b/unotools/inc/pch/precompiled_utl.hxx index 4fcd5815e615..129cddec2a54 100644 --- a/unotools/inc/pch/precompiled_utl.hxx +++ b/unotools/inc/pch/precompiled_utl.hxx @@ -16,7 +16,6 @@ #include <algorithm> #include <boost/noncopyable.hpp> -#include <boost/unordered_map.hpp> #include <cassert> #include <com/sun/star/awt/XRequestCallback.hpp> #include <com/sun/star/beans/NamedValue.hpp> @@ -195,6 +194,7 @@ #include <ucbhelper/interactionrequest.hxx> #include <ucbhelper/interceptedinteraction.hxx> #include <uno/data.h> +#include <unordered_map> #include <vector> /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unotools/source/config/cmdoptions.cxx b/unotools/source/config/cmdoptions.cxx index 76527d86def5..d343e9ffa347 100644 --- a/unotools/source/config/cmdoptions.cxx +++ b/unotools/source/config/cmdoptions.cxx @@ -31,7 +31,7 @@ #include "itemholder1.hxx" #include <algorithm> -#include <boost/unordered_map.hpp> +#include <unordered_map> using namespace ::std; using namespace ::utl; @@ -76,7 +76,7 @@ class SvtCmdOptions } private: - typedef boost::unordered_map<OUString, sal_Int32, OUStringHash> + typedef std::unordered_map<OUString, sal_Int32, OUStringHash> CommandHashMap; CommandHashMap m_aCommandHashMap; diff --git a/unotools/source/config/eventcfg.cxx b/unotools/source/config/eventcfg.cxx index ef1f984b4eb7..e98cb00ffb2c 100644 --- a/unotools/source/config/eventcfg.cxx +++ b/unotools/source/config/eventcfg.cxx @@ -25,7 +25,6 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <cppuhelper/weakref.hxx> -#include <boost/unordered_map.hpp> #include <rtl/ustrbuf.hxx> #include <osl/diagnose.h> diff --git a/unotools/source/config/extendedsecurityoptions.cxx b/unotools/source/config/extendedsecurityoptions.cxx index 75e511bc8caa..e079c937a7df 100644 --- a/unotools/source/config/extendedsecurityoptions.cxx +++ b/unotools/source/config/extendedsecurityoptions.cxx @@ -28,10 +28,10 @@ #include <unotools/pathoptions.hxx> -#include <boost/unordered_map.hpp> - #include "itemholder1.hxx" +#include <unordered_map> + using namespace ::utl; using namespace ::osl; using namespace ::com::sun::star::uno; @@ -47,7 +47,7 @@ using namespace ::com::sun::star::uno; #define PROPERTYCOUNT 1 -typedef boost::unordered_map<OUString, sal_Int32, OUStringHash> +typedef std::unordered_map<OUString, sal_Int32, OUStringHash> ExtensionHashMap; class SvtExtendedSecurityOptions_Impl : public ConfigItem diff --git a/unotools/source/config/fontcfg.cxx b/unotools/source/config/fontcfg.cxx index f84591970b3a..77d57a1cd431 100644 --- a/unotools/source/config/fontcfg.cxx +++ b/unotools/source/config/fontcfg.cxx @@ -165,7 +165,7 @@ OUString DefaultFontConfiguration::tryLocale( const OUString& rBcp47, const OUSt { OUString aRet; - boost::unordered_map< OUString, LocaleAccess, OUStringHash >::const_iterator it = m_aConfig.find( rBcp47 ); + std::unordered_map< OUString, LocaleAccess, OUStringHash >::const_iterator it = m_aConfig.find( rBcp47 ); if( it != m_aConfig.end() ) { if( !it->second.xAccess.is() ) @@ -1021,7 +1021,7 @@ unsigned long FontSubstConfiguration::getSubstType( const com::sun::star::uno::R void FontSubstConfiguration::readLocaleSubst( const OUString& rBcp47 ) const { - boost::unordered_map< OUString, LocaleSubst, OUStringHash >::const_iterator it = m_aSubst.find( rBcp47 ); + std::unordered_map< OUString, LocaleSubst, OUStringHash >::const_iterator it = m_aSubst.find( rBcp47 ); if( it != m_aSubst.end() ) { if( ! it->second.bConfigRead ) @@ -1121,7 +1121,7 @@ const FontNameAttr* FontSubstConfiguration::getSubstInfo( const OUString& rFontN for (::std::vector< OUString >::const_iterator fb( aFallbacks.begin()); fb != aFallbacks.end(); ++fb) { - boost::unordered_map< OUString, LocaleSubst, OUStringHash >::const_iterator lang = m_aSubst.find( *fb ); + std::unordered_map< OUString, LocaleSubst, OUStringHash >::const_iterator lang = m_aSubst.find( *fb ); if( lang != m_aSubst.end() ) { if( ! lang->second.bConfigRead ) diff --git a/unotools/source/config/optionsdlg.cxx b/unotools/source/config/optionsdlg.cxx index d831914fc5f8..92a1ba278371 100644 --- a/unotools/source/config/optionsdlg.cxx +++ b/unotools/source/config/optionsdlg.cxx @@ -24,9 +24,10 @@ #include <com/sun/star/uno/Sequence.hxx> #include <osl/mutex.hxx> -#include <boost/unordered_map.hpp> #include "itemholder1.hxx" +#include <unordered_map> + using namespace utl; using namespace com::sun::star::beans; using namespace com::sun::star::uno; @@ -42,7 +43,7 @@ static sal_Int32 nRefCount = 0; class SvtOptionsDlgOptions_Impl : public utl::ConfigItem { private: - typedef boost::unordered_map< OUString, sal_Bool, OUStringHash, ::std::equal_to< OUString > > OptionNodeList; + typedef std::unordered_map< OUString, sal_Bool, OUStringHash, 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 42a2caa5c82b..4473397b2ea9 100644 --- a/unotools/source/config/pathoptions.cxx +++ b/unotools/source/config/pathoptions.cxx @@ -44,8 +44,8 @@ #include "itemholder1.hxx" +#include <unordered_map> #include <vector> -#include <boost/unordered_map.hpp> using namespace osl; using namespace utl; @@ -72,11 +72,11 @@ enum VarNameProperty VAR_NEEDS_FILEURL }; -typedef boost::unordered_map<OUString, sal_Int32, OUStringHash> NameToHandleMap; +typedef std::unordered_map<OUString, sal_Int32, OUStringHash> NameToHandleMap; -typedef boost::unordered_map<sal_Int32, sal_Int32> EnumToHandleMap; +typedef std::unordered_map<sal_Int32, sal_Int32> EnumToHandleMap; -typedef boost::unordered_map<OUString, VarNameProperty, OUStringHash> +typedef std::unordered_map<OUString, VarNameProperty, OUStringHash> VarNameToEnumMap; // class SvtPathOptions_Impl --------------------------------------------- diff --git a/unotools/source/config/viewoptions.cxx b/unotools/source/config/viewoptions.cxx index 403a82b053a2..9f078e10556e 100644 --- a/unotools/source/config/viewoptions.cxx +++ b/unotools/source/config/viewoptions.cxx @@ -20,7 +20,6 @@ #include <unotools/viewoptions.hxx> #include <com/sun/star/uno/Any.hxx> -#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> diff --git a/unotools/source/misc/atom.cxx b/unotools/source/misc/atom.cxx index 01f329b22066..5adcbdcea009 100644 --- a/unotools/source/misc/atom.cxx +++ b/unotools/source/misc/atom.cxx @@ -34,7 +34,7 @@ AtomProvider::~AtomProvider() int AtomProvider::getAtom( const OUString& rString, bool bCreate ) { - ::boost::unordered_map< OUString, int, OUStringHash >::iterator it = m_aAtomMap.find( rString ); + std::unordered_map< OUString, int, OUStringHash >::iterator it = m_aAtomMap.find( rString ); if( it != m_aAtomMap.end() ) return it->second; if( ! bCreate ) @@ -48,7 +48,7 @@ int AtomProvider::getAtom( const OUString& rString, bool bCreate ) const OUString& AtomProvider::getString( int nAtom ) const { static OUString aEmpty; - ::boost::unordered_map< int, OUString, ::boost::hash< int > >::const_iterator it = m_aStringMap.find( nAtom ); + std::unordered_map< int, OUString, ::boost::hash< int > >::const_iterator it = m_aStringMap.find( nAtom ); return it == m_aStringMap.end() ? aEmpty : it->second; } @@ -59,13 +59,13 @@ MultiAtomProvider::MultiAtomProvider() MultiAtomProvider::~MultiAtomProvider() { - for( ::boost::unordered_map< int, AtomProvider*, ::boost::hash< int > >::iterator it = m_aAtomLists.begin(); it != m_aAtomLists.end(); ++it ) + for( std::unordered_map< int, AtomProvider*, ::boost::hash< int > >::iterator it = m_aAtomLists.begin(); it != m_aAtomLists.end(); ++it ) delete it->second; } int MultiAtomProvider::getAtom( int atomClass, const OUString& rString, bool bCreate ) { - ::boost::unordered_map< int, AtomProvider*, ::boost::hash< int > >::iterator it = + std::unordered_map< int, AtomProvider*, ::boost::hash< int > >::iterator it = m_aAtomLists.find( atomClass ); if( it != m_aAtomLists.end() ) return it->second->getAtom( rString, bCreate ); @@ -81,7 +81,7 @@ int MultiAtomProvider::getAtom( int atomClass, const OUString& rString, bool bCr const OUString& MultiAtomProvider::getString( int atomClass, int atom ) const { - ::boost::unordered_map< int, AtomProvider*, ::boost::hash< int > >::const_iterator it = + std::unordered_map< int, AtomProvider*, ::boost::hash< int > >::const_iterator it = m_aAtomLists.find( atomClass ); if( it != m_aAtomLists.end() ) return it->second->getString( atom ); diff --git a/unotools/source/misc/fontdefs.cxx b/unotools/source/misc/fontdefs.cxx index 79f282143f8c..37915aab5a07 100644 --- a/unotools/source/misc/fontdefs.cxx +++ b/unotools/source/misc/fontdefs.cxx @@ -19,8 +19,8 @@ #include <unotools/fontdefs.hxx> #include <unotools/fontcfg.hxx> -#include <boost/unordered_map.hpp> #include <rtl/ustrbuf.hxx> +#include <unordered_map> struct ImplLocalizedFontName { @@ -421,7 +421,7 @@ OUString GetEnglishSearchFontName(const OUString& rInName) // translate normalized localized name to its normalized English ASCII name if( bNeedTranslation ) { - typedef boost::unordered_map<const OUString, const char*, OUStringHash> FontNameDictionary; + typedef std::unordered_map<const OUString, const char*, OUStringHash> FontNameDictionary; static FontNameDictionary aDictionary( SAL_N_ELEMENTS(aImplLocalizedNamesList) ); // the font name dictionary needs to be intialized once if( aDictionary.empty() ) diff --git a/unoxml/source/dom/node.hxx b/unoxml/source/dom/node.hxx index e04e0c3aee50..65bd92ffac63 100644 --- a/unoxml/source/dom/node.hxx +++ b/unoxml/source/dom/node.hxx @@ -44,7 +44,7 @@ #include <com/sun/star/xml/sax/XDocumentHandler.hpp> #include <com/sun/star/xml/sax/XFastDocumentHandler.hpp> -#include <boost/unordered_map.hpp> +#include <unordered_map> namespace DOM { @@ -70,7 +70,7 @@ namespace DOM }; typedef std::vector< std::vector<Namespace> > NamespaceVectorType; - typedef boost::unordered_map< OUString, + typedef std::unordered_map< OUString, sal_Int32, OUStringHash > NamespaceMapType; diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx index c207092a861b..789fcb77e6ab 100644 --- a/uui/source/iahndl.hxx +++ b/uui/source/iahndl.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_UUI_SOURCE_IAHNDL_HXX #define INCLUDED_UUI_SOURCE_IAHNDL_HXX -#include <vector> - #include <osl/mutex.hxx> #include <rtl/ustring.hxx> @@ -36,6 +34,9 @@ #include <tools/rc.hxx> #include <tools/wintypes.hxx> +#include <unordered_map> +#include <vector> + namespace com { namespace sun { namespace star { namespace awt { class XWindow; @@ -59,8 +60,6 @@ namespace com { namespace sun { namespace star { } } } } -#include <boost/unordered_map.hpp> - namespace vcl { class Window; } struct InteractionHandlerData @@ -78,7 +77,7 @@ typedef std::vector< InteractionHandlerData > InteractionHandlerDataList; typedef ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > Continuations; -typedef ::boost::unordered_map< OUString, OUString, OUStringHash > StringHashMap; +typedef std::unordered_map< OUString, OUString, OUStringHash > StringHashMap; class UUIInteractionHelper { diff --git a/vbahelper/inc/pch/precompiled_msforms.hxx b/vbahelper/inc/pch/precompiled_msforms.hxx index a6251b917a23..dcfc172189da 100644 --- a/vbahelper/inc/pch/precompiled_msforms.hxx +++ b/vbahelper/inc/pch/precompiled_msforms.hxx @@ -22,7 +22,6 @@ #include <basic/sbmod.hxx> #include <basic/sbstar.hxx> #include <basic/sbx.hxx> -#include <boost/unordered_map.hpp> #include <com/sun/star/awt/FontSlant.hpp> #include <com/sun/star/awt/FontStrikeout.hpp> #include <com/sun/star/awt/FontUnderline.hpp> @@ -77,6 +76,7 @@ #include <svtools/bindablecontrolhelper.hxx> #include <svx/svdobj.hxx> #include <toolkit/helper/vclunohelper.hxx> +#include <unordered_map> #include <vcl/window.hxx> #include <vector> diff --git a/vbahelper/inc/pch/precompiled_vbahelper.hxx b/vbahelper/inc/pch/precompiled_vbahelper.hxx index b33416993dd5..93eac8850145 100644 --- a/vbahelper/inc/pch/precompiled_vbahelper.hxx +++ b/vbahelper/inc/pch/precompiled_vbahelper.hxx @@ -22,7 +22,6 @@ #include <basic/sbx.hxx> #include <basic/vbahelper.hxx> #include <boost/noncopyable.hpp> -#include <boost/unordered_map.hpp> #include <com/sun/star/awt/FontSlant.hpp> #include <com/sun/star/awt/FontStrikeout.hpp> #include <com/sun/star/awt/FontUnderline.hpp> @@ -165,6 +164,7 @@ #include <tools/datetime.hxx> #include <tools/diagnose_ex.h> #include <tools/urlobj.hxx> +#include <unordered_map> #include <unotools/eventcfg.hxx> #include <unotools/mediadescriptor.hxx> #include <vcl/svapp.hxx> diff --git a/vbahelper/source/msforms/vbacontrols.cxx b/vbahelper/source/msforms/vbacontrols.cxx index effbe48dc133..85a7bd421e6d 100644 --- a/vbahelper/source/msforms/vbacontrols.cxx +++ b/vbahelper/source/msforms/vbacontrols.cxx @@ -32,7 +32,7 @@ #include "vbacontrol.hxx" #include <cppuhelper/implbase2.hxx> #include <ooo/vba/XControlProvider.hpp> -#include <boost/unordered_map.hpp> +#include <unordered_map> using namespace com::sun::star; using namespace ooo::vba; @@ -40,8 +40,8 @@ using namespace ooo::vba; typedef ::cppu::WeakImplHelper2< container::XNameAccess, container::XIndexAccess > ArrayWrapImpl; -typedef boost::unordered_map< OUString, sal_Int32, OUStringHash, - ::std::equal_to< OUString > > ControlIndexMap; +typedef std::unordered_map< OUString, sal_Int32, OUStringHash, + std::equal_to< OUString > > ControlIndexMap; typedef std::vector< uno::Reference< awt::XControl > > ControlVec; class ControlArrayWrapper : public ArrayWrapImpl diff --git a/vbahelper/source/vbahelper/vbaapplicationbase.cxx b/vbahelper/source/vbahelper/vbaapplicationbase.cxx index 8dfe505fb47d..80ecc53f73f2 100644 --- a/vbahelper/source/vbahelper/vbaapplicationbase.cxx +++ b/vbahelper/source/vbahelper/vbaapplicationbase.cxx @@ -34,7 +34,6 @@ #include <com/sun/star/awt/XWindow2.hpp> #include <boost/noncopyable.hpp> -#include <boost/unordered_map.hpp> #include <filter/msfilter/msvbahelper.hxx> #include <tools/datetime.hxx> @@ -47,6 +46,8 @@ #include "vbacommandbars.hxx" +#include <unordered_map> + using namespace ::com::sun::star; using namespace ::ooo::vba; @@ -144,7 +145,7 @@ struct VbaTimerInfoHash }; // ====VbaTimerHashMap================================== -typedef ::boost::unordered_map< VbaTimerInfo, VbaTimer*, VbaTimerInfoHash, ::std::equal_to< VbaTimerInfo > > VbaTimerHashMap; +typedef std::unordered_map< VbaTimerInfo, VbaTimer*, VbaTimerInfoHash, std::equal_to< VbaTimerInfo > > VbaTimerHashMap; // ====VbaApplicationBase_Impl================================== struct VbaApplicationBase_Impl diff --git a/vbahelper/source/vbahelper/vbadocumentsbase.cxx b/vbahelper/source/vbahelper/vbadocumentsbase.cxx index 1c82657dcdb9..8c66d5bc029a 100644 --- a/vbahelper/source/vbahelper/vbadocumentsbase.cxx +++ b/vbahelper/source/vbahelper/vbadocumentsbase.cxx @@ -45,8 +45,8 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <sfx2/objsh.hxx> #include <tools/urlobj.hxx> -#include <boost/unordered_map.hpp> #include <osl/file.hxx> +#include <unordered_map> #include "vbahelper/vbahelper.hxx" #include "vbahelper/vbaapplicationbase.hxx" @@ -58,7 +58,7 @@ using namespace ::com::sun::star; static const char aSpreadsheetDocument[] = "com.sun.star.sheet.SpreadsheetDocument"; static const char aTextDocument[] = "com.sun.star.text.TextDocument"; -typedef boost::unordered_map< OUString, +typedef std::unordered_map< OUString, sal_Int32, OUStringHash, ::std::equal_to< OUString > > NameIndexHash; diff --git a/vcl/generic/fontmanager/fontconfig.cxx b/vcl/generic/fontmanager/fontconfig.cxx index 128193c26889..839a722aeda3 100644 --- a/vcl/generic/fontmanager/fontconfig.cxx +++ b/vcl/generic/fontmanager/fontconfig.cxx @@ -85,8 +85,8 @@ public: FcResult LocalizedElementFromPattern(FcPattern* pPattern, FcChar8 **family, const char *elementtype, const char *elementlangtype); //to-do, make private and add some cleanish accessor methods - boost::unordered_map< OString, OString, OStringHash > m_aFontNameToLocalized; - boost::unordered_map< OString, OString, OStringHash > m_aLocalizedToCanonical; + std::unordered_map< OString, OString, OStringHash > m_aFontNameToLocalized; + std::unordered_map< OString, OString, OStringHash > m_aLocalizedToCanonical; private: void cacheLocalizedFontNames(const FcChar8 *origfontname, const FcChar8 *bestfontname, const std::vector< lang_and_element > &lang_and_elements); @@ -472,7 +472,7 @@ static void lcl_FcFontSetRemove(FcFontSet* pFSet, int i) memmove(pFSet->fonts + i, pFSet->fonts + i + 1, nTail*sizeof(FcPattern*)); } -void PrintFontManager::countFontconfigFonts( boost::unordered_map<OString, int, OStringHash>& o_rVisitedPaths ) +void PrintFontManager::countFontconfigFonts( std::unordered_map<OString, int, OStringHash>& o_rVisitedPaths ) { #if OSL_DEBUG_LEVEL > 1 int nFonts = 0; @@ -1052,7 +1052,7 @@ bool PrintFontManager::Substitute( FontSelectPattern &rPattern, OUString& rMissi if( eFamilyRes == FcResultMatch ) { OString sFamily((sal_Char*)family); - boost::unordered_map< OString, OString, OStringHash >::const_iterator aI = + std::unordered_map< OString, OString, OStringHash >::const_iterator aI = rWrapper.m_aFontNameToLocalized.find(sFamily); if (aI != rWrapper.m_aFontNameToLocalized.end()) sFamily = aI->second; @@ -1181,7 +1181,7 @@ ImplFontOptions* PrintFontManager::getFontOptions( OString sFamily = OUStringToOString( rInfo.m_aFamilyName, RTL_TEXTENCODING_UTF8 ); - boost::unordered_map< OString, OString, OStringHash >::const_iterator aI = rWrapper.m_aLocalizedToCanonical.find(sFamily); + std::unordered_map< OString, OString, OStringHash >::const_iterator aI = rWrapper.m_aLocalizedToCanonical.find(sFamily); if (aI != rWrapper.m_aLocalizedToCanonical.end()) sFamily = aI->second; if( !sFamily.isEmpty() ) diff --git a/vcl/generic/fontmanager/fontmanager.cxx b/vcl/generic/fontmanager/fontmanager.cxx index 94165b8f174e..142179fa1068 100644 --- a/vcl/generic/fontmanager/fontmanager.cxx +++ b/vcl/generic/fontmanager/fontmanager.cxx @@ -61,9 +61,9 @@ #include "sal/alloca.h" -#include <set> -#include <boost/unordered_set.hpp> #include <algorithm> +#include <set> +#include <unordered_set> #include "adobeenc.tab" @@ -258,7 +258,7 @@ bool PrintFontManager::TrueTypeFontFile::queryMetricPage( int nPage, MultiAtomPr */ static bool familyNameOverride( const OUString& i_rPSname, OUString& o_rFamilyName ) { - static boost::unordered_map< OUString, OUString, OUStringHash > aPSNameToFamily( 16 ); + static std::unordered_map< OUString, OUString, OUStringHash > aPSNameToFamily( 16 ); if( aPSNameToFamily.empty() ) // initialization { aPSNameToFamily[ "Helvetica-Narrow" ] = "Helvetica Narrow"; @@ -266,7 +266,7 @@ static bool familyNameOverride( const OUString& i_rPSname, OUString& o_rFamilyNa aPSNameToFamily[ "Helvetica-Narrow-BoldOblique" ] = "Helvetica Narrow"; aPSNameToFamily[ "Helvetica-Narrow-Oblique" ] = "Helvetica Narrow"; } - boost::unordered_map<OUString,OUString,OUStringHash>::const_iterator it = + std::unordered_map<OUString,OUString,OUStringHash>::const_iterator it = aPSNameToFamily.find( i_rPSname ); bool bReplaced = (it != aPSNameToFamily.end() ); if( bReplaced ) @@ -588,8 +588,8 @@ bool PrintFontManager::PrintFont::readAfmMetrics( MultiAtomProvider* pProvider, } else if( pChar->code != -1 ) { - ::std::pair< ::boost::unordered_multimap< sal_uInt8, sal_Unicode >::const_iterator, - ::boost::unordered_multimap< sal_uInt8, sal_Unicode >::const_iterator > + ::std::pair< std::unordered_multimap< sal_uInt8, sal_Unicode >::const_iterator, + std::unordered_multimap< sal_uInt8, sal_Unicode >::const_iterator > aCodes = rManager.getUnicodeFromAdobeCode( pChar->code ); while( aCodes.first != aCodes.second ) { @@ -648,12 +648,12 @@ PrintFontManager::PrintFontManager() { for( unsigned int i = 0; i < SAL_N_ELEMENTS( aAdobeCodes ); i++ ) { - m_aUnicodeToAdobename.insert( ::boost::unordered_multimap< sal_Unicode, OString >::value_type( aAdobeCodes[i].aUnicode, aAdobeCodes[i].pAdobename ) ); - m_aAdobenameToUnicode.insert( ::boost::unordered_multimap< OString, sal_Unicode, OStringHash >::value_type( aAdobeCodes[i].pAdobename, aAdobeCodes[i].aUnicode ) ); + m_aUnicodeToAdobename.insert( std::unordered_multimap< sal_Unicode, OString >::value_type( aAdobeCodes[i].aUnicode, aAdobeCodes[i].pAdobename ) ); + m_aAdobenameToUnicode.insert( std::unordered_multimap< OString, sal_Unicode, OStringHash >::value_type( aAdobeCodes[i].pAdobename, aAdobeCodes[i].aUnicode ) ); if( aAdobeCodes[i].aAdobeStandardCode ) { - m_aUnicodeToAdobecode.insert( ::boost::unordered_multimap< sal_Unicode, sal_uInt8 >::value_type( aAdobeCodes[i].aUnicode, aAdobeCodes[i].aAdobeStandardCode ) ); - m_aAdobecodeToUnicode.insert( ::boost::unordered_multimap< sal_uInt8, sal_Unicode >::value_type( aAdobeCodes[i].aAdobeStandardCode, aAdobeCodes[i].aUnicode ) ); + m_aUnicodeToAdobecode.insert( std::unordered_multimap< sal_Unicode, sal_uInt8 >::value_type( aAdobeCodes[i].aUnicode, aAdobeCodes[i].aAdobeStandardCode ) ); + m_aAdobecodeToUnicode.insert( std::unordered_multimap< sal_uInt8, sal_Unicode >::value_type( aAdobeCodes[i].aAdobeStandardCode, aAdobeCodes[i].aUnicode ) ); } } @@ -665,7 +665,7 @@ PrintFontManager::~PrintFontManager() { m_aFontInstallerTimer.Stop(); deinitFontconfig(); - for( ::boost::unordered_map< fontID, PrintFont* >::const_iterator it = m_aFonts.begin(); it != m_aFonts.end(); ++it ) + for( std::unordered_map< fontID, PrintFont* >::const_iterator it = m_aFonts.begin(); it != m_aFonts.end(); ++it ) delete (*it).second; delete m_pAtoms; delete m_pFontCache; @@ -673,14 +673,14 @@ PrintFontManager::~PrintFontManager() OString PrintFontManager::getDirectory( int nAtom ) const { - ::boost::unordered_map< int, OString >::const_iterator it( m_aAtomToDir.find( nAtom ) ); + std::unordered_map< int, OString >::const_iterator it( m_aAtomToDir.find( nAtom ) ); return it != m_aAtomToDir.end() ? it->second : OString(); } int PrintFontManager::getDirectoryAtom( const OString& rDirectory, bool bCreate ) { int nAtom = 0; - ::boost::unordered_map< OString, int, OStringHash >::const_iterator it + std::unordered_map< OString, int, OStringHash >::const_iterator it ( m_aDirToAtom.find( rDirectory ) ); if( it != m_aDirToAtom.end() ) nAtom = it->second; @@ -885,13 +885,13 @@ fontID PrintFontManager::findFontFileID( int nDirID, const OString& rFontFile, i { fontID nID = 0; - ::boost::unordered_map< OString, ::std::set< fontID >, OStringHash >::const_iterator set_it = m_aFontFileToFontID.find( rFontFile ); + std::unordered_map< OString, ::std::set< fontID >, OStringHash >::const_iterator set_it = m_aFontFileToFontID.find( rFontFile ); if( set_it == m_aFontFileToFontID.end() ) return nID; for( ::std::set< fontID >::const_iterator font_it = set_it->second.begin(); font_it != set_it->second.end() && ! nID; ++font_it ) { - ::boost::unordered_map< fontID, PrintFont* >::const_iterator it = m_aFonts.find( *font_it ); + std::unordered_map< fontID, PrintFont* >::const_iterator it = m_aFonts.find( *font_it ); if( it == m_aFonts.end() ) continue; switch( it->second->m_eType ) @@ -924,13 +924,13 @@ std::vector<fontID> PrintFontManager::findFontFileIDs( int nDirID, const OString { std::vector<fontID> aIds; - ::boost::unordered_map< OString, ::std::set< fontID >, OStringHash >::const_iterator set_it = m_aFontFileToFontID.find( rFontFile ); + std::unordered_map< OString, ::std::set< fontID >, OStringHash >::const_iterator set_it = m_aFontFileToFontID.find( rFontFile ); if( set_it == m_aFontFileToFontID.end() ) return aIds; for( ::std::set< fontID >::const_iterator font_it = set_it->second.begin(); font_it != set_it->second.end(); ++font_it ) { - ::boost::unordered_map< fontID, PrintFont* >::const_iterator it = m_aFonts.find( *font_it ); + std::unordered_map< fontID, PrintFont* >::const_iterator it = m_aFonts.find( *font_it ); if( it == m_aFonts.end() ) continue; switch( it->second->m_eType ) @@ -1358,7 +1358,7 @@ void PrintFontManager::initialize() // gtk-fontconfig-timestamp changes to reflect new font installed and // PrintFontManager::initialize called again { - for( ::boost::unordered_map< fontID, PrintFont* >::const_iterator it = m_aFonts.begin(); it != m_aFonts.end(); ++it ) + for( std::unordered_map< fontID, PrintFont* >::const_iterator it = m_aFonts.begin(); it != m_aFonts.end(); ++it ) delete (*it).second; m_nNextFontID = 1; m_aFonts.clear(); @@ -1410,7 +1410,7 @@ void PrintFontManager::initialize() } // protect against duplicate paths - boost::unordered_map< OString, int, OStringHash > visited_dirs; + std::unordered_map< OString, int, OStringHash > visited_dirs; // Don't search directories that fontconfig already did countFontconfigFonts( visited_dirs ); @@ -1463,10 +1463,10 @@ void PrintFontManager::initialize() #endif // part three - fill in family styles - ::boost::unordered_map< fontID, PrintFont* >::iterator font_it; + std::unordered_map< fontID, PrintFont* >::iterator font_it; for (font_it = m_aFonts.begin(); font_it != m_aFonts.end(); ++font_it) { - ::boost::unordered_map< int, FontFamily >::const_iterator it = + std::unordered_map< int, FontFamily >::const_iterator it = m_aFamilyTypes.find( font_it->second->m_nFamilyName ); if (it != m_aFamilyTypes.end()) continue; @@ -1495,7 +1495,7 @@ void PrintFontManager::initialize() void PrintFontManager::getFontList( ::std::list< fontID >& rFontIDs ) { rFontIDs.clear(); - boost::unordered_map< fontID, PrintFont* >::const_iterator it; + std::unordered_map< fontID, PrintFont* >::const_iterator it; for( it = m_aFonts.begin(); it != m_aFonts.end(); ++it ) rFontIDs.push_back( it->first ); @@ -1503,7 +1503,7 @@ void PrintFontManager::getFontList( ::std::list< fontID >& rFontIDs ) void PrintFontManager::fillPrintFontInfo( PrintFont* pFont, FastPrintFontInfo& rInfo ) const { - ::boost::unordered_map< int, FontFamily >::const_iterator style_it = + std::unordered_map< int, FontFamily >::const_iterator style_it = m_aFamilyTypes.find( pFont->m_nFamilyName ); rInfo.m_eType = pFont->m_eType; rInfo.m_aFamilyName = m_pAtoms->getString( ATOM_FAMILYNAME, pFont->m_nFamilyName ); @@ -1693,7 +1693,7 @@ OString PrintFontManager::getFontFile( PrintFont* pFont ) const if( pFont && pFont->m_eType == fonttype::Type1 ) { Type1FontFile* pPSFont = static_cast< Type1FontFile* >(pFont); - ::boost::unordered_map< int, OString >::const_iterator it = m_aAtomToDir.find( pPSFont->m_nDirectory ); + std::unordered_map< int, OString >::const_iterator it = m_aAtomToDir.find( pPSFont->m_nDirectory ); aPath = it->second; aPath += "/"; aPath += pPSFont->m_aFontFile; @@ -1701,7 +1701,7 @@ OString PrintFontManager::getFontFile( PrintFont* pFont ) const else if( pFont && pFont->m_eType == fonttype::TrueType ) { TrueTypeFontFile* pTTFont = static_cast< TrueTypeFontFile* >(pFont); - ::boost::unordered_map< int, OString >::const_iterator it = m_aAtomToDir.find( pTTFont->m_nDirectory ); + std::unordered_map< int, OString >::const_iterator it = m_aAtomToDir.find( pTTFont->m_nDirectory ); aPath = it->second; aPath += "/"; aPath += pTTFont->m_aFontFile; @@ -1770,7 +1770,7 @@ void PrintFontManager::hasVerticalSubstitutions( fontID nFontID, if( ! pFont->m_pMetrics || ! ( pFont->m_pMetrics->m_aPages[ code >> 11 ] & ( 1 << ( ( code >> 8 ) & 7 ) ) ) ) pFont->queryMetricPage( code >> 8, m_pAtoms ); - ::boost::unordered_map< sal_Unicode, bool >::const_iterator it = pFont->m_pMetrics->m_bVerticalSubstitutions.find( code ); + std::unordered_map< sal_Unicode, bool >::const_iterator it = pFont->m_pMetrics->m_bVerticalSubstitutions.find( code ); pHasSubst[i] = it != pFont->m_pMetrics->m_bVerticalSubstitutions.end(); } } @@ -1839,7 +1839,7 @@ bool PrintFontManager::getMetrics( fontID nFontID, const sal_Unicode* pString, i { int effectiveCode = pString[i]; effectiveCode |= bVertical ? 1 << 16 : 0; - ::boost::unordered_map< int, CharacterMetric >::const_iterator it = + std::unordered_map< int, CharacterMetric >::const_iterator it = pFont->m_pMetrics->m_aMetrics.find( effectiveCode ); // if no vertical metrics are available assume rotated horizontal metrics if( bVertical && (it == pFont->m_pMetrics->m_aMetrics.end()) ) @@ -1886,7 +1886,7 @@ bool PrintFontManager::getMetrics( fontID nFontID, sal_Unicode minCharacter, sal { int effectiveCode = code; effectiveCode |= bVertical ? 1 << 16 : 0; - ::boost::unordered_map< int, CharacterMetric >::const_iterator it = + std::unordered_map< int, CharacterMetric >::const_iterator it = pFont->m_pMetrics->m_aMetrics.find( effectiveCode ); // if no vertical metrics are available assume rotated horizontal metrics if( bVertical && (it == pFont->m_pMetrics->m_aMetrics.end()) ) @@ -2124,7 +2124,7 @@ void PrintFontManager::getGlyphWidths( fontID nFont, rUnicodeEnc.clear(); rWidths.clear(); rWidths.reserve( pFont->m_pMetrics->m_aMetrics.size() ); - for( boost::unordered_map< int, CharacterMetric >::const_iterator it = + for( std::unordered_map< int, CharacterMetric >::const_iterator it = pFont->m_pMetrics->m_aMetrics.begin(); it != pFont->m_pMetrics->m_aMetrics.end(); ++it ) { @@ -2155,8 +2155,8 @@ const std::map< sal_Unicode, sal_Int32 >* PrintFontManager::getEncodingMap( font std::list< OString > PrintFontManager::getAdobeNameFromUnicode( sal_Unicode aChar ) const { - std::pair< boost::unordered_multimap< sal_Unicode, OString >::const_iterator, - boost::unordered_multimap< sal_Unicode, OString >::const_iterator > range + std::pair< std::unordered_multimap< sal_Unicode, OString >::const_iterator, + std::unordered_multimap< sal_Unicode, OString >::const_iterator > range = m_aUnicodeToAdobename.equal_range( aChar ); std::list< OString > aRet; @@ -2175,8 +2175,8 @@ std::list< OString > PrintFontManager::getAdobeNameFromUnicode( sal_Unicode aCha std::list< sal_Unicode > PrintFontManager::getUnicodeFromAdobeName( const OString& rName ) const { - std::pair< boost::unordered_multimap< OString, sal_Unicode, OStringHash >::const_iterator, - boost::unordered_multimap< OString, sal_Unicode, OStringHash >::const_iterator > range + std::pair< std::unordered_multimap< OString, sal_Unicode, OStringHash >::const_iterator, + std::unordered_multimap< OString, sal_Unicode, OStringHash >::const_iterator > range = m_aAdobenameToUnicode.equal_range( rName ); std::list< sal_Unicode > aRet; diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx index 2db0f0d98d34..bdbc0b64146a 100644 --- a/vcl/generic/glyphs/gcach_ftyp.cxx +++ b/vcl/generic/glyphs/gcach_ftyp.cxx @@ -93,7 +93,7 @@ static FT_Library aLibFT = 0; // enable linking with old FT versions static int nFTVERSION = 0; -typedef ::boost::unordered_map<const char*, boost::shared_ptr<FtFontFile>, rtl::CStringHash, rtl::CStringEqual> FontFileList; +typedef std::unordered_map<const char*, boost::shared_ptr<FtFontFile>, rtl::CStringHash, rtl::CStringEqual> FontFileList; namespace { struct vclFontFileList : public rtl::Static< FontFileList, vclFontFileList > {}; } diff --git a/vcl/generic/glyphs/gcach_ftyp.hxx b/vcl/generic/glyphs/gcach_ftyp.hxx index 21cd6538bcca..beee3328a867 100644 --- a/vcl/generic/glyphs/gcach_ftyp.hxx +++ b/vcl/generic/glyphs/gcach_ftyp.hxx @@ -102,8 +102,8 @@ private: FontCharMapPtr mpFontCharMap; // cache unicode->glyphid mapping because looking it up is expensive - // TODO: change to boost::unordered_multimap when a use case requires a m:n mapping - typedef ::boost::unordered_map<int,int> Int2IntMap; + // TODO: change to std::unordered_multimap when a use case requires a m:n mapping + typedef std::unordered_map<int,int> Int2IntMap; mutable Int2IntMap* mpChar2Glyph; mutable Int2IntMap* mpGlyph2Char; void InitHashes() const; @@ -143,7 +143,7 @@ public: ServerFont* CreateFont( const FontSelectPattern& ); private: - typedef ::boost::unordered_map<sal_IntPtr,FtFontInfo*> FontList; + typedef std::unordered_map<sal_IntPtr,FtFontInfo*> FontList; FontList maFontList; sal_IntPtr mnMaxFontId; diff --git a/vcl/generic/print/glyphset.hxx b/vcl/generic/print/glyphset.hxx index e6f8fa73c811..41cff1650311 100644 --- a/vcl/generic/print/glyphset.hxx +++ b/vcl/generic/print/glyphset.hxx @@ -27,7 +27,7 @@ #include "rtl/string.hxx" #include <list> -#include <boost/unordered_map.hpp> +#include <unordered_map> class Point; @@ -47,9 +47,9 @@ private: rtl_TextEncoding mnBaseEncoding; bool mbUseFontEncoding; - typedef boost::unordered_map< sal_Unicode, sal_uInt8 > char_map_t; + typedef std::unordered_map< sal_Unicode, sal_uInt8 > char_map_t; typedef std::list< char_map_t > char_list_t; - typedef boost::unordered_map< sal_GlyphId, sal_uInt8 > glyph_map_t; + typedef std::unordered_map< sal_GlyphId, sal_uInt8 > glyph_map_t; typedef std::list< glyph_map_t > glyph_list_t; char_list_t maCharList; diff --git a/vcl/inc/PhysicalFontCollection.hxx b/vcl/inc/PhysicalFontCollection.hxx index 86488fcebef5..28e18071ddb3 100644 --- a/vcl/inc/PhysicalFontCollection.hxx +++ b/vcl/inc/PhysicalFontCollection.hxx @@ -37,7 +37,7 @@ private: mutable bool mbMatchData; // true if matching attributes are initialized bool mbMapNames; // true if MapNames are available - typedef boost::unordered_map<const OUString, PhysicalFontFamily*,OUStringHash> PhysicalFontFamilies; + typedef std::unordered_map<const OUString, PhysicalFontFamily*,OUStringHash> PhysicalFontFamilies; PhysicalFontFamilies maPhysicalFontFamilies; ImplPreMatchFontSubstitution* mpPreMatchHook; // device specific prematch substitution diff --git a/vcl/inc/cupsmgr.hxx b/vcl/inc/cupsmgr.hxx index 12beba4d365c..c7b948737f05 100644 --- a/vcl/inc/cupsmgr.hxx +++ b/vcl/inc/cupsmgr.hxx @@ -38,13 +38,13 @@ struct FPtrHash class CUPSManager : public PrinterInfoManager { - boost::unordered_map< FILE*, OString, FPtrHash > m_aSpoolFiles; - int m_nDests; - void* m_pDests; - bool m_bNewDests; - boost::unordered_map< OUString, int, OUStringHash > m_aCUPSDestMap; + std::unordered_map< FILE*, OString, FPtrHash > m_aSpoolFiles; + int m_nDests; + void* m_pDests; + bool m_bNewDests; + std::unordered_map< OUString, int, OUStringHash > m_aCUPSDestMap; - boost::unordered_map< OUString, PPDContext, OUStringHash > m_aDefaultContexts; + std::unordered_map< OUString, PPDContext, OUStringHash > m_aDefaultContexts; OString m_aUser; /** this is a security risk, but the CUPS API demands diff --git a/vcl/inc/fontcache.hxx b/vcl/inc/fontcache.hxx index 777c896face3..98d9029b6be9 100644 --- a/vcl/inc/fontcache.hxx +++ b/vcl/inc/fontcache.hxx @@ -22,7 +22,7 @@ #include <rtl/ustring.hxx> #include <vcl/dllapi.h> -#include <boost/unordered_map.hpp> +#include <unordered_map> #include "fontmanager.hxx" @@ -42,7 +42,7 @@ class VCL_PLUGIN_PUBLIC FontCache FontCacheEntry m_aEntry; }; - typedef boost::unordered_map< OString, FontFile, OStringHash > FontDirMap; + typedef std::unordered_map< OString, FontFile, OStringHash > FontDirMap; struct FontDir { sal_Int64 m_nTimestamp; @@ -53,7 +53,7 @@ class VCL_PLUGIN_PUBLIC FontCache FontDir() : m_nTimestamp(0), m_bNoFiles(false), m_bUserOverrideOnly( false ) {} }; - typedef boost::unordered_map< int, FontDir > FontCacheData; + typedef std::unordered_map< int, FontDir > FontCacheData; FontCacheData m_aCache; OUString m_aCacheFile; bool m_bDoFlush; diff --git a/vcl/inc/fontmanager.hxx b/vcl/inc/fontmanager.hxx index e1203bd83a90..beec12ad838f 100644 --- a/vcl/inc/fontmanager.hxx +++ b/vcl/inc/fontmanager.hxx @@ -20,10 +20,10 @@ #ifndef INCLUDED_VCL_INC_FONTMANAGER_HXX #define INCLUDED_VCL_INC_FONTMANAGER_HXX -#include <boost/unordered_map.hpp> -#include <map> #include <list> +#include <map> #include <set> +#include <unordered_map> #include <vcl/dllapi.h> #include <vcl/helper.hxx> @@ -155,7 +155,7 @@ class VCL_PLUGIN_PUBLIC PrintFontManager // upper byte contains: 0 for horizontal metric // 1 for vertical metric // highest byte: 0 for now - boost::unordered_map< int, CharacterMetric > m_aMetrics; + std::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 @@ -167,7 +167,7 @@ class VCL_PLUGIN_PUBLIC PrintFontManager // a single pass, then all bits should be set char m_aPages[32]; - boost::unordered_map< sal_Unicode, bool > m_bVerticalSubstitutions; + std::unordered_map< sal_Unicode, bool > m_bVerticalSubstitutions; PrintFontMetrics() {} @@ -239,27 +239,27 @@ class VCL_PLUGIN_PUBLIC PrintFontManager }; fontID m_nNextFontID; - boost::unordered_map< fontID, PrintFont* > m_aFonts; - boost::unordered_map< int, FontFamily > m_aFamilyTypes; + std::unordered_map< fontID, PrintFont* > m_aFonts; + std::unordered_map< int, FontFamily > m_aFamilyTypes; std::list< OUString > m_aPrinterDrivers; std::list< OString > m_aFontDirectories; std::list< int > m_aPrivateFontDirectories; utl::MultiAtomProvider* m_pAtoms; // for speeding up findFontFileID - boost::unordered_map< OString, std::set< fontID >, OStringHash > + std::unordered_map< OString, std::set< fontID >, OStringHash > m_aFontFileToFontID; - boost::unordered_map< OString, int, OStringHash > + std::unordered_map< OString, int, OStringHash > m_aDirToAtom; - boost::unordered_map< int, OString > m_aAtomToDir; + std::unordered_map< int, OString > m_aAtomToDir; int m_nNextDirAtom; - boost::unordered_multimap< OString, sal_Unicode, OStringHash > + std::unordered_multimap< OString, sal_Unicode, OStringHash > m_aAdobenameToUnicode; - boost::unordered_multimap< sal_Unicode, OString > + std::unordered_multimap< sal_Unicode, OString > m_aUnicodeToAdobename; - boost::unordered_multimap< sal_Unicode, sal_uInt8 > m_aUnicodeToAdobecode; - boost::unordered_multimap< sal_uInt8, sal_Unicode > m_aAdobecodeToUnicode; + std::unordered_multimap< sal_Unicode, sal_uInt8 > m_aUnicodeToAdobecode; + std::unordered_multimap< sal_uInt8, sal_Unicode > m_aAdobecodeToUnicode; mutable FontCache* m_pFontCache; @@ -286,7 +286,7 @@ class VCL_PLUGIN_PUBLIC PrintFontManager PrintFont* getFont( fontID nID ) const { - boost::unordered_map< fontID, PrintFont* >::const_iterator it; + std::unordered_map< fontID, PrintFont* >::const_iterator it; it = m_aFonts.find( nID ); return it == m_aFonts.end() ? NULL : it->second; } @@ -301,7 +301,7 @@ class VCL_PLUGIN_PUBLIC PrintFontManager called from <code>initialize()</code> */ void initFontconfig(); - void countFontconfigFonts( boost::unordered_map<OString, int, OStringHash>& o_rVisitedPaths ); + void countFontconfigFonts( std::unordered_map<OString, int, OStringHash>& o_rVisitedPaths ); /* deinitialize fontconfig */ void deinitFontconfig(); @@ -447,15 +447,15 @@ public: // helper for type 1 fonts std::list< OString > getAdobeNameFromUnicode( sal_Unicode aChar ) const; - std::pair< boost::unordered_multimap< sal_Unicode, sal_uInt8 >::const_iterator, - boost::unordered_multimap< sal_Unicode, sal_uInt8 >::const_iterator > + std::pair< std::unordered_multimap< sal_Unicode, sal_uInt8 >::const_iterator, + std::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 OString& rName ) const; - std::pair< boost::unordered_multimap< sal_uInt8, sal_Unicode >::const_iterator, - boost::unordered_multimap< sal_uInt8, sal_Unicode >::const_iterator > + std::pair< std::unordered_multimap< sal_uInt8, sal_Unicode >::const_iterator, + std::unordered_multimap< sal_uInt8, sal_Unicode >::const_iterator > getUnicodeFromAdobeCode( sal_uInt8 aChar ) const { return m_aAdobecodeToUnicode.equal_range( aChar ); diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx index ddfc7a8ef965..4133cd8689d8 100644 --- a/vcl/inc/generic/glyphcache.hxx +++ b/vcl/inc/generic/glyphcache.hxx @@ -27,7 +27,6 @@ #include FT_GLYPH_H #include <boost/shared_ptr.hpp> -#include <boost/unordered_map.hpp> #include <basebmp/bitmapdevice.hxx> #include <com/sun/star/i18n/XBreakIterator.hpp> @@ -38,6 +37,8 @@ #include <outfont.hxx> #include <sallayout.hxx> +#include <unordered_map> + class FtFontInfo; class GlyphCachePeer; class GlyphData; @@ -87,7 +88,7 @@ private: // the FontList key's mpFontData member is reinterpreted as integer font id struct IFSD_Equal{ bool operator()( const FontSelectPattern&, const FontSelectPattern& ) const; }; struct IFSD_Hash{ size_t operator()( const FontSelectPattern& ) const; }; - typedef ::boost::unordered_map<FontSelectPattern,ServerFont*,IFSD_Hash,IFSD_Equal > FontList; + typedef std::unordered_map<FontSelectPattern,ServerFont*,IFSD_Hash,IFSD_Equal > FontList; FontList maFontList; sal_uLong mnMaxSize; // max overall cache size in bytes mutable sal_uLong mnBytesUsed; @@ -221,7 +222,7 @@ private: ServerFontLayoutEngine* GetLayoutEngine(); - typedef ::boost::unordered_map<int,GlyphData> GlyphList; + typedef std::unordered_map<int,GlyphData> GlyphList; mutable GlyphList maGlyphList; const FontSelectPattern maFontSelData; @@ -256,7 +257,7 @@ private: bool mbArtBold; bool mbUseGamma; - typedef ::boost::unordered_map<int,int> GlyphSubstitution; + typedef std::unordered_map<int,int> GlyphSubstitution; GlyphSubstitution maGlyphSubstitution; ServerFontLayoutEngine* mpLayoutEngine; diff --git a/vcl/inc/generic/printergfx.hxx b/vcl/inc/generic/printergfx.hxx index a0e2683ce6b2..aa7f87ce4876 100644 --- a/vcl/inc/generic/printergfx.hxx +++ b/vcl/inc/generic/printergfx.hxx @@ -27,7 +27,6 @@ #include "vclpluginapi.h" #include <list> -#include <boost/unordered_map.hpp> namespace psp { diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx index 0bf542fccd2b..2e2d8339c7f8 100644 --- a/vcl/inc/headless/svpinst.hxx +++ b/vcl/inc/headless/svpinst.hxx @@ -30,6 +30,7 @@ #include <basebmp/scanlineformats.hxx> #include <list> +#include <map> #include <time.h> diff --git a/vcl/inc/image.h b/vcl/inc/image.h index d9de98caa13f..b9767ce0362c 100644 --- a/vcl/inc/image.h +++ b/vcl/inc/image.h @@ -22,7 +22,7 @@ #include <vcl/bitmapex.hxx> -#include <boost/unordered_map.hpp> +#include <unordered_map> // - ImplImageBmp - @@ -81,7 +81,7 @@ struct ImageAryData struct ImplImageList { typedef std::vector<ImageAryData *> ImageAryDataVec; - typedef boost::unordered_map< OUString, ImageAryData *, OUStringHash > + typedef std::unordered_map< OUString, ImageAryData *, OUStringHash > ImageAryDataNameHash; ImageAryDataVec maImages; diff --git a/vcl/inc/impimagetree.hxx b/vcl/inc/impimagetree.hxx index e66e754a1c8d..0fbb2769e086 100644 --- a/vcl/inc/impimagetree.hxx +++ b/vcl/inc/impimagetree.hxx @@ -22,10 +22,9 @@ #include "sal/config.h" +#include <unordered_map> #include <vector> -#include <boost/unordered_map.hpp> - #include "boost/noncopyable.hpp" #include "com/sun/star/uno/Reference.hxx" #include "rtl/ustring.hxx" @@ -58,8 +57,8 @@ public: css::uno::Reference< css::container::XNameAccess > getNameAccess(); private: - typedef boost::unordered_map<OUString, std::pair<bool, BitmapEx>, OUStringHash> IconCache; - typedef boost::unordered_map<OUString, OUString, OUStringHash> IconLinkHash; + typedef std::unordered_map<OUString, std::pair<bool, BitmapEx>, OUStringHash> IconCache; + typedef std::unordered_map<OUString, OUString, OUStringHash> IconLinkHash; struct IconSet { OUString maURL; @@ -72,7 +71,7 @@ private: }; /// Map between the theme name(s) and the content. - typedef boost::unordered_map<OUString, IconSet, OUStringHash> StyleIconSet; + typedef std::unordered_map<OUString, IconSet, OUStringHash> StyleIconSet; /// Remember all the (used) icon styles and individual icons in them. StyleIconSet maIconSet; diff --git a/vcl/inc/jobset.h b/vcl/inc/jobset.h index c62440773d57..e1ba5bbe629e 100644 --- a/vcl/inc/jobset.h +++ b/vcl/inc/jobset.h @@ -20,9 +20,9 @@ #ifndef INCLUDED_VCL_INC_JOBSET_H #define INCLUDED_VCL_INC_JOBSET_H -#include <boost/unordered_map.hpp> #include <rtl/ustring.hxx> #include <vcl/prntypes.hxx> +#include <unordered_map> // see com.sun.star.portal.client.JobSetupSystem.idl: #define JOBSETUP_SYSTEM_DONTKNOW 0 @@ -46,7 +46,7 @@ struct ImplJobSetup long mnPaperHeight; // paper height (100th mm) sal_uIntPtr mnDriverDataLen; // length of system specific data sal_uInt8* mpDriverData; // system specific data (will be streamed a byte block) - ::boost::unordered_map< OUString, OUString, OUStringHash > maValueMap; + std::unordered_map< OUString, OUString, OUStringHash > maValueMap; ImplJobSetup(); ImplJobSetup( const ImplJobSetup& rJobSetup ); diff --git a/vcl/inc/opengl/program.hxx b/vcl/inc/opengl/program.hxx index 996bc61b275c..6e21abfd1129 100644 --- a/vcl/inc/opengl/program.hxx +++ b/vcl/inc/opengl/program.hxx @@ -22,9 +22,9 @@ #include <tools/color.hxx> #include <opengl/texture.hxx> -#include <boost/unordered_map.hpp> +#include <unordered_map> -typedef boost::unordered_map< OString, GLuint, OStringHash > UniformCache; +typedef std::unordered_map< OString, GLuint, OStringHash > UniformCache; typedef std::list< OpenGLTexture > TextureList; class VCL_PLUGIN_PUBLIC OpenGLProgram diff --git a/vcl/inc/outdev.h b/vcl/inc/outdev.h index c878d8b2590d..bcb64f23dde1 100644 --- a/vcl/inc/outdev.h +++ b/vcl/inc/outdev.h @@ -140,7 +140,7 @@ private: // cache of recently used font instances struct IFSD_Equal { bool operator()( const FontSelectPattern&, const FontSelectPattern& ) const; }; struct IFSD_Hash { size_t operator()( const FontSelectPattern& ) const; }; - typedef ::boost::unordered_map<FontSelectPattern,ImplFontEntry*,IFSD_Hash,IFSD_Equal > FontInstanceList; + typedef std::unordered_map<FontSelectPattern,ImplFontEntry*,IFSD_Hash,IFSD_Equal > FontInstanceList; FontInstanceList maFontInstanceList; public: diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx index 0f28657aed0d..69de06ac1cf9 100644 --- a/vcl/inc/outfont.hxx +++ b/vcl/inc/outfont.hxx @@ -28,7 +28,7 @@ #include <unotools/fontdefs.hxx> #include <vcl/vclenum.hxx> -#include <boost/unordered_map.hpp> +#include <unordered_map> class PhysicalFontFace; class PhysicalFontFamily; @@ -246,7 +246,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 ::boost::unordered_map<GFBCacheKey,OUString,GFBCacheKey_Hash> UnicodeFallbackList; + typedef ::std::unordered_map<GFBCacheKey,OUString,GFBCacheKey_Hash> UnicodeFallbackList; UnicodeFallbackList* mpUnicodeFallbackList; }; diff --git a/vcl/inc/print.h b/vcl/inc/print.h index 2aa3c6b4a370..7eec4216eb63 100644 --- a/vcl/inc/print.h +++ b/vcl/inc/print.h @@ -23,7 +23,7 @@ #include "rtl/ustring.hxx" #include "vcl/dllapi.h" #include <vector> -#include <boost/unordered_map.hpp> +#include <unordered_map> struct SalPrinterQueueInfo; class QueueInfo; @@ -41,7 +41,7 @@ struct ImplPrnQueueData class VCL_PLUGIN_PUBLIC ImplPrnQueueList { public: - boost::unordered_map< OUString, sal_Int32, OUStringHash > + std::unordered_map< OUString, sal_Int32, OUStringHash > m_aNameToIndex; std::vector< ImplPrnQueueData > m_aQueueInfos; std::vector< OUString > m_aPrinterList; diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index 683f40d908fb..9d20196d07b5 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -43,7 +43,7 @@ #include "com/sun/star/lang/XComponent.hpp" #include "com/sun/star/uno/Reference.hxx" -#include <boost/unordered_map.hpp> +#include <unordered_map> #include <config_version.h> @@ -336,7 +336,7 @@ struct ImplSVData ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > mxAccessBridge; ::vcl::SettingsConfigItem* mpSettingsConfigItem; std::list< vcl::DeleteOnDeinitBase* >* mpDeinitDeleteList; - boost::unordered_map< int, OUString >* mpPaperNames; + std::unordered_map< int, OUString >* mpPaperNames; Link maDeInitHook; }; diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx index 8b56e18c0924..acaa1fd7065a 100644 --- a/vcl/inc/unx/saldisp.hxx +++ b/vcl/inc/unx/saldisp.hxx @@ -31,9 +31,9 @@ class SalXLib; #include <vcl/ptrstyle.hxx> #include <sal/types.h> #include <osl/mutex.h> -#include <vector> #include <list> -#include <boost/unordered_map.hpp> +#include <unordered_map> +#include <vector> #include <tools/gen.hxx> #include <salwtype.hxx> #include <generic/gendata.hxx> @@ -204,7 +204,7 @@ public: RenderEntry() : m_aPixmap( 0 ), m_aPicture( 0 ) {} }; - typedef boost::unordered_map<int,RenderEntry> RenderEntryMap; + typedef std::unordered_map<int,RenderEntry> RenderEntryMap; struct ScreenData { diff --git a/vcl/inc/unx/salinst.h b/vcl/inc/unx/salinst.h index cea08dd6da96..c2df7a87f182 100644 --- a/vcl/inc/unx/salinst.h +++ b/vcl/inc/unx/salinst.h @@ -37,7 +37,7 @@ class SalXLib; class VCLPLUG_GEN_PUBLIC X11SalInstance : public SalGenericInstance { private: - boost::unordered_map< Atom, com::sun::star::uno::Reference< com::sun::star::datatransfer::clipboard::XClipboard > > m_aInstances; + std::unordered_map< Atom, com::sun::star::uno::Reference< com::sun::star::datatransfer::clipboard::XClipboard > > m_aInstances; protected: SalXLib *mpXLib; diff --git a/vcl/opengl/program.cxx b/vcl/opengl/program.cxx index 434b72482a8b..0fe460592007 100644 --- a/vcl/opengl/program.cxx +++ b/vcl/opengl/program.cxx @@ -113,9 +113,7 @@ void OpenGLProgram::SetAlphaCoord( const GLvoid* pData ) GLuint OpenGLProgram::GetUniformLocation( const OString& rName ) { - boost::unordered_map<OString, GLuint>::iterator it; - - it = maUniformLocations.find( rName ); + auto it = maUniformLocations.find( rName ); if( it == maUniformLocations.end() ) { GLuint nLocation = glGetUniformLocation( mnId, (char*) rName.getStr() ); diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index e36acc02ac54..5bebdbee5a8f 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -36,7 +36,7 @@ #include "svdata.hxx" #include "window.h" -#include <boost/unordered_map.hpp> +#include <unordered_map> #include <vector> struct ImplTabItem @@ -62,8 +62,8 @@ struct ImplTabItem struct ImplTabCtrlData { - boost::unordered_map< int, int > maLayoutPageIdToLine; - boost::unordered_map< int, int > maLayoutLineToPageId; + std::unordered_map< int, int > maLayoutPageIdToLine; + std::unordered_map< int, int > maLayoutLineToPageId; std::vector< Rectangle > maTabRectangles; Point maItemsOffset; // offset of the tabitems std::vector< ImplTabItem > maItemList; @@ -2025,7 +2025,7 @@ Rectangle TabControl::GetCharacterBounds( sal_uInt16 nPageId, long nIndex ) cons if( HasLayoutData() ) { - boost::unordered_map< int, int >::const_iterator it = mpTabCtrlData->maLayoutPageIdToLine.find( (int)nPageId ); + std::unordered_map< int, int >::const_iterator it = mpTabCtrlData->maLayoutPageIdToLine.find( (int)nPageId ); if( it != mpTabCtrlData->maLayoutPageIdToLine.end() ) { Pair aPair = mpControlData->mpLayoutData->GetLineStartEnd( it->second ); diff --git a/vcl/source/gdi/configsettings.cxx b/vcl/source/gdi/configsettings.cxx index 72b11592029d..8e1c5d9b5aaa 100644 --- a/vcl/source/gdi/configsettings.cxx +++ b/vcl/source/gdi/configsettings.cxx @@ -59,7 +59,7 @@ SettingsConfigItem::~SettingsConfigItem() void SettingsConfigItem::Commit() { - boost::unordered_map< OUString, SmallOUStrMap, OUStringHash >::const_iterator group; + std::unordered_map< OUString, SmallOUStrMap, OUStringHash >::const_iterator group; for( group = m_aSettings.begin(); group != m_aSettings.end(); ++group ) { @@ -136,7 +136,7 @@ void SettingsConfigItem::getValues() const OUString& SettingsConfigItem::getValue( const OUString& rGroup, const OUString& rKey ) const { - ::boost::unordered_map< OUString, SmallOUStrMap, OUStringHash >::const_iterator group = m_aSettings.find( rGroup ); + std::unordered_map< OUString, SmallOUStrMap, 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/jobset.cxx b/vcl/source/gdi/jobset.cxx index d9fca2276d57..f376d14a5262 100644 --- a/vcl/source/gdi/jobset.cxx +++ b/vcl/source/gdi/jobset.cxx @@ -342,7 +342,7 @@ SvStream& WriteJobSetup( SvStream& rOStream, const JobSetup& rJobSetup ) rOStream.Write( (char*)&aOldData, sizeof( aOldData ) ); rOStream.Write( (char*)&aOldJobData, nOldJobDataSize ); rOStream.Write( (char*)pJobData->mpDriverData, pJobData->mnDriverDataLen ); - ::boost::unordered_map< OUString, OUString, OUStringHash >::const_iterator it; + std::unordered_map< OUString, OUString, OUStringHash >::const_iterator it; for( it = pJobData->maValueMap.begin(); it != pJobData->maValueMap.end(); ++it ) { write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStream, it->first, RTL_TEXTENCODING_UTF8); diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 72c8f2eff7cc..01931775d2dc 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -700,7 +700,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 ); - boost::unordered_map< OString, sal_Int32, OStringHash >::const_iterator it = m_aFieldNameMap.find( aDomain ); + std::unordered_map< OString, sal_Int32, OStringHash >::const_iterator it = m_aFieldNameMap.find( aDomain ); if( it == m_aFieldNameMap.end() ) { // create new hierarchy field @@ -761,7 +761,7 @@ void PDFWriterImpl::createWidgetFieldName( sal_Int32 i_nWidgetIndex, const PDFWr // insert widget into its hierarchy field if( !aDomain.isEmpty() ) { - boost::unordered_map< OString, sal_Int32, OStringHash >::const_iterator it = m_aFieldNameMap.find( aDomain ); + std::unordered_map< OString, sal_Int32, 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" ); @@ -788,11 +788,11 @@ void PDFWriterImpl::createWidgetFieldName( sal_Int32 i_nWidgetIndex, const PDFWr if( ! m_aContext.AllowDuplicateFieldNames ) { - boost::unordered_map<OString, sal_Int32, OStringHash>::iterator it = m_aFieldNameMap.find( aFullName ); + std::unordered_map<OString, sal_Int32, OStringHash>::iterator it = m_aFieldNameMap.find( aFullName ); if( it != m_aFieldNameMap.end() ) // not unique { - boost::unordered_map< OString, sal_Int32, OStringHash >::const_iterator check_it; + std::unordered_map< OString, sal_Int32, OStringHash >::const_iterator check_it; OString aTry; sal_Int32 nTry = 2; do @@ -2695,7 +2695,7 @@ sal_Int32 PDFWriterImpl::emitStructure( PDFStructureElement& rEle ) if( ! m_aRoleMap.empty() ) { aLine.append( "/RoleMap<<" ); - for( boost::unordered_map<OString,OString,OStringHash>::const_iterator + for( std::unordered_map<OString,OString,OStringHash>::const_iterator it = m_aRoleMap.begin(); it != m_aRoleMap.end(); ++it ) { aLine.append( '/' ); @@ -6948,7 +6948,7 @@ void PDFWriterImpl::sortWidgets() { // sort widget annotations on each page as per their // TabOrder attribute - boost::unordered_map< sal_Int32, AnnotSortContainer > sorted; + std::unordered_map< sal_Int32, AnnotSortContainer > sorted; int nWidgets = m_aWidgets.size(); for( int nW = 0; nW < nWidgets; nW++ ) { @@ -6968,7 +6968,7 @@ void PDFWriterImpl::sortWidgets() } } } - for( boost::unordered_map< sal_Int32, AnnotSortContainer >::iterator it = sorted.begin(); it != sorted.end(); ++it ) + for( std::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 ]; @@ -11920,7 +11920,7 @@ void PDFWriterImpl::ensureUniqueRadioOnValues() { PDFWidget& rGroupWidget = m_aWidgets[ group->second ]; // check whether all kids have a unique OnValue - boost::unordered_map< OUString, sal_Int32, OUStringHash > aOnValues; + std::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 7b294a421f17..43bb0c5d5759 100644 --- a/vcl/source/gdi/pdfwriter_impl.hxx +++ b/vcl/source/gdi/pdfwriter_impl.hxx @@ -19,10 +19,10 @@ #ifndef INCLUDED_VCL_SOURCE_GDI_PDFWRITER_IMPL_HXX #define INCLUDED_VCL_SOURCE_GDI_PDFWRITER_IMPL_HXX -#include <vector> #include <map> -#include <boost/unordered_map.hpp> #include <list> +#include <unordered_map> +#include <vector> #include <boost/shared_array.hpp> #include <com/sun/star/lang/Locale.hpp> @@ -437,8 +437,8 @@ public: {} }; - typedef boost::unordered_map< OString, SvMemoryStream*, OStringHash > PDFAppearanceStreams; - typedef boost::unordered_map< OString, PDFAppearanceStreams, OStringHash > PDFAppearanceMap; + typedef std::unordered_map< OString, SvMemoryStream*, OStringHash > PDFAppearanceStreams; + typedef std::unordered_map< OString, PDFAppearanceStreams, OStringHash > PDFAppearanceMap; struct PDFWidget : public PDFAnnotation { @@ -643,7 +643,7 @@ private: bool m_bEmitStructure; bool m_bNewMCID; /* role map of struct tree root */ - boost::unordered_map< OString, OString, OStringHash > + std::unordered_map< OString, OString, OStringHash > m_aRoleMap; /* contains all widgets used in the PDF @@ -651,8 +651,8 @@ private: std::vector<PDFWidget> m_aWidgets; /* maps radio group id to index of radio group control in m_aWidgets */ std::map< sal_Int32, sal_Int32 > m_aRadioGroupWidgets; - /* boost::unordered_map for field names, used to ensure unique field names */ - boost::unordered_map< OString, sal_Int32, OStringHash > m_aFieldNameMap; + /* unordered_map for field names, used to ensure unique field names */ + std::unordered_map< OString, sal_Int32, 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 f6dd207f679f..3fec08f330b0 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -438,7 +438,7 @@ ImplPrnQueueList::~ImplPrnQueueList() void ImplPrnQueueList::Add( SalPrinterQueueInfo* pData ) { - boost::unordered_map< OUString, sal_Int32, OUStringHash >::iterator it = + std::unordered_map< OUString, sal_Int32, OUStringHash >::iterator it = m_aNameToIndex.find( pData->maPrinterName ); if( it == m_aNameToIndex.end() ) { @@ -461,7 +461,7 @@ void ImplPrnQueueList::Add( SalPrinterQueueInfo* pData ) ImplPrnQueueData* ImplPrnQueueList::Get( const OUString& rPrinter ) { ImplPrnQueueData* pData = NULL; - boost::unordered_map<OUString,sal_Int32,OUStringHash>::iterator it = + std::unordered_map<OUString,sal_Int32,OUStringHash>::iterator it = m_aNameToIndex.find( rPrinter ); if( it != m_aNameToIndex.end() ) pData = &m_aQueueInfos[it->second]; @@ -1554,7 +1554,7 @@ OUString Printer::GetPaperName( Paper ePaper ) ImplSVData* pSVData = ImplGetSVData(); if( ! pSVData->mpPaperNames ) { - pSVData->mpPaperNames = new boost::unordered_map< int, OUString >(); + pSVData->mpPaperNames = new std::unordered_map< int, OUString >(); if( ImplGetResMgr() ) { ResStringArray aPaperStrings( VclResId( RID_STR_PAPERNAMES ) ); @@ -1575,7 +1575,7 @@ OUString Printer::GetPaperName( Paper ePaper ) } } - boost::unordered_map<int,OUString>::const_iterator it = pSVData->mpPaperNames->find( (int)ePaper ); + std::unordered_map<int,OUString>::const_iterator it = pSVData->mpPaperNames->find( (int)ePaper ); return (it != pSVData->mpPaperNames->end()) ? it->second : OUString(); } diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx index 369c8fb47ace..16caf5262b8a 100644 --- a/vcl/source/gdi/print3.cxx +++ b/vcl/source/gdi/print3.cxx @@ -42,8 +42,8 @@ #include "com/sun/star/awt/Size.hpp" #include "comphelper/processfactory.hxx" -#include <boost/unordered_map.hpp> -#include <boost/unordered_set.hpp> +#include <unordered_map> +#include <unordered_set> using namespace com::sun::star; using namespace com::sun::star::uno; @@ -136,9 +136,9 @@ public: ControlDependency() : mnDependsOnEntry( -1 ) {} }; - typedef boost::unordered_map< OUString, size_t, OUStringHash > PropertyToIndexMap; - typedef boost::unordered_map< OUString, ControlDependency, OUStringHash > ControlDependencyMap; - typedef boost::unordered_map< OUString, Sequence< sal_Bool >, OUStringHash > ChoiceDisableMap; + typedef std::unordered_map< OUString, size_t, OUStringHash > PropertyToIndexMap; + typedef std::unordered_map< OUString, ControlDependency, OUStringHash > ControlDependencyMap; + typedef std::unordered_map< OUString, Sequence< sal_Bool >, OUStringHash > ChoiceDisableMap; boost::shared_ptr<Printer> mpPrinter; Sequence< PropertyValue > maUIOptions; @@ -1358,7 +1358,7 @@ bool PrinterController::getPapersizeFromSetup() const Sequence< PropertyValue > PrinterController::getJobProperties( const Sequence< PropertyValue >& i_rMergeList ) const { - boost::unordered_set< OUString, OUStringHash > aMergeSet; + std::unordered_set< OUString, 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 ); @@ -1407,14 +1407,14 @@ const Sequence< PropertyValue >& PrinterController::getUIOptions() const PropertyValue* PrinterController::getValue( const OUString& i_rProperty ) { - boost::unordered_map< OUString, size_t, OUStringHash >::const_iterator it = + std::unordered_map< OUString, size_t, OUStringHash >::const_iterator it = mpImplData->maPropertyToIndex.find( i_rProperty ); return it != mpImplData->maPropertyToIndex.end() ? &mpImplData->maUIProperties[it->second] : NULL; } const PropertyValue* PrinterController::getValue( const OUString& i_rProperty ) const { - boost::unordered_map< OUString, size_t, OUStringHash >::const_iterator it = + std::unordered_map< OUString, size_t, OUStringHash >::const_iterator it = mpImplData->maPropertyToIndex.find( i_rProperty ); return it != mpImplData->maPropertyToIndex.end() ? &mpImplData->maUIProperties[it->second] : NULL; } @@ -1430,7 +1430,7 @@ void PrinterController::setValue( const OUString& i_rName, const Any& i_rValue ) void PrinterController::setValue( const PropertyValue& i_rValue ) { - boost::unordered_map< OUString, size_t, OUStringHash >::const_iterator it = + std::unordered_map< OUString, size_t, OUStringHash >::const_iterator it = mpImplData->maPropertyToIndex.find( i_rValue.Name ); if( it != mpImplData->maPropertyToIndex.end() ) mpImplData->maUIProperties[ it->second ] = i_rValue; @@ -1510,7 +1510,7 @@ void PrinterController::setUIOptions( const Sequence< PropertyValue >& i_rOption bool PrinterController::isUIOptionEnabled( const OUString& i_rProperty ) const { bool bEnabled = false; - boost::unordered_map< OUString, size_t, OUStringHash >::const_iterator prop_it = + std::unordered_map< OUString, size_t, OUStringHash >::const_iterator prop_it = mpImplData->maPropertyToIndex.find( i_rProperty ); if( prop_it != mpImplData->maPropertyToIndex.end() ) { @@ -1745,7 +1745,7 @@ sal_Int32 PrinterController::getIntProperty( const OUString& i_rProperty, sal_In Any PrinterOptionsHelper::getValue( const OUString& i_rPropertyName ) const { Any aRet; - boost::unordered_map< OUString, Any, OUStringHash >::const_iterator it = + std::unordered_map< OUString, Any, OUStringHash >::const_iterator it = m_aPropertyMap.find( i_rPropertyName ); if( it != m_aPropertyMap.end() ) aRet = it->second; @@ -1787,7 +1787,7 @@ bool PrinterOptionsHelper::processProperties( const Sequence< PropertyValue >& i for( sal_Int32 i = 0; i < nElements; i++ ) { bool bElementChanged = false; - boost::unordered_map< OUString, Any, OUStringHash >::iterator it = + std::unordered_map< OUString, Any, OUStringHash >::iterator it = m_aPropertyMap.find( pVals[ i ].Name ); if( it != m_aPropertyMap.end() ) { diff --git a/vcl/source/helper/canvastools.cxx b/vcl/source/helper/canvastools.cxx index f16a5bcc96a0..54a9ae1f2e36 100644 --- a/vcl/source/helper/canvastools.cxx +++ b/vcl/source/helper/canvastools.cxx @@ -57,7 +57,6 @@ #include <canvasbitmap.hxx> #include <vcl/canvastools.hxx> -#include <boost/unordered_map.hpp> using namespace ::com::sun::star; diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx index 3868a6b35c1e..e20f742b0865 100644 --- a/vcl/source/outdev/font.cxx +++ b/vcl/source/outdev/font.cxx @@ -49,9 +49,9 @@ #include "../gdi/pdfwriter_impl.hxx" +#include <boost/functional/hash.hpp> #include <cmath> #include <cstring> - #include <memory> #include <algorithm> diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx index 53c006776afa..180758c8c166 100644 --- a/vcl/unx/generic/dtrans/X11_selection.cxx +++ b/vcl/unx/generic/dtrans/X11_selection.cxx @@ -201,9 +201,9 @@ rtl_TextEncoding x11::getTextPlainEncoding( const OUString& rMimeType ) return aEncoding; } -::boost::unordered_map< OUString, SelectionManager*, OUStringHash >& SelectionManager::getInstances() +std::unordered_map< OUString, SelectionManager*, OUStringHash >& SelectionManager::getInstances() { - static ::boost::unordered_map< OUString, SelectionManager*, OUStringHash > aInstances; + static std::unordered_map< OUString, SelectionManager*, OUStringHash > aInstances; return aInstances; } @@ -465,7 +465,7 @@ SelectionManager::~SelectionManager() { osl::MutexGuard aGuard( *osl::Mutex::getGlobalMutex() ); - ::boost::unordered_map< OUString, SelectionManager*, OUStringHash >::iterator it; + std::unordered_map< OUString, SelectionManager*, OUStringHash >::iterator it; for( it = getInstances().begin(); it != getInstances().end(); ++it ) if( it->second == this ) { @@ -522,7 +522,7 @@ SelectionManager::~SelectionManager() SelectionAdaptor* SelectionManager::getAdaptor( Atom selection ) { - ::boost::unordered_map< Atom, Selection* >::iterator it = + std::unordered_map< Atom, Selection* >::iterator it = m_aSelections.find( selection ); return it != m_aSelections.end() ? it->second->m_pAdaptor : NULL; } @@ -681,7 +681,7 @@ SelectionManager& SelectionManager::get( const OUString& rDisplayName ) aDisplayName = OStringToOUString( getenv( "DISPLAY" ), RTL_TEXTENCODING_ISO_8859_1 ); SelectionManager* pInstance = NULL; - ::boost::unordered_map< OUString, SelectionManager*, OUStringHash >::iterator it = getInstances().find( aDisplayName ); + std::unordered_map< OUString, SelectionManager*, OUStringHash >::iterator it = getInstances().find( aDisplayName ); if( it != getInstances().end() ) pInstance = it->second; else pInstance = getInstances()[ aDisplayName ] = new SelectionManager(); @@ -693,7 +693,7 @@ const OUString& SelectionManager::getString( Atom aAtom ) { osl::MutexGuard aGuard(m_aMutex); - ::boost::unordered_map< Atom, OUString >::const_iterator it; + std::unordered_map< Atom, OUString >::const_iterator it; if( ( it = m_aAtomToString.find( aAtom ) ) == m_aAtomToString.end() ) { static OUString aEmpty; @@ -712,7 +712,7 @@ Atom SelectionManager::getAtom( const OUString& rString ) { osl::MutexGuard aGuard(m_aMutex); - ::boost::unordered_map< OUString, Atom, OUStringHash >::const_iterator it; + std::unordered_map< OUString, Atom, OUStringHash >::const_iterator it; if( ( it = m_aStringToAtom.find( rString ) ) == m_aStringToAtom.end() ) { static Atom nNoDisplayAtoms = 1; @@ -857,7 +857,7 @@ OUString SelectionManager::convertTypeFromNative( Atom nType, Atom selection, in bool SelectionManager::getPasteData( Atom selection, Atom type, Sequence< sal_Int8 >& rData ) { osl::ResettableMutexGuard aGuard(m_aMutex); - ::boost::unordered_map< Atom, Selection* >::iterator it; + std::unordered_map< Atom, Selection* >::iterator it; bool bSuccess = false; #if OSL_DEBUG_LEVEL > 1 @@ -994,7 +994,7 @@ bool SelectionManager::getPasteData( Atom selection, const OUString& rType, Sequ { bool bSuccess = false; - ::boost::unordered_map< Atom, Selection* >::iterator it; + std::unordered_map< Atom, Selection* >::iterator it; { osl::MutexGuard aGuard(m_aMutex); @@ -1205,7 +1205,7 @@ bool SelectionManager::getPasteData( Atom selection, const OUString& rType, Sequ bool SelectionManager::getPasteDataTypes( Atom selection, Sequence< DataFlavor >& rTypes ) { - ::boost::unordered_map< Atom, Selection* >::iterator it; + std::unordered_map< Atom, Selection* >::iterator it; { osl::MutexGuard aGuard(m_aMutex); @@ -1408,7 +1408,7 @@ bool SelectionManager::getPasteDataTypes( Atom selection, Sequence< DataFlavor > PixmapHolder* SelectionManager::getPixmapHolder( Atom selection ) { - boost::unordered_map< Atom, Selection* >::const_iterator it = m_aSelections.find( selection ); + std::unordered_map< Atom, Selection* >::const_iterator it = m_aSelections.find( selection ); if( it == m_aSelections.end() ) return NULL; if( ! it->second->m_pPixmap ) @@ -1510,10 +1510,10 @@ bool SelectionManager::sendData( SelectionAdaptor* pAdaptor, { #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "using INCR protocol\n" ); - boost::unordered_map< ::Window, boost::unordered_map< Atom, IncrementalTransfer > >::const_iterator win_it = m_aIncrementals.find( requestor ); + std::unordered_map< ::Window, std::unordered_map< Atom, IncrementalTransfer > >::const_iterator win_it = m_aIncrementals.find( requestor ); if( win_it != m_aIncrementals.end() ) { - boost::unordered_map< Atom, IncrementalTransfer >::const_iterator inc_it = win_it->second.find( property ); + std::unordered_map< Atom, IncrementalTransfer >::const_iterator inc_it = win_it->second.find( property ); if( inc_it != win_it->second.end() ) { const IncrementalTransfer& rInc = inc_it->second; @@ -1781,7 +1781,7 @@ bool SelectionManager::handleReceivePropertyNotify( XPropertyEvent& rNotify ) #endif bool bHandled = false; - ::boost::unordered_map< Atom, Selection* >::iterator it = + std::unordered_map< Atom, Selection* >::iterator it = m_aSelections.find( rNotify.atom ); if( it != m_aSelections.end() && rNotify.state == PropertyNewValue && @@ -1904,13 +1904,13 @@ bool SelectionManager::handleSendPropertyNotify( XPropertyEvent& rNotify ) // feed incrementals if( rNotify.state == PropertyDelete ) { - boost::unordered_map< ::Window, boost::unordered_map< Atom, IncrementalTransfer > >::iterator it; + std::unordered_map< ::Window, std::unordered_map< Atom, IncrementalTransfer > >::iterator it; it = m_aIncrementals.find( rNotify.window ); if( it != m_aIncrementals.end() ) { bHandled = true; int nCurrentTime = time( NULL ); - boost::unordered_map< Atom, IncrementalTransfer >::iterator inc_it; + std::unordered_map< Atom, IncrementalTransfer >::iterator inc_it; // throw out aborted transfers std::list< Atom > aTimeouts; for( inc_it = it->second.begin(); inc_it != it->second.end(); ++inc_it ) @@ -2006,7 +2006,7 @@ bool SelectionManager::handleSelectionNotify( XSelectionEvent& rNotify ) if( rNotify.requestor != m_aWindow && rNotify.requestor != m_aCurrentDropWindow ) fprintf( stderr, "Warning: selection notify for unknown window 0x%lx\n", rNotify.requestor ); #endif - ::boost::unordered_map< Atom, Selection* >::iterator it = + std::unordered_map< Atom, Selection* >::iterator it = m_aSelections.find( rNotify.selection ); if ( (rNotify.requestor == m_aWindow || rNotify.requestor == m_aCurrentDropWindow) && @@ -2087,7 +2087,7 @@ bool SelectionManager::handleDropEvent( XClientMessageEvent& rMessage ) bool bHandled = false; - ::boost::unordered_map< ::Window, DropTargetEntry >::iterator it = + std::unordered_map< ::Window, DropTargetEntry >::iterator it = m_aDropTargets.find( aTarget ); #if OSL_DEBUG_LEVEL > 1 @@ -2455,7 +2455,7 @@ void SelectionManager::sendDropPosition( bool bForce, Time eventTime ) if( m_bDropSent ) return; - ::boost::unordered_map< ::Window, DropTargetEntry >::const_iterator it = + std::unordered_map< ::Window, DropTargetEntry >::const_iterator it = m_aDropTargets.find( m_aDropWindow ); if( it != m_aDropTargets.end() ) { @@ -2516,7 +2516,7 @@ bool SelectionManager::handleDragEvent( XEvent& rMessage ) bool bHandled = false; // for shortcut - ::boost::unordered_map< ::Window, DropTargetEntry >::const_iterator it = + std::unordered_map< ::Window, DropTargetEntry >::const_iterator it = m_aDropTargets.find( m_aDropWindow ); #if OSL_DEBUG_LEVEL > 1 switch( rMessage.type ) @@ -3009,7 +3009,7 @@ void SelectionManager::updateDragWindow( int nX, int nY, ::Window aRoot ) dsde.DropAction = nNewProtocolVersion >= 0 ? m_nUserDragAction : DNDConstants::ACTION_COPY; dsde.UserAction = nNewProtocolVersion >= 0 ? m_nUserDragAction : DNDConstants::ACTION_COPY; - ::boost::unordered_map< ::Window, DropTargetEntry >::const_iterator it; + std::unordered_map< ::Window, DropTargetEntry >::const_iterator it; if( aNewCurrentWindow != m_aDropWindow ) { #if OSL_DEBUG_LEVEL > 1 @@ -3162,7 +3162,7 @@ void SelectionManager::startDrag( int root_x(0), root_y(0), win_x(0), win_y(0); unsigned int mask(0); - ::boost::unordered_map< ::Window, DropTargetEntry >::const_iterator it; + std::unordered_map< ::Window, DropTargetEntry >::const_iterator it; it = m_aDropTargets.begin(); while( it != m_aDropTargets.end() ) { @@ -3558,7 +3558,7 @@ bool SelectionManager::handleXEvent( XEvent& rEvent ) ); #endif SelectionAdaptor* pAdaptor = getAdaptor( rEvent.xselectionclear.selection ); - boost::unordered_map< Atom, Selection* >::iterator it( m_aSelections.find( rEvent.xselectionclear.selection ) ); + std::unordered_map< Atom, Selection* >::iterator it( m_aSelections.find( rEvent.xselectionclear.selection ) ); if( it != m_aSelections.end() ) it->second->m_bOwner = false; aGuard.clear(); @@ -3683,7 +3683,7 @@ void SelectionManager::run( void* pThis ) osl::ClearableMutexGuard aGuard(This->m_aMutex); std::list< std::pair< SelectionAdaptor*, css::uno::Reference< XInterface > > > aChangeList; - for( boost::unordered_map< Atom, Selection* >::iterator it = This->m_aSelections.begin(); it != This->m_aSelections.end(); ++it ) + for( std::unordered_map< Atom, Selection* >::iterator it = This->m_aSelections.begin(); it != This->m_aSelections.end(); ++it ) { if( it->first != This->m_nXdndSelection && ! it->second->m_bOwner ) { @@ -3846,7 +3846,7 @@ void SelectionManager::deregisterHandler( Atom selection ) { osl::MutexGuard aGuard(m_aMutex); - ::boost::unordered_map< Atom, Selection* >::iterator it = + std::unordered_map< Atom, Selection* >::iterator it = m_aSelections.find( selection ); if( it != m_aSelections.end() ) { @@ -3873,7 +3873,7 @@ void SelectionManager::registerDropTarget( ::Window aWindow, DropTarget* pTarget osl::MutexGuard aGuard(m_aMutex); // sanity check - ::boost::unordered_map< ::Window, DropTargetEntry >::const_iterator it = + std::unordered_map< ::Window, DropTargetEntry >::const_iterator it = m_aDropTargets.find( aWindow ); if( it != m_aDropTargets.end() ) OSL_FAIL( "attempt to register window as drop target twice" ); @@ -3918,7 +3918,7 @@ void SelectionManager::deregisterDropTarget( ::Window aWindow ) if( aWindow == m_aDragSourceWindow && m_aDragRunning.check() ) { // abort drag - boost::unordered_map< ::Window, DropTargetEntry >::const_iterator it = + std::unordered_map< ::Window, DropTargetEntry >::const_iterator it = m_aDropTargets.find( m_aDropWindow ); if( it != m_aDropTargets.end() ) { diff --git a/vcl/unx/generic/dtrans/X11_selection.hxx b/vcl/unx/generic/dtrans/X11_selection.hxx index de588345c7fe..c04ae945ed51 100644 --- a/vcl/unx/generic/dtrans/X11_selection.hxx +++ b/vcl/unx/generic/dtrans/X11_selection.hxx @@ -34,8 +34,8 @@ #include <osl/conditn.hxx> -#include <boost/unordered_map.hpp> #include <list> +#include <unordered_map> #include <prex.h> #include <X11/Xlib.h> @@ -153,7 +153,7 @@ namespace x11 { >, public SelectionAdaptor { - static ::boost::unordered_map< OUString, SelectionManager*, OUStringHash >& getInstances(); + static std::unordered_map< OUString, SelectionManager*, OUStringHash >& getInstances(); // for INCR type selection transfer // INCR protocol is used if the data cannot @@ -323,7 +323,7 @@ namespace x11 { // drag and drop int m_nCurrentProtocolVersion; - ::boost::unordered_map< ::Window, DropTargetEntry > + std::unordered_map< ::Window, DropTargetEntry > m_aDropTargets; // some special atoms that are needed often @@ -353,16 +353,16 @@ namespace x11 { Atom m_nXdndActionPrivate; // caching for atoms - ::boost::unordered_map< Atom, OUString > + std::unordered_map< Atom, OUString > m_aAtomToString; - ::boost::unordered_map< OUString, Atom, OUStringHash > + std::unordered_map< OUString, Atom, OUStringHash > m_aStringToAtom; // the registered selections - ::boost::unordered_map< Atom, Selection* > + std::unordered_map< Atom, Selection* > m_aSelections; // IncrementalTransfers in progress - boost::unordered_map< ::Window, boost::unordered_map< Atom, IncrementalTransfer > > + std::unordered_map< ::Window, std::unordered_map< Atom, IncrementalTransfer > > m_aIncrementals; // do not use X11 multithreading capabilities diff --git a/vcl/unx/generic/dtrans/X11_service.cxx b/vcl/unx/generic/dtrans/X11_service.cxx index 4ec02c123416..360b29d087ad 100644 --- a/vcl/unx/generic/dtrans/X11_service.cxx +++ b/vcl/unx/generic/dtrans/X11_service.cxx @@ -73,7 +73,7 @@ css::uno::Reference< XInterface > X11SalInstance::CreateClipboard( const Sequenc } Atom nSelection = rManager.getAtom(sel); - ::boost::unordered_map< Atom, css::uno::Reference< XClipboard > >::iterator it = m_aInstances.find( nSelection ); + std::unordered_map< Atom, css::uno::Reference< XClipboard > >::iterator it = m_aInstances.find( nSelection ); if( it != m_aInstances.end() ) return it->second; diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx index 180992332dda..f0a69ee406e2 100644 --- a/vcl/unx/generic/gdi/salgdi3.cxx +++ b/vcl/unx/generic/gdi/salgdi3.cxx @@ -30,7 +30,6 @@ #include <sys/types.h> #include <basegfx/polygon/b2dpolypolygon.hxx> -#include <boost/unordered_set.hpp> #include <i18nlangtag/mslangid.hxx> #include <osl/file.hxx> #include <osl/module.hxx> diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx index a6ed76d29db0..52a255323c64 100644 --- a/vcl/unx/generic/printer/cupsmgr.cxx +++ b/vcl/unx/generic/printer/cupsmgr.cxx @@ -334,7 +334,7 @@ void CUPSManager::initialize() // behaviour aPrinter.m_aInfo.m_pParser = NULL; aPrinter.m_aInfo.m_aContext.setParser( NULL ); - boost::unordered_map< OUString, PPDContext, OUStringHash >::const_iterator c_it = m_aDefaultContexts.find( aPrinterName ); + std::unordered_map< OUString, PPDContext, OUStringHash >::const_iterator c_it = m_aDefaultContexts.find( aPrinterName ); if( c_it != m_aDefaultContexts.end() ) { aPrinter.m_aInfo.m_pParser = c_it->second.getParser(); @@ -351,7 +351,7 @@ void CUPSManager::initialize() // remove everything that is not a CUPS printer and not // a special purpose printer (PDF, Fax) std::list< OUString > aRemovePrinters; - for( boost::unordered_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.begin(); + for( std::unordered_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.begin(); it != m_aPrinters.end(); ++it ) { if( m_aCUPSDestMap.find( it->first ) != m_aCUPSDestMap.end() ) @@ -426,7 +426,7 @@ const PPDParser* CUPSManager::createCUPSParser( const OUString& rPrinter ) { if (m_nDests && m_pDests) { - boost::unordered_map< OUString, int, OUStringHash >::iterator dest_it = + std::unordered_map< OUString, int, OUStringHash >::iterator dest_it = m_aCUPSDestMap.find( aPrinter ); if( dest_it != m_aCUPSDestMap.end() ) { @@ -503,13 +503,13 @@ const PPDParser* CUPSManager::createCUPSParser( const OUString& rPrinter ) void CUPSManager::setupJobContextData( JobData& rData ) { - boost::unordered_map< OUString, int, OUStringHash >::iterator dest_it = + std::unordered_map< OUString, int, OUStringHash >::iterator dest_it = m_aCUPSDestMap.find( rData.m_aPrinterName ); if( dest_it == m_aCUPSDestMap.end() ) return PrinterInfoManager::setupJobContextData( rData ); - boost::unordered_map< OUString, Printer, OUStringHash >::iterator p_it = + std::unordered_map< OUString, Printer, OUStringHash >::iterator p_it = m_aPrinters.find( rData.m_aPrinterName ); if( p_it == m_aPrinters.end() ) // huh ? { @@ -630,7 +630,7 @@ bool CUPSManager::endSpool( const OUString& rPrintername, const OUString& rJobTi osl::MutexGuard aGuard( m_aCUPSMutex ); - boost::unordered_map< OUString, int, OUStringHash >::iterator dest_it = + std::unordered_map< OUString, int, OUStringHash >::iterator dest_it = m_aCUPSDestMap.find( rPrintername ); if( dest_it == m_aCUPSDestMap.end() ) { @@ -638,7 +638,7 @@ bool CUPSManager::endSpool( const OUString& rPrintername, const OUString& rJobTi return PrinterInfoManager::endSpool( rPrintername, rJobTitle, pFile, rDocumentJobData, bBanner, rFaxNumber ); } - boost::unordered_map< FILE*, OString, FPtrHash >::const_iterator it = m_aSpoolFiles.find( pFile ); + std::unordered_map< FILE*, OString, FPtrHash >::const_iterator it = m_aSpoolFiles.find( pFile ); if( it != m_aSpoolFiles.end() ) { fclose( pFile ); @@ -763,7 +763,7 @@ bool CUPSManager::removePrinter( const OUString& rName, bool bCheck ) bool CUPSManager::setDefaultPrinter( const OUString& rName ) { bool bSuccess = false; - boost::unordered_map< OUString, int, OUStringHash >::iterator nit = + std::unordered_map< OUString, int, OUStringHash >::iterator nit = m_aCUPSDestMap.find( rName ); if( nit != m_aCUPSDestMap.end() && m_aCUPSMutex.tryToAcquire() ) { @@ -787,10 +787,10 @@ bool CUPSManager::writePrinterConfig() bool bDestModified = false; rtl_TextEncoding aEncoding = osl_getThreadTextEncoding(); - for( boost::unordered_map< OUString, Printer, OUStringHash >::iterator prt = + for( std::unordered_map< OUString, Printer, OUStringHash >::iterator prt = m_aPrinters.begin(); prt != m_aPrinters.end(); ++prt ) { - boost::unordered_map< OUString, int, OUStringHash >::iterator nit = + std::unordered_map< OUString, int, OUStringHash >::iterator nit = m_aCUPSDestMap.find( prt->first ); if( nit == m_aCUPSDestMap.end() ) continue; diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx index 7238a44d57f9..ff4cdd685fd7 100644 --- a/vcl/unx/generic/printer/ppdparser.cxx +++ b/vcl/unx/generic/printer/ppdparser.cxx @@ -21,7 +21,6 @@ #include <stdio.h> #include <boost/noncopyable.hpp> -#include <boost/unordered_map.hpp> #include <comphelper/string.hxx> #include "vcl/ppdparser.hxx" @@ -45,6 +44,8 @@ #include "com/sun/star/lang/Locale.hpp" +#include <unordered_map> + namespace psp { class PPDTranslator @@ -71,8 +72,8 @@ namespace psp } }; - typedef boost::unordered_map< com::sun::star::lang::Locale, OUString, LocaleHash, LocaleEqual > translation_map; - typedef boost::unordered_map< OUString, translation_map, OUStringHash > key_translation_map; + typedef std::unordered_map< css::lang::Locale, OUString, LocaleHash, LocaleEqual > translation_map; + typedef std::unordered_map< OUString, translation_map, OUStringHash > key_translation_map; key_translation_map m_aTranslations; public: @@ -244,7 +245,7 @@ namespace psp { public: std::list< PPDParser* > aAllParsers; - boost::unordered_map< OUString, OUString, OUStringHash >* pAllPPDFiles; + std::unordered_map< OUString, OUString, OUStringHash >* pAllPPDFiles; PPDCache() : pAllPPDFiles(NULL) {} @@ -448,7 +449,7 @@ void PPDParser::initPPDFiles(PPDCache &rPPDCache) if( rPPDCache.pAllPPDFiles ) return; - rPPDCache.pAllPPDFiles = new boost::unordered_map< OUString, OUString, OUStringHash >(); + rPPDCache.pAllPPDFiles = new std::unordered_map< OUString, OUString, OUStringHash >(); // check installation directories std::list< OUString > aPathList; @@ -483,7 +484,7 @@ OUString PPDParser::getPPDFile( const OUString& rFile ) PPDDecompressStream aStream( aPPD.PathToFileName() ); if( ! aStream.IsOpen() ) { - boost::unordered_map< OUString, OUString, OUStringHash >::const_iterator it; + std::unordered_map< OUString, OUString, OUStringHash >::const_iterator it; PPDCache &rPPDCache = thePPDCache::get(); bool bRetry = true; diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx index 5dd8bfe7007c..1272792c6250 100644 --- a/vcl/unx/generic/printer/printerinfomanager.cxx +++ b/vcl/unx/generic/printer/printerinfomanager.cxx @@ -47,7 +47,7 @@ // the group of the global defaults #define GLOBAL_DEFAULTS_GROUP "__Global_Printer_Defaults__" -#include <boost/unordered_set.hpp> +#include <unordered_set> using namespace psp; using namespace osl; @@ -463,7 +463,7 @@ void PrinterInfoManager::initialize() FileBase::getFileURLFromSystemPath( aFile.PathToFileName(), aPrinter.m_aFile ); aPrinter.m_bModified = false; aPrinter.m_aGroup = aConfig.GetGroupName( nGroup ); - boost::unordered_map< OUString, Printer, OUStringHash >::const_iterator find_it = + std::unordered_map< OUString, Printer, OUStringHash >::const_iterator find_it = m_aPrinters.find( aPrinterName ); if( find_it != m_aPrinters.end() ) { @@ -537,7 +537,7 @@ void PrinterInfoManager::initialize() void PrinterInfoManager::listPrinters( ::std::list< OUString >& rList ) const { - ::boost::unordered_map< OUString, Printer, OUStringHash >::const_iterator it; + std::unordered_map< OUString, Printer, OUStringHash >::const_iterator it; rList.clear(); for( it = m_aPrinters.begin(); it != m_aPrinters.end(); ++it ) rList.push_back( it->first ); @@ -546,7 +546,7 @@ void PrinterInfoManager::listPrinters( ::std::list< OUString >& rList ) const const PrinterInfo& PrinterInfoManager::getPrinterInfo( const OUString& rPrinter ) const { static PrinterInfo aEmptyInfo; - ::boost::unordered_map< OUString, Printer, OUStringHash >::const_iterator it = m_aPrinters.find( rPrinter ); + std::unordered_map< OUString, Printer, OUStringHash >::const_iterator it = m_aPrinters.find( rPrinter ); DBG_ASSERT( it != m_aPrinters.end(), "Do not ask for info about nonexistent printers" ); @@ -555,7 +555,7 @@ const PrinterInfo& PrinterInfoManager::getPrinterInfo( const OUString& rPrinter void PrinterInfoManager::changePrinterInfo( const OUString& rPrinter, const PrinterInfo& rNewInfo ) { - ::boost::unordered_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.find( rPrinter ); + std::unordered_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.find( rPrinter ); DBG_ASSERT( it != m_aPrinters.end(), "Do not change nonexistant printers" ); @@ -582,9 +582,9 @@ static bool checkWriteability( const OUString& rUniPath ) bool PrinterInfoManager::writePrinterConfig() { // find at least one writeable config - ::boost::unordered_map< OUString, Config*, OUStringHash > files; - ::boost::unordered_map< OUString, int, OUStringHash > rofiles; - ::boost::unordered_map< OUString, Config*, OUStringHash >::iterator file_it; + std::unordered_map< OUString, Config*, OUStringHash > files; + std::unordered_map< OUString, int, OUStringHash > rofiles; + std::unordered_map< OUString, Config*, OUStringHash >::iterator file_it; for( ::std::list< WatchFile >::const_iterator wit = m_aWatchFiles.begin(); wit != m_aWatchFiles.end(); ++wit ) { @@ -601,7 +601,7 @@ bool PrinterInfoManager::writePrinterConfig() Config* pGlobal = files.begin()->second; pGlobal->SetGroup( GLOBAL_DEFAULTS_GROUP ); - ::boost::unordered_map< OUString, Printer, OUStringHash >::iterator it; + std::unordered_map< OUString, Printer, OUStringHash >::iterator it; for( it = m_aPrinters.begin(); it != m_aPrinters.end(); ++it ) { if( ! it->second.m_bModified ) @@ -772,7 +772,7 @@ bool PrinterInfoManager::removePrinter( const OUString& rPrinterName, bool bChec { bool bSuccess = true; - ::boost::unordered_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.find( rPrinterName ); + std::unordered_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.find( rPrinterName ); if( it != m_aPrinters.end() ) { if( !it->second.m_aFile.isEmpty() ) @@ -823,7 +823,7 @@ bool PrinterInfoManager::setDefaultPrinter( const OUString& rPrinterName ) { bool bSuccess = false; - ::boost::unordered_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.find( rPrinterName ); + std::unordered_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.find( rPrinterName ); if( it != m_aPrinters.end() ) { bSuccess = true; @@ -901,7 +901,7 @@ bool PrinterInfoManager::endSpool( const OUString& /*rPrintername*/, const OUStr void PrinterInfoManager::setupJobContextData( JobData& rData ) { - boost::unordered_map< OUString, Printer, OUStringHash >::iterator it = + std::unordered_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.find( rData.m_aPrinterName ); if( it != m_aPrinters.end() ) { @@ -1013,8 +1013,8 @@ static void lpgetSysQueueTokenHandler( const SystemCommandParameters* ) { rtl_TextEncoding aEncoding = osl_getThreadTextEncoding(); - boost::unordered_set< OUString, OUStringHash > aUniqueSet; - boost::unordered_set< OUString, OUStringHash > aOnlySet; + std::unordered_set< OUString, OUStringHash > aUniqueSet; + std::unordered_set< OUString, OUStringHash > aOnlySet; aUniqueSet.insert( OUString( "_all" ) ); aUniqueSet.insert( OUString( "_default" ) ); @@ -1110,7 +1110,7 @@ static void standardSysQueueTokenHandler( const SystemCommandParameters* i_pParms) { rtl_TextEncoding aEncoding = osl_getThreadTextEncoding(); - boost::unordered_set< OUString, OUStringHash > aUniqueSet; + std::unordered_set< OUString, OUStringHash > aUniqueSet; OString aForeToken( i_pParms->pForeToken ); OString aAftToken( i_pParms->pAftToken ); /* Normal Unix print queue discovery, also used for Darwin 5 LPR printing diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index d0f2bf2ac512..0e142aaa7267 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -34,7 +34,7 @@ #include <cmath> #include <vector> #include <algorithm> -#include <boost/unordered_map.hpp> +#include <unordered_map> #include "vcl/vclenum.hxx" #include <vcl/settings.hxx> @@ -175,7 +175,7 @@ struct NWFWidgetData // Keep a hash table of Widgets->default flags so that we can // easily and quickly reset each to a default state before using // them -static boost::unordered_map<long, guint> gWidgetDefaultFlags; +static std::unordered_map<long, guint> gWidgetDefaultFlags; class WidgetDataVector { private: diff --git a/writerfilter/inc/pch/precompiled_writerfilter.hxx b/writerfilter/inc/pch/precompiled_writerfilter.hxx index ded05d08b239..be50d59520cd 100644 --- a/writerfilter/inc/pch/precompiled_writerfilter.hxx +++ b/writerfilter/inc/pch/precompiled_writerfilter.hxx @@ -20,7 +20,6 @@ #include <boost/optional.hpp> #include <memory> #include <boost/tuple/tuple.hpp> -#include <boost/unordered_map.hpp> #include <com/sun/star/awt/FontPitch.hpp> #include <com/sun/star/awt/FontRelief.hpp> #include <com/sun/star/awt/FontSlant.hpp> @@ -227,6 +226,7 @@ #include <tools/mapunit.hxx> #include <tools/resmgr.hxx> #include <tools/stream.hxx> +#include <unordered_map> #include <unotools/datetime.hxx> #include <unotools/fontdefs.hxx> #include <unotools/localfilehelper.hxx> diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx index 69a8c7d755cc..5f1cd198a351 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx @@ -31,7 +31,8 @@ #include <stack> #include <queue> #include <boost/optional.hpp> -#include <boost/unordered_map.hpp> +#include <boost/tuple/tuple.hpp> +#include <unordered_map> #include <ooxml/resourceids.hxx> @@ -269,7 +270,7 @@ struct AnnotationPosition ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > m_xStart; ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > m_xEnd; }; -typedef boost::unordered_map< sal_Int32, AnnotationPosition > AnnotationPositions_t; +typedef std::unordered_map< sal_Int32, AnnotationPosition > AnnotationPositions_t; struct LineNumberSettings { diff --git a/writerfilter/source/dmapper/TagLogger.cxx b/writerfilter/source/dmapper/TagLogger.cxx index 5865e32a025b..e67b44772270 100644 --- a/writerfilter/source/dmapper/TagLogger.cxx +++ b/writerfilter/source/dmapper/TagLogger.cxx @@ -21,7 +21,7 @@ #include <string.h> #include "TagLogger.hxx" #include <ooxml/QNameToString.hxx> -#include <boost/unordered_map.hpp> +#include <unordered_map> using namespace css; @@ -92,7 +92,7 @@ namespace writerfilter TagLogger::Pointer_t TagLogger::getInstance(const char * name) { - typedef boost::unordered_map<std::string, TagLogger::Pointer_t> TagLoggerHashMap_t; + typedef std::unordered_map<std::string, TagLogger::Pointer_t> TagLoggerHashMap_t; static TagLoggerHashMap_t tagLoggers; TagLoggerHashMap_t::iterator aIt = tagLoggers.end(); diff --git a/writerperfect/source/common/WPXSvInputStream.cxx b/writerperfect/source/common/WPXSvInputStream.cxx index 5e23f6dd8b52..8233820b5eca 100644 --- a/writerperfect/source/common/WPXSvInputStream.cxx +++ b/writerperfect/source/common/WPXSvInputStream.cxx @@ -28,7 +28,7 @@ #include <boost/noncopyable.hpp> #include <boost/scoped_ptr.hpp> -#include <boost/unordered_map.hpp> +#include <unordered_map> namespace writerperfect { @@ -118,8 +118,8 @@ struct OLEStreamData rtl::OString name; }; -typedef boost::unordered_map<rtl::OUString, std::size_t, rtl::OUStringHash> NameMap_t; -typedef boost::unordered_map<rtl::OUString, SotStorageRefWrapper, rtl::OUStringHash> OLEStorageMap_t; +typedef std::unordered_map<rtl::OUString, std::size_t, rtl::OUStringHash> NameMap_t; +typedef std::unordered_map<rtl::OUString, SotStorageRefWrapper, rtl::OUStringHash> OLEStorageMap_t; /** Representation of an OLE2 storage. * diff --git a/xmlhelp/source/cxxhelp/provider/databases.hxx b/xmlhelp/source/cxxhelp/provider/databases.hxx index 4b22947cbdff..78ec84c0ae48 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.hxx +++ b/xmlhelp/source/cxxhelp/provider/databases.hxx @@ -23,9 +23,9 @@ #include <sal/config.h> #include <set> +#include <unordered_map> +#include <unordered_set> #include <vector> -#include <boost/unordered_map.hpp> -#include <boost/unordered_set.hpp> #include <osl/mutex.hxx> #include <rtl/ustring.hxx> #include <rtl/string.hxx> @@ -279,27 +279,27 @@ namespace chelp { std::vector< OUString > m_avModules; - typedef boost::unordered_map< OUString,helpdatafileproxy::Hdf*,OUStringHash > DatabasesTable; + typedef std::unordered_map< OUString,helpdatafileproxy::Hdf*,OUStringHash > DatabasesTable; DatabasesTable m_aDatabases; // Language and module dependent databases - typedef boost::unordered_map< OUString,OUString,OUStringHash > LangSetTable; + typedef std::unordered_map< OUString,OUString,OUStringHash > LangSetTable; LangSetTable m_aLangSet; // Mapping to of lang-country to lang - typedef boost::unordered_map< OUString,StaticModuleInformation*,OUStringHash > ModInfoTable; + typedef std::unordered_map< OUString,StaticModuleInformation*,OUStringHash > ModInfoTable; ModInfoTable m_aModInfo; // Module information - typedef boost::unordered_map< OUString,KeywordInfo*,OUStringHash > KeywordInfoTable; + typedef std::unordered_map< OUString,KeywordInfo*,OUStringHash > KeywordInfoTable; KeywordInfoTable m_aKeywordInfo; // Module information typedef - boost::unordered_map< + std::unordered_map< OUString, ::com::sun::star::uno::Reference< com::sun::star::container::XHierarchicalNameAccess >, OUStringHash > ZipFileTable; ZipFileTable m_aZipFileTable; // No closing of an once opened jarfile typedef - boost::unordered_map< + std::unordered_map< OUString, ::com::sun::star::uno::Reference< com::sun::star::i18n::XCollator >, OUStringHash > CollatorTable; @@ -307,7 +307,7 @@ namespace chelp { typedef - boost::unordered_set< + std::unordered_set< OString, OStringHash > EmptyActiveTextSet; EmptyActiveTextSet m_aEmptyActiveTextSet; @@ -329,7 +329,7 @@ namespace chelp { }; // Hashtable to cache extension help status - typedef boost::unordered_map + typedef std::unordered_map < OUString, bool, diff --git a/xmlhelp/source/cxxhelp/provider/db.hxx b/xmlhelp/source/cxxhelp/provider/db.hxx index 101a52c310d9..fb96ec42b593 100644 --- a/xmlhelp/source/cxxhelp/provider/db.hxx +++ b/xmlhelp/source/cxxhelp/provider/db.hxx @@ -21,9 +21,9 @@ #include <com/sun/star/ucb/XSimpleFileAccess3.hpp> -#include <boost/unordered_map.hpp> #include <osl/diagnose.h> #include <rtl/string.hxx> +#include <unordered_map> namespace helpdatafileproxy { @@ -63,8 +63,8 @@ namespace helpdatafileproxy { { return m_pBuffer; } }; - typedef boost::unordered_map< OString,std::pair<int,int>,OStringHash > StringToValPosMap; - typedef boost::unordered_map< OString,OString,OStringHash > StringToDataMap; + typedef std::unordered_map< OString,std::pair<int,int>,OStringHash > StringToValPosMap; + typedef std::unordered_map< OString,OString,OStringHash > StringToDataMap; class Hdf : hdf_internal::Noncopyable { diff --git a/xmloff/inc/StyleMap.hxx b/xmloff/inc/StyleMap.hxx index 2c1be800e2b6..1f3142a6aaac 100644 --- a/xmloff/inc/StyleMap.hxx +++ b/xmloff/inc/StyleMap.hxx @@ -22,7 +22,7 @@ #include <com/sun/star/lang/XUnoTunnel.hpp> #include <cppuhelper/implbase1.hxx> -#include <boost/unordered_map.hpp> +#include <unordered_map> struct StyleNameKey_Impl { @@ -64,7 +64,7 @@ inline bool StyleNameHash_Impl::operator()( class StyleMap : public ::cppu::WeakImplHelper1< ::com::sun::star::lang::XUnoTunnel>, - public ::boost::unordered_map< StyleNameKey_Impl, OUString, + public std::unordered_map< StyleNameKey_Impl, OUString, StyleNameHash_Impl, StyleNameHash_Impl > { diff --git a/xmloff/inc/pch/precompiled_xo.hxx b/xmloff/inc/pch/precompiled_xo.hxx index 3a8c4ab671d7..67ce4a1fdc8a 100644 --- a/xmloff/inc/pch/precompiled_xo.hxx +++ b/xmloff/inc/pch/precompiled_xo.hxx @@ -39,7 +39,6 @@ #include <boost/scoped_array.hpp> #include <boost/scoped_ptr.hpp> #include <boost/shared_ptr.hpp> -#include <boost/unordered_map.hpp> #include <cassert> #include <com/sun/star/animations/AnimationAdditiveMode.hpp> #include <com/sun/star/animations/AnimationCalcMode.hpp> @@ -552,6 +551,7 @@ #include <tools/time.hxx> #include <tools/urlobj.hxx> #include <typeinfo> +#include <unordered_map> #include <unotools/bootstrap.hxx> #include <unotools/calendarwrapper.hxx> #include <unotools/charclass.hxx> diff --git a/xmloff/inc/pch/precompiled_xof.hxx b/xmloff/inc/pch/precompiled_xof.hxx index 4edfb09d295f..02b1a9e0cca1 100644 --- a/xmloff/inc/pch/precompiled_xof.hxx +++ b/xmloff/inc/pch/precompiled_xof.hxx @@ -14,7 +14,6 @@ also fixes all possible problems, so it's usually better to use it). */ -#include <boost/unordered_map.hpp> #include <com/sun/star/beans/XPropertySetInfo.hpp> #include <com/sun/star/i18n/CharacterClassification.hpp> #include <com/sun/star/i18n/UnicodeType.hpp> @@ -37,5 +36,6 @@ #include <rtl/ustrbuf.hxx> #include <sax/tools/converter.hxx> #include <string.h> +#include <unordered_map> /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/core/nmspmap.cxx b/xmloff/source/core/nmspmap.cxx index d1aa755ce6f7..2f78a6a530ea 100644 --- a/xmloff/source/core/nmspmap.cxx +++ b/xmloff/source/core/nmspmap.cxx @@ -32,7 +32,7 @@ using namespace ::xmloff::token; /* The basic idea of this class is that we have two two ways to search our - * data...by prefix and by key. We use an STL boost::unordered_map for fast prefix + * data...by prefix and by key. We use an unordered_map for fast prefix * searching and an STL map for fast key searching. * * The references to an 'Index' refer to an earlier implementation of the diff --git a/xmloff/source/draw/EnhancedCustomShapeToken.cxx b/xmloff/source/draw/EnhancedCustomShapeToken.cxx index d9c45ea1698a..c8fa8a8eb337 100644 --- a/xmloff/source/draw/EnhancedCustomShapeToken.cxx +++ b/xmloff/source/draw/EnhancedCustomShapeToken.cxx @@ -19,12 +19,12 @@ #include "EnhancedCustomShapeToken.hxx" #include <osl/mutex.hxx> -#include <boost/unordered_map.hpp> +#include <unordered_map> #include <string.h> namespace xmloff { namespace EnhancedCustomShapeToken { -typedef boost::unordered_map< const char*, EnhancedCustomShapeTokenEnum, rtl::CStringHash, rtl::CStringEqual> TypeNameHashMap; +typedef std::unordered_map< const char*, EnhancedCustomShapeTokenEnum, rtl::CStringHash, rtl::CStringEqual> TypeNameHashMap; static TypeNameHashMap* pHashMap = NULL; static ::osl::Mutex& getHashMapMutex() { diff --git a/xmloff/source/draw/ximpcustomshape.cxx b/xmloff/source/draw/ximpcustomshape.cxx index fe6b60f19a7f..0db4b72f4aa3 100644 --- a/xmloff/source/draw/ximpcustomshape.cxx +++ b/xmloff/source/draw/ximpcustomshape.cxx @@ -44,8 +44,8 @@ #include <com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeTextPathMode.hpp> #include <com/sun/star/drawing/ProjectionMode.hpp> -#include <boost/unordered_map.hpp> #include <sax/tools/converter.hxx> +#include <unordered_map> using namespace ::com::sun::star; using namespace ::xmloff::token; @@ -1213,7 +1213,7 @@ void SdXMLCustomShapePropertyMerge( std::vector< com::sun::star::beans::Property } } -typedef boost::unordered_map< OUString, sal_Int32, OUStringHash > EquationHashMap; +typedef std::unordered_map< OUString, sal_Int32, OUStringHash > EquationHashMap; /* if rPara.Type is from type EnhancedCustomShapeParameterType::EQUATION, the name of the equation will be converted from OUString to index */ diff --git a/xmloff/source/forms/property_meta_data.cxx b/xmloff/source/forms/property_meta_data.cxx index e48e1f575887..e5898f38a04b 100644 --- a/xmloff/source/forms/property_meta_data.cxx +++ b/xmloff/source/forms/property_meta_data.cxx @@ -27,7 +27,7 @@ #include <tools/debug.hxx> #include <osl/diagnose.h> -#include <boost/unordered_map.hpp> +#include <unordered_map> namespace xmloff { namespace metadata { @@ -68,7 +68,7 @@ namespace xmloff { namespace metadata // one big instance, since in this case, every instance can quickly decide whether it is responsible // for some attribute or property, and otherwise delegate to the next instance. - typedef ::boost::unordered_map< OUString, const PropertyDescription*, OUStringHash > DescriptionsByName; + typedef std::unordered_map< OUString, const PropertyDescription*, OUStringHash > DescriptionsByName; const DescriptionsByName& lcl_getPropertyDescriptions() { @@ -105,7 +105,7 @@ namespace xmloff { namespace metadata return s_indexedPropertyGroups; } - typedef ::boost::unordered_map< OUString, XMLTokenEnum, OUStringHash > ReverseTokenLookup; + typedef std::unordered_map< OUString, XMLTokenEnum, OUStringHash > ReverseTokenLookup; const ReverseTokenLookup& getReverseTokenLookup() { @@ -131,7 +131,7 @@ namespace xmloff { namespace metadata } }; - typedef ::boost::unordered_multimap< AttributeDescription, PropertyGroup, AttributeHash > AttributeGroups; + typedef std::unordered_multimap< AttributeDescription, PropertyGroup, AttributeHash > AttributeGroups; const AttributeGroups& lcl_getAttributeGroups() { @@ -150,7 +150,7 @@ namespace xmloff { namespace metadata return s_attributeGroups; } - typedef ::boost::unordered_map< AttributeDescription, PropertyGroups, AttributeHash > AttributesWithoutGroup; + typedef std::unordered_map< AttributeDescription, PropertyGroups, AttributeHash > AttributesWithoutGroup; const AttributesWithoutGroup& lcl_getAttributesWithoutGroups() { diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index 9ad98920a93a..c73c802c73ee 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -21,9 +21,6 @@ #include <tools/debug.hxx> #include <rtl/ustrbuf.hxx> #include <sal/types.h> -#include <vector> -#include <list> -#include <boost/unordered_map.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> #include <com/sun/star/container/XEnumeration.hpp> @@ -108,6 +105,9 @@ #include <com/sun/star/document/XStorageBasedDocument.hpp> #include <txtlists.hxx> #include <com/sun/star/rdf/XMetadatable.hpp> +#include <list> +#include <unordered_map> +#include <vector> using namespace ::std; using namespace ::com::sun::star; @@ -198,7 +198,7 @@ namespace }; private: - typedef boost::unordered_map< + typedef std::unordered_map< Reference<XTextFrame>, TextContentSet, FrameRefHash> framebound_map_t; diff --git a/xmloff/source/transform/EventOASISTContext.cxx b/xmloff/source/transform/EventOASISTContext.cxx index a6bea92f8dee..03213bebbcd7 100644 --- a/xmloff/source/transform/EventOASISTContext.cxx +++ b/xmloff/source/transform/EventOASISTContext.cxx @@ -32,14 +32,14 @@ #include <com/sun/star/uri/XVndSunStarScriptUrl.hpp> #include <comphelper/processfactory.hxx> -#include <boost/unordered_map.hpp> +#include <unordered_map> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; using namespace ::xmloff::token; class XMLTransformerOASISEventMap_Impl: - public ::boost::unordered_map< NameKey_Impl, OUString, + public std::unordered_map< NameKey_Impl, OUString, NameHash_Impl, NameHash_Impl > { public: diff --git a/xmloff/source/transform/EventOOoTContext.cxx b/xmloff/source/transform/EventOOoTContext.cxx index 47a3c3611437..48ce63c1d91e 100644 --- a/xmloff/source/transform/EventOOoTContext.cxx +++ b/xmloff/source/transform/EventOOoTContext.cxx @@ -28,14 +28,14 @@ #include <rtl/ustrbuf.hxx> #include <osl/diagnose.h> -#include <boost/unordered_map.hpp> +#include <unordered_map> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; using namespace ::xmloff::token; class XMLTransformerOOoEventMap_Impl: - public ::boost::unordered_map< OUString, NameKey_Impl, OUStringHash > + public std::unordered_map< OUString, NameKey_Impl, OUStringHash > { public: diff --git a/xmloff/source/transform/TransformerActions.hxx b/xmloff/source/transform/TransformerActions.hxx index e28afc7f5a16..f1950ec138f7 100644 --- a/xmloff/source/transform/TransformerActions.hxx +++ b/xmloff/source/transform/TransformerActions.hxx @@ -22,10 +22,9 @@ #include <rtl/ustring.hxx> #include <xmloff/nmspmap.hxx> - -#include <boost/unordered_map.hpp> #include "TransformerActionInit.hxx" #include "TransformerAction.hxx" +#include <unordered_map> struct NameKey_Impl { @@ -133,7 +132,7 @@ struct TransformerAction_Impl }; class XMLTransformerActions : - public ::boost::unordered_map< NameKey_Impl, TransformerAction_Impl, + public std::unordered_map< NameKey_Impl, TransformerAction_Impl, NameHash_Impl, NameHash_Impl > { public: diff --git a/xmloff/source/transform/TransformerTokenMap.hxx b/xmloff/source/transform/TransformerTokenMap.hxx index b3a05a1e9817..30914f7dcf12 100644 --- a/xmloff/source/transform/TransformerTokenMap.hxx +++ b/xmloff/source/transform/TransformerTokenMap.hxx @@ -21,11 +21,11 @@ #define INCLUDED_XMLOFF_SOURCE_TRANSFORM_TRANSFORMERTOKENMAP_HXX #include <rtl/ustring.hxx> -#include <boost/unordered_map.hpp> #include <xmloff/xmltoken.hxx> +#include <unordered_map> class XMLTransformerTokenMap : - public ::boost::unordered_map< OUString, ::xmloff::token::XMLTokenEnum, + public std::unordered_map< OUString, ::xmloff::token::XMLTokenEnum, OUStringHash > { public: diff --git a/xmlscript/inc/pch/precompiled_xmlscript.hxx b/xmlscript/inc/pch/precompiled_xmlscript.hxx index 002f9b813ec7..d78546bb0872 100644 --- a/xmlscript/inc/pch/precompiled_xmlscript.hxx +++ b/xmlscript/inc/pch/precompiled_xmlscript.hxx @@ -14,7 +14,6 @@ also fixes all possible problems, so it's usually better to use it). */ -#include <boost/unordered_map.hpp> #include <com/sun/star/awt/CharSet.hpp> #include <com/sun/star/awt/FontFamily.hpp> #include <com/sun/star/awt/FontPitch.hpp> @@ -78,6 +77,7 @@ #include <tools/date.hxx> #include <tools/diagnose_ex.h> #include <tools/time.hxx> +#include <unordered_map> #include <vector> /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlscript/source/xml_helper/xml_impctx.cxx b/xmlscript/source/xml_helper/xml_impctx.cxx index df6b4a97c4ba..886b076d1952 100644 --- a/xmlscript/source/xml_helper/xml_impctx.cxx +++ b/xmlscript/source/xml_helper/xml_impctx.cxx @@ -31,10 +31,9 @@ #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <vector> -#include <boost/unordered_map.hpp> - #include <memory> +#include <unordered_map> +#include <vector> using namespace ::osl; using namespace ::com::sun::star; @@ -56,7 +55,7 @@ OUString getImplementationName_DocumentHandlerImpl() return OUString( "com.sun.star.comp.xml.input.SaxDocumentHandler" ); } -typedef ::boost::unordered_map< OUString, sal_Int32, OUStringHash > t_OUString2LongMap; +typedef std::unordered_map< OUString, sal_Int32, OUStringHash > t_OUString2LongMap; struct PrefixEntry { @@ -66,7 +65,7 @@ struct PrefixEntry { m_Uids.reserve( 4 ); } }; -typedef ::boost::unordered_map< +typedef std::unordered_map< OUString, PrefixEntry *, OUStringHash > t_OUString2PrefixMap; struct ElementEntry |