diff options
Diffstat (limited to 'include')
30 files changed, 95 insertions, 106 deletions
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 { |