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

support export of property mapping

Browse Source 
Change-Id: I9529eedb9c9c002bfc2fee638938082cef59f185
This commit is contained in:
Markus Mohrhard
2014-03-10 01:01:24 +01:00
committed by Markus Mohrhard
parent b595df2012
commit 37b437dcd6
3 changed files with 46 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/xmloff/xmltoken.hxx
View File

@@ -3212,6 +3212,8 @@ namespace xmloff { namespace token {
XML_MARGIN, // #i117001# XML_MARGIN, // #i117001#
XML_PROPERTY_MAPPING,
// regina, ODF1.2 additional symbols in charts // regina, ODF1.2 additional symbols in charts
XML_STAR, XML_STAR,
XML_ASTERISK, XML_ASTERISK,

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

@@ -207,6 +207,11 @@ public:
const ::com::sun::star::awt::Size & rPageSize, const ::com::sun::star::awt::Size & rPageSize,
sal_Bool bExportContent, sal_Bool bExportContent,
sal_Bool bHasTwoYAxes ); sal_Bool bHasTwoYAxes );
void exportPropertyMapping(
const com::sun::star::uno::Reference< com::sun::star::chart2::data::XDataSource > & xSource,
Sequence< OUString >& rSupportedMappings );
void exportCandleStickSeries( void exportCandleStickSeries(
const ::com::sun::star::uno::Sequence< const ::com::sun::star::uno::Sequence<
::com::sun::star::uno::Reference< ::com::sun::star::uno::Reference<
@@ -2874,6 +2879,13 @@ void SchXMLExportHelper_Impl::exportSeries(
uno::Reference< beans::XPropertySet >( aSeriesSeq[nSeriesIdx], uno::UNO_QUERY ), uno::Reference< beans::XPropertySet >( aSeriesSeq[nSeriesIdx], uno::UNO_QUERY ),
nSeriesLength, xNewDiagram, bExportContent ); nSeriesLength, xNewDiagram, bExportContent );
const SvtSaveOptions::ODFDefaultVersion nCurrentODFVersion( SvtSaveOptions().GetODFDefaultVersion() );
if( bExportContent && nCurrentODFVersion > SvtSaveOptions::ODFVER_012 )//do not export to ODF 1.2 or older
{
Sequence< OUString > aSupportedMappings = aCTSeq[nCTIdx]->getSupportedPropertyRoles();
exportPropertyMapping( xSource, aSupportedMappings );
}
// close series element // close series element
delete pSeries; delete pSeries;
} }
@@ -2883,6 +2895,36 @@ void SchXMLExportHelper_Impl::exportSeries(
} }
} }
void SchXMLExportHelper_Impl::exportPropertyMapping(
const Reference< chart2::data::XDataSource > & xSource, Sequence< OUString >& rSupportedMappings )
{
Reference< chart2::XChartDocument > xNewDoc( mrExport.GetModel(), uno::UNO_QUERY );
Sequence< Reference< chart2::data::XLabeledDataSequence > > aSeqCnt(
xSource->getDataSequences());
for(sal_Int32 i = 0, n = rSupportedMappings.getLength(); i < n; ++i)
{
Reference< chart2::data::XLabeledDataSequence > xSequence( lcl_getDataSequenceByRole( aSeqCnt, rSupportedMappings[i] ) );
if(xSequence.is())
{
Reference< chart2::data::XDataSequence > xValues( xSequence->getValues() );
if( xValues.is())
{
mrExport.AddAttribute( XML_NAMESPACE_LO_EXT, XML_PROPERTY, rSupportedMappings[i]);
mrExport.AddAttribute( XML_NAMESPACE_LO_EXT, XML_CELL_RANGE_ADDRESS,
lcl_ConvertRange(
xValues->getSourceRangeRepresentation(),
xNewDoc ));
SvXMLElementExport( mrExport, XML_NAMESPACE_LO_EXT, XML_PROPERTY_MAPPING, sal_True, sal_True );
// register range for data table export
m_aDataSequencesToExport.push_back( tLabelValuesDataPair(
(uno::Reference< chart2::data::XDataSequence >)0, xValues ));
}
}
}
}
void SchXMLExportHelper_Impl::exportRegressionCurve( void SchXMLExportHelper_Impl::exportRegressionCurve(
const Reference< chart2::XDataSeries >& xSeries, const Reference< chart2::XDataSeries >& xSeries,
const awt::Size& rPageSize, const awt::Size& rPageSize,

2
xmloff/source/core/xmltoken.cxx
View File

@@ -3212,6 +3212,8 @@ namespace xmloff { namespace token {
TOKEN( "margin", XML_MARGIN), TOKEN( "margin", XML_MARGIN),
TOKEN( "propertry-mapping", XML_PROPERTY_MAPPING),
// regina, ODF1.2 additional symbols in charts // regina, ODF1.2 additional symbols in charts
TOKEN( "star", XML_STAR ), TOKEN( "star", XML_STAR ),
TOKEN( "asterisk", XML_ASTERISK ), TOKEN( "asterisk", XML_ASTERISK ),