summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2007-05-22 15:07:57 +0000
committerVladimir Glazounov <vg@openoffice.org>2007-05-22 15:07:57 +0000
commite40192dd070003a363fb97a62cf88d3416eb9375 (patch)
treea0d90fcf88ff487edb02ab932ee5e8aee0b2a6e9
parent8c0be1aeabe9689a7c38ac20d606a832ee2624f2 (diff)
INTEGRATION: CWS chart2mst3 (1.2.322); FILE MERGED
2006/12/07 16:32:07 bm 1.2.322.6: #i64497# some more fixes for clipboard 2006/12/06 18:57:11 bm 1.2.322.5: build breaks on Linux 2006/12/06 18:50:47 bm 1.2.322.4: #i64497# allow import and export to deal with flexible source ranges also with own data. This is needed for the clipboard between Calc and Impress 2006/01/26 00:22:27 bm 1.2.322.3: RESYNC: (1.3-1.4); FILE MERGED 2005/10/09 08:07:24 bm 1.2.322.2: RESYNC: (1.2-1.3); FILE MERGED 2005/08/15 13:09:12 bm 1.2.322.1: applyTableSimple: gets the data directly. This eases filling the internal data provider
-rw-r--r--xmloff/source/chart/SchXMLTableContext.hxx21
1 files changed, 12 insertions, 9 deletions
diff --git a/xmloff/source/chart/SchXMLTableContext.hxx b/xmloff/source/chart/SchXMLTableContext.hxx
index d04876303bd7..e1de0b9936b6 100644
--- a/xmloff/source/chart/SchXMLTableContext.hxx
+++ b/xmloff/source/chart/SchXMLTableContext.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: SchXMLTableContext.hxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: obo $ $Date: 2006-01-19 18:07:31 $
+ * last change: $Author: vg $ $Date: 2007-05-22 16:07:57 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -42,9 +42,12 @@
#include "SchXMLImport.hxx"
#endif
-#ifndef _COM_SUN_STAR_UNO_SEQUENCE_H_
-#include <com/sun/star/uno/Sequence.h>
+#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 "transporttypes.hxx"
@@ -57,6 +60,7 @@ namespace com { namespace sun { namespace star {
}}
namespace chart {
class XChartDocument;
+ class XChartDataArray;
struct ChartSeriesAddress;
}}}}
@@ -100,17 +104,16 @@ public:
/// The data for the ChartDocument is applied linearly
static void applyTableSimple(
const SchXMLTable& rTable,
- com::sun::star::uno::Reference< com::sun::star::chart::XChartDocument > xChartDoc );
+ 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,
- com::sun::star::uno::Sequence<
- com::sun::star::chart::ChartSeriesAddress >& rSeriesAddresses,
- rtl::OUString& rCategoriesAddress,
- com::sun::star::uno::Reference< com::sun::star::chart::XChartDocument > xChartDoc );
+ const tSchXMLLSequencesPerIndex & rLSequencesPerIndex,
+ com::sun::star::uno::Reference< com::sun::star::chart2::XChartDocument > xChartDoc );
+// ::com::sun::star::chart::ChartDataRowSource eDataRowSource );
};
// ========================================