summaryrefslogtreecommitdiff
path: root/oox/source/drawingml
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2008-07-01 11:07:01 +0000
committerVladimir Glazounov <vg@openoffice.org>2008-07-01 11:07:01 +0000
commitcca98acbab04373fb7500be83bfce4cf484511ab (patch)
treefa5fd0666407a7992bcd055083cb8bac393ede3b /oox/source/drawingml
parentd5fa8c2c92bb124a24655b459b1294c662a4879c (diff)
INTEGRATION: CWS xmlfilter05 (1.1.4); FILE MERGED
2008/05/21 12:31:55 dr 1.1.4.6: #i10000# new header 2008/04/25 15:51:45 dr 1.1.4.5: auto formatting 2008/04/23 16:00:21 dr 1.1.4.4: chart auto formatting, first steps... 2008/04/02 12:41:57 hbrinkm 1.1.4.3: merged changes from xmlfilter04 to xmlfilter05 2008/04/01 15:38:13 hbrinkm 1.1.4.2: 'Merged xmlfilter04' 2008/03/12 14:22:30 hbrinkm 1.1.4.1: file chartspaceconverter.cxx was added on branch cws_dev300_xmlfilter05 on 2008-04-01 15:38:13 +0000
Diffstat (limited to 'oox/source/drawingml')
-rw-r--r--oox/source/drawingml/chart/chartspaceconverter.cxx17
1 files changed, 12 insertions, 5 deletions
diff --git a/oox/source/drawingml/chart/chartspaceconverter.cxx b/oox/source/drawingml/chart/chartspaceconverter.cxx
index 1efe8e9821a1..89e6717e4c38 100644
--- a/oox/source/drawingml/chart/chartspaceconverter.cxx
+++ b/oox/source/drawingml/chart/chartspaceconverter.cxx
@@ -8,7 +8,7 @@
*
* $RCSfile: chartspaceconverter.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
* This file is part of OpenOffice.org.
*
@@ -62,8 +62,11 @@ ChartSpaceConverter::~ChartSpaceConverter()
{
}
-void ChartSpaceConverter::convertModelToDocument()
+void ChartSpaceConverter::convertFromModel()
{
+ // initialize the automatic formatting information
+ initAutoFormats( mrModel.mnStyle );
+
/* create data provider (virtual function in the ChartConverter class,
derived converters may create an external data provider) */
getChartConverter().createDataProvider( getChartDocument() );
@@ -79,9 +82,13 @@ void ChartSpaceConverter::convertModelToDocument()
{
}
+ // formatting of the chart background
+ PropertySet aPropSet( getChartDocument()->getPageBackground() );
+ convertAutoFormats( aPropSet, OBJECTTYPE_CHARTSPACE );
+
// convert plot area (container of all chart type groups)
PlotAreaConverter aPlotAreaConv( *this, mrModel.mxPlotArea.getOrCreate() );
- OUString aAutoTitle = aPlotAreaConv.convertModelToDocument( mrModel.mxView3D.getOrCreate() );
+ OUString aAutoTitle = aPlotAreaConv.convertFromModel( mrModel.mxView3D.getOrCreate() );
// chart title
if( !mrModel.mbAutoTitleDel ) try
@@ -94,7 +101,7 @@ void ChartSpaceConverter::convertModelToDocument()
aAutoTitle = CREATE_OUSTRING( "Chart Title" );
Reference< XTitled > xTitled( getChartDocument(), UNO_QUERY_THROW );
TitleConverter aTitleConv( *this, mrModel.mxTitle.getOrCreate() );
- aTitleConv.convertModelToDocument( xTitled, aAutoTitle );
+ aTitleConv.convertFromModel( xTitled, aAutoTitle );
}
}
catch( Exception& )
@@ -105,7 +112,7 @@ void ChartSpaceConverter::convertModelToDocument()
if( mrModel.mxLegend.is() )
{
LegendConverter aLegendConv( *this, *mrModel.mxLegend );
- aLegendConv.convertModelToDocument( getChartDocument()->getFirstDiagram() );
+ aLegendConv.convertFromModel( getChartDocument()->getFirstDiagram() );
}
}