tdf#97499 Fixed containers parameters clearing #3

Change-Id: I1c105de7e1df251533179fba77e3797ef1c4e2d4
Reviewed-on: https://gerrit.libreoffice.org/23752
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

10 files changed, 13 insertions, 25 deletions

diff --git a/framework/inc/classes/filtercachedata.hxx b/framework/inc/classes/filtercachedata.hxx
index 8e1e53d7ad35..f6716786aa9b 100644
--- a/framework/inc/classes/filtercachedata.hxx
+++ b/framework/inc/classes/filtercachedata.hxx
@@ -310,8 +310,7 @@ struct ContentHandler
 template< class HashType >
 class SetNodeHash : public std::unordered_map< OUString                    ,
                                                HashType                           ,
-                                               OUStringHash                  ,
-                                               std::equal_to< OUString > >
+                                               OUStringHash >
 {
 };
 
@@ -321,8 +320,7 @@ class SetNodeHash : public std::unordered_map< OUString                    ,
 
 class PerformanceHash   :   public  std::unordered_map< OUString,
                                                         OUStringList,
-                                                        OUStringHash,
-                                                        std::equal_to< OUString >  >
+                                                        OUStringHash >
 {
 };
 
diff --git a/framework/inc/stdtypes.h b/framework/inc/stdtypes.h
index b748cedf2b8c..407ecfa930b0 100644
--- a/framework/inc/stdtypes.h
+++ b/framework/inc/stdtypes.h
@@ -95,8 +95,7 @@ void free(std::vector<T>& vec)
 template< class TType >
 class BaseHash : public std::unordered_map< OUString                    ,
                                             TType                              ,
-                                            OUStringHash                  ,
-                                            std::equal_to< OUString > >
+                                            OUStringHash >
 {
     public:
 
diff --git a/framework/inc/uiconfiguration/imagetype.hxx b/framework/inc/uiconfiguration/imagetype.hxx
index 6c3cf3217a55..219eb9a5b82a 100644
--- a/framework/inc/uiconfiguration/imagetype.hxx
+++ b/framework/inc/uiconfiguration/imagetype.hxx
@@ -35,12 +35,10 @@ enum ImageType
 
 typedef std::unordered_map< OUString,
                             OUString,
-                            OUStringHash,
-                            std::equal_to< OUString > > CommandToImageNameMap;
+                            OUStringHash > CommandToImageNameMap;
 typedef std::unordered_map< OUString,
                             bool,
-                            OUStringHash,
-                            std::equal_to< OUString > > CommandMap;
+                            OUStringHash > CommandMap;
 
 }
 
diff --git a/framework/inc/uielement/uicommanddescription.hxx b/framework/inc/uielement/uicommanddescription.hxx
index 9e837cb0c4a2..083cffe71ac2 100644
--- a/framework/inc/uielement/uicommanddescription.hxx
+++ b/framework/inc/uielement/uicommanddescription.hxx
@@ -83,13 +83,11 @@ private:
 public:
         typedef std::unordered_map< OUString,
                                     OUString,
-                                    OUStringHash,
-                                    std::equal_to< OUString > > ModuleToCommandFileMap;
+                                    OUStringHash > ModuleToCommandFileMap;
 
         typedef std::unordered_map< OUString,
                                     css::uno::Reference< css::container::XNameAccess >,
-                                    OUStringHash,
-                                    std::equal_to< OUString > > UICommandsHashMap;
+                                    OUStringHash > UICommandsHashMap;
 
     protected:
         UICommandDescription( const css::uno::Reference< css::uno::XComponentContext>& rxContext, bool  );
diff --git a/framework/inc/uifactory/factoryconfiguration.hxx b/framework/inc/uifactory/factoryconfiguration.hxx
index 37a24de5b33e..183b09cb70ec 100644
--- a/framework/inc/uifactory/factoryconfiguration.hxx
+++ b/framework/inc/uifactory/factoryconfiguration.hxx
@@ -75,8 +75,7 @@ private:
     };
     class MenuControllerMap : public std::unordered_map< OUString,
                                                          ControllerInfo,
-                                                         OUStringHash,
-                                                         std::equal_to< OUString > >
+                                                         OUStringHash >
     {
     };
 
diff --git a/framework/inc/xml/imagesdocumenthandler.hxx b/framework/inc/xml/imagesdocumenthandler.hxx
index 552e21159bc8..3e1b84c69c11 100644
--- a/framework/inc/xml/imagesdocumenthandler.hxx
+++ b/framework/inc/xml/imagesdocumenthandler.hxx
@@ -111,8 +111,7 @@ class OReadImagesDocumentHandler : public ::cppu::WeakImplHelper< css::xml::sax:
 
         class ImageHashMap : public std::unordered_map< OUString     ,
                                                         Image_XML_Entry        ,
-                                                        OUStringHash,
-                                                        std::equal_to< OUString > >
+                                                        OUStringHash >
         {
         };
 
diff --git a/framework/inc/xml/statusbardocumenthandler.hxx b/framework/inc/xml/statusbardocumenthandler.hxx
index 8e3528c25c25..141e559f4cc0 100644
--- a/framework/inc/xml/statusbardocumenthandler.hxx
+++ b/framework/inc/xml/statusbardocumenthandler.hxx
@@ -106,8 +106,7 @@ class FWE_DLLPUBLIC OReadStatusBarDocumentHandler :
 
         class StatusBarHashMap : public std::unordered_map<OUString,
                                                            StatusBar_XML_Entry,
-                                                           OUStringHash,
-                                                           std::equal_to< OUString > >
+                                                           OUStringHash >
         {
         };
 
diff --git a/framework/source/inc/accelerators/keymapping.hxx b/framework/source/inc/accelerators/keymapping.hxx
index 3b6b7a25bebf..d51046f09d37 100644
--- a/framework/source/inc/accelerators/keymapping.hxx
+++ b/framework/source/inc/accelerators/keymapping.hxx
@@ -57,8 +57,7 @@ class KeyMapping
         /** @short  hash structure to map key codes to identifier. */
         typedef std::unordered_map< sal_Int16                    ,
                                     OUString              ,
-                                    ShortHashCode                ,
-                                    std::equal_to< sal_Int16 > > Code2IdentifierHash;
+                                    ShortHashCode > Code2IdentifierHash;
 
     // member
 
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx b/framework/source/uiconfiguration/imagemanagerimpl.hxx
index 9b4af2536b68..f1f71b06362b 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.hxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx
@@ -127,8 +127,7 @@ namespace framework
 
             typedef std::unordered_map< OUString,
                                         sal_Bool,
-                                        OUStringHash,
-                                        std::equal_to< OUString > > ImageNameMap;
+                                        OUStringHash > ImageNameMap;
 
             enum Layer
             {
diff --git a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
index 59b5cc1333bb..ebdf8277dcc1 100644
--- a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
+++ b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
@@ -91,7 +91,7 @@ public:
 private:
     virtual void SAL_CALL disposing() override;
 
-    typedef std::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 > ModuleToModuleCfgMgr;
 
 //TODO_AS            void impl_initStorages();