From 5d67d70b26706ce8a08612c12a68821f984210a2 Mon Sep 17 00:00:00 2001 From: Balazs Varga Date: Wed, 8 Jul 2020 11:06:38 +0200 Subject: tdf#134563 Add UNO API for custom leader lines MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If its ShowCustomLeaderLines=true, data series uses leader lines for labels with custom alignment. Add also OOXML import/export of custom data series setting. Change-Id: I8e6f7cb457c38b84aa40c917e69704862262a96e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98323 Tested-by: László Németh Reviewed-by: László Németh --- oox/source/drawingml/chart/seriescontext.cxx | 6 +++++- oox/source/drawingml/chart/seriesconverter.cxx | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'oox/source/drawingml') diff --git a/oox/source/drawingml/chart/seriescontext.cxx b/oox/source/drawingml/chart/seriescontext.cxx index 912b7252e02b..3f92818c5544 100644 --- a/oox/source/drawingml/chart/seriescontext.cxx +++ b/oox/source/drawingml/chart/seriescontext.cxx @@ -139,8 +139,12 @@ ContextHandlerRef DataLabelsContext::onCreateContext( sal_Int32 nElement, const case C_TOKEN( leaderLines ): return new ShapePrWrapperContext( *this, mrModel.mxLeaderLines.create() ); case C_TOKEN( showLeaderLines ): - mrModel.mbShowLeaderLines = rAttribs.getBool( XML_val, !bMSO2007Doc ); + case C15_TOKEN( showLeaderLines ): + mrModel.mbShowLeaderLines = rAttribs.getBool( XML_val, true ); return nullptr; + case C_TOKEN( extLst ): + case C_TOKEN( ext ): + return new DataLabelsContext( *this, mrModel ); } return lclDataLabelSharedCreateContext( *this, nElement, rAttribs, mrModel, bMSO2007Doc ); } diff --git a/oox/source/drawingml/chart/seriesconverter.cxx b/oox/source/drawingml/chart/seriesconverter.cxx index 6e75fc89beab..b80ea05ae481 100644 --- a/oox/source/drawingml/chart/seriesconverter.cxx +++ b/oox/source/drawingml/chart/seriesconverter.cxx @@ -419,7 +419,7 @@ void DataLabelsConverter::convertFromModel( const Reference< XDataSeries >& rxDa } // import leaderline of data labels if( !mrModel.mbShowLeaderLines ) - aPropSet.setProperty( PROP_ShowLeaderLines, false ); + aPropSet.setProperty( PROP_ShowCustomLeaderLines, false ); // data point label settings for (auto const& pointLabel : mrModel.maPointLabels) -- cgit