mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avoid memory leak and invalid documents

Browse Source 
See e.g. fdo54757-1.xlsx exported to ods.

Change-Id: I81fb9a18519c5770b52dfb8131211e440ad9682f
This commit is contained in:
Markus Mohrhard
2014-06-08 07:31:19 +02:00
parent 0179d35fb3
commit 684d79906f
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
xmloff/source/chart/SchXMLExport.cxx
View File

@@ -1210,7 +1210,7 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >&
}
// chart element
SvXMLElementExport* pElChart = 0;
boost::scoped_ptr<SvXMLElementExport> pElChart;
// get property states for autostyles
if( mxExpPropMapper.is())
@@ -1283,7 +1283,7 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >&
AddAutoStyleAttribute( aPropertyStates );
//element
pElChart = new SvXMLElementExport( mrExport, XML_NAMESPACE_CHART, XML_CHART, true, true );
pElChart.reset(new SvXMLElementExport( mrExport, XML_NAMESPACE_CHART, XML_CHART, true, true ));
}
else // autostyles
{
@@ -1540,10 +1540,6 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >&
// #85929# always export table, otherwise clipboard may lose data
exportTable();
}
// close <chart:chart> element
if( pElChart )
delete pElChart;
}
static void lcl_exportComplexLabel( const Sequence< uno::Any >& rComplexLabel, SvXMLExport& rExport )
@@ -1866,7 +1862,7 @@ void SchXMLExportHelper_Impl::exportPlotArea(
// plot-area element
SvXMLElementExport* pElPlotArea = 0;
boost::scoped_ptr<SvXMLElementExport> pElPlotArea;
// get property states for autostyles
xPropSet = Reference< beans::XPropertySet >( xDiagram, uno::UNO_QUERY );
if( xPropSet.is())
@@ -1956,7 +1952,7 @@ void SchXMLExportHelper_Impl::exportPlotArea(
}
// plot-area element
pElPlotArea = new SvXMLElementExport( mrExport, XML_NAMESPACE_CHART, XML_PLOT_AREA, true, true );
pElPlotArea.reset(new SvXMLElementExport( mrExport, XML_NAMESPACE_CHART, XML_PLOT_AREA, true, true ));
//inner position rectangle element
exportCoordinateRegion( xDiagram );
@@ -2111,9 +2107,6 @@ void SchXMLExportHelper_Impl::exportPlotArea(
}
}
}
if( pElPlotArea )
delete pElPlotArea;
}
void SchXMLExportHelper_Impl::exportCoordinateRegion( const uno::Reference< chart::XDiagram >& xDiagram )