1 files changed, 11 insertions, 29 deletions
diff --git a/chart2/source/tools/NameContainer.cxx b/chart2/source/tools/NameContainer.cxx
index b5e730ba552e..3ca97e75b302 100644
--- a/chart2/source/tools/NameContainer.cxx
+++ b/chart2/source/tools/NameContainer.cxx
@@ -20,7 +20,9 @@
 #include <NameContainer.hxx>
 
 #include <com/sun/star/uno/Any.hxx>
- #include <cppuhelper/supportsservice.hxx>
+
+#include <comphelper/sequence.hxx>
+#include <cppuhelper/supportsservice.hxx>
 
 using namespace ::com::sun::star;
 using ::com::sun::star::uno::Sequence;
@@ -29,26 +31,13 @@ using ::com::sun::star::uno::Any;
 namespace chart
 {
 
-uno::Reference< container::XNameContainer > createNameContainer(
-        const css::uno::Type& rType, const OUString& rServicename, const OUString& rImplementationName )
-{
-    return new NameContainer( rType, rServicename, rImplementationName );
-}
 
-NameContainer::NameContainer( const css::uno::Type& rType, const OUString& rServicename, const OUString& rImplementationName )
-    : m_aType( rType )
-    , m_aServicename( rServicename )
-    , m_aImplementationName( rImplementationName )
-    , m_aMap()
+NameContainer::NameContainer()
 {
 }
 
-NameContainer::NameContainer(
-    const NameContainer & rOther )
+NameContainer::NameContainer( const NameContainer & rOther )
     : impl::NameContainer_Base(rOther)
-    , m_aType( rOther.m_aType )
-    , m_aServicename( rOther.m_aServicename )
-    , m_aImplementationName( rOther.m_aImplementationName )
     , m_aMap( rOther.m_aMap )
 {
 }
@@ -60,7 +49,7 @@ NameContainer::~NameContainer()
 //XServiceInfo
 OUString SAL_CALL NameContainer::getImplementationName()
 {
-    return m_aImplementationName;
+    return u"com.sun.star.comp.chart.XMLNameSpaceMap"_ustr;
 }
 
 sal_Bool SAL_CALL NameContainer::supportsService( const OUString& ServiceName )
@@ -70,13 +59,13 @@ sal_Bool SAL_CALL NameContainer::supportsService( const OUString& ServiceName )
 
 Sequence< OUString > SAL_CALL NameContainer::getSupportedServiceNames()
 {
-    return { m_aServicename };
+    return { u"com.sun.star.xml.NamespaceMap"_ustr };
 }
 
 // XNameContainer
 void SAL_CALL NameContainer::insertByName( const OUString& rName, const Any& rElement )
 {
-    if( m_aMap.find( rName ) != m_aMap.end() )
+    if( m_aMap.contains( rName ))
         throw container::ElementExistException();
     m_aMap.emplace( rName, rElement );
 }
@@ -109,19 +98,12 @@ Any SAL_CALL NameContainer::getByName( const OUString& rName )
 
 Sequence< OUString > SAL_CALL NameContainer::getElementNames()
 {
-    sal_Int32 nCount = m_aMap.size();
-    Sequence< OUString > aSeq(nCount);
-    sal_Int32 nN = 0;
-    for (auto const& elem : m_aMap)
-    {
-        aSeq[nN++]=elem.first;
-    }
-    return aSeq;
+    return comphelper::mapKeysToSequence(m_aMap);
 }
 
 sal_Bool SAL_CALL NameContainer::hasByName( const OUString& rName )
 {
-    return ( m_aMap.find( rName ) != m_aMap.end() );
+    return m_aMap.contains( rName );
 }
 
 // XElementAccess
@@ -132,7 +114,7 @@ sal_Bool SAL_CALL NameContainer::hasElements()
 
 uno::Type SAL_CALL NameContainer::getElementType()
 {
-    return m_aType;
+    return ::cppu::UnoType<OUString>::get();
 }
 
 // XCloneable