diff options
| author | Balazs Varga <balazs.varga991@gmail.com> | 2020-03-06 10:27:11 +0100 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2020-03-24 11:20:46 +0100 |
| commit | 9bf40c635c41c6b3b072b7c61fea67a20ba4342b (patch) | |
| tree | 00e3dd6fbbe44dc21dc01328024fd84f710c77e6 /chart2/source/controller/chartapiwrapper | |
| parent | 45435e2ac007aed2aabd175ad944d6c779d99167 (diff) | |
tdf#95425 follow-up: enable "Source format" checkbox of data label
settings after file opening, if its value is true in the opened
ODF or OOXML document, instead of always showing disabled state.
Testing notes: double click on a data label during chart editing
to see the Data Labels for Data Series... window. On the page
"Data Labels...", click on the Number format... button to see
the checkbox "Source format".
Change-Id: Idb837d9492ad7e83b9020167c47ed52499c070a7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90079
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'chart2/source/controller/chartapiwrapper')
3 files changed, 3 insertions, 7 deletions
diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx index 52dd240a1587..45b7f401550d 100644 --- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx +++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx @@ -158,11 +158,7 @@ sal_Int32 Chart2ModelContact::getExplicitNumberFormatKeyForSeries( const Reference< chart2::XDataSeries >& xSeries ) { return ExplicitValueProvider::getExplicitNumberFormatKeyForDataLabel( - uno::Reference< beans::XPropertySet >( xSeries, uno::UNO_QUERY ), - xSeries, - -1 /*-1 for whole series*/, - ChartModelHelper::findDiagram( m_xChartModel ) - ); + uno::Reference< beans::XPropertySet >( xSeries, uno::UNO_QUERY )); } awt::Size Chart2ModelContact::GetPageSize() const diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx index c9651cbf3d34..2c7b2b050738 100644 --- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx +++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx @@ -78,7 +78,7 @@ public: sal_Int32 getExplicitNumberFormatKeyForAxis( const css::uno::Reference< css::chart2::XAxis >& xAxis ); - sal_Int32 getExplicitNumberFormatKeyForSeries( + static sal_Int32 getExplicitNumberFormatKeyForSeries( const css::uno::Reference< css::chart2::XDataSeries >& xSeries ); /** Returns the size of the page in logic coordinates. This value is used diff --git a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx index a2da1089f555..1ce277c321ba 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx @@ -64,7 +64,7 @@ Any WrappedNumberFormatProperty::getPropertyValue( const Reference< beans::XProp sal_Int32 nKey = 0; Reference< chart2::XDataSeries > xSeries( xInnerPropertySet, uno::UNO_QUERY ); if( xSeries.is() ) - nKey = m_spChart2ModelContact->getExplicitNumberFormatKeyForSeries( xSeries ); + nKey = Chart2ModelContact::getExplicitNumberFormatKeyForSeries( xSeries ); else { Reference< chart2::XAxis > xAxis( xInnerPropertySet, uno::UNO_QUERY ); |