1 files changed, 17 insertions, 24 deletions

diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx
index 228d24bc19fe..e77fe760b67f 100644
--- a/chart2/inc/ChartView.hxx
+++ b/chart2/inc/ChartView.hxx
@@ -20,16 +20,16 @@
 
 #include <chartview/ExplicitValueProvider.hxx>
 #include <cppuhelper/implbase.hxx>
-#include <comphelper/multicontainer2.hxx>
+#include <comphelper/interfacecontainer4.hxx>
 
 #include <svl/lstner.hxx>
 #include <com/sun/star/awt/Size.hpp>
+#include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/datatransfer/XTransferable.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/qa/XDumper.hpp>
 #include <com/sun/star/util/XModeChangeBroadcaster.hpp>
 #include <com/sun/star/util/XModifyListener.hpp>
@@ -40,9 +40,9 @@
 
 #include <vector>
 #include <memory>
+#include <mutex>
 
 #include <vcl/timer.hxx>
-#include <sfx2/xmldump.hxx>
 
 namespace com::sun::star::drawing { class XDrawPage; }
 namespace com::sun::star::drawing { class XShapes; }
@@ -82,11 +82,10 @@ struct TimeBasedInfo
  * The View is not responsible to handle single user events (that is instead
  * done by the ChartWindow).
  */
-class OOO_DLLPUBLIC_CHARTVIEW ChartView final : public ::cppu::WeakImplHelper<
+class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTVIEW) ChartView final : public ::cppu::WeakImplHelper<
     css::lang::XInitialization
         ,css::lang::XServiceInfo
         ,css::datatransfer::XTransferable
-        ,css::lang::XUnoTunnel
         ,css::util::XModifyListener
         ,css::util::XModeChangeBroadcaster
         ,css::util::XUpdatable2
@@ -96,15 +95,13 @@ class OOO_DLLPUBLIC_CHARTVIEW ChartView final : public ::cppu::WeakImplHelper<
         >
         , public ExplicitValueProvider
         , private SfxListener
-        , public sfx2::XmlDump
 {
 private:
     void init();
 
 public:
     ChartView() = delete;
-    ChartView(css::uno::Reference< css::uno::XComponentContext > const & xContext,
-               ChartModel& rModel);
+    ChartView(css::uno::Reference<css::uno::XComponentContext> xContext, ChartModel& rModel);
 
     virtual ~ChartView() override;
 
@@ -118,10 +115,10 @@ public:
 
     // ___ExplicitValueProvider___
     virtual bool getExplicitValuesForAxis(
-        css::uno::Reference< css::chart2::XAxis > xAxis
+        rtl::Reference< Axis > xAxis
         , ExplicitScaleData&  rExplicitScale
         , ExplicitIncrementData& rExplicitIncrement ) override;
-    virtual css::uno::Reference< css::drawing::XShape >
+    virtual rtl::Reference< SvxShape >
         getShapeForCID( const OUString& rObjectCID ) override;
 
     virtual css::awt::Rectangle getRectangleOfObject( const OUString& rObjectCID, bool bSnapRect=false ) override;
@@ -175,17 +172,14 @@ public:
         const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments ) override;
     virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() override;
 
-    // for ExplicitValueProvider
-    // ____ XUnoTunnel ___
-    virtual ::sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< ::sal_Int8 >& aIdentifier ) override;
-
     // XDumper
-    virtual OUString SAL_CALL dump() override;
+    virtual OUString SAL_CALL dump(OUString const & kind) override;
 
     void setViewDirty();
 
-    /// See sfx2::XmlDump::dumpAsXml().
-    void dumpAsXml(xmlTextWriterPtr pWriter) const override;
+    css::uno::Reference<css::uno::XComponentContext> const& getComponentContext() { return m_xCC;}
+
+    void dumpAsXml(xmlTextWriterPtr pWriter) const;
 
 private: //methods
     void createShapes();
@@ -207,12 +201,11 @@ private: //methods
     DECL_LINK( UpdateTimeBased, Timer*, void );
 
 private: //member
-    ::osl::Mutex m_aMutex;
+    std::mutex m_aMutex;
 
-    css::uno::Reference< css::uno::XComponentContext>
-            m_xCC;
+    css::uno::Reference< css::uno::XComponentContext> m_xCC;
 
-    chart::ChartModel& mrChartModel;
+    ChartModel& mrChartModel;
 
     css::uno::Reference< css::lang::XMultiServiceFactory>
             m_xShapeFactory;
@@ -232,8 +225,8 @@ private: //member
 
     std::vector< std::unique_ptr<VCoordinateSystem> > m_aVCooSysList;
 
-    comphelper::OMultiTypeInterfaceContainerHelper2
-                        m_aListenerContainer;
+    comphelper::OInterfaceContainerHelper4<css::util::XModeChangeListener>
+                        m_aModeChangeListeners;
 
     bool m_bViewDirty; //states whether the view needs to be rebuild
     bool m_bInViewUpdate;
@@ -255,7 +248,7 @@ private: //member
     css::awt::Rectangle m_aResultingDiagramRectangleExcludingAxes;
 
     TimeBasedInfo maTimeBased;
-    osl::Mutex maTimeMutex;
+    std::mutex maTimeMutex;
 };
 
 }