1 files changed, 6 insertions, 10 deletions
diff --git a/chart2/source/controller/main/CommandDispatch.hxx b/chart2/source/controller/main/CommandDispatch.hxx
index 37de7c59c119..feb1c2183af5 100644
--- a/chart2/source/controller/main/CommandDispatch.hxx
+++ b/chart2/source/controller/main/CommandDispatch.hxx
@@ -18,14 +18,12 @@
  */
 #pragma once
 
-#include <MutexContainer.hxx>
-#include <cppuhelper/compbase.hxx>
-#include <comphelper/interfacecontainer2.hxx>
+#include <comphelper/compbase.hxx>
+#include <comphelper/interfacecontainer4.hxx>
 #include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/util/XModifyListener.hpp>
 
 #include <map>
-#include <memory>
 
 namespace com::sun::star::uno { class XComponentContext; }
 namespace com::sun::star::util { class XURLTransformer; }
@@ -35,7 +33,7 @@ namespace chart
 
 namespace impl
 {
-typedef ::cppu::WeakComponentImplHelper<
+typedef ::comphelper::WeakComponentImplHelper<
         css::frame::XDispatch,
         css::util::XModifyListener >
     CommandDispatch_Base;
@@ -43,9 +41,7 @@ typedef ::cppu::WeakComponentImplHelper<
 
 /** This is the base class for an XDispatch.
  */
-class CommandDispatch :
-        public MutexContainer,
-        public impl::CommandDispatch_Base
+class CommandDispatch : public impl::CommandDispatch_Base
 {
 public:
     explicit CommandDispatch( const css::uno::Reference< css::uno::XComponentContext > & xContext );
@@ -107,7 +103,7 @@ protected:
 
     // ____ WeakComponentImplHelperBase ____
     /// is called when this is disposed
-    virtual void SAL_CALL disposing() override;
+    virtual void disposing(std::unique_lock<std::mutex>& rGuard) override;
 
     // ____ XModifyListener ____
     virtual void SAL_CALL modified(
@@ -121,7 +117,7 @@ private:
     css::uno::Reference< css::uno::XComponentContext > m_xContext;
     css::uno::Reference< css::util::XURLTransformer >  m_xURLTransformer;
 
-    typedef std::map< OUString, std::unique_ptr<::comphelper::OInterfaceContainerHelper2> >
+    typedef std::map< OUString, ::comphelper::OInterfaceContainerHelper4<css::frame::XStatusListener> >
         tListenerMap;
 
     tListenerMap m_aListeners;