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

[Tomaž Vajngerl (via logerrit)]

 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 fc909263a1bb9326f838326f3299b16b80318f42
Author:     Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Fri Aug 12 23:21:34 2022 +0200
Commit:     Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Tue Aug 16 16:14:44 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 <qui...@gmail.com>

diff --git a/chart2/source/controller/inc/DataTableItemConverter.hxx 
b/chart2/source/controller/inc/DataTableItemConverter.hxx
index 65483f0f16f1..5dbfaf60bba9 100644
--- a/chart2/source/controller/inc/DataTableItemConverter.hxx
+++ b/chart2/source/controller/inc/DataTableItemConverter.hxx
@@ -35,8 +35,7 @@ class DataTableItemConverter final : public ItemConverter
 public:
     DataTableItemConverter(const 
css::uno::Reference<css::beans::XPropertySet>& rPropertySet,
                            SfxItemPool& rItemPool, SdrModel& rDrawModel,
-                           const rtl::Reference<::chart::ChartModel>& 
xChartDoc,
-                           const css::awt::Size* pRefSize);
+                           const rtl::Reference<::chart::ChartModel>& 
xChartDoc);
 
     virtual ~DataTableItemConverter() override;
 
diff --git a/chart2/source/controller/itemsetwrapper/DataTableItemConverter.cxx 
b/chart2/source/controller/itemsetwrapper/DataTableItemConverter.cxx
index 462cd2517e54..2f05efaaa447 100644
--- a/chart2/source/controller/itemsetwrapper/DataTableItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/DataTableItemConverter.cxx
@@ -53,15 +53,13 @@ ItemPropertyMapType& lclDataTablePropertyMap()
 
 DataTableItemConverter::DataTableItemConverter(
     const uno::Reference<beans::XPropertySet>& rPropertySet, SfxItemPool& 
rItemPool,
-    SdrModel& rDrawModel, const rtl::Reference<::chart::ChartModel>& xChartDoc,
-    const awt::Size* pRefSize)
+    SdrModel& rDrawModel, const rtl::Reference<::chart::ChartModel>& xChartDoc)
     : ItemConverter(rPropertySet, rItemPool)
     , m_xChartDoc(xChartDoc)
 {
     m_aConverters.emplace_back(new GraphicPropertyItemConverter(
         rPropertySet, rItemPool, rDrawModel, xChartDoc, 
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 feb8cc6c8a59..8352d4e01ff1 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, xChartModel, 
pRefSize.get());
+                                        rDrawModel, xChartModel);
             }
             break;
             default: //OBJECTTYPE_UNKNOWN