1 files changed, 13 insertions, 10 deletions
diff --git a/chart2/source/inc/ExplicitCategoriesProvider.hxx b/chart2/source/inc/ExplicitCategoriesProvider.hxx
index 63097a3aea11..73bc258c9922 100644
--- a/chart2/source/inc/ExplicitCategoriesProvider.hxx
+++ b/chart2/source/inc/ExplicitCategoriesProvider.hxx
@@ -18,11 +18,13 @@
  */
 #pragma once
 
+#include <config_options.h>
 #include "charttoolsdllapi.hxx"
-#include <cppuhelper/weakref.hxx>
+#include <unotools/weakref.hxx>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/Sequence.h>
 
+#include <utility>
 #include <vector>
 
 namespace chart { class ChartModel; }
@@ -33,13 +35,15 @@ namespace com::sun::star::uno { class Any; }
 
 namespace chart
 {
+class BaseCoordinateSystem;
+class LabeledDataSequence;
 
 struct OOO_DLLPUBLIC_CHARTTOOLS ComplexCategory
 {
     OUString Text;
     sal_Int32 Count;
 
-    ComplexCategory( const OUString& rText, sal_Int32 nCount ) : Text( rText ), Count (nCount)
+    ComplexCategory( OUString aText, sal_Int32 nCount ) : Text(std::move( aText )), Count (nCount)
     {}
 };
 
@@ -52,10 +56,10 @@ public:
     virtual css::uno::Sequence< OUString > getStringsForLevel( sal_Int32 nIndex ) const = 0;
 };
 
-class OOO_DLLPUBLIC_CHARTTOOLS ExplicitCategoriesProvider final
+class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) ExplicitCategoriesProvider final
 {
 public:
-    ExplicitCategoriesProvider( const css::uno::Reference< css::chart2::XCoordinateSystem >& xCooSysModel
+    ExplicitCategoriesProvider( const rtl::Reference< ::chart::BaseCoordinateSystem >& xCooSysModel
                        , ChartModel& rChartModel
                        );
     ~ExplicitCategoriesProvider();
@@ -68,7 +72,7 @@ public:
     const std::vector<ComplexCategory>* getCategoriesByLevel( sal_Int32 nLevel );
 
     static OUString getCategoryByIndex(
-          const css::uno::Reference< css::chart2::XCoordinateSystem >& xCooSysModel
+          const rtl::Reference< ::chart::BaseCoordinateSystem >& xCooSysModel
         , ChartModel& rModel
         , sal_Int32 nIndex );
 
@@ -82,8 +86,8 @@ public:
     bool hasComplexCategories() const;
     sal_Int32 getCategoryLevelCount() const;
 
-    const css::uno::Sequence< css::uno::Reference<
-        css::chart2::data::XLabeledDataSequence> >& getSplitCategoriesList() const { return m_aSplitCategoriesList;}
+    const std::vector< css::uno::Reference< css::chart2::data::XLabeledDataSequence> >&
+            getSplitCategoriesList() const { return m_aSplitCategoriesList;}
 
     bool isDateAxis();
     const std::vector< double >&  getDateCategories();
@@ -93,15 +97,14 @@ private:
     ExplicitCategoriesProvider& operator =(ExplicitCategoriesProvider const &) = delete;
 
     bool volatile m_bDirty;
-    css::uno::WeakReference< css::chart2::XCoordinateSystem >   m_xCooSysModel;
+    unotools::WeakReference< ::chart::BaseCoordinateSystem >   m_xCooSysModel;
     ChartModel& mrModel;
     css::uno::Reference< css::chart2::data::XLabeledDataSequence> m_xOriginalCategories;
 
     bool m_bIsExplicitCategoriesInited;
     css::uno::Sequence< OUString >  m_aExplicitCategories;
     std::vector< std::vector< ComplexCategory > >   m_aComplexCats;
-    css::uno::Sequence< css::uno::Reference<
-        css::chart2::data::XLabeledDataSequence> > m_aSplitCategoriesList;
+    std::vector< css::uno::Reference< css::chart2::data::XLabeledDataSequence> > m_aSplitCategoriesList;
 
     bool m_bIsDateAxis;
     bool m_bIsAutoDate;