tdf#97499 Fixed containers parameters clearing #4

Change-Id: I7c96181399f4d7e62d4aceca404b22d68f903513 Reviewed-on: https://gerrit.libreoffice.org/23754 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2016-04-03 17:42:53 +02:00 · 2016-04-03 17:42:53 +02:00 · c20cc7e79b
commit c20cc7e79b
parent bfb9612226
42 changed files with 52 additions and 81 deletions
--- a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
+++ b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
@ -384,8 +384,7 @@ private:

 typedef std::unordered_map< OUString,
                         css::beans::PropertyValue,
-                         OUStringHash,
-                         ::std::equal_to< OUString > > tPropValMap;
+                         OUStringHash > tPropValMap;

 class Document: public ::VCLXAccessibleComponent, public ::SfxListener
 {
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@ -1148,7 +1148,7 @@ struct ClassModuleRunInitItem
 // to allow forward declaration in sbmod.hxx
 class ModuleInitDependencyMap : public
    std::unordered_map< OUString, ClassModuleRunInitItem,
-                          OUStringHash, ::std::equal_to< OUString > >
+                          OUStringHash >
 {};

 void SbModule::implProcessModuleRunInit( ModuleInitDependencyMap& rMap, ClassModuleRunInitItem& rItem )
--- a/basic/source/inc/sbunoobj.hxx
+++ b/basic/source/inc/sbunoobj.hxx
@ -366,7 +366,7 @@ public:
    virtual void Clear() override;
 };

-typedef std::unordered_map< OUString, css::uno::Any, OUStringHash, ::std::equal_to< OUString > > VBAConstantsHash;
+typedef std::unordered_map< OUString, css::uno::Any, OUStringHash > VBAConstantsHash;

 typedef std::vector< OUString > VBAConstantsVector;

--- a/connectivity/source/drivers/postgresql/pq_connection.hxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.hxx
@ -147,9 +147,7 @@ struct HashByteSequence
 typedef std::unordered_map<
    ::rtl::ByteSequence,
    ::com::sun::star::uno::WeakReference< com::sun::star::sdbc::XCloseable >,
-    HashByteSequence,
-    ::std::equal_to< ::rtl::ByteSequence >
-> WeakHashMap;
+    HashByteSequence > WeakHashMap;
 typedef ::std::vector< OString > OStringVector;


--- a/connectivity/source/drivers/postgresql/pq_tools.hxx
+++ b/connectivity/source/drivers/postgresql/pq_tools.hxx
@ -129,9 +129,7 @@ typedef std::unordered_map
 <
    OString,
    OString,
