diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-03-06 14:58:43 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-03-06 14:58:43 +0000 |
| commit | 599807a7b1d15d0d0349d116a163dc975f137a9f (patch) | |
| tree | 6c0a65fac9a320a6c13a2f4740f49a6e676ff0e1 /xmloff | |
| parent | fe8fbca774df1b4709d95581a3ef85eb4a7094e7 (diff) | |
INTEGRATION: CWS chart20_DEV300 (1.6.142); FILE MERGED
2008/02/25 17:19:50 bm 1.6.142.2: #i366# fixed a bug for charts with own data
2008/02/21 15:59:49 bm 1.6.142.1: #i366# error bars from cell ranges
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/chart/SchXMLTableContext.hxx | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/xmloff/source/chart/SchXMLTableContext.hxx b/xmloff/source/chart/SchXMLTableContext.hxx index 5934d443e457..2ff977e8ed10 100644 --- a/xmloff/source/chart/SchXMLTableContext.hxx +++ b/xmloff/source/chart/SchXMLTableContext.hxx @@ -4,9 +4,9 @@ * * $RCSfile: SchXMLTableContext.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: hr $ $Date: 2007-06-27 14:50:12 $ + * last change: $Author: kz $ $Date: 2008-03-06 15:58:43 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -41,13 +41,13 @@ #ifndef SCH_XMLIMPORT_HXX_ #include "SchXMLImport.hxx" #endif +// #include "SchXMLChartContext.hxx" #ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_ #include <com/sun/star/uno/Sequence.hxx> #endif -// #ifndef _COM_SUN_STAR_CHART_CHARTDATAROWSOURCE_HPP_ -// #include <com/sun/star/chart/ChartDataRowSource.hpp> -// #endif + +#include <com/sun/star/chart/ChartDataRowSource.hpp> #include "transporttypes.hxx" @@ -83,6 +83,7 @@ public: USHORT nPrefix, const rtl::OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); + virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); }; // ---------------------------------------- @@ -104,16 +105,23 @@ public: /// The data for the ChartDocument is applied linearly static void applyTableSimple( const SchXMLTable& rTable, - com::sun::star::uno::Reference< com::sun::star::chart::XChartDataArray > xData ); + const com::sun::star::uno::Reference< com::sun::star::chart::XChartDataArray > & xData ); /** The data for the ChartDocument is applied by reading the table, the addresses of series, the addresses of labels, the cell-range-address for the categories */ static void applyTable( const SchXMLTable& rTable, - const tSchXMLLSequencesPerIndex & rLSequencesPerIndex, com::sun::star::uno::Reference< com::sun::star::chart2::XChartDocument > xChartDoc ); -// ::com::sun::star::chart::ChartDataRowSource eDataRowSource ); + + /** Second part of applyTable that has to be called after the data series + got their styles set. This function reorders local data to fit the + correct data structure. + */ + static void postProcessTable( const SchXMLTable& rTable, + const tSchXMLLSequencesPerIndex & rLSequencesPerIndex, + com::sun::star::uno::Reference< com::sun::star::chart2::XChartDocument > xChartDoc, + ::com::sun::star::chart::ChartDataRowSource eDataRowSource ); }; // ======================================== @@ -217,6 +225,7 @@ private: SchXMLImportHelper& mrImportHelper; SchXMLTable& mrTable; rtl::OUString maCellContent; + rtl::OUString maRangeId; sal_Bool mbReadPara; public: |