chart2/source/chartcore.component | 5 - chart2/source/tools/ChartTypeHelper.cxx | 2 oox/inc/drawingml/chart/seriescontext.hxx | 14 ----- oox/inc/drawingml/chart/seriesmodel.hxx | 1 oox/inc/drawingml/chart/typegroupcontext.hxx | 12 ---- oox/source/drawingml/chart/chartspacefragment.cxx | 47 ----------------- oox/source/drawingml/chart/plotareacontext.cxx | 59 ++-------------------- oox/source/drawingml/chart/seriescontext.cxx | 48 ----------------- oox/source/drawingml/chart/typegroupcontext.cxx | 15 ----- oox/source/token/tokens.txt | 19 ------- 10 files changed, 7 insertions(+), 215 deletions(-)
New commits: commit 0e0c1bf6ab93f1aa68b127012ad59c1ef29e5627 Author: Kurt Nordback <[email protected]> AuthorDate: Thu Jan 22 12:26:32 2026 -0700 Commit: Tomaž Vajngerl <[email protected]> CommitDate: Tue Jan 27 04:58:30 2026 +0100 Revert "tdf#165742 Step 3: Establish a narrow input path for chartex" This reverts commit 0b64e0f3c6cd7ebd1b8a6803123040ede892b73f. Change-Id: I947bd0a1a634471cbc2d24a47dc8ad920576cbc9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197906 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Tomaž Vajngerl <[email protected]> diff --git a/chart2/source/chartcore.component b/chart2/source/chartcore.component index c50a5e567e27..d15c808919df 100644 --- a/chart2/source/chartcore.component +++ b/chart2/source/chartcore.component @@ -155,11 +155,6 @@ <service name="com.sun.star.chart2.FormattedString"/> <service name="com.sun.star.chart2.DataPointCustomLabelField"/> </implementation> - <implementation name="com.sun.star.comp.chart.FunnelChartType" - constructor="com_sun_star_comp_chart_FunnelChartType_get_implementation"> - <service name="com.sun.star.chart2.ChartType"/> - <service name="com.sun.star.chart2.FunnelChartType"/> - </implementation> <implementation name="com.sun.star.comp.chart.LineChartType" constructor="com_sun_star_comp_chart_LineChartType_get_implementation"> <service name="com.sun.star.beans.PropertySet"/> diff --git a/chart2/source/tools/ChartTypeHelper.cxx b/chart2/source/tools/ChartTypeHelper.cxx index 544a5986cf61..f49a45ad4162 100644 --- a/chart2/source/tools/ChartTypeHelper.cxx +++ b/chart2/source/tools/ChartTypeHelper.cxx @@ -272,7 +272,6 @@ uno::Sequence < sal_Int32 > ChartTypeHelper::getSupportedLabelPlacements( const else if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_SCATTER) || aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_LINE) || aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE) - || aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_FUNNEL) // TODO: check this ) { aRet.realloc(5); @@ -621,7 +620,6 @@ uno::Sequence < sal_Int32 > ChartTypeHelper::getSupportedMissingValueTreatments( OUString aChartTypeName = xChartType->getChartType(); if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_COLUMN) || aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_BAR) || - aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_FUNNEL) || aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE) ) { aRet.realloc( 2 ); diff --git a/oox/inc/drawingml/chart/seriescontext.hxx b/oox/inc/drawingml/chart/seriescontext.hxx index 05b3ebe84c66..d3fe3bb05128 100644 --- a/oox/inc/drawingml/chart/seriescontext.hxx +++ b/oox/inc/drawingml/chart/seriescontext.hxx @@ -237,20 +237,6 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; }; -/** Handler for a data series context for chartex chart types (cx:series element - * for boxWhisker, clusteredColumn/histogram, funnel, paretoLine, waterfall, - * sunburst, treemap, and regionMap). - */ -class ChartexSeriesContext final : public SeriesContextBase -{ -public: - explicit ChartexSeriesContext( ::oox::core::ContextHandler2Helper& rParent, SeriesModel& rModel ); - virtual ~ChartexSeriesContext() override; - - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; -}; - - } // namespace oox::drawingml::chart diff --git a/oox/inc/drawingml/chart/seriesmodel.hxx b/oox/inc/drawingml/chart/seriesmodel.hxx index 81c6e770ee1c..4f48115676f0 100644 --- a/oox/inc/drawingml/chart/seriesmodel.hxx +++ b/oox/inc/drawingml/chart/seriesmodel.hxx @@ -211,7 +211,6 @@ struct SeriesModel bool mbBubble3d; /// True = show bubbles with 3D shade. bool mbInvertNeg; /// True = invert negative data points. bool mbSmooth; /// True = smooth series line. - sal_Int32 mnCxChartType; /// Enumerated chartex type explicit SeriesModel(bool bMSO2007Doc); ~SeriesModel(); diff --git a/oox/inc/drawingml/chart/typegroupcontext.hxx b/oox/inc/drawingml/chart/typegroupcontext.hxx index 07b45d5c50bd..d3af8436d7ac 100644 --- a/oox/inc/drawingml/chart/typegroupcontext.hxx +++ b/oox/inc/drawingml/chart/typegroupcontext.hxx @@ -154,18 +154,6 @@ public: }; -/** Handler for chartex type group contexts - */ -class ChartexTypeGroupContext final : public TypeGroupContextBase -{ -public: - explicit ChartexTypeGroupContext( ::oox::core::ContextHandler2Helper& rParent, TypeGroupModel& rModel ); - virtual ~ChartexTypeGroupContext() override; - - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; -}; - - } // namespace oox::drawingml::chart #endif diff --git a/oox/source/drawingml/chart/chartspacefragment.cxx b/oox/source/drawingml/chart/chartspacefragment.cxx index 1361ddf31d7a..538631ee63ca 100644 --- a/oox/source/drawingml/chart/chartspacefragment.cxx +++ b/oox/source/drawingml/chart/chartspacefragment.cxx @@ -52,7 +52,7 @@ ContextHandlerRef ChartSpaceFragment::onCreateContext( sal_Int32 nElement, const case C_TOKEN( chartSpace ): return this; case CX_TOKEN(chartSpace) : - return this; + break; } break; @@ -136,52 +136,7 @@ ContextHandlerRef ChartSpaceFragment::onCreateContext( sal_Int32 nElement, const return new View3DContext( *this, mrModel.mxView3D.create(bMSO2007Document) ); } break; - - // chartex handling case CX_TOKEN(chartSpace) : - switch (nElement) { - case CX_TOKEN(chartData): - // TODO - return nullptr; - case CX_TOKEN(chart): - return this; - case CX_TOKEN(spPr): - return new ShapePropertiesContext( *this, mrModel.mxShapeProp.create() ); - case CX_TOKEN(txPr): - return new TextBodyContext( *this, mrModel.mxTextProp.create() ); - case CX_TOKEN(clrMapOvr): - // TODO - return nullptr; - case CX_TOKEN(fmtOvrs): - // TODO - return nullptr; - case CX_TOKEN(printSettings): - // TODO - return nullptr; - case CX_TOKEN(extLst): - // TODO - return nullptr; - default: - // shouldn't happen - assert(false); - - } - break; - case CX_TOKEN(chart) : - switch (nElement) { - case CX_TOKEN(title): - return new TitleContext( *this, mrModel.mxTitle.create() ); - case CX_TOKEN(plotArea): - return new PlotAreaContext( *this, mrModel.mxPlotArea.create() ); - case CX_TOKEN(legend): - return new LegendContext( *this, mrModel.mxLegend.create() ); - case CX_TOKEN(extLst): - // TODO - return nullptr; - default: - // shouldn't happen - assert(false); - } break; } return nullptr; diff --git a/oox/source/drawingml/chart/plotareacontext.cxx b/oox/source/drawingml/chart/plotareacontext.cxx index 29d769ebb251..2be07fd1cafa 100644 --- a/oox/source/drawingml/chart/plotareacontext.cxx +++ b/oox/source/drawingml/chart/plotareacontext.cxx @@ -116,7 +116,7 @@ PlotAreaContext::~PlotAreaContext() { } -ContextHandlerRef PlotAreaContext::onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs) +ContextHandlerRef PlotAreaContext::onCreateContext( sal_Int32 nElement, const AttributeList& ) { bool bMSO2007Doc = getFilter().isMSO2007Document(); switch( getCurrentElement() ) @@ -165,59 +165,12 @@ ContextHandlerRef PlotAreaContext::onCreateContext( sal_Int32 nElement, const At return new ShapePropertiesContext( *this, mrModel.mxShapeProp.create() ); case C_TOKEN(dTable): return new DataTableContext( *this, mrModel.mxDataTable.create() ); +#if 0 + case CHARTEX_TOKEN( funnel ): + return new FunnelTypeGroupContext( *this, mrModel.maTypeGroups.create( nElement, false ) ); +#endif } - break; - case CX_TOKEN(plotArea) : - switch (nElement) { - case CX_TOKEN(plotAreaRegion) : - return this; - case CX_TOKEN(axis) : - // TODO - return nullptr; - case CX_TOKEN(spPr) : - return new ShapePropertiesContext( *this, mrModel.mxShapeProp.getOrCreate() ); - case CX_TOKEN(extLst) : - // TODO - return nullptr; - } - break; - case CX_TOKEN(plotAreaRegion) : - switch (nElement) { - case CX_TOKEN(plotSurface) : - // TODO - return nullptr; - case CX_TOKEN(series) : - if (rAttribs.hasAttribute(XML_layoutId)) { - sal_Int32 nChartType = 0; - OUString sChartId = rAttribs.getStringDefaulted(XML_layoutId); - assert(!sChartId.isEmpty()); - - if (sChartId == "boxWhisker") { - nChartType = CX_TOKEN(boxWhisker); - } else if (sChartId == "clusteredColumn") { - nChartType = CX_TOKEN(clusteredColumn); - } else if (sChartId == "funnel") { - nChartType = CX_TOKEN(funnel); - } else if (sChartId == "paretoLine") { - nChartType = CX_TOKEN(paretoLine); - } else if (sChartId == "regionMap") { - nChartType = CX_TOKEN(regionMap); - } else if (sChartId == "sunburst") { - nChartType = CX_TOKEN(sunburst); - } else if (sChartId == "treemap") { - nChartType = CX_TOKEN(treemap); - } else if (sChartId == "waterfall") { - nChartType = CX_TOKEN(waterfall); - } - assert(nChartType != 0); - - return new ChartexTypeGroupContext( *this, - mrModel.maTypeGroups.create( nChartType, false ) ); - } - break; - - } - break; + break; } return nullptr; } diff --git a/oox/source/drawingml/chart/seriescontext.cxx b/oox/source/drawingml/chart/seriescontext.cxx index 867ba684fd2d..bfbc28304ab3 100644 --- a/oox/source/drawingml/chart/seriescontext.cxx +++ b/oox/source/drawingml/chart/seriescontext.cxx @@ -445,7 +445,6 @@ ContextHandlerRef SeriesContextBase::onCreateContext( sal_Int32 nElement, const mrModel.mxLabels->mpLabelsSource = &rLabelsSource; return new DataSourceContext( *this, rLabelsSource ); } - break; } return nullptr; } @@ -747,53 +746,6 @@ ContextHandlerRef SurfaceSeriesContext::onCreateContext( sal_Int32 nElement, con return SeriesContextBase::onCreateContext( nElement, rAttribs ); } -ChartexSeriesContext::ChartexSeriesContext( ContextHandler2Helper& rParent, SeriesModel& rModel ) : - SeriesContextBase( rParent, rModel ) -{ -} - -ChartexSeriesContext::~ChartexSeriesContext() -{ -} - -ContextHandlerRef ChartexSeriesContext::onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) -{ - switch( getCurrentElement() ) - { - case CX_TOKEN( tx ): - // TODO - return nullptr; - case CX_TOKEN( spPr ): - // TODO - return nullptr; - case CX_TOKEN( valueColors ): - // TODO - return nullptr; - case CX_TOKEN( valueColorPositions ): - // TODO - return nullptr; - case CX_TOKEN( dataPt ): - // TODO - return nullptr; - case CX_TOKEN( dataLabels ): - // TODO - return nullptr; - case CX_TOKEN( dataId ): - // TODO - return nullptr; - case CX_TOKEN( layoutPr ): - // TODO - return nullptr; - case CX_TOKEN( axisId ): - // TODO - return nullptr; - case CX_TOKEN( extLst ): - // TODO - return nullptr; - } - return SeriesContextBase::onCreateContext( nElement, rAttribs ); -} - } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/chart/typegroupcontext.cxx b/oox/source/drawingml/chart/typegroupcontext.cxx index d5f97c25cdac..393073261533 100644 --- a/oox/source/drawingml/chart/typegroupcontext.cxx +++ b/oox/source/drawingml/chart/typegroupcontext.cxx @@ -396,21 +396,6 @@ ContextHandlerRef SurfaceTypeGroupContext::onCreateContext( sal_Int32 nElement, return nullptr; } -ChartexTypeGroupContext::ChartexTypeGroupContext( ContextHandler2Helper& rParent, TypeGroupModel& rModel ) : - TypeGroupContextBase( rParent, rModel ) -{ -} - -ChartexTypeGroupContext::~ChartexTypeGroupContext() -{ -} - -ContextHandlerRef ChartexTypeGroupContext::onCreateContext( [[maybe_unused]] sal_Int32 nElement, - [[maybe_unused]] const AttributeList& rAttribs ) -{ - return new ChartexSeriesContext( *this, mrModel.maSeries.create(false) ); -} - } // namespace oox::drawingml::chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/token/tokens.txt b/oox/source/token/tokens.txt index 81644193aee7..72a9986b224f 100644 --- a/oox/source/token/tokens.txt +++ b/oox/source/token/tokens.txt @@ -750,7 +750,6 @@ axPos axis axisCol axisColor -axisId axisPage axisPosition axisRow @@ -968,7 +967,6 @@ bottomRight boundingCube box boxPr -boxWhisker br bracePair bracketPair @@ -1174,7 +1172,6 @@ characteristic charset chart chartAndTx -chartData chartFormat chartFormats chartObject @@ -1263,7 +1260,6 @@ clrTo clrVal clsid clustered -clusteredColumn cm cmAuthor cmAuthorLst @@ -1659,14 +1655,11 @@ dataDxfId dataExtractLoad dataField dataFields -dataId -dataLabels dataModel dataModelExt dataOnRows dataOnly dataPosition -dataPt dataRef dataRefs dataSource @@ -2362,7 +2355,6 @@ flythrough fmla fmt fmtId -fmtOvrs fmtScheme fmtid focus @@ -3029,10 +3021,8 @@ layout layoutDef layoutDefHdr layoutDefHdrLst -layoutId layoutInCell layoutNode -layoutPr layoutRawTableWidth layoutTableRowsApart layoutTarget @@ -3913,7 +3903,6 @@ parameterType parameters parent parentSet -paretoLine parsePre partyFavor partyGlass @@ -4073,8 +4062,6 @@ plaqueTabs plastic plcHide plotArea -plotAreaRegion -plotSurface plotVisOnly plum plus @@ -4318,7 +4305,6 @@ refreshOnLoad refreshedBy refreshedDate refreshedVersion -regionMap regroupid regrouptable regular @@ -5099,7 +5085,6 @@ summaryBelow summaryLength summaryRight sun -sunburst sunrise sunset sup @@ -5460,7 +5445,6 @@ translucentPowder transp trapezoid tree -treemap trees trellis trend @@ -5672,8 +5656,6 @@ val valAx value valueBetween -valueColors -valueColorPositions valueEqual valueGreaterThan valueGreaterThanOrEqual @@ -5756,7 +5738,6 @@ wR warmMatte warning warp -waterfall watermarks wavAudioFile wave
