95b2c8b82e
This is a subtask of tdf#165742: Chartex charts are lost on input from OOXML and re-export. Fix various aspects of input and output for chartex (and specifically for funnel charts). This now allows for loading and re-exporting a very basic funnel chart, with the result that MS Office successfully loads the exported chart, and it looks similar (though not quite identical) to the original. Change-Id: I6eeb277e31250031604f7cdd21b80848a9c642ca Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184758 Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Tested-by: Jenkins
254 lines
11 KiB
C++
254 lines
11 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*
|
|
* This file incorporates work covered by the following license notice:
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed
|
|
* with this work for additional information regarding copyright
|
|
* ownership. The ASF licenses this file to you under the Apache
|
|
* License, Version 2.0 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of
|
|
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
*/
|
|
|
|
#include <drawingml/chart/plotareacontext.hxx>
|
|
|
|
#include <drawingml/shapepropertiescontext.hxx>
|
|
#include <drawingml/chart/axiscontext.hxx>
|
|
#include <drawingml/chart/plotareamodel.hxx>
|
|
#include <drawingml/chart/seriescontext.hxx>
|
|
#include <drawingml/chart/typegroupcontext.hxx>
|
|
#include <drawingml/chart/datatablecontext.hxx>
|
|
#include <oox/core/xmlfilterbase.hxx>
|
|
#include <oox/helper/attributelist.hxx>
|
|
#include <oox/token/namespaces.hxx>
|
|
#include <oox/token/tokens.hxx>
|
|
|
|
namespace oox::drawingml::chart {
|
|
|
|
using ::oox::core::ContextHandler2Helper;
|
|
using ::oox::core::ContextHandlerRef;
|
|
|
|
View3DContext::View3DContext( ContextHandler2Helper& rParent, View3DModel& rModel ) :
|
|
ContextBase< View3DModel >( rParent, rModel )
|
|
{
|
|
}
|
|
|
|
View3DContext::~View3DContext()
|
|
{
|
|
}
|
|
|
|
ContextHandlerRef View3DContext::onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs )
|
|
{
|
|
bool bMSO2007Doc = getFilter().isMSO2007Document();
|
|
switch( getCurrentElement() )
|
|
{
|
|
case C_TOKEN( view3D ):
|
|
switch( nElement )
|
|
{
|
|
case C_TOKEN( depthPercent ):
|
|
mrModel.mnDepthPercent = rAttribs.getInteger( XML_val, 100 );
|
|
return nullptr;
|
|
case C_TOKEN( hPercent ):
|
|
mrModel.monHeightPercent = rAttribs.getInteger( XML_val, 100 );
|
|
return nullptr;
|
|
case C_TOKEN( perspective ):
|
|
mrModel.mnPerspective = rAttribs.getInteger( XML_val, 30 );
|
|
return nullptr;
|
|
case C_TOKEN( rAngAx ):
|
|
mrModel.mbRightAngled = rAttribs.getBool( XML_val, !bMSO2007Doc );
|
|
return nullptr;
|
|
case C_TOKEN( rotX ):
|
|
// default value dependent on chart type
|
|
mrModel.monRotationX = rAttribs.getInteger( XML_val );
|
|
return nullptr;
|
|
case C_TOKEN( rotY ):
|
|
// default value dependent on chart type
|
|
mrModel.monRotationY = rAttribs.getInteger( XML_val );
|
|
return nullptr;
|
|
}
|
|
break;
|
|
}
|
|
return nullptr;
|
|
}
|
|
|
|
WallFloorContext::WallFloorContext( ContextHandler2Helper& rParent, WallFloorModel& rModel ) :
|
|
ContextBase< WallFloorModel >( rParent, rModel )
|
|
{
|
|
}
|
|
|
|
WallFloorContext::~WallFloorContext()
|
|
{
|
|
}
|
|
|
|
ContextHandlerRef WallFloorContext::onCreateContext( sal_Int32 nElement, const AttributeList& )
|
|
{
|
|
bool bMSO2007Doc = getFilter().isMSO2007Document();
|
|
switch( getCurrentElement() )
|
|
{
|
|
case C_TOKEN( backWall ):
|
|
case C_TOKEN( floor ):
|
|
case C_TOKEN( sideWall ):
|
|
switch( nElement )
|
|
{
|
|
case C_TOKEN( pictureOptions ):
|
|
return new PictureOptionsContext( *this, mrModel.mxPicOptions.create(bMSO2007Doc) );
|
|
case C_TOKEN( spPr ):
|
|
return new ShapePropertiesContext( *this, mrModel.mxShapeProp.create() );
|
|
}
|
|
break;
|
|
}
|
|
return nullptr;
|
|
}
|
|
|
|
PlotAreaContext::PlotAreaContext( ContextHandler2Helper& rParent, PlotAreaModel& rModel ) :
|
|
ContextBase< PlotAreaModel >( rParent, rModel )
|
|
{
|
|
}
|
|
|
|
PlotAreaContext::~PlotAreaContext()
|
|
{
|
|
}
|
|
|
|
ContextHandlerRef PlotAreaContext::onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs)
|
|
{
|
|
bool bMSO2007Doc = getFilter().isMSO2007Document();
|
|
switch( getCurrentElement() )
|
|
{
|
|
case C_TOKEN( plotArea ):
|
|
switch( nElement )
|
|
{
|
|
case C_TOKEN( area3DChart ):
|
|
case C_TOKEN( areaChart ):
|
|
return new AreaTypeGroupContext( *this, mrModel.maTypeGroups.create( nElement, bMSO2007Doc ) );
|
|
case C_TOKEN( bar3DChart ):
|
|
case C_TOKEN( barChart ):
|
|
return new BarTypeGroupContext( *this, mrModel.maTypeGroups.create( nElement, bMSO2007Doc ) );
|
|
case C_TOKEN( bubbleChart ):
|
|
return new BubbleTypeGroupContext( *this, mrModel.maTypeGroups.create( nElement, bMSO2007Doc ) );
|
|
case C_TOKEN( line3DChart ):
|
|
case C_TOKEN( lineChart ):
|
|
case C_TOKEN( stockChart ):
|
|
return new LineTypeGroupContext( *this, mrModel.maTypeGroups.create( nElement, bMSO2007Doc ) );
|
|
case C_TOKEN( ofPieChart ):
|
|
return new OfPieTypeGroupContext( *this, mrModel.maTypeGroups.create( nElement, bMSO2007Doc ) );
|
|
case C_TOKEN( doughnutChart ):
|
|
case C_TOKEN( pie3DChart ):
|
|
case C_TOKEN( pieChart ):
|
|
return new PieTypeGroupContext( *this, mrModel.maTypeGroups.create( nElement, bMSO2007Doc ) );
|
|
case C_TOKEN( radarChart ):
|
|
return new RadarTypeGroupContext( *this, mrModel.maTypeGroups.create( nElement, bMSO2007Doc ) );
|
|
case C_TOKEN( scatterChart ):
|
|
return new ScatterTypeGroupContext( *this, mrModel.maTypeGroups.create( nElement, bMSO2007Doc ) );
|
|
case C_TOKEN( surface3DChart ):
|
|
case C_TOKEN( surfaceChart ):
|
|
return new SurfaceTypeGroupContext( *this, mrModel.maTypeGroups.create( nElement, bMSO2007Doc ) );
|
|
|
|
case C_TOKEN( catAx ):
|
|
return new CatAxisContext( *this, mrModel.maAxes.create( nElement, bMSO2007Doc ) );
|
|
case C_TOKEN( dateAx ):
|
|
return new DateAxisContext( *this, mrModel.maAxes.create( nElement, bMSO2007Doc ) );
|
|
case C_TOKEN( serAx ):
|
|
return new SerAxisContext( *this, mrModel.maAxes.create( nElement, bMSO2007Doc ) );
|
|
case C_TOKEN( valAx ):
|
|
return new ValAxisContext( *this, mrModel.maAxes.create( nElement, bMSO2007Doc ) );
|
|
|
|
case C_TOKEN( layout ):
|
|
return new LayoutContext( *this, mrModel.mxLayout.create() );
|
|
case C_TOKEN( spPr ):
|
|
return new ShapePropertiesContext( *this, mrModel.mxShapeProp.getOrCreate() );
|
|
case C_TOKEN(dTable):
|
|
return new DataTableContext( *this, mrModel.mxDataTable.create() );
|
|
}
|
|
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);
|
|
|
|
// This is a little awkward. The existing parsing
|
|
// structures are set up for the ECMA-376 charts, which
|
|
// are structured in the XML as
|
|
// ...
|
|
// <c:plotArea>
|
|
// <c:barChart> (or whatever)
|
|
// <c:series ... />
|
|
// <c:barChart/>
|
|
// <c:plotArea/>
|
|
//
|
|
// By contrast, chartex is like this:
|
|
// ...
|
|
// <cx:plotArea>
|
|
// <cx:plotAreaRegion>
|
|
// <cx:series layoutId="funnel" ... /> (or other chart type)
|
|
// <cx:plotAreaRegion/>
|
|
// <cx:plotArea/>
|
|
//
|
|
// The best way I've figured out to bridge this
|
|
// difference is via the explicit CreateSeries() call
|
|
// below, since the structure wants a TypeGroup but
|
|
// we're already in the series handling. There may well
|
|
// be a better solution.
|
|
rtl::Reference<ChartexTypeGroupContext> rTGCtx = new ChartexTypeGroupContext( *this,
|
|
mrModel.maTypeGroups.create( nChartType, false ) );
|
|
rTGCtx->CreateSeries();
|
|
|
|
return rTGCtx;
|
|
}
|
|
break;
|
|
|
|
}
|
|
break;
|
|
}
|
|
return nullptr;
|
|
}
|
|
|
|
} // namespace oox::drawingml::chart
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|