diff options
author | Daniel Rentz <dr@openoffice.org> | 2009-07-21 08:45:37 +0000 |
---|---|---|
committer | Daniel Rentz <dr@openoffice.org> | 2009-07-21 08:45:37 +0000 |
commit | 666ab44fc05a32d5d60783b8986fa3c72bb8bb19 (patch) | |
tree | 3bae923318ab89e382e15710ecab386327759fd5 /oox/source/drawingml/chart/chartconverter.cxx | |
parent | e86f49f5885249ea160cdd16f9866d18f92e4401 (diff) |
#i12587# support chart sheets with embedded shapes
Diffstat (limited to 'oox/source/drawingml/chart/chartconverter.cxx')
-rw-r--r-- | oox/source/drawingml/chart/chartconverter.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/oox/source/drawingml/chart/chartconverter.cxx b/oox/source/drawingml/chart/chartconverter.cxx index 6358e6b899e6..53c301dab7f8 100644 --- a/oox/source/drawingml/chart/chartconverter.cxx +++ b/oox/source/drawingml/chart/chartconverter.cxx @@ -37,7 +37,9 @@ using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Exception; +using ::com::sun::star::awt::Point; using ::com::sun::star::awt::Size; +using ::com::sun::star::drawing::XShapes; using ::com::sun::star::chart2::XChartDocument; using ::com::sun::star::chart2::data::XDataProvider; using ::com::sun::star::chart2::data::XDataSequence; @@ -58,14 +60,15 @@ ChartConverter::~ChartConverter() } void ChartConverter::convertFromModel( XmlFilterBase& rFilter, - ChartSpaceModel& rModel, const Reference< XChartDocument >& rxChartDoc, const Size& rChartSize ) + ChartSpaceModel& rChartModel, const Reference< XChartDocument >& rxChartDoc, + const Reference< XShapes >& rxExternalPage, const Point& rChartPos, const Size& rChartSize ) { OSL_ENSURE( rxChartDoc.is(), "ChartConverter::convertFromModel - missing chart document" ); if( rxChartDoc.is() ) { - ConverterRoot aConvBase( rFilter, *this, rxChartDoc, rChartSize, rModel ); - ChartSpaceConverter aSpaceConv( aConvBase, rModel ); - aSpaceConv.convertFromModel(); + ConverterRoot aConvBase( rFilter, *this, rChartModel, rxChartDoc, rChartSize ); + ChartSpaceConverter aSpaceConv( aConvBase, rChartModel ); + aSpaceConv.convertFromModel( rxExternalPage, rChartPos ); } } |