-    OStringHash,
-    ::std::equal_to< OString >
-> String2StringMap;
+    OStringHash > String2StringMap;

 OUString querySingleValue(
    const com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > &connection,
--- a/connectivity/source/drivers/postgresql/pq_xcontainer.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xcontainer.hxx
@ -89,8 +89,7 @@ typedef std::unordered_map
 <
   OUString,
   sal_Int32,
-   OUStringHash,
-   ::std::equal_to< OUString >
+   OUStringHash
 > String2IntMap;

 typedef ::cppu::WeakComponentImplHelper
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@ -107,8 +107,7 @@ typedef std::unordered_map<

 // mapping from ptr to object entry
 typedef std::unordered_map<
-    void *, ObjectEntry *, FctPtrHash,
-    std::equal_to< void * > > Ptr2ObjectMap;
+    void *, ObjectEntry *, FctPtrHash > Ptr2ObjectMap;
 // mapping from oid to object entry
 typedef std::unordered_map<
    OUString, ObjectEntry *, OUStringHash > OId2ObjectMap;
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@ -1387,7 +1387,7 @@ SvxEntries* ContextMenuSaveInData::GetEntries()
 {
    if ( !m_pRootEntry )
    {
-        typedef std::unordered_map< OUString, bool, OUStringHash, std::equal_to< OUString > > MenuInfo;
+        typedef std::unordered_map< OUString, bool, OUStringHash > MenuInfo;
        MenuInfo aMenuInfo;

        m_pRootEntry.reset( new SvxConfigEntry( "ContextMenus", OUString(), true ) );
@ -3899,7 +3899,7 @@ OUString ToolbarSaveInData::GetSystemUIName( const OUString& rResourceURL )
 SvxEntries* ToolbarSaveInData::GetEntries()
 {
    typedef std::unordered_map<OUString, bool,
-                               OUStringHash, std::equal_to< OUString > > ToolbarInfo;
+                               OUStringHash > ToolbarInfo;

    ToolbarInfo aToolbarInfo;

@ -4965,7 +4965,7 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( vcl::Window *pWindow,
    pTbSymbol->SetStyle(pTbSymbol->GetStyle() | WB_SCROLL | WB_LINESPACING);

    typedef std::unordered_map< OUString, bool,
-                                OUStringHash, std::equal_to< OUString > > ImageInfo;
+                                OUStringHash > ImageInfo;

    pTbSymbol->SetPageScroll( true );

--- a/cui/source/inc/scriptdlg.hxx
+++ b/cui/source/inc/scriptdlg.hxx
@ -39,7 +39,7 @@
 #define OBJTYPE_SFROOT          4L

 typedef std::unordered_map < OUString, OUString,
-                             OUStringHash, std::equal_to< OUString > > Selection_hash;
+                             OUStringHash > Selection_hash;

 class SFEntry;

--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@ -100,7 +100,7 @@ static const DispatchInfo SupportedCommandsArray[] =
    { nullptr                         ,   0                               , false }
 };

-typedef std::unordered_map< OUString, CacheDispatchInfo, OUStringHash, ::std::equal_to< OUString > > CmdToInfoCache;
+typedef std::unordered_map< OUString, CacheDispatchInfo, OUStringHash > CmdToInfoCache;

 const CmdToInfoCache& GetCommandToInfoCache()
 {
--- a/framework/inc/uielement/menubarmanager.hxx
+++ b/framework/inc/uielement/menubarmanager.hxx
@ -64,7 +64,7 @@ struct PopupControllerEntry
    css::uno::WeakReference< css::frame::XDispatchProvider > m_xDispatchProvider;
 };

-typedef std::unordered_map< OUString, PopupControllerEntry, OUStringHash, std::equal_to< OUString > > PopupControllerCache;
+typedef std::unordered_map< OUString, PopupControllerEntry, OUStringHash > PopupControllerCache;

 class BmkMenu;
 class AddonMenu;
--- a/framework/inc/xml/toolboxdocumenthandler.hxx
+++ b/framework/inc/xml/toolboxdocumenthandler.hxx
@ -106,8 +106,7 @@ class FWE_DLLPUBLIC OReadToolBoxDocumentHandler :

        class ToolBoxHashMap : public std::unordered_map<OUString,
                                                         ToolBox_XML_Entry,
-                                                         OUStringHash,
-                                                         std::equal_to< OUString >  >
+                                                         OUStringHash >
        {
        };

--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@ -229,10 +229,10 @@ class AddonsOptions_Impl : public ConfigItem
            void addImage(ImageSize eSize, const Image &rImage, const OUString &rURL);
        };

-        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::unordered_map< OUString, ImageEntry, OUStringHash > ImageManager;
+        typedef std::unordered_map< OUString, sal_uInt32, OUStringHash > StringToIndexMap;
        typedef std::vector< Sequence< Sequence< PropertyValue > > > AddonToolBars;
-        typedef std::unordered_map< OUString, MergeToolbarInstructionContainer, OUStringHash, std::equal_to< OUString > > ToolbarMergingInstructions;
+        typedef std::unordered_map< OUString, MergeToolbarInstructionContainer, OUStringHash > ToolbarMergingInstructions;

        /*-****************************************************************************************************
            @short      return list of key names of our configuration management which represent oue module tree
--- a/framework/source/inc/accelerators/storageholder.hxx
+++ b/framework/source/inc/accelerators/storageholder.hxx
@ -58,8 +58,7 @@ class StorageHolder
        /** @short  TODO */
        typedef std::unordered_map< OUString                    ,
                                    TStorageInfo                       ,
-                                    OUStringHash                ,
-                                    std::equal_to< OUString > > TPath2StorageInfo;
+                                    OUStringHash > TPath2StorageInfo;

    // member
    private:
--- a/framework/source/services/tabwindowservice.cxx
+++ b/framework/source/services/tabwindowservice.cxx
@ -71,8 +71,7 @@ struct TTabPageInfo

 typedef std::unordered_map< ::sal_Int32                    ,
                            TTabPageInfo                   ,
-                            Int32HashCode                  ,
-                            std::equal_to< ::sal_Int32 > > TTabPageInfoHash;
+                            Int32HashCode > TTabPageInfoHash;

 /*-************************************************************************************************************
    @short  implements a helper service providing a dockable tab control window
--- 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 std::unordered_map< OUString, UIElementData, OUStringHash, std::equal_to< OUString > > UIElementDataHashMap;
+    typedef std::unordered_map< OUString, UIElementData, OUStringHash > UIElementDataHashMap;

    struct UIElementType
    {
@ -187,7 +187,7 @@ private:

    typedef std::vector< UIElementType > UIElementTypesVector;
    typedef std::vector< css::ui::ConfigurationEvent > ConfigEventNotifyContainer;
-    typedef std::unordered_map< OUString, UIElementInfo, OUStringHash, std::equal_to< OUString > > UIElementInfoHashMap;
+    typedef std::unordered_map< OUString, UIElementInfo, OUStringHash > UIElementInfoHashMap;

    void            impl_Initialize();
    void            implts_notifyContainerListener( const css::ui::ConfigurationEvent& aEvent, NotifyOp eOp );
--- a/framework/source/uiconfiguration/uicategorydescription.cxx
+++ b/framework/source/uiconfiguration/uicategorydescription.cxx
@ -97,8 +97,7 @@ class ConfigurationAccess_UICategory : public ::cppu::WeakImplHelper<XNameAccess
    private:
        typedef std::unordered_map< OUString,
                                    OUString,
-                                    OUStringHash,
-                                    std::equal_to< OUString > > IdToInfoCache;
+                                    OUStringHash > IdToInfoCache;

        void initializeConfigAccess();

--- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
@ -150,7 +150,7 @@ private:

    struct UIElementType;
    friend struct UIElementType;
-    typedef std::unordered_map< OUString, UIElementData, OUStringHash, std::equal_to< OUString > > UIElementDataHashMap;
+    typedef std::unordered_map< OUString, UIElementData, OUStringHash > UIElementDataHashMap;

    struct UIElementType
    {
@ -169,7 +169,7 @@ private:

    typedef std::vector< UIElementType > UIElementTypesVector;
    typedef std::vector< css::ui::ConfigurationEvent > ConfigEventNotifyContainer;
-    typedef std::unordered_map< OUString, UIElementInfo, OUStringHash, std::equal_to< OUString > > UIElementInfoHashMap;
+    typedef std::unordered_map< OUString, UIElementInfo, OUStringHash > UIElementInfoHashMap;

    void            impl_Initialize();
    void            implts_notifyContainerListener( const css::ui::ConfigurationEvent& aEvent, NotifyOp eOp );
--- a/framework/source/uiconfiguration/windowstateconfiguration.cxx
+++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx
@ -218,8 +218,7 @@ class ConfigurationAccess_WindowState : public  ::cppu::WeakImplHelper< XNameCon
    private:
        typedef std::unordered_map< OUString,
                                    WindowStateInfo,
-                                    OUStringHash,
-                                    std::equal_to< OUString > > ResourceURLToInfoCache;
+                                    OUStringHash > ResourceURLToInfoCache;

        osl::Mutex                        m_aMutex;
        OUString                          m_aConfigWindowAccess;
@ -1317,13 +1316,11 @@ public:

    typedef std::unordered_map< OUString,
                                OUString,
-                                OUStringHash,
-                                std::equal_to< OUString > > ModuleToWindowStateFileMap;
+                                OUStringHash > ModuleToWindowStateFileMap;

    typedef std::unordered_map< OUString,
                                css::uno::Reference< css::container::XNameAccess >,
-                                OUStringHash,
-                                std::equal_to< OUString > > ModuleToWindowStateConfigHashMap;
+                                OUStringHash > ModuleToWindowStateConfigHashMap;

 private:
    css::uno::Reference< css::uno::XComponentContext>         m_xContext;
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@ -221,8 +221,7 @@ private:

    class UrlToDispatchMap : public std::unordered_map< OUString,
                                                        uno::Reference< frame::XDispatch >,
-                                                        OUStringHash,
-                                                        std::equal_to< OUString > >
+                                                        OUStringHash >
    {
        public:
            inline void free()
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@ -83,7 +83,7 @@ static const char STATIC_INTERNAL_CMD_PART[]    = ".cmd:";
 namespace framework
 {

-typedef std::unordered_map< OUString, OUString, OUStringHash, std::equal_to< OUString > > ToolbarHashMap;
+typedef std::unordered_map< OUString, OUString, OUStringHash > ToolbarHashMap;

 struct ToolBarEntry
 {
--- a/framework/source/uielement/uicommanddescription.cxx
+++ b/framework/source/uielement/uicommanddescription.cxx
@ -145,8 +145,7 @@ class ConfigurationAccess_UICommand : // Order is necessary for right initializa
    private:
        typedef std::unordered_map< OUString,
                                    CmdToInfoMap,
-                                    OUStringHash,
-                                    std::equal_to< OUString > > CommandToInfoCache;
+                                    OUStringHash > CommandToInfoCache;

        void initializeConfigAccess();

--- a/include/comphelper/sequenceashashmap.hxx
+++ b/include/comphelper/sequenceashashmap.hxx
@ -43,8 +43,7 @@ namespace comphelper{
 struct SequenceAsHashMapBase : public std::unordered_map<
    OUString                    ,
    css::uno::Any         ,
-    OUStringHash                ,
-    ::std::equal_to< OUString > >
+    OUStringHash >
 {
 };

--- a/include/formula/FormulaCompiler.hxx
+++ b/include/formula/FormulaCompiler.hxx
@ -60,8 +60,8 @@ struct FormulaArrayStack
 };


-typedef std::unordered_map< OUString, OpCode, OUStringHash, ::std::equal_to< OUString > > OpCodeHashMap;
-typedef std::unordered_map< OUString, OUString, OUStringHash, ::std::equal_to< OUString > > ExternalHashMap;
+typedef std::unordered_map< OUString, OpCode, OUStringHash > OpCodeHashMap;
+typedef std::unordered_map< OUString, OUString, OUStringHash > ExternalHashMap;

 class FORMULA_DLLPUBLIC FormulaCompiler
 {
--- a/include/svtools/toolboxcontroller.hxx
+++ b/include/svtools/toolboxcontroller.hxx
@ -153,8 +153,7 @@ class SVT_DLLPUBLIC ToolboxController :

        typedef std::unordered_map< OUString,
                                    css::uno::Reference< css::frame::XDispatch >,
-                                    OUStringHash,
-                                    std::equal_to< OUString > > URLToDispatchMap;
+                                    OUStringHash > URLToDispatchMap;

        // methods to support status forwarder, known by the old sfx2 toolbox controller implementation
        void addStatusListener( const OUString& aCommandURL );
--- a/sal/rtl/bootstrap.cxx
+++ b/sal/rtl/bootstrap.cxx
@ -581,7 +581,7 @@ namespace {
 struct bootstrap_map: private boost::noncopyable {
    typedef std::unordered_map<
        rtl::OUString, Bootstrap_Impl *,
-        rtl::OUStringHash, std::equal_to< rtl::OUString > > t;
+        rtl::OUStringHash > t;

    // get and release must only be called properly synchronized via some mutex
    // (e.g., osl::Mutex::getGlobalMutex()):
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@ -68,7 +68,7 @@ struct NamespaceDefine;
 struct Entity;

 typedef std::unordered_map< OUString, sal_Int32,
-        OUStringHash, std::equal_to< OUString > > NamespaceMap;
+        OUStringHash > NamespaceMap;

 typedef std::vector<Event> EventList;

--- a/sc/source/core/tool/formulaparserpool.cxx
+++ b/sc/source/core/tool/formulaparserpool.cxx
@ -48,7 +48,7 @@ public:
 private:
    typedef std::unordered_map<
        OUString, Reference< XSingleComponentFactory >,
-        OUStringHash, std::equal_to< OUString > > FactoryMap;
+        OUStringHash > FactoryMap;

    Reference< XComponentContext > mxContext;   /// Global component context.
    FactoryMap          maFactories;            /// All parser factories, mapped by formula namespace.
--- a/sc/source/filter/excel/excimp8.cxx
+++ b/sc/source/filter/excel/excimp8.cxx
@ -113,8 +113,7 @@ using namespace ::comphelper;
 class OleNameOverrideContainer : public ::cppu::WeakImplHelper< container::XNameContainer >
 {
 private:
-    typedef std::unordered_map< OUString, uno::Reference< container::XIndexContainer >, OUStringHash,
-       std::equal_to< OUString > > NamedIndexToOleName;
+    typedef std::unordered_map< OUString, uno::Reference< container::XIndexContainer >, OUStringHash > NamedIndexToOleName;
    NamedIndexToOleName  IdToOleNameHash;
    ::osl::Mutex m_aMutex;
 public:
--- a/sc/source/ui/vba/vbawindow.cxx
+++ b/sc/source/ui/vba/vbawindow.cxx
@ -50,8 +50,7 @@ using namespace ::ooo::vba;
 using namespace ::ooo::vba::excel::XlWindowState;

 typedef  std::unordered_map< OUString,
-SCTAB, OUStringHash,
-::std::equal_to< OUString > > NameIndexHash;
+SCTAB, OUStringHash > NameIndexHash;

 typedef std::vector< uno::Reference< sheet::XSpreadsheet > > Sheets;

--- a/sc/source/ui/vba/vbawindows.cxx
+++ b/sc/source/ui/vba/vbawindows.cxx
@ -33,8 +33,7 @@ using namespace ::com::sun::star;
 using namespace ::ooo::vba;

 typedef  std::unordered_map< OUString,
-sal_Int32, OUStringHash,
-std::equal_to< OUString > > NameIndexHash;
+sal_Int32, OUStringHash > NameIndexHash;

 static uno::Reference< XHelperInterface > lcl_createWorkbookHIParent( const uno::Reference< frame::XModel >& xModel, const uno::Reference< uno::XComponentContext >& xContext, const uno::Any& aApplication )
 {
--- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx
+++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
@ -157,7 +157,7 @@ public:

 //typedef std::map< OUString, Reference< browse::XBrowseNode > >
 typedef std::unordered_map< OUString, Reference< browse::XBrowseNode >,
-    OUStringHash, ::std::equal_to< OUString > >
+    OUStringHash >
        BrowseNodeAggregatorHash;
 typedef std::vector< OUString > vString;

--- a/scripting/source/vbaevents/eventhelper.cxx
+++ b/scripting/source/vbaevents/eventhelper.cxx
@ -190,8 +190,7 @@ struct TranslateInfo

 typedef std::unordered_map< OUString,
 std::list< TranslateInfo >,
-OUStringHash,
-::std::equal_to< OUString > > EventInfoHash;
+OUStringHash > EventInfoHash;


 struct TranslatePropMap
@ -487,8 +486,7 @@ public:
    { return !m_hEvents.empty(); }
 private:

-typedef std::unordered_map< OUString, Any, OUStringHash,
-::std::equal_to< OUString > > EventSupplierHash;
+typedef std::unordered_map< OUString, Any, OUStringHash > EventSupplierHash;

    EventSupplierHash m_hEvents;
 };
--- a/svgio/source/svgreader/svgtoken.cxx
+++ b/svgio/source/svgreader/svgtoken.cxx
@ -167,7 +167,7 @@ namespace svgio

        SVGToken StrToSVGToken(const OUString& rStr, bool bCaseIndependent)
        {
-            typedef std::unordered_map< OUString, SVGToken, OUStringHash, std::equal_to< OUString >  > SVGTokenMapper;
+            typedef std::unordered_map< OUString, SVGToken, OUStringHash > SVGTokenMapper;
            typedef std::pair< OUString, SVGToken > SVGTokenValueType;
            static SVGTokenMapper aSVGTokenMapperList;

--- a/svgio/source/svgreader/svgtools.cxx
+++ b/svgio/source/svgreader/svgtools.cxx
@ -638,9 +638,7 @@ namespace svgio
        bool match_colorKeyword(basegfx::BColor& rColor, const OUString& rName, bool bCaseIndependent)
        {
            typedef std::unordered_map< OUString, Color,
-                      OUStringHash,
-                      ::std::equal_to< OUString >
-                      > ColorTokenMapper;
+                      OUStringHash > ColorTokenMapper;
            typedef std::pair< OUString, Color > ColorTokenValueType;
            ColorTokenMapper aColorTokenMapperList;

--- a/sw/source/core/access/accpara.hxx
+++ b/sw/source/core/access/accpara.hxx
@ -51,8 +51,7 @@ namespace com { namespace sun { namespace star {

 typedef std::unordered_map< OUString,
                         css::beans::PropertyValue,
-                         OUStringHash,
-                         ::std::equal_to< OUString > > tAccParaPropValMap;
+                         OUStringHash > tAccParaPropValMap;

 class SwAccessibleParagraph :
        public SwClient, // #i108125#
--- a/sw/source/ui/vba/vbadocumentproperties.cxx
+++ b/sw/source/ui/vba/vbadocumentproperties.cxx
@ -657,7 +657,7 @@ public:
    }
 };

-typedef std::unordered_map< OUString, uno::Reference< XDocumentProperty >, OUStringHash, ::std::equal_to< OUString > > DocPropsByName;
+typedef std::unordered_map< OUString, uno::Reference< XDocumentProperty >, OUStringHash > DocPropsByName;

 class BuiltInPropertiesImpl : public PropertiesImpl_BASE
 {
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@ -76,8 +76,7 @@ using namespace ::com::sun::star::util;
 template< typename T >
 class SimpleNamedThingContainer : public ::cppu::WeakImplHelper< container::XNameContainer >
 {
-    typedef std::unordered_map< OUString, Reference< T >, OUStringHash,
-       std::equal_to< OUString > > NamedThingsHash;
+    typedef std::unordered_map< OUString, Reference< T >, OUStringHash > NamedThingsHash;
    NamedThingsHash things;
    ::osl::Mutex m_aMutex;
 public:
--- a/unotools/source/config/eventcfg.cxx
+++ b/unotools/source/config/eventcfg.cxx
@ -77,7 +77,7 @@ static o3tl::enumarray<GlobalEventId, const char*> pEventAsciiNames =
 "OnStorageChanged"
 };

-typedef std::unordered_map< OUString, OUString, OUStringHash, std::equal_to< OUString > > EventBindingHash;
+typedef std::unordered_map< OUString, OUString, OUStringHash > EventBindingHash;
 typedef std::vector< css::uno::WeakReference< css::frame::XFrame > > FrameVector;
 typedef o3tl::enumarray< GlobalEventId, OUString > SupportedEventsVector;

--- a/vbahelper/source/msforms/vbacontrols.cxx
+++ b/vbahelper/source/msforms/vbacontrols.cxx
@ -38,8 +38,7 @@ using namespace com::sun::star;
 using namespace ooo::vba;


-typedef  std::unordered_map< OUString, sal_Int32, OUStringHash,
-                             std::equal_to< OUString >  > ControlIndexMap;
+typedef  std::unordered_map< OUString, sal_Int32, OUStringHash > ControlIndexMap;
 typedef  std::vector< uno::Reference< awt::XControl > > ControlVec;

 class ControlArrayWrapper : public ::cppu::WeakImplHelper< container::XNameAccess, container::XIndexAccess >
--- a/vbahelper/source/vbahelper/vbaapplicationbase.cxx
+++ b/vbahelper/source/vbahelper/vbaapplicationbase.cxx
@ -143,7 +143,7 @@ struct VbaTimerInfoHash
 };

 // ====VbaTimerHashMap==================================
-typedef std::unordered_map< VbaTimerInfo, VbaTimer*, VbaTimerInfoHash, std::equal_to< VbaTimerInfo > > VbaTimerHashMap;
+typedef std::unordered_map< VbaTimerInfo, VbaTimer*, VbaTimerInfoHash > VbaTimerHashMap;

 // ====VbaApplicationBase_Impl==================================
 struct VbaApplicationBase_Impl
--- a/vbahelper/source/vbahelper/vbadocumentsbase.cxx
+++ b/vbahelper/source/vbahelper/vbadocumentsbase.cxx
@ -59,8 +59,7 @@ static const char aSpreadsheetDocument[] = "com.sun.star.sheet.SpreadsheetDocume
 static const char aTextDocument[] = "com.sun.star.text.TextDocument";

 typedef  std::unordered_map< OUString,
-                             sal_Int32, OUStringHash,
-                             ::std::equal_to< OUString > > NameIndexHash;
+                             sal_Int32, OUStringHash > NameIndexHash;

 typedef std::vector < uno::Reference< frame::XModel > > Documents;