summaryrefslogtreecommitdiff
path: root/xmloff/source/chart
diff options
context:
space:
mode:
Diffstat (limited to 'xmloff/source/chart')
-rw-r--r--xmloff/source/chart/SchXMLChartContext.cxx12
-rw-r--r--xmloff/source/chart/SchXMLChartContext.hxx5
-rw-r--r--xmloff/source/chart/SchXMLExport.cxx7
3 files changed, 5 insertions, 19 deletions
diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx
index 8e264843e2dd..80512e58b0a3 100644
--- a/xmloff/source/chart/SchXMLChartContext.cxx
+++ b/xmloff/source/chart/SchXMLChartContext.cxx
@@ -319,9 +319,6 @@ void SchXMLChartContext::StartElement( const uno::Reference< xml::sax::XAttribut
if( xVisualObject.is() )
maChartSize = xVisualObject->getVisualAreaSize( embed::Aspects::MSOLE_CONTENT ); //#i103460# take the size given from the parent frame as default
- // this flag is necessary for pie charts in the core
- bool bSetSwitchData = false;
-
OUString sAutoStyleName;
OUString aOldChartTypeName;
bool bHasAddin = false;
@@ -356,9 +353,6 @@ void SchXMLChartContext::StartElement( const uno::Reference< xml::sax::XAttribut
maChartTypeServiceName = SchXMLTools::GetChartTypeByClassName( sClassName, false /* bUseOldNames */ );
switch( eChartTypeEnum )
{
- case XML_CHART_CLASS_CIRCLE:
- bSetSwitchData = true;
- break;
case XML_CHART_CLASS_STOCK:
mbIsStockChart = true;
break;
@@ -419,7 +413,7 @@ void SchXMLChartContext::StartElement( const uno::Reference< xml::sax::XAttribut
if( xVisualObject.is() )
xVisualObject->setVisualAreaSize( embed::Aspects::MSOLE_CONTENT, maChartSize );
- InitChart( aOldChartTypeName, bSetSwitchData);
+ InitChart( aOldChartTypeName);
if( bHasAddin )
{
@@ -1164,8 +1158,8 @@ SvXMLImportContext* SchXMLChartContext::CreateChildContext(
4. Set the chart type.
*/
void SchXMLChartContext::InitChart(
- const OUString & rChartTypeServiceName, // currently the old service name
- bool /* bSetSwitchData */ )
+ const OUString & rChartTypeServiceName // currently the old service name
+ )
{
uno::Reference< chart::XChartDocument > xDoc = mrImportHelper.GetChartDocument();
SAL_WARN_IF( !xDoc.is(), "xmloff.chart", "No valid document!" );
diff --git a/xmloff/source/chart/SchXMLChartContext.hxx b/xmloff/source/chart/SchXMLChartContext.hxx
index 11b69987ac93..da5514c246e4 100644
--- a/xmloff/source/chart/SchXMLChartContext.hxx
+++ b/xmloff/source/chart/SchXMLChartContext.hxx
@@ -119,11 +119,8 @@ private:
/** @descr This method bundles some settings to the chart model and executes them with
a locked controller. This includes setting the chart type.
@param aServiceName The name of the service the diagram is initialized with.
- @param bSetSwitchData Indicates whether the data set takes it's data series from
- rows or from columns.
*/
- void InitChart (const OUString & rChartTypeServiceName,
- bool bSetSwitchData);
+ void InitChart (const OUString & rChartTypeServiceName);
void MergeSeriesForStockChart();
};
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index 35f4a3ffd0be..085f949eac80 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -1006,12 +1006,7 @@ void SchXMLExportHelper_Impl::exportAutoStyles()
mrExport.exportAutoDataStyles();
// export chart auto styles
- mrAutoStylePool.exportXML(
- XML_STYLE_FAMILY_SCH_CHART_ID
- , mrExport.GetDocHandler(),
- mrExport.GetMM100UnitConverter(),
- mrExport.GetNamespaceMap()
- );
+ mrAutoStylePool.exportXML( XML_STYLE_FAMILY_SCH_CHART_ID );
// export auto styles for additional shapes
mrExport.GetShapeExport()->exportAutoStyles();