chart2/source/controller/inc/DataPointItemConverter.hxx |
1
chart2/source/controller/inc/ErrorBarItemConverter.hxx |
7 +-
chart2/source/controller/inc/GraphicPropertyItemConverter.hxx |
3 -
chart2/source/controller/inc/LegendItemConverter.hxx |
4 +
chart2/source/controller/inc/MultipleChartConverters.hxx |
9 +--
chart2/source/controller/inc/RegressionCurveItemConverter.hxx |
2
chart2/source/controller/inc/RegressionEquationItemConverter.hxx |
4 +
chart2/source/controller/inc/TitleItemConverter.hxx |
4 +
chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx |
3 -
chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx |
10 +--
chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx |
27 ++++------
chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx |
5 +
chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx |
15 ++---
chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx |
5 +
chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx |
5 +
chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx |
5 +
chart2/source/controller/main/ChartController_Insert.cxx |
6 --
chart2/source/controller/main/ChartController_Properties.cxx |
8 +-
18 files changed, 59 insertions(+), 64 deletions(-)
New commits:
commit 0b900b8683398666f8c5d84587bc2b4dc91a4a03
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Tue Jun 17 13:05:52 2025 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Jun 18 19:52:40 2025 +0200
use more concrete UNO classes in chart2
Change-Id: Ia8ccb01b6ae4b586da0d6f11d0593840af4c356f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186668
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Tested-by: Jenkins
diff --git a/chart2/source/controller/inc/DataPointItemConverter.hxx
b/chart2/source/controller/inc/DataPointItemConverter.hxx
index 720cc0fef2e7..5d75b3057cfd 100644
--- a/chart2/source/controller/inc/DataPointItemConverter.hxx
+++ b/chart2/source/controller/inc/DataPointItemConverter.hxx
@@ -47,7 +47,6 @@ public:
const rtl::Reference<::chart::DataSeries>& xSeries,
SfxItemPool& rItemPool,
SdrModel& rDrawModel,
- const css::uno::Reference<css::lang::XMultiServiceFactory>&
xNamedPropertyContainerFactory,
GraphicObjectType eMapTo,
const std::optional<css::awt::Size>& pRefSize = std::nullopt,
bool bDataSeries = false,
diff --git a/chart2/source/controller/inc/ErrorBarItemConverter.hxx
b/chart2/source/controller/inc/ErrorBarItemConverter.hxx
index a53fbe18ef60..50b2fbe3f73b 100644
--- a/chart2/source/controller/inc/ErrorBarItemConverter.hxx
+++ b/chart2/source/controller/inc/ErrorBarItemConverter.hxx
@@ -20,11 +20,13 @@
#pragma once
#include "ItemConverter.hxx"
+#include <rtl/ref.hxx>
namespace com::sun::star::frame { class XModel; }
namespace com::sun::star::lang { class XMultiServiceFactory; }
class SdrModel;
+namespace chart { class ChartModel; }
namespace chart::wrapper
{
@@ -33,11 +35,10 @@ class ErrorBarItemConverter final : public ItemConverter
{
public:
ErrorBarItemConverter(
- css::uno::Reference< css::frame::XModel > xChartModel,
+ const rtl::Reference< ChartModel > & xChartModel,
const css::uno::Reference< css::beans::XPropertySet > & rPropertySet,
SfxItemPool& rItemPool,
- SdrModel& rDrawModel,
- const css::uno::Reference< css::lang::XMultiServiceFactory > &
xNamedPropertyContainerFactory );
+ SdrModel& rDrawModel );
virtual ~ErrorBarItemConverter() override;
virtual void FillItemSet( SfxItemSet & rOutItemSet ) const override;
diff --git a/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx
b/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx
index c8a78944c96b..afb9dd0a0c40 100644
--- a/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx
+++ b/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx
@@ -46,7 +46,7 @@ public:
const css::uno::Reference< css::beans::XPropertySet > & rPropertySet,
SfxItemPool& rItemPool,
SdrModel& rDrawModel,
- css::uno::Reference< css::lang::XMultiServiceFactory >
xNamedPropertyContainerFactory,
+ rtl::Reference< ChartModel > xChartModel,
GraphicObjectType eObjectType );
virtual ~GraphicPropertyItemConverter() override;
@@ -60,7 +60,6 @@ protected:
private:
GraphicObjectType m_GraphicObjectType;
SdrModel & m_rDrawModel;
- css::uno::Reference< css::lang::XMultiServiceFactory >
m_xNamedPropertyTableFactory;
rtl::Reference<ChartModel> m_xChartModel;
};
diff --git a/chart2/source/controller/inc/LegendItemConverter.hxx
b/chart2/source/controller/inc/LegendItemConverter.hxx
index cbb657edf0d3..4d3d8fd87e59 100644
--- a/chart2/source/controller/inc/LegendItemConverter.hxx
+++ b/chart2/source/controller/inc/LegendItemConverter.hxx
@@ -20,12 +20,14 @@
#include "ItemConverter.hxx"
#include <com/sun/star/awt/Size.hpp>
+#include <rtl/ref.hxx>
#include <optional>
#include <vector>
namespace com::sun::star::lang { class XMultiServiceFactory; }
class SdrModel;
+namespace chart { class ChartModel; }
namespace chart::wrapper
{
@@ -37,7 +39,7 @@ public:
const css::uno::Reference< css::beans::XPropertySet > & rPropertySet,
SfxItemPool& rItemPool,
SdrModel& rDrawModel,
- const css::uno::Reference< css::lang::XMultiServiceFactory > &
xNamedPropertyContainerFactory,
+ const rtl::Reference< ChartModel > & xChartModel,
const std::optional<css::awt::Size>& pRefSize );
virtual ~LegendItemConverter() override;
diff --git a/chart2/source/controller/inc/MultipleChartConverters.hxx
b/chart2/source/controller/inc/MultipleChartConverters.hxx
index 51b3f70e190a..ce24aba49309 100644
--- a/chart2/source/controller/inc/MultipleChartConverters.hxx
+++ b/chart2/source/controller/inc/MultipleChartConverters.hxx
@@ -50,8 +50,7 @@ public:
AllGridItemConverter(
const rtl::Reference<::chart::ChartModel>& xChartModel,
SfxItemPool& rItemPool,
- SdrModel& rDrawModel,
- const css::uno::Reference<css::lang::XMultiServiceFactory> &
xNamedPropertyContainerFactory );
+ SdrModel& rDrawModel );
virtual ~AllGridItemConverter() override;
protected:
@@ -64,8 +63,7 @@ public:
AllDataLabelItemConverter(
const rtl::Reference<::chart::ChartModel>& xChartModel,
SfxItemPool& rItemPool,
- SdrModel& rDrawModel,
- const css::uno::Reference<css::lang::XMultiServiceFactory>&
xNamedPropertyContainerFactory );
+ SdrModel& rDrawModel );
virtual ~AllDataLabelItemConverter() override;
@@ -78,8 +76,7 @@ class AllTitleItemConverter final : public
MultipleItemConverter
public:
AllTitleItemConverter(
const rtl::Reference<::chart::ChartModel>& xChartModel,
- SfxItemPool& rItemPool, SdrModel& rDrawModel,
- const css::uno::Reference<css::lang::XMultiServiceFactory>&
xNamedPropertyContainerFactory );
+ SfxItemPool& rItemPool, SdrModel& rDrawModel );
virtual ~AllTitleItemConverter() override;
diff --git a/chart2/source/controller/inc/RegressionCurveItemConverter.hxx
b/chart2/source/controller/inc/RegressionCurveItemConverter.hxx
index cce795f9789d..3849a2179387 100644
--- a/chart2/source/controller/inc/RegressionCurveItemConverter.hxx
+++ b/chart2/source/controller/inc/RegressionCurveItemConverter.hxx
@@ -36,7 +36,7 @@ public:
rtl::Reference< ::chart::DataSeries > xRegCurveCnt,
SfxItemPool& rItemPool,
SdrModel& rDrawModel,
- const css::uno::Reference< css::lang::XMultiServiceFactory > &
xNamedPropertyContainerFactory );
+ const rtl::Reference< ChartModel > & xChartModel );
virtual ~RegressionCurveItemConverter() override;
virtual void FillItemSet( SfxItemSet & rOutItemSet ) const override;
diff --git a/chart2/source/controller/inc/RegressionEquationItemConverter.hxx
b/chart2/source/controller/inc/RegressionEquationItemConverter.hxx
index 83394b1ea45d..e0b0bac2bae9 100644
--- a/chart2/source/controller/inc/RegressionEquationItemConverter.hxx
+++ b/chart2/source/controller/inc/RegressionEquationItemConverter.hxx
@@ -20,6 +20,7 @@
#include "ItemConverter.hxx"
#include <com/sun/star/awt/Size.hpp>
+#include <rtl/ref.hxx>
#include <optional>
#include <vector>
@@ -27,6 +28,7 @@ namespace com::sun::star::beans { class XPropertySet; }
namespace com::sun::star::lang { class XMultiServiceFactory; }
class SdrModel;
+namespace chart { class ChartModel; }
namespace chart::wrapper {
@@ -37,7 +39,7 @@ public:
const css::uno::Reference< css::beans::XPropertySet > & rPropertySet,
SfxItemPool& rItemPool,
SdrModel& rDrawModel,
- const css::uno::Reference< css::lang::XMultiServiceFactory > &
xNamedPropertyContainerFactory,
+ const rtl::Reference< ChartModel > & xChartModel,
const std::optional<css::awt::Size>& pRefSize );
virtual ~RegressionEquationItemConverter() override;
diff --git a/chart2/source/controller/inc/TitleItemConverter.hxx
b/chart2/source/controller/inc/TitleItemConverter.hxx
index 4a306b690363..917db7ef9cb6 100644
--- a/chart2/source/controller/inc/TitleItemConverter.hxx
+++ b/chart2/source/controller/inc/TitleItemConverter.hxx
@@ -21,12 +21,14 @@
#include "ItemConverter.hxx"
#include <com/sun/star/awt/Size.hpp>
+#include <rtl/ref.hxx>
#include <optional>
#include <vector>
namespace com::sun::star::lang { class XMultiServiceFactory; }
class SdrModel;
+namespace chart { class ChartModel; }
namespace chart::wrapper {
@@ -36,7 +38,7 @@ public:
TitleItemConverter(
const css::uno::Reference<css::beans::XPropertySet>& rPropertySet,
SfxItemPool& rItemPool, SdrModel& rDrawModel,
- const css::uno::Reference<css::lang::XMultiServiceFactory>&
xNamedPropertyContainerFactory,
+ const rtl::Reference<ChartModel>& xChartModel,
const std::optional<css::awt::Size>& pRefSize );
virtual ~TitleItemConverter() override;
diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
index 57fe3fd6f3d9..aa8f21231120 100644
--- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
@@ -206,7 +206,6 @@ DataPointItemConverter::DataPointItemConverter(
const rtl::Reference< DataSeries > & xSeries,
SfxItemPool& rItemPool,
SdrModel& rDrawModel,
- const uno::Reference<lang::XMultiServiceFactory>&
xNamedPropertyContainerFactory,
GraphicObjectType eMapTo,
const std::optional<awt::Size>& pRefSize,
bool bDataSeries,
@@ -229,7 +228,7 @@ DataPointItemConverter::DataPointItemConverter(
m_xSeries(xSeries)
{
m_aConverters.emplace_back( new GraphicPropertyItemConverter(
- rPropertySet, rItemPool, rDrawModel,
xNamedPropertyContainerFactory, eMapTo ));
+ rPropertySet, rItemPool, rDrawModel,
xChartModel, eMapTo ));
m_aConverters.emplace_back( new
CharacterPropertyItemConverter(rPropertySet, rItemPool, pRefSize,
u"ReferencePageSize"_ustr));
if( bDataSeries )
{
diff --git a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
index 082494182a01..f97ae631ee02 100644
--- a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
@@ -22,6 +22,7 @@
#include <StatisticsHelper.hxx>
#include <GraphicPropertyItemConverter.hxx>
+#include <ChartModel.hxx>
#include <svl/stritem.hxx>
#include <svx/chrtitem.hxx>
@@ -79,17 +80,16 @@ namespace chart::wrapper
{
ErrorBarItemConverter::ErrorBarItemConverter(
- uno::Reference< frame::XModel > xModel,
+ const rtl::Reference< ChartModel > & xChartModel,
const uno::Reference< beans::XPropertySet > & rPropertySet,
SfxItemPool& rItemPool,
- SdrModel& rDrawModel,
- const uno::Reference< lang::XMultiServiceFactory > &
xNamedPropertyContainerFactory ) :
+ SdrModel& rDrawModel ) :
ItemConverter( rPropertySet, rItemPool ),
m_spGraphicConverter( std::make_shared<GraphicPropertyItemConverter>(
rPropertySet, rItemPool, rDrawModel,
- xNamedPropertyContainerFactory,
+ xChartModel,
GraphicObjectType::LineProperties )),
- m_xModel(std::move( xModel ))
+ m_xModel(xChartModel)
{}
ErrorBarItemConverter::~ErrorBarItemConverter()
diff --git
a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
index a6fecfb39f85..301abe03397c 100644
--- a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
@@ -140,16 +140,13 @@
GraphicPropertyItemConverter::GraphicPropertyItemConverter(
beans::XPropertySet > & rPropertySet,
SfxItemPool& rItemPool,
SdrModel& rDrawModel,
- uno::Reference< lang::XMultiServiceFactory >
xNamedPropertyContainerFactory,
+ rtl::Reference< ChartModel > xChartModel,
GraphicObjectType eObjectType /* = FILL_PROPERTIES */ ) :
ItemConverter( rPropertySet, rItemPool ),
m_GraphicObjectType( eObjectType ),
m_rDrawModel( rDrawModel ),
- m_xNamedPropertyTableFactory(std::move( xNamedPropertyContainerFactory
))
+ m_xChartModel(std::move( xChartModel ))
{
- m_xChartModel =
dynamic_cast<ChartModel*>(m_xNamedPropertyTableFactory.get());
- DBG_ASSERT(m_xChartModel.is(),
- "GraphicPropertyItemConverter ctor: passed XMultiServiceFactory
parameter is not a ChartModel instance.");
}
GraphicPropertyItemConverter::~GraphicPropertyItemConverter()
@@ -253,7 +250,7 @@ void GraphicPropertyItemConverter::FillSpecialItem(
aItem.PutValue( aValue, MID_NAME );
lcl_SetContentForNamedProperty(
- m_xNamedPropertyTableFactory,
u"com.sun.star.drawing.TransparencyGradientTable"_ustr ,
+ m_xChartModel,
u"com.sun.star.drawing.TransparencyGradientTable"_ustr ,
aItem, MID_FILLGRADIENT );
// this is important to enable the item
@@ -301,7 +298,7 @@ void GraphicPropertyItemConverter::FillSpecialItem(
aItem.PutValue( GetPropertySet()->getPropertyValue( aPropName ),
MID_NAME );
lcl_SetContentForNamedProperty(
- m_xNamedPropertyTableFactory,
u"com.sun.star.drawing.DashTable"_ustr ,
+ m_xChartModel, u"com.sun.star.drawing.DashTable"_ustr ,
aItem, MID_LINEDASH );
// translate model name to UI-name for predefined entries, so
@@ -327,7 +324,7 @@ void GraphicPropertyItemConverter::FillSpecialItem(
aItem.PutValue( GetPropertySet()->getPropertyValue( aPropName
), MID_NAME );
lcl_SetContentForNamedProperty(
- m_xNamedPropertyTableFactory,
u"com.sun.star.drawing.GradientTable"_ustr ,
+ m_xChartModel, u"com.sun.star.drawing.GradientTable"_ustr ,
aItem, MID_FILLGRADIENT );
// translate model name to UI-name for predefined entries, so
@@ -353,7 +350,7 @@ void GraphicPropertyItemConverter::FillSpecialItem(
aItem.PutValue( GetPropertySet()->getPropertyValue( aPropName
), MID_NAME );
lcl_SetContentForNamedProperty(
- m_xNamedPropertyTableFactory,
u"com.sun.star.drawing.HatchTable"_ustr ,
+ m_xChartModel, u"com.sun.star.drawing.HatchTable"_ustr ,
aItem, MID_FILLHATCH );
// translate model name to UI-name for predefined entries, so
@@ -374,7 +371,7 @@ void GraphicPropertyItemConverter::FillSpecialItem(
aItem.PutValue( GetPropertySet()->getPropertyValue(
u"FillBitmapName"_ustr ), MID_NAME );
lcl_SetContentForNamedProperty(
- m_xNamedPropertyTableFactory,
u"com.sun.star.drawing.BitmapTable"_ustr ,
+ m_xChartModel, u"com.sun.star.drawing.BitmapTable"_ustr ,
aItem, MID_BITMAP );
// translate model name to UI-name for predefined entries, so
@@ -497,7 +494,7 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
OUString aPreferredName;
aValue >>= aPreferredName;
aValue <<=
PropertyHelper::addTransparencyGradientUniqueNameToTable(
- aGradient, m_xNamedPropertyTableFactory,
aPreferredName );
+ aGradient, m_xChartModel, aPreferredName );
if( aValue != GetPropertySet()->getPropertyValue(
aPropName ))
{
@@ -568,7 +565,7 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
OUString aPreferredName;
aValue >>= aPreferredName;
aValue <<= PropertyHelper::addLineDashUniqueNameToTable(
- aLineDash, m_xNamedPropertyTableFactory,
aPreferredName );
+ aLineDash, m_xChartModel, aPreferredName );
GetPropertySet()->setPropertyValue( aPropName, aValue );
bChanged = true;
@@ -600,7 +597,7 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
OUString aPreferredName;
aValue >>= aPreferredName;
aValue <<=
PropertyHelper::addGradientUniqueNameToTable(
- aGradient, m_xNamedPropertyTableFactory,
aPreferredName );
+ aGradient, m_xChartModel, aPreferredName );
GetPropertySet()->setPropertyValue( aPropName, aValue
);
bChanged = true;
@@ -633,7 +630,7 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
OUString aPreferredName;
aValue >>= aPreferredName;
aValue <<= PropertyHelper::addHatchUniqueNameToTable(
- aHatch, m_xNamedPropertyTableFactory,
aPreferredName );
+ aHatch, m_xChartModel, aPreferredName );
GetPropertySet()->setPropertyValue( aPropName, aValue
);
bChanged = true;
@@ -661,7 +658,7 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
OUString aPreferredName;
aValue >>= aPreferredName;
aValue <<= PropertyHelper::addBitmapUniqueNameToTable(
- aBitmap, m_xNamedPropertyTableFactory,
aPreferredName );
+ aBitmap, m_xChartModel, aPreferredName );
GetPropertySet()->setPropertyValue(
u"FillBitmapName"_ustr , aValue );
bChanged = true;
diff --git a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
index a431efc34349..e58dbc544f37 100644
--- a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
@@ -21,6 +21,7 @@
#include "SchWhichPairs.hxx"
#include <GraphicPropertyItemConverter.hxx>
#include <CharacterPropertyItemConverter.hxx>
+#include <ChartModel.hxx>
#include <com/sun/star/chart2/LegendPosition.hpp>
#include <com/sun/star/chart/ChartLegendExpansion.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
@@ -40,12 +41,12 @@ LegendItemConverter::LegendItemConverter(
const css::uno::Reference< css::beans::XPropertySet > & rPropertySet,
SfxItemPool& rItemPool,
SdrModel& rDrawModel,
- const uno::Reference< lang::XMultiServiceFactory > &
xNamedPropertyContainerFactory,
+ const rtl::Reference< ChartModel > & xChartModel,
const std::optional<awt::Size>& pRefSize ) :
ItemConverter( rPropertySet, rItemPool )
{
m_aConverters.emplace_back( new GraphicPropertyItemConverter(
- rPropertySet, rItemPool, rDrawModel,
xNamedPropertyContainerFactory,
+ rPropertySet, rItemPool, rDrawModel,
xChartModel,
GraphicObjectType::LineAndFillProperties ));
m_aConverters.emplace_back( new CharacterPropertyItemConverter(
rPropertySet, rItemPool, pRefSize,
diff --git
a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
index 22ba346aaf14..a6dbf6d2faac 100644
--- a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
+++ b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
@@ -72,8 +72,7 @@ const WhichRangesContainer&
AllAxisItemConverter::GetWhichPairs() const
AllGridItemConverter::AllGridItemConverter(
const rtl::Reference<::chart::ChartModel> & xChartModel,
SfxItemPool& rItemPool,
- SdrModel& rDrawModel,
- const uno::Reference< lang::XMultiServiceFactory > &
xNamedPropertyContainerFactory )
+ SdrModel& rDrawModel )
: MultipleItemConverter( rItemPool )
{
rtl::Reference< Diagram > xDiagram( xChartModel->getFirstChartDiagram() );
@@ -81,7 +80,7 @@ AllGridItemConverter::AllGridItemConverter(
for( rtl::Reference< GridProperties > const & xObjectProperties :
aElementList )
{
m_aConverters.emplace_back( new
::chart::wrapper::GraphicPropertyItemConverter(
- xObjectProperties, rItemPool,
rDrawModel, xNamedPropertyContainerFactory,
+ xObjectProperties, rItemPool,
rDrawModel, xChartModel,
::chart::wrapper::GraphicObjectType::LineProperties ) );
}
}
@@ -99,8 +98,7 @@ const WhichRangesContainer&
AllGridItemConverter::GetWhichPairs() const
AllDataLabelItemConverter::AllDataLabelItemConverter(
const rtl::Reference<::chart::ChartModel> & xChartModel,
SfxItemPool& rItemPool,
- SdrModel& rDrawModel,
- const uno::Reference< lang::XMultiServiceFactory > &
xNamedPropertyContainerFactory )
+ SdrModel& rDrawModel )
: MultipleItemConverter( rItemPool )
{
std::vector< rtl::Reference< DataSeries > > aSeriesList =
@@ -117,7 +115,7 @@ AllDataLabelItemConverter::AllDataLabelItemConverter(
m_aConverters.emplace_back(
new ::chart::wrapper::DataPointItemConverter(
xChartModel, xContext, series, series, rItemPool, rDrawModel,
- xNamedPropertyContainerFactory,
GraphicObjectType::FilledDataPoint,
+ GraphicObjectType::FilledDataPoint,
std::nullopt, true, false, 0, true, nNumberFormat,
nPercentNumberFormat));
}
}
@@ -135,8 +133,7 @@ const WhichRangesContainer&
AllDataLabelItemConverter::GetWhichPairs() const
AllTitleItemConverter::AllTitleItemConverter(
const rtl::Reference<::chart::ChartModel> & xChartModel,
SfxItemPool& rItemPool,
- SdrModel& rDrawModel,
- const uno::Reference< lang::XMultiServiceFactory > &
xNamedPropertyContainerFactory )
+ SdrModel& rDrawModel )
: MultipleItemConverter( rItemPool )
{
for(sal_Int32 nTitle = TitleHelper::TITLE_BEGIN; nTitle <
TitleHelper::NORMAL_TITLE_END; nTitle++ )
@@ -147,7 +144,7 @@ AllTitleItemConverter::AllTitleItemConverter(
m_aConverters.emplace_back(
new ::chart::wrapper::TitleItemConverter(
uno::Reference< beans::XPropertySet >( xTitle ),
- rItemPool, rDrawModel, xNamedPropertyContainerFactory,
std::nullopt));
+ rItemPool, rDrawModel, xChartModel, std::nullopt));
}
}
diff --git
a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
index 684c6fc1cdd5..721f1247f439 100644
--- a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
@@ -23,6 +23,7 @@
#include "SchWhichPairs.hxx"
#include <GraphicPropertyItemConverter.hxx>
#include <DataSeries.hxx>
+#include <ChartModel.hxx>
#include <com/sun/star/chart2/XRegressionCurve.hpp>
#include <osl/diagnose.h>
@@ -91,11 +92,11 @@ RegressionCurveItemConverter::RegressionCurveItemConverter(
rtl::Reference< DataSeries > xContainer,
SfxItemPool& rItemPool,
SdrModel& rDrawModel,
- const uno::Reference< lang::XMultiServiceFactory > &
xNamedPropertyContainerFactory ) :
+ const rtl::Reference< ChartModel > & xChartModel ) :
ItemConverter( rPropertySet, rItemPool ),
m_spGraphicConverter( std::make_shared<GraphicPropertyItemConverter>(
rPropertySet, rItemPool, rDrawModel,
- xNamedPropertyContainerFactory,
+ xChartModel,
GraphicObjectType::LineProperties )),
m_xCurveContainer(std::move( xContainer ))
{}
diff --git
a/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx
b/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx
index 239bf2ecadf9..5487d8d2e757 100644
---
a/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx
+++
b/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx
@@ -22,6 +22,7 @@
#include <ItemPropertyMap.hxx>
#include <GraphicPropertyItemConverter.hxx>
#include <CharacterPropertyItemConverter.hxx>
+#include <ChartModel.hxx>
#include <unonames.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
@@ -48,13 +49,13 @@
RegressionEquationItemConverter::RegressionEquationItemConverter(
const css::uno::Reference< css::beans::XPropertySet > & rPropertySet,
SfxItemPool& rItemPool,
SdrModel& rDrawModel,
- const uno::Reference< lang::XMultiServiceFactory > &
xNamedPropertyContainerFactory,
+ const rtl::Reference< ChartModel > & xChartModel,
const std::optional<awt::Size>& pRefSize ) :
ItemConverter( rPropertySet, rItemPool )
{
m_aConverters.emplace_back( new GraphicPropertyItemConverter(
rPropertySet, rItemPool, rDrawModel,
- xNamedPropertyContainerFactory,
+ xChartModel,
GraphicObjectType::LineAndFillProperties ));
m_aConverters.emplace_back(
diff --git a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
index 004309868dbe..23341ac287bd 100644
--- a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
@@ -23,6 +23,7 @@
#include <GraphicPropertyItemConverter.hxx>
#include <CharacterPropertyItemConverter.hxx>
#include <MultipleItemConverter.hxx>
+#include <ChartModel.hxx>
#include <svx/sdangitm.hxx>
#include <rtl/math.hxx>
@@ -91,13 +92,13 @@ TitleItemConverter::TitleItemConverter(
const uno::Reference<beans::XPropertySet> & rPropertySet,
SfxItemPool& rItemPool,
SdrModel& rDrawModel,
- const uno::Reference< lang::XMultiServiceFactory > &
xNamedPropertyContainerFactory,
+ const rtl::Reference< ChartModel > & xChartModel,
const std::optional<awt::Size>& pRefSize ) :
ItemConverter( rPropertySet, rItemPool )
{
m_aConverters.emplace_back( new GraphicPropertyItemConverter(
rPropertySet, rItemPool, rDrawModel,
- xNamedPropertyContainerFactory,
+ xChartModel,
GraphicObjectType::LineAndFillProperties ));
// CharacterProperties are not at the title but at its contained
XFormattedString objects
diff --git a/chart2/source/controller/main/ChartController_Insert.cxx
b/chart2/source/controller/main/ChartController_Insert.cxx
index 7d12aa9097b9..5b930ee7190c 100644
--- a/chart2/source/controller/main/ChartController_Insert.cxx
+++ b/chart2/source/controller/main/ChartController_Insert.cxx
@@ -382,8 +382,7 @@ void
ChartController::executeDispatch_InsertMenu_DataLabels()
wrapper::AllDataLabelItemConverter aItemConverter(
getChartModel(),
m_pDrawModelWrapper->GetItemPool(),
- m_pDrawModelWrapper->getSdrModel(),
- getChartModel() );
+ m_pDrawModelWrapper->getSdrModel() );
SfxItemSet aItemSet = aItemConverter.CreateEmptyItemSet();
aItemConverter.FillItemSet( aItemSet );
@@ -543,8 +542,7 @@ void ChartController::executeDispatch_InsertErrorBars( bool
bYError )
// get an appropriate item converter
auto aItemConverter = std::make_shared<wrapper::ErrorBarItemConverter>
(
getChartModel(), xErrorBarProp,
m_pDrawModelWrapper->getSdrModel().GetItemPool(),
- m_pDrawModelWrapper->getSdrModel(),
- getChartModel() );
+ m_pDrawModelWrapper->getSdrModel() );
// open dialog
SfxItemSet aItemSet = aItemConverter->CreateEmptyItemSet();
diff --git a/chart2/source/controller/main/ChartController_Properties.cxx
b/chart2/source/controller/main/ChartController_Properties.cxx
index 2225dcdbcbb6..762d730d0539 100644
--- a/chart2/source/controller/main/ChartController_Properties.cxx
+++ b/chart2/source/controller/main/ChartController_Properties.cxx
@@ -234,7 +234,6 @@ wrapper::ItemConverter* createItemConverter(
pItemConverter = new wrapper::DataPointItemConverter(
xChartModel, xContext,
xObjectProperties, xSeries,
rDrawModel.GetItemPool(), rDrawModel,
- xChartModel,
eMapTo, pRefSize, bDataSeries,
bUseSpecialFillColor, nSpecialFillColor, true,
nNumberFormat, nPercentNumberFormat,
nPointIndex );
break;
@@ -253,7 +252,7 @@ wrapper::ItemConverter* createItemConverter(
case OBJECTTYPE_DATA_ERRORS_Z:
pItemConverter = new wrapper::ErrorBarItemConverter(
xChartModel, xObjectProperties, rDrawModel.GetItemPool(),
- rDrawModel, xChartModel);
+ rDrawModel );
break;
case OBJECTTYPE_DATA_CURVE:
@@ -295,7 +294,7 @@ wrapper::ItemConverter* createItemConverter(
{
case OBJECTTYPE_TITLE:
pItemConverter = new wrapper::AllTitleItemConverter(
xChartModel, rDrawModel.GetItemPool(),
-
rDrawModel, xChartModel);
+
rDrawModel );
break;
case OBJECTTYPE_AXIS:
{
@@ -311,7 +310,7 @@ wrapper::ItemConverter* createItemConverter(
case OBJECTTYPE_GRID:
case OBJECTTYPE_SUBGRID:
pItemConverter = new wrapper::AllGridItemConverter(
xChartModel, rDrawModel.GetItemPool(),
-
rDrawModel, xChartModel);
+
rDrawModel );
break;
default: //for this type it is not supported to change all
elements at once
break;
@@ -760,7 +759,6 @@ void
ChartController::executeDlg_ObjectProperties_withUndoGuard(
, xObjectProperties,
ObjectIdentifier::getDataSeriesForCID( rObjectCID, xChartDoc )
,
m_pDrawModelWrapper->getSdrModel().GetItemPool()
, m_pDrawModelWrapper->getSdrModel()
- , xChartDoc
,
wrapper::GraphicObjectType::FilledDataPoint );
SfxItemSet
aSymbolShapeProperties(aSymbolItemConverter.CreateEmptyItemSet() );
