From fd1372ba8b1c3eb3c7fad6d9c623176c8071f31b Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 1 Jan 2015 19:58:59 +0000 Subject: boost::unordered_map->std::unordered_map you can get debug stl this way Change-Id: Ia70a3e7c7c452390e8bee34975d296c9318e4a19 --- framework/inc/classes/filtercachedata.hxx | 23 +++++++++---------- framework/inc/pch/precompiled_fwe.hxx | 2 +- framework/inc/pch/precompiled_fwk.hxx | 2 +- framework/inc/stdtypes.h | 14 ++++++------ framework/inc/uiconfiguration/globalsettings.hxx | 10 +++------ framework/inc/uiconfiguration/imagemanager.hxx | 1 - framework/inc/uiconfiguration/imagetype.hxx | 18 +++++++-------- .../inc/uiconfiguration/moduleimagemanager.hxx | 12 ++++------ framework/inc/uielement/menubarmanager.hxx | 2 +- framework/inc/uielement/menubarwrapper.hxx | 2 -- framework/inc/uielement/newmenucontroller.hxx | 4 ++-- framework/inc/uielement/toolbarmanager.hxx | 6 +++-- framework/inc/uielement/uicommanddescription.hxx | 22 +++++++++--------- .../configurationaccessfactorymanager.hxx | 10 ++++----- framework/inc/uifactory/factoryconfiguration.hxx | 5 +++-- framework/inc/xml/imagesdocumenthandler.hxx | 10 ++++----- framework/inc/xml/statusbardocumenthandler.hxx | 10 ++++----- framework/inc/xml/toolboxdocumenthandler.hxx | 8 +++---- framework/source/fwe/classes/addonsoptions.cxx | 8 +++---- .../source/inc/accelerators/acceleratorcache.hxx | 8 +++---- framework/source/inc/accelerators/keymapping.hxx | 8 +++---- .../source/inc/accelerators/storageholder.hxx | 8 +++---- framework/source/services/desktop.cxx | 2 +- framework/source/services/frame.cxx | 2 +- framework/source/services/substitutepathvars.cxx | 6 ++--- framework/source/services/tabwindowservice.cxx | 8 +++---- .../source/uiconfiguration/imagemanagerimpl.hxx | 19 +++++++--------- .../source/uiconfiguration/moduleuicfgsupplier.cxx | 6 ++--- .../moduleuiconfigurationmanager.cxx | 16 ++++++------- .../uiconfiguration/uicategorydescription.cxx | 10 ++++----- .../uiconfiguration/uiconfigurationmanager.cxx | 14 ++++++------ .../uiconfiguration/windowstateconfiguration.cxx | 26 +++++++++++----------- .../source/uielement/controlmenucontroller.cxx | 8 +++---- framework/source/uielement/newmenucontroller.cxx | 2 +- .../source/uielement/toolbarsmenucontroller.cxx | 2 +- .../source/uielement/uicommanddescription.cxx | 8 +++---- 36 files changed, 153 insertions(+), 169 deletions(-) (limited to 'framework') 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 -#include -#include - #include #include #include @@ -45,6 +38,10 @@ #include #include +#include +#include +#include + 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 #include -#include +#include #include #include #include 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 +#include #include #include #include -#include #include #include #include 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 #include -#include +#include +#include #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 -#include -#include - #include #include #include @@ -40,6 +33,9 @@ #include #include +#include +#include + 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 #include #include 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 #include +#include 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 -#include -#include -#include - #include #include #include @@ -53,6 +45,10 @@ #include #include +#include +#include +#include + 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 #include -#include - 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 #include #include -#include +#include 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 #include +#include + 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 - +#include #include - #include #include #include @@ -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 #include -#include +#include 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 > { 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 #include +#include // 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 #include -#include +#include #include 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 #include -#include +#include #include #include @@ -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 > { 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 > { 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 #include -#include #include +#include #include // 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 #include -#include +#include #include using namespace com::sun::star::uno; @@ -107,7 +107,7 @@ struct SubstituteRule EnvironmentType aEnvType; }; -typedef boost::unordered_map +typedef std::unordered_map 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 + typedef std::unordered_map 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 -#include -#include - #include #include #include @@ -53,6 +46,10 @@ #include #include +#include +#include +#include + 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 #include -#include +#include 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 #include -#include +#include using namespace com::sun::star::uno; using namespace com::sun::star::lang; @@ -101,10 +101,10 @@ class ConfigurationAccess_UICategory : public ::cppu::WeakImplHelper2 > 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 #include -#include +#include 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 #include +#include #include -#include 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( 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(); -- cgit