EnumerableMap does not need to implement XAggreggation

Checked on jenkins using 'make check' and

+void SAL_CALL setDelegator(css::uno::Reference<css::uno::XInterface> const &) final { assert(false); }

Change-Id: I98b05a5bc83e3a747ffc45909ca3de4969d4e187
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156797
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

comphelper/source/container/enumerablemap.cxx

@@ -31,7 +31,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 
-#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <typelib/typedescription.hxx>
@@ -143,7 +143,7 @@ namespace comphelper
 
     // EnumerableMap
 
-    typedef ::cppu::WeakAggComponentImplHelper3 <   XInitialization
+    typedef ::cppu::WeakComponentImplHelper <   XInitialization
                                                 ,   XEnumerableMap
                                                 ,   XServiceInfo
                                                 > Map_IFace;