chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx | 2 +-
chart2/source/controller/inc/ObjectHierarchy.hxx | 2 +-
chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx | 8 ++++----
chart2/source/controller/main/ObjectHierarchy.cxx | 8 +++-----
chart2/source/inc/chartview/ExplicitValueProvider.hxx | 5 +++--
chart2/source/view/main/ChartView.cxx | 2 +-
6 files changed, 13 insertions(+), 14 deletions(-)
New commits:
commit 93933e5f4ec1d8109717f89deb4029a8472d17ff
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Wed Jan 26 18:35:01 2022 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Jan 27 07:40:50 2022 +0100
use more concrete types in chart2, BaseCoordinateSystem
Change-Id: I98890707708f2b6161e52ef5c1563cceb6e3e56a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129000
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
index ea2b0413afd4..4d85f5c0c493 100644
--- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
+++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
@@ -153,7 +153,7 @@ void Chart2ModelContact::getExplicitValuesForAxis(
sal_Int32 Chart2ModelContact::getExplicitNumberFormatKeyForAxis(
const Reference< chart2::XAxis >& xAxis )
{
- Reference< chart2::XCoordinateSystem > xCooSys(
+ rtl::Reference< BaseCoordinateSystem > xCooSys(
AxisHelper::getCoordinateSystemOfAxis(
xAxis, ChartModelHelper::findDiagram( m_xChartModel ) ) );
diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
index bc09b1bda1b9..878f3bc4f247 100644
--- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
@@ -404,7 +404,7 @@ void AxisItemConverter::FillSpecialItem( sal_uInt16
nWhichId, SfxItemSet & rOutI
{
if( m_pExplicitScale )
{
- Reference< chart2::XCoordinateSystem > xCooSys(
+ rtl::Reference< BaseCoordinateSystem > xCooSys(
AxisHelper::getCoordinateSystemOfAxis(
m_xAxis, ChartModelHelper::findDiagram(
m_xChartDoc ) ) );
@@ -941,9 +941,9 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16
nWhichId, const SfxItemSet
}
else
{
- Reference< chart2::XCoordinateSystem > xCooSys(
- AxisHelper::getCoordinateSystemOfAxis(
- m_xAxis, ChartModelHelper::findDiagram(
m_xChartDoc ) ) );
+ rtl::Reference< BaseCoordinateSystem > xCooSys =
+ AxisHelper::getCoordinateSystemOfAxis(
+ m_xAxis, ChartModelHelper::findDiagram(
m_xChartDoc ) );
sal_Int32 nFormatKey =
ExplicitValueProvider::getExplicitNumberFormatKeyForAxis(
m_xAxis, xCooSys, m_xChartDoc);
diff --git a/chart2/source/inc/chartview/ExplicitValueProvider.hxx
b/chart2/source/inc/chartview/ExplicitValueProvider.hxx
index 174f060161ba..e77df0ddcf3d 100644
--- a/chart2/source/inc/chartview/ExplicitValueProvider.hxx
+++ b/chart2/source/inc/chartview/ExplicitValueProvider.hxx
@@ -41,8 +41,9 @@ namespace com::sun::star::util { class
XNumberFormatsSupplier; }
namespace chart
{
-
+class BaseCoordinateSystem;
class DrawModelWrapper;
+
class OOO_DLLPUBLIC_CHARTVIEW ExplicitValueProvider
{
public:
@@ -78,7 +79,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);
static sal_Int32 getExplicitNumberFormatKeyForDataLabel(
diff --git a/chart2/source/view/main/ChartView.cxx
b/chart2/source/view/main/ChartView.cxx
index 2c4fc46ef62b..e9a8995fb6e0 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -1805,7 +1805,7 @@ bool lcl_getPropertySwapXAndYAxis( const rtl::Reference<
Diagram >& xDiagram )
sal_Int32 ExplicitValueProvider::getExplicitNumberFormatKeyForAxis(
const Reference< chart2::XAxis >& xAxis
- , const Reference< chart2::XCoordinateSystem > &
xCorrespondingCoordinateSystem
+ , const rtl::Reference< ::chart::BaseCoordinateSystem > &
xCorrespondingCoordinateSystem
, const rtl::Reference<::chart::ChartModel>& xChartDoc)
{
return AxisHelper::getExplicitNumberFormatKeyForAxis( xAxis,
xCorrespondingCoordinateSystem, xChartDoc
commit a12b65360b6e8f1ace3e589117b4d172230a0050
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Wed Jan 26 18:26:47 2022 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Jan 27 07:40:37 2022 +0100
use more concrete types in chart2, Diagram
Change-Id: I768983241bf277d3b7688dca12a1ab441ac2373d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128999
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/chart2/source/controller/inc/ObjectHierarchy.hxx
b/chart2/source/controller/inc/ObjectHierarchy.hxx
index ac7833452c50..a767523bfced 100644
--- a/chart2/source/controller/inc/ObjectHierarchy.hxx
+++ b/chart2/source/controller/inc/ObjectHierarchy.hxx
@@ -74,7 +74,7 @@ private:
const rtl::Reference< ::chart::Diagram >& xDiagram );
void createDataSeriesTree(
ObjectHierarchy::tChildContainer & rOutDiagramSubContainer,
- const css::uno::Reference< css::chart2::XDiagram > & xDiagram );
+ const rtl::Reference< ::chart::Diagram > & xDiagram );
static void createWallAndFloor(
ObjectHierarchy::tChildContainer & rContainer,
const rtl::Reference< ::chart::Diagram > & xDiagram );
diff --git a/chart2/source/controller/main/ObjectHierarchy.cxx
b/chart2/source/controller/main/ObjectHierarchy.cxx
index 63ac8edb35c9..f509b639bd96 100644
--- a/chart2/source/controller/main/ObjectHierarchy.cxx
+++ b/chart2/source/controller/main/ObjectHierarchy.cxx
@@ -313,15 +313,13 @@ void ObjectHierarchy::createDiagramTree(
void ObjectHierarchy::createDataSeriesTree(
ObjectHierarchy::tChildContainer & rOutDiagramSubContainer,
- const Reference< XDiagram > & xDiagram )
+ const rtl::Reference< Diagram > & xDiagram )
{
- auto pDiagram = dynamic_cast<Diagram*>(xDiagram.get());
- assert(pDiagram);
try
{
- sal_Int32 nDimensionCount = DiagramHelper::getDimension( pDiagram );
+ sal_Int32 nDimensionCount = DiagramHelper::getDimension( xDiagram );
std::vector< rtl::Reference< BaseCoordinateSystem > > aCooSysSeq(
- pDiagram->getBaseCoordinateSystems());
+ xDiagram->getBaseCoordinateSystems());
for( sal_Int32 nCooSysIdx=0;
nCooSysIdx<static_cast<sal_Int32>(aCooSysSeq.size()); ++nCooSysIdx )
{
std::vector< rtl::Reference< ChartType > > aChartTypeSeq(
aCooSysSeq[nCooSysIdx]->getChartTypes2());
