chart2/source/controller/inc/DataTableItemConverter.hxx | 3 +-- chart2/source/controller/itemsetwrapper/DataTableItemConverter.cxx | 6 ++---- chart2/source/controller/main/ChartController_Properties.cxx | 6 +----- 3 files changed, 4 insertions(+), 11 deletions(-)
New commits: commit 4d406ce5f7ca5fe5c40324d83cc4898fa4646437 Author: Tomaž Vajngerl <[email protected]> AuthorDate: Fri Aug 12 23:21:34 2022 +0200 Commit: Tomaž Vajngerl <[email protected]> CommitDate: Thu Aug 25 07:27:49 2022 +0200 chart2: don't use ref-size property when converting data table Change-Id: I4dd93d84879274721ded01be1a47b62487066b4e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138334 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <[email protected]> (cherry picked from commit fc909263a1bb9326f838326f3299b16b80318f42) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138781 Tested-by: Jenkins CollaboraOffice <[email protected]> diff --git a/chart2/source/controller/inc/DataTableItemConverter.hxx b/chart2/source/controller/inc/DataTableItemConverter.hxx index 5a8f86bc39ec..d5e0eb0df0cf 100644 --- a/chart2/source/controller/inc/DataTableItemConverter.hxx +++ b/chart2/source/controller/inc/DataTableItemConverter.hxx @@ -37,8 +37,7 @@ public: DataTableItemConverter( const css::uno::Reference<css::beans::XPropertySet>& rPropertySet, SfxItemPool& rItemPool, SdrModel& rDrawModel, - css::uno::Reference<css::lang::XMultiServiceFactory> const& xNamedPropertyContainerFactory, - const css::awt::Size* pRefSize); + css::uno::Reference<css::lang::XMultiServiceFactory> const& xNamedPropertyContainerFactory); virtual ~DataTableItemConverter() override; diff --git a/chart2/source/controller/itemsetwrapper/DataTableItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DataTableItemConverter.cxx index 693f67b593c9..d02517e55857 100644 --- a/chart2/source/controller/itemsetwrapper/DataTableItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/DataTableItemConverter.cxx @@ -50,14 +50,12 @@ ItemPropertyMapType& lclDataTablePropertyMap() DataTableItemConverter::DataTableItemConverter( const uno::Reference<beans::XPropertySet>& rPropertySet, SfxItemPool& rItemPool, - SdrModel& rDrawModel, uno::Reference<lang::XMultiServiceFactory> const& xFactory, - const awt::Size* pRefSize) + SdrModel& rDrawModel, uno::Reference<lang::XMultiServiceFactory> const& xFactory) : ItemConverter(rPropertySet, rItemPool) { m_aConverters.emplace_back(new GraphicPropertyItemConverter( rPropertySet, rItemPool, rDrawModel, xFactory, GraphicObjectType::LineProperties)); - m_aConverters.emplace_back( - new CharacterPropertyItemConverter(rPropertySet, rItemPool, pRefSize, "ReferencePageSize")); + m_aConverters.emplace_back(new CharacterPropertyItemConverter(rPropertySet, rItemPool)); } DataTableItemConverter::~DataTableItemConverter() = default; diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx index 69e1a2dd7d62..0967cc47af68 100644 --- a/chart2/source/controller/main/ChartController_Properties.cxx +++ b/chart2/source/controller/main/ChartController_Properties.cxx @@ -290,13 +290,9 @@ wrapper::ItemConverter* createItemConverter( break; case OBJECTTYPE_DATA_TABLE: { - std::unique_ptr<awt::Size> pRefSize; - if (pRefSizeProvider) - pRefSize.reset(new awt::Size(pRefSizeProvider->getPageSize())); - pItemConverter = new wrapper::DataTableItemConverter( xObjectProperties, rDrawModel.GetItemPool(), - rDrawModel, uno::Reference<lang::XMultiServiceFactory>(xChartModel, uno::UNO_QUERY), pRefSize.get()); + rDrawModel, uno::Reference<lang::XMultiServiceFactory>(xChartModel, uno::UNO_QUERY)); } break; default: //OBJECTTYPE_UNKNOWN
