diff options
Diffstat (limited to 'framework/inc')
18 files changed, 74 insertions, 87 deletions
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() |