chart2/source/controller/chartapiwrapper/GridWrapper.cxx      |    2 
 chart2/source/controller/inc/SeriesOptionsItemConverter.hxx   |    3 
 chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx |    6 
 chart2/source/inc/AxisHelper.hxx                              |   24 +--
 chart2/source/tools/AxisHelper.cxx                            |   61 +++-------
 chart2/source/view/main/ChartView.cxx                         |    4 
 6 files changed, 44 insertions(+), 56 deletions(-)

New commits:
commit 00e28abcd33f7a52539cb0250b1cadcaf22f8f35
Author:     Noel Grandin <noelgran...@gmail.com>
AuthorDate: Wed Jan 26 21:04:19 2022 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Jan 28 09:04:55 2022 +0100

    use more concrete types in chart2, BaseCoordinateSystem
    
    Change-Id: Ieb815775e069dd0d2cc36a2ab97b318e3b9f7a1b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129056
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx 
b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
index 0cf33baa5848..b2474e236260 100644
--- a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
@@ -133,7 +133,7 @@ Reference< beans::XPropertySet > 
GridWrapper::getInnerPropertySet()
     try
     {
         rtl::Reference< ::chart::Diagram > xDiagram( 
m_spChart2ModelContact->getDiagram() );
-        uno::Reference< XCoordinateSystem > xCooSys( 
AxisHelper::getCoordinateSystemByIndex( xDiagram, 0 /*nCooSysIndex*/ ) );
+        rtl::Reference< BaseCoordinateSystem > xCooSys( 
AxisHelper::getCoordinateSystemByIndex( xDiagram, 0 /*nCooSysIndex*/ ) );
 
         sal_Int32 nDimensionIndex = 1;
         bool bSubGrid = false;
diff --git a/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx 
b/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx
index c658b08fa7dc..f9bc42dcc42d 100644
--- a/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx
+++ b/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx
@@ -26,6 +26,7 @@ namespace com::sun::star::chart2 { class XCoordinateSystem; }
 namespace com::sun::star::frame { class XModel; }
 namespace com::sun::star::uno { class XComponentContext; }
 namespace chart { class ChartModel; }
+namespace chart { class BaseCoordinateSystem; }
 
 namespace chart::wrapper
 {
@@ -66,7 +67,7 @@ private:
     sal_Int32 m_nStartingAngle;
 
     bool m_bClockwise;
-    css::uno::Reference< css::chart2::XCoordinateSystem > m_xCooSys;
+    rtl::Reference< ::chart::BaseCoordinateSystem > m_xCooSys;
 
     css::uno::Sequence< sal_Int32 > m_aSupportedMissingValueTreatments;
     sal_Int32 m_nMissingValueTreatment;
diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx 
b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
index 878f3bc4f247..e4a1df261ff2 100644
--- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
@@ -434,7 +434,7 @@ void AxisItemConverter::FillSpecialItem( sal_uInt16 
nWhichId, SfxItemSet & rOutI
 
         case SCHATTR_AXIS_ALLOW_DATEAXIS:
         {
-            Reference< chart2::XCoordinateSystem > xCooSys(
+            rtl::Reference< BaseCoordinateSystem > xCooSys(
                 AxisHelper::getCoordinateSystemOfAxis( m_xAxis, 
ChartModelHelper::findDiagram( m_xChartDoc ) ) );
             sal_Int32 nDimensionIndex=0; sal_Int32 nAxisIndex=0;
             AxisHelper::getIndicesForAxis(m_xAxis, xCooSys, nDimensionIndex, 
nAxisIndex );
@@ -716,7 +716,7 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 
nWhichId, const SfxItemSet
                     if( !AxisHelper::isAxisPositioningEnabled() )
                     {
                         //keep old and new settings for axis positioning in 
sync somehow
-                        Reference< chart2::XCoordinateSystem > xCooSys( 
AxisHelper::getCoordinateSystemOfAxis(
+                        rtl::Reference< BaseCoordinateSystem > xCooSys( 
AxisHelper::getCoordinateSystemOfAxis(
                             m_xAxis, ChartModelHelper::findDiagram( 
m_xChartDoc ) ) );
 
                         sal_Int32 nDimensionIndex=0;
@@ -793,7 +793,7 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 
nWhichId, const SfxItemSet
 
                 //keep old and new settings for axis positioning in sync 
somehow
                 {
-                    Reference< chart2::XCoordinateSystem > xCooSys( 
AxisHelper::getCoordinateSystemOfAxis(
+                    rtl::Reference< BaseCoordinateSystem > xCooSys( 
AxisHelper::getCoordinateSystemOfAxis(
                         m_xAxis, ChartModelHelper::findDiagram( m_xChartDoc ) 
) );
 
                     sal_Int32 nDimensionIndex=0;
diff --git a/chart2/source/inc/AxisHelper.hxx b/chart2/source/inc/AxisHelper.hxx
index 8cb148f393a6..4e2480a65eee 100644
--- a/chart2/source/inc/AxisHelper.hxx
+++ b/chart2/source/inc/AxisHelper.hxx
@@ -59,7 +59,7 @@ public:
 
     static sal_Int32 getExplicitNumberFormatKeyForAxis(
                   const css::uno::Reference< css::chart2::XAxis >& xAxis
-                , const css::uno::Reference< css::chart2::XCoordinateSystem >& 
xCorrespondingCoordinateSystem
+                , const rtl::Reference< ::chart::BaseCoordinateSystem >& 
xCorrespondingCoordinateSystem
                 , const rtl::Reference< ::chart::ChartModel>& xChartDoc
                 , bool bSearchForParallelAxisIfNothingIsFound );
 
@@ -74,7 +74,7 @@ public:
         createAxis(
             sal_Int32 nDimensionIndex
             , sal_Int32 nAxisIndex // 0==main or 1==secondary axis
-            , const css::uno::Reference< css::chart2::XCoordinateSystem >& 
xCooSys
+            , const rtl::Reference< ::chart::BaseCoordinateSystem >& xCooSys
             , const css::uno::Reference< css::uno::XComponentContext > & 
xContext
             , ReferenceSizeProvider * pRefSizeProvider = nullptr );
 
@@ -124,18 +124,18 @@ public:
                 , const rtl::Reference< ::chart::Diagram >& xDiagram );
     static css::uno::Reference< css::chart2::XAxis >
         getAxis( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex
-            , const css::uno::Reference< css::chart2::XCoordinateSystem >& 
xCooSys );
+            , const rtl::Reference< ::chart::BaseCoordinateSystem >& xCooSys );
 
     static css::uno::Reference< css::chart2::XAxis >
         getCrossingMainAxis( const css::uno::Reference< css::chart2::XAxis >& 
xAxis
-            , const css::uno::Reference< css::chart2::XCoordinateSystem >& 
xCooSys );
+            , const rtl::Reference< ::chart::BaseCoordinateSystem >& xCooSys );
 
     static css::uno::Reference< css::chart2::XAxis >
         getParallelAxis( const css::uno::Reference< css::chart2::XAxis >& xAxis
             , const rtl::Reference< ::chart::Diagram >& xDiagram );
 
     static css::uno::Reference< css::beans::XPropertySet >
-        getGridProperties( const css::uno::Reference< 
css::chart2::XCoordinateSystem >& xCooSys
+        getGridProperties( const rtl::Reference< ::chart::BaseCoordinateSystem 
>& xCooSys
                 , sal_Int32 nDimensionIndex
                 , sal_Int32 nAxisIndex //0: Primary axis, 1: secondary axis
                 , sal_Int32 nSubGridIndex //-1: Main Grid; 0: First SubGrid etc
@@ -147,7 +147,7 @@ public:
 
     static bool getIndicesForAxis(
               const css::uno::Reference< css::chart2::XAxis >& xAxis
-            , const css::uno::Reference< css::chart2::XCoordinateSystem >& 
xCooSys
+            , const rtl::Reference< ::chart::BaseCoordinateSystem >& xCooSys
             , sal_Int32& rOutDimensionIndex, sal_Int32& rOutAxisIndex );
 
     static bool getIndicesForAxis(
@@ -166,7 +166,7 @@ public:
                </sal_True> are returned
      */
     SAL_DLLPRIVATE static std::vector< css::uno::Reference< css::chart2::XAxis 
> >
-            getAllAxesOfCoordinateSystem( const css::uno::Reference< 
css::chart2::XCoordinateSystem >& xCooSys
+            getAllAxesOfCoordinateSystem( const rtl::Reference< 
::chart::BaseCoordinateSystem >& xCooSys
             , bool bOnlyVisible = false );
 
     static css::uno::Sequence< css::uno::Reference< css::beans::XPropertySet > 
>
@@ -189,15 +189,15 @@ public:
                         , ReferenceSizeProvider * pRefSizeProvider );
 
     static bool shouldAxisBeDisplayed( const css::uno::Reference< 
css::chart2::XAxis >& xAxis
-                                       , const css::uno::Reference< 
css::chart2::XCoordinateSystem >& xCooSys );
-    static bool isSecondaryYAxisNeeded( const css::uno::Reference<
-                    css::chart2::XCoordinateSystem >& xCooSys );
+                                       , const rtl::Reference< 
::chart::BaseCoordinateSystem >& xCooSys );
+    static bool isSecondaryYAxisNeeded( const rtl::Reference<
+                    ::chart::BaseCoordinateSystem >& xCooSys );
 
     static rtl::Reference< ::chart::ChartType >
-        getChartTypeByIndex( const css::uno::Reference< 
css::chart2::XCoordinateSystem >& xCooSys,
+        getChartTypeByIndex( const rtl::Reference< 
::chart::BaseCoordinateSystem >& xCooSys,
                              sal_Int32 nIndex );
 
-    static void setRTLAxisLayout( const css::uno::Reference< 
css::chart2::XCoordinateSystem >& xCooSys );
+    static void setRTLAxisLayout( const rtl::Reference< 
::chart::BaseCoordinateSystem >& xCooSys );
 
     static rtl::Reference< ::chart::ChartType >
         getFirstChartTypeWithSeriesAttachedToAxisIndex( const rtl::Reference< 
::chart::Diagram >& xDiagram, const sal_Int32 nAttachedAxisIndex );
diff --git a/chart2/source/tools/AxisHelper.cxx 
b/chart2/source/tools/AxisHelper.cxx
index 9d8af98c757f..7fe222f6e635 100644
--- a/chart2/source/tools/AxisHelper.cxx
+++ b/chart2/source/tools/AxisHelper.cxx
@@ -135,7 +135,7 @@ void AxisHelper::checkDateAxis( chart2::ScaleData& rScale, 
ExplicitCategoriesPro
 
 sal_Int32 AxisHelper::getExplicitNumberFormatKeyForAxis(
                   const Reference< chart2::XAxis >& xAxis
-                , const Reference< chart2::XCoordinateSystem > & 
xCorrespondingCoordinateSystem
+                , const rtl::Reference< BaseCoordinateSystem > & 
xCorrespondingCoordinateSystem
                 , const rtl::Reference<ChartModel>& xChartDoc
                 , bool bSearchForParallelAxisIfNothingIsFound )
 {
@@ -148,9 +148,6 @@ sal_Int32 AxisHelper::getExplicitNumberFormatKeyForAxis(
     if (!xProp.is())
         return 0;
 
-    auto pCorrespondingCoordinateSystem = 
dynamic_cast<BaseCoordinateSystem*>(xCorrespondingCoordinateSystem.get());
-    assert(pCorrespondingCoordinateSystem);
-
     bool bLinkToSource = true;
     xProp->getPropertyValue(CHART_UNONAME_LINK_TO_SRC_NUMFMT) >>= 
bLinkToSource;
     xProp->getPropertyValue(CHART_UNONAME_NUMFMT) >>= nNumberFormatKey;
@@ -238,7 +235,7 @@ sal_Int32 AxisHelper::getExplicitNumberFormatKeyForAxis(
                 OUString aRoleToMatch;
                 if( nDimensionIndex == 0 )
                     aRoleToMatch = "values-x";
-                const std::vector< rtl::Reference< ChartType > > & 
aChartTypes( pCorrespondingCoordinateSystem->getChartTypes2());
+                const std::vector< rtl::Reference< ChartType > > & 
aChartTypes( xCorrespondingCoordinateSystem->getChartTypes2());
                 for( rtl::Reference< ChartType > const & chartType : 
aChartTypes )
                 {
                     if( nDimensionIndex != 0 )
@@ -323,7 +320,7 @@ sal_Int32 AxisHelper::getExplicitNumberFormatKeyForAxis(
 Reference< XAxis > AxisHelper::createAxis(
           sal_Int32 nDimensionIndex
         , sal_Int32 nAxisIndex // 0==main or 1==secondary axis
-        , const Reference< XCoordinateSystem >& xCooSys
+        , const rtl::Reference< BaseCoordinateSystem >& xCooSys
         , const Reference< uno::XComponentContext > & xContext
         , ReferenceSizeProvider * pRefSizeProvider )
 {
@@ -399,7 +396,7 @@ Reference< XAxis > AxisHelper::createAxis( sal_Int32 
nDimensionIndex, bool bMain
         return nullptr;
 
     sal_Int32 nAxisIndex = bMainAxis ? MAIN_AXIS_INDEX : SECONDARY_AXIS_INDEX;
-    Reference< XCoordinateSystem > xCooSys = 
AxisHelper::getCoordinateSystemByIndex( xDiagram, 0 );
+    rtl::Reference< BaseCoordinateSystem > xCooSys = 
AxisHelper::getCoordinateSystemByIndex( xDiagram, 0 );
 
     // create axis
     return AxisHelper::createAxis(
@@ -434,7 +431,7 @@ void AxisHelper::showGrid( sal_Int32 nDimensionIndex, 
sal_Int32 nCooSysIndex, bo
     if( !xDiagram.is() )
         return;
 
-    Reference< XCoordinateSystem > xCooSys = 
AxisHelper::getCoordinateSystemByIndex( xDiagram, nCooSysIndex );
+    rtl::Reference< BaseCoordinateSystem > xCooSys = 
AxisHelper::getCoordinateSystemByIndex( xDiagram, nCooSysIndex );
     if(!xCooSys.is())
         return;
 
@@ -515,7 +512,7 @@ void AxisHelper::hideGrid( sal_Int32 nDimensionIndex, 
sal_Int32 nCooSysIndex, bo
     if( !xDiagram.is() )
         return;
 
-    Reference< XCoordinateSystem > xCooSys = 
AxisHelper::getCoordinateSystemByIndex( xDiagram, nCooSysIndex );
+    rtl::Reference< BaseCoordinateSystem > xCooSys = 
AxisHelper::getCoordinateSystemByIndex( xDiagram, nCooSysIndex );
     if(!xCooSys.is())
         return;
 
@@ -546,7 +543,7 @@ bool AxisHelper::isGridShown( sal_Int32 nDimensionIndex, 
sal_Int32 nCooSysIndex,
 {
     bool bRet = false;
 
-    Reference< XCoordinateSystem > xCooSys = 
AxisHelper::getCoordinateSystemByIndex( xDiagram, nCooSysIndex );
+    rtl::Reference< BaseCoordinateSystem > xCooSys = 
AxisHelper::getCoordinateSystemByIndex( xDiagram, nCooSysIndex );
     if(!xCooSys.is())
         return bRet;
 
@@ -583,7 +580,7 @@ Reference< XAxis > AxisHelper::getAxis( sal_Int32 
nDimensionIndex, bool bMainAxi
     Reference< XAxis > xRet;
     try
     {
-        Reference< XCoordinateSystem > xCooSys = 
AxisHelper::getCoordinateSystemByIndex( xDiagram, 0 );
+        rtl::Reference< BaseCoordinateSystem > xCooSys = 
AxisHelper::getCoordinateSystemByIndex( xDiagram, 0 );
         xRet.set( AxisHelper::getAxis( nDimensionIndex, bMainAxis ? 0 : 1, 
xCooSys ) );
     }
     catch( const uno::Exception & )
@@ -593,7 +590,7 @@ Reference< XAxis > AxisHelper::getAxis( sal_Int32 
nDimensionIndex, bool bMainAxi
 }
 
 Reference< XAxis > AxisHelper::getAxis( sal_Int32 nDimensionIndex, sal_Int32 
nAxisIndex
-            , const Reference< XCoordinateSystem >& xCooSys )
+            , const rtl::Reference< BaseCoordinateSystem >& xCooSys )
 {
     Reference< XAxis > xRet;
     if(!xCooSys.is())
@@ -612,7 +609,7 @@ Reference< XAxis > AxisHelper::getAxis( sal_Int32 
nDimensionIndex, sal_Int32 nAx
 }
 
 Reference< XAxis > AxisHelper::getCrossingMainAxis( const Reference< XAxis >& 
xAxis
-            , const Reference< XCoordinateSystem >& xCooSys )
+            , const rtl::Reference< BaseCoordinateSystem >& xCooSys )
 {
     sal_Int32 nDimensionIndex = 0;
     sal_Int32 nAxisIndex = 0;
@@ -621,8 +618,7 @@ Reference< XAxis > AxisHelper::getCrossingMainAxis( const 
Reference< XAxis >& xA
     {
         nDimensionIndex=1;
         bool bSwapXY = false;
-        Reference< beans::XPropertySet > xCooSysProp( xCooSys, uno::UNO_QUERY 
);
-        if( xCooSysProp.is() && (xCooSysProp->getPropertyValue( 
"SwapXAndYAxis" ) >>= bSwapXY) && bSwapXY )
+        if( (xCooSys->getPropertyValue( "SwapXAndYAxis" ) >>= bSwapXY) && 
bSwapXY )
             nDimensionIndex=0;
     }
     else if( nDimensionIndex==1 )
@@ -697,7 +693,7 @@ bool AxisHelper::isGridVisible( const Reference< 
beans::XPropertySet >& xGridpro
 }
 
 Reference< beans::XPropertySet > AxisHelper::getGridProperties(
-            const Reference< XCoordinateSystem >& xCooSys
+            const rtl::Reference< BaseCoordinateSystem >& xCooSys
         , sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex, sal_Int32 
nSubGridIndex )
 {
     Reference< beans::XPropertySet > xRet;
@@ -731,7 +727,7 @@ sal_Int32 AxisHelper::getDimensionIndexOfAxis(
 
 bool AxisHelper::getIndicesForAxis(
               const Reference< XAxis >& xAxis
-            , const Reference< XCoordinateSystem >& xCooSys
+            , const rtl::Reference< BaseCoordinateSystem >& xCooSys
             , sal_Int32& rOutDimensionIndex, sal_Int32& rOutAxisIndex )
 {
     //returns true if indices are found
@@ -784,7 +780,7 @@ bool AxisHelper::getIndicesForAxis( const Reference< XAxis 
>& xAxis, const rtl::
 }
 
 std::vector< Reference< XAxis > > AxisHelper::getAllAxesOfCoordinateSystem(
-      const Reference< XCoordinateSystem >& xCooSys
+      const rtl::Reference< BaseCoordinateSystem >& xCooSys
     , bool bOnlyVisible /* = false */ )
 {
     std::vector< Reference< XAxis > > aAxisVector;
@@ -888,20 +884,15 @@ void AxisHelper::getAxisOrGridPossibilities( Sequence< 
sal_Bool >& rPossibilityL
             pPossibilityList[nIndex] = rPossibilityList[nIndex-3];
 }
 
-bool AxisHelper::isSecondaryYAxisNeeded( const Reference< XCoordinateSystem >& 
xCooSys )
+bool AxisHelper::isSecondaryYAxisNeeded( const rtl::Reference< 
BaseCoordinateSystem >& xCooSys )
 {
-    Reference< chart2::XChartTypeContainer > xCTCnt( xCooSys, uno::UNO_QUERY );
-    if( !xCTCnt.is() )
+    if( !xCooSys.is() )
         return false;
 
-    const Sequence< Reference< chart2::XChartType > > aChartTypes( 
xCTCnt->getChartTypes() );
-    for( Reference< chart2::XChartType > const & chartType : aChartTypes )
+    const std::vector< rtl::Reference< ChartType > > & aChartTypes( 
xCooSys->getChartTypes2() );
+    for( rtl::Reference< ChartType > const & chartType : aChartTypes )
     {
-        Reference< XDataSeriesContainer > xSeriesContainer( chartType, 
uno::UNO_QUERY );
-        if( !xSeriesContainer.is() )
-                continue;
-
-        Sequence< Reference< XDataSeries > > aSeriesList( 
xSeriesContainer->getDataSeries() );
+        Sequence< Reference< XDataSeries > > aSeriesList( 
chartType->getDataSeries() );
         for( sal_Int32 nS = aSeriesList.getLength(); nS-- ; )
         {
             Reference< beans::XPropertySet > xProp( aSeriesList[nS], 
uno::UNO_QUERY );
@@ -917,7 +908,7 @@ bool AxisHelper::isSecondaryYAxisNeeded( const Reference< 
XCoordinateSystem >& x
 }
 
 bool AxisHelper::shouldAxisBeDisplayed( const Reference< XAxis >& xAxis
-                                       , const Reference< XCoordinateSystem >& 
xCooSys )
+                                       , const rtl::Reference< 
BaseCoordinateSystem >& xCooSys )
 {
     bool bRet = false;
 
@@ -1031,15 +1022,13 @@ rtl::Reference< BaseCoordinateSystem > 
AxisHelper::getCoordinateSystemOfAxis(
     return xRet;
 }
 
-rtl::Reference< ChartType > AxisHelper::getChartTypeByIndex( const Reference< 
XCoordinateSystem >& xCooSys, sal_Int32 nIndex )
+rtl::Reference< ChartType > AxisHelper::getChartTypeByIndex( const 
rtl::Reference< BaseCoordinateSystem >& xCooSys, sal_Int32 nIndex )
 {
     rtl::Reference< ChartType > xChartType;
 
-    Reference< XChartTypeContainer > xChartTypeContainer( xCooSys, 
uno::UNO_QUERY );
     if( xCooSys.is() )
     {
-        auto pCooSys = dynamic_cast<BaseCoordinateSystem*>(xCooSys.get());
-        const std::vector< rtl::Reference< ChartType > > aChartTypeList( 
pCooSys->getChartTypes2() );
+        const std::vector< rtl::Reference< ChartType > > aChartTypeList( 
xCooSys->getChartTypes2() );
         if( nIndex >= 0 && nIndex < 
static_cast<sal_Int32>(aChartTypeList.size()) )
             xChartType = aChartTypeList[nIndex];
     }
@@ -1047,7 +1036,7 @@ rtl::Reference< ChartType > 
AxisHelper::getChartTypeByIndex( const Reference< XC
     return xChartType;
 }
 
-void AxisHelper::setRTLAxisLayout( const Reference< XCoordinateSystem >& 
xCooSys )
+void AxisHelper::setRTLAxisLayout( const rtl::Reference< BaseCoordinateSystem 
>& xCooSys )
 {
     if( !xCooSys.is() )
         return;
@@ -1057,9 +1046,7 @@ void AxisHelper::setRTLAxisLayout( const Reference< 
XCoordinateSystem >& xCooSys
         return;
 
     bool bVertical = false;
-    Reference< beans::XPropertySet > xCooSysProp( xCooSys, uno::UNO_QUERY );
-    if( xCooSysProp.is() )
-        xCooSysProp->getPropertyValue( "SwapXAndYAxis" ) >>= bVertical;
+    xCooSys->getPropertyValue( "SwapXAndYAxis" ) >>= bVertical;
 
     sal_Int32 nHorizontalAxisDimension = bVertical ? 1 : 0;
     sal_Int32 nVerticalAxisDimension = bVertical ? 0 : 1;
diff --git a/chart2/source/view/main/ChartView.cxx 
b/chart2/source/view/main/ChartView.cxx
index e9a8995fb6e0..245181f6a90a 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -634,7 +634,7 @@ void SeriesPlotterContainer::initAxisUsageList(const Date& 
rNullDate)
     // there should only be one coordinate system per diagram).
     for (auto & pVCooSys : m_rVCooSysList)
     {
-        uno::Reference<XCoordinateSystem> xCooSys = pVCooSys->getModel();
+        rtl::Reference<BaseCoordinateSystem> xCooSys = pVCooSys->getModel();
         sal_Int32 nDimCount = xCooSys->getDimension();
         bool bComplexCategoryAllowed = 
ChartTypeHelper::isSupportingComplexCategory(AxisHelper::getChartTypeByIndex(xCooSys,
 0));
 
@@ -914,7 +914,7 @@ void 
SeriesPlotterContainer::AdaptScaleOfYAxisWithoutAttachedSeries( ChartModel&
             ExplicitScaleData aExplicitScale( 
aVCooSysList[nC]->getExplicitScale( nDimensionIndex, nAxisIndex ) );
             ExplicitIncrementData aExplicitIncrement( 
aVCooSysList[nC]->getExplicitIncrement( nDimensionIndex, nAxisIndex ) );
 
-            Reference< chart2::XCoordinateSystem > xCooSys( 
aVCooSysList[nC]->getModel() );
+            rtl::Reference< BaseCoordinateSystem > xCooSys( 
aVCooSysList[nC]->getModel() );
             Reference< XAxis > xAxis( xCooSys->getAxisByDimension( 
nDimensionIndex, nAxisIndex ) );
             Reference< beans::XPropertySet > xCrossingMainAxis( 
AxisHelper::getCrossingMainAxis( xAxis, xCooSys ), uno::UNO_QUERY );
 

Reply via email to