[Libreoffice-commits] core.git: configmgr/source

[Daniel Sikeler]

 configmgr/source/access.hxx     |    8 ++++----
 configmgr/source/components.hxx |    5 ++---
 configmgr/source/config_map.hxx |    3 ---
 configmgr/source/data.hxx       |    2 +-
 configmgr/source/nodemap.hxx    |    3 ++-
 5 files changed, 9 insertions(+), 12 deletions(-)

New commits:
commit a2deca9d755710bd543fd0caaea0352ac746396d
Author: Daniel Sikeler <d.sikeler94 at gmail.com>
Date:   Mon Oct 20 08:11:21 2014 +0200

    fdo#75757: remove inheritance to std::map
    
    Change-Id: I189d7a1d68eb9022a32e882d68ce8c8dc567c1fd
    Reviewed-on: https://gerrit.libreoffice.org/12042
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/configmgr/source/access.hxx b/configmgr/source/access.hxx
index 807f2a2..d8db2a8 100644
--- a/configmgr/source/access.hxx
+++ b/configmgr/source/access.hxx
@@ -487,7 +487,7 @@ private:
             bool theDirectlyModified);
     };
 
-    typedef config_map< ModifiedChild > ModifiedChildren;
+    typedef std::map< OUString, ModifiedChild, LengthContentsCompare > ModifiedChildren;
 
     rtl::Reference< ChildAccess > getModifiedChild(
         ModifiedChildren::iterator const & childIterator);
@@ -516,7 +516,7 @@ private:
 
     rtl::Reference< Access > getNotificationRoot();
 
-    typedef config_map< ChildAccess * > WeakChildMap;
+    typedef std::map< OUString, ChildAccess *, LengthContentsCompare > WeakChildMap;
 
     typedef
         std::multiset<
@@ -536,7 +536,7 @@ private:
                 com::sun::star::beans::XPropertyChangeListener > >
         PropertyChangeListenersElement;
 
-    typedef config_map< PropertyChangeListenersElement >
+    typedef std::map< OUString, PropertyChangeListenersElement, LengthContentsCompare >
         PropertyChangeListeners;
 
     typedef
@@ -545,7 +545,7 @@ private:
                 com::sun::star::beans::XVetoableChangeListener > >
         VetoableChangeListenersElement;
 
-    typedef config_map< VetoableChangeListenersElement >
+    typedef std::map< OUString, VetoableChangeListenersElement, LengthContentsCompare >
         VetoableChangeListeners;
 
     typedef
diff --git a/configmgr/source/components.hxx b/configmgr/source/components.hxx
index 48c1f7a..abd40b8 100644
--- a/configmgr/source/components.hxx
+++ b/configmgr/source/components.hxx
@@ -148,9 +148,8 @@ private:
     typedef std::set< RootAccess * > WeakRootSet;
 
     typedef
-        config_map<
-            com::sun::star::uno::Reference<
-                com::sun::star::beans::XPropertySet > >
+        std::map< OUString, com::sun::star::uno::Reference<
+                com::sun::star::beans::XPropertySet >, LengthContentsCompare >
         ExternalServices;
 
     class WriteThread;
diff --git a/configmgr/source/config_map.hxx b/configmgr/source/config_map.hxx
index 0e9f614..943d409 100644
--- a/configmgr/source/config_map.hxx
+++ b/configmgr/source/config_map.hxx
@@ -9,7 +9,6 @@
 #ifndef CONFIG_MAP_HXX
 #define CONFIG_MAP_HXX
 
-#include <map>
 #include <rtl/ustring.hxx>
 
 // The realisation here is that while a map is a reasonably compact
@@ -28,8 +27,6 @@ struct LengthContentsCompare
     }
 };
 
-template< class T > struct config_map : public std::map< OUString, T, LengthContentsCompare > { };
-
 #endif // CONFIG_MAP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/configmgr/source/data.hxx b/configmgr/source/data.hxx
index 17a0e1d..3dd8d08 100644
--- a/configmgr/source/data.hxx
+++ b/configmgr/source/data.hxx
@@ -86,7 +86,7 @@ struct Data: private boost::noncopyable {
         OUString const & url);
 
 private:
-    typedef config_map< rtl::Reference< ExtensionXcu > >
+    typedef std::map< OUString, rtl::Reference< ExtensionXcu >, LengthContentsCompare >
         ExtensionXcuAdditions;
 
     rtl::Reference< Node > root_;
diff --git a/configmgr/source/nodemap.hxx b/configmgr/source/nodemap.hxx
index a000b30..1c01aa3 100644
--- a/configmgr/source/nodemap.hxx
+++ b/configmgr/source/nodemap.hxx
@@ -21,13 +21,14 @@
 #define INCLUDED_CONFIGMGR_SOURCE_NODEMAP_HXX
 
 #include <sal/config.h>
+#include <map>
 #include "config_map.hxx"
 #include <rtl/ref.hxx>
 #include <node.hxx>
 
 namespace configmgr {
 
-typedef config_map< rtl::Reference< Node > > NodeMapImpl;
+typedef std::map< OUString, rtl::Reference< Node >, LengthContentsCompare > NodeMapImpl;
 class NodeMap
 {
     NodeMapImpl maImpl;