1 files changed, 12 insertions, 9 deletions
diff --git a/chart2/source/inc/BaseCoordinateSystem.hxx b/chart2/source/inc/BaseCoordinateSystem.hxx
index 4cfa7ab42c80..71f226abcd51 100644
--- a/chart2/source/inc/BaseCoordinateSystem.hxx
+++ b/chart2/source/inc/BaseCoordinateSystem.hxx
@@ -19,7 +19,6 @@
 #pragma once
 
 #include "OPropertySet.hxx"
-#include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <comphelper/uno3.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -27,12 +26,13 @@
 #include <com/sun/star/chart2/XChartTypeContainer.hpp>
 #include <com/sun/star/util/XCloneable.hpp>
 #include "ModifyListenerHelper.hxx"
-#include "charttoolsdllapi.hxx"
 
 #include <vector>
 
 namespace chart
 {
+class Axis;
+class ChartType;
 
 namespace impl
 {
@@ -48,7 +48,6 @@ typedef ::cppu::WeakImplHelper
 
 class SAL_DLLPUBLIC_RTTI BaseCoordinateSystem :
         public impl::BaseCoordinateSystem_Base,
-        public cppu::BaseMutex,
         public ::property::OPropertySet
 {
 public:
@@ -87,7 +86,7 @@ public:
         const css::uno::Reference< css::chart2::XChartType >& aChartType ) override;
     virtual css::uno::Sequence< css::uno::Reference< css::chart2::XChartType > > SAL_CALL getChartTypes() override;
     virtual void SAL_CALL setChartTypes(
-        const css::uno::Sequence< css::uno::Reference< css::chart2::XChartType > >& aChartTypes ) override;
+        const css::uno::Sequence< css::uno::Reference< css::chart2::XChartType > >& aChartTypes ) final override;
 
     // ____ XModifyBroadcaster ____
     virtual void SAL_CALL addModifyListener(
@@ -95,6 +94,12 @@ public:
     virtual void SAL_CALL removeModifyListener(
         const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
 
+    void setAxisByDimension( sal_Int32 nDimension, const rtl::Reference< ::chart::Axis >& xAxis, sal_Int32 nIndex );
+    const rtl::Reference< ::chart::Axis > & getAxisByDimension2(sal_Int32 nDimension, sal_Int32 nIndex ) const;
+
+    void setChartTypes( const std::vector< rtl::Reference< ::chart::ChartType > >& aChartTypes );
+    const std::vector< rtl::Reference<::chart::ChartType > > & getChartTypes2() const { return m_aChartTypes; }
+
 protected:
 
     // ____ XModifyListener ____
@@ -111,14 +116,12 @@ protected:
 
     void fireModifyEvent();
 
-protected:
-    rtl::Reference<ModifyEventForwarder> m_xModifyEventForwarder;
-
 private:
+    rtl::Reference<ModifyEventForwarder> m_xModifyEventForwarder;
     sal_Int32                                             m_nDimensionCount;
-    typedef std::vector< std::vector< css::uno::Reference< css::chart2::XAxis > > > tAxisVecVecType;
+    typedef std::vector< std::vector< rtl::Reference< ::chart::Axis > > > tAxisVecVecType;
     tAxisVecVecType m_aAllAxis; //outer sequence is the dimension; inner sequence is the axis index that indicates main or secondary axis
-    std::vector< css::uno::Reference< css::chart2::XChartType > >          m_aChartTypes;
+    std::vector< rtl::Reference<::chart::ChartType > >          m_aChartTypes;
 };
 
 } //  namespace chart