[Libreoffice-commits] core.git: sc/source

[Noel Grandin (via logerrit)]

 sc/source/ui/vba/vbaaxes.cxx |   10 +++++-----
 sc/source/ui/vba/vbaaxes.hxx |    6 ++++--
 2 files changed, 9 insertions(+), 7 deletions(-)

New commits:
commit 4f505ba25335b1b279ab8164825c3d051cd74757
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Nov 8 13:13:15 2023 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Nov 9 09:10:43 2023 +0100

    loplugin:fieldcast in AxisIndexWrapper
    
    Change-Id: I8cfd954d71349fb42f306020f17240755fd70c2b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159195
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/sc/source/ui/vba/vbaaxes.cxx b/sc/source/ui/vba/vbaaxes.cxx
index 0a377750aa59..66155bccfc43 100644
--- a/sc/source/ui/vba/vbaaxes.cxx
+++ b/sc/source/ui/vba/vbaaxes.cxx
@@ -91,14 +91,14 @@ class AxisIndexWrapper : public ::cppu::WeakImplHelper< 
container::XIndexAccess
     // on each getByIndex
     uno::Reference< uno::XComponentContext > mxContext;
     std::vector< AxesCoordinate > mCoordinates;
-    uno::Reference< excel::XChart > mxChart;
+    rtl::Reference< ScVbaChart > mxChart;
 public:
-    AxisIndexWrapper( uno::Reference< uno::XComponentContext > xContext, 
uno::Reference< excel::XChart > xChart ) : mxContext(std::move( xContext )), 
mxChart(std::move( xChart ))
+    AxisIndexWrapper( uno::Reference< uno::XComponentContext > xContext, 
rtl::Reference< ScVbaChart > xChart ) : mxContext(std::move( xContext )), 
mxChart(std::move( xChart ))
     {
         if ( !mxChart.is() )
             return;
 
-        ScVbaChart* pChart = static_cast< ScVbaChart* >( mxChart.get() );
+        ScVbaChart* pChart = mxChart.get();
         // primary
         bool bBool = false;
         uno::Reference< beans::XPropertySet > xDiagramPropertySet( 
pChart->xDiagramPropertySet() );
@@ -145,7 +145,7 @@ public:
     }
 };
 
-uno::Reference< container::XIndexAccess > createIndexWrapper( const 
uno::Reference< excel::XChart >& xChart, const uno::Reference< 
uno::XComponentContext >& xContext )
+uno::Reference< container::XIndexAccess > createIndexWrapper( const 
rtl::Reference< ScVbaChart >& xChart, const uno::Reference< 
uno::XComponentContext >& xContext )
 {
     return new AxisIndexWrapper( xContext, xChart );
 }
@@ -153,7 +153,7 @@ uno::Reference< container::XIndexAccess > 
createIndexWrapper( const uno::Referen
 }
 
 // #FIXME The collection semantics will never work as this object is not yet 
initialised correctly
-ScVbaAxes::ScVbaAxes( const uno::Reference< XHelperInterface >& xParent,const 
uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< 
excel::XChart >& xChart ) : ScVbaAxes_BASE( xParent, xContext, 
createIndexWrapper( xChart, xContext )), moChartParent( xChart )
+ScVbaAxes::ScVbaAxes( const uno::Reference< XHelperInterface >& xParent,const 
uno::Reference< uno::XComponentContext > & xContext, const rtl::Reference< 
ScVbaChart >& xChart ) : ScVbaAxes_BASE( xParent, xContext, createIndexWrapper( 
xChart, xContext )), moChartParent( xChart )
 {
 }
 
diff --git a/sc/source/ui/vba/vbaaxes.hxx b/sc/source/ui/vba/vbaaxes.hxx
index cb7c48a7fccd..62f39717468c 100644
--- a/sc/source/ui/vba/vbaaxes.hxx
+++ b/sc/source/ui/vba/vbaaxes.hxx
@@ -20,16 +20,18 @@
 
 #include <ooo/vba/excel/XAxes.hpp>
 #include <vbahelper/vbacollectionimpl.hxx>
+#include <rtl/ref.hxx>
 
 namespace ooo::vba::excel { class XAxis; }
 namespace ooo::vba::excel { class XChart; }
+class ScVbaChart;
 
 typedef CollTestImplHelper< ov::excel::XAxes > ScVbaAxes_BASE;
 class ScVbaAxes : public ScVbaAxes_BASE
 {
-    css::uno::Reference< ov::excel::XChart > moChartParent; // not the true 
parent I guess
+    rtl::Reference< ScVbaChart > moChartParent; // not the true parent I guess
 public:
-    ScVbaAxes( const css::uno::Reference< ov::XHelperInterface >& xParent, 
const css::uno::Reference< css::uno::XComponentContext > & xContext, const 
css::uno::Reference< ov::excel::XChart >& xChart );
+    ScVbaAxes( const css::uno::Reference< ov::XHelperInterface >& xParent, 
const css::uno::Reference< css::uno::XComponentContext > & xContext, const 
rtl::Reference< ScVbaChart >& xChart );
     // XEnumerationAccess
     virtual css::uno::Type SAL_CALL getElementType() override;
     virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL 
createEnumeration() override;