diff options
| -rw-r--r-- | configmgr/source/access.hxx | 8 | ||||
| -rw-r--r-- | configmgr/source/components.hxx | 5 | ||||
| -rw-r--r-- | configmgr/source/config_map.hxx | 3 | ||||
| -rw-r--r-- | configmgr/source/data.hxx | 2 | ||||
| -rw-r--r-- | configmgr/source/nodemap.hxx | 3 |
5 files changed, 9 insertions, 12 deletions
diff --git a/configmgr/source/access.hxx b/configmgr/source/access.hxx index 807f2a2a9724..d8db2a81c17e 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 48c1f7a73199..abd40b8880a7 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 0e9f614bb5cd..943d409a1287 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 17a0e1dec879..3dd8d08fc899 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 a000b30aef96..1c01aa39fca0 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; |