diff options
| author | Kohei Yoshida <kyoshida@novell.com> | 2010-01-07 09:10:34 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kyoshida@novell.com> | 2010-01-07 09:10:34 -0500 |
| commit | a0bd898b3d425063b55503bcd7b5af8eb0f6ef62 (patch) | |
| tree | 8809e9cb3c56db5082ffc26bc6a6462025fb5381 /sc/source/filter/inc | |
| parent | 50e1b982ff532184892b63dd2634571b2ef6ce8e (diff) | |
| parent | 989eab85ffddf68cff47d562c55812ad6689ef03 (diff) | |
kohei03: rebased to DEV300_m68.
Diffstat (limited to 'sc/source/filter/inc')
| -rw-r--r-- | sc/source/filter/inc/excimp8.hxx | 1 | ||||
| -rw-r--r-- | sc/source/filter/inc/xestream.hxx | 3 | ||||
| -rw-r--r-- | sc/source/filter/inc/xichart.hxx | 9 |
3 files changed, 11 insertions, 2 deletions
diff --git a/sc/source/filter/inc/excimp8.hxx b/sc/source/filter/inc/excimp8.hxx index 9bd633eae879..f715c96a7bfc 100644 --- a/sc/source/filter/inc/excimp8.hxx +++ b/sc/source/filter/inc/excimp8.hxx @@ -37,6 +37,7 @@ #include "excscen.hxx" #include "excdefs.hxx" #include "ftools.hxx" +#include "queryparam.hxx" class SotStorage; diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx index 95d172baf9c2..e7a2da370772 100644 --- a/sc/source/filter/inc/xestream.hxx +++ b/sc/source/filter/inc/xestream.hxx @@ -126,6 +126,9 @@ public: sal_Size Write( const void* pData, sal_Size nBytes ); /** Writes a sequence of nBytes zero bytes (respects slice setting). */ void WriteZeroBytes( sal_Size nBytes ); + + void WriteZeroBytesToRecord( sal_Size nBytes ); + /** Copies nBytes bytes from current position of the stream rInStrm. @descr Omitting the second parameter means: read to end of stream. */ sal_Size CopyFromStream( SvStream& rInStrm, sal_Size nBytes = STREAM_SEEK_TO_END ); diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx index e09530083965..34536a0da67f 100644 --- a/sc/source/filter/inc/xichart.hxx +++ b/sc/source/filter/inc/xichart.hxx @@ -39,6 +39,7 @@ #include <svl/itemset.hxx> #include "rangelst.hxx" +#include "token.hxx" #include "xlchart.hxx" #include "xlstyle.hxx" #include "xistring.hxx" @@ -403,6 +404,8 @@ public: XFormattedStringSeq CreateStringSequence( const XclImpChRoot& rRoot, sal_uInt16 nLeadFontIdx, const Color& rLeadFontColor ) const; + void FillSourceLink(::std::vector<ScSharedTokenRef>& rTokens) const; + private: XclChSourceLink maData; /// Contents of the CHSOURCELINK record. XclImpStringRef mxString; /// Text data (CHSTRING record). @@ -811,6 +814,8 @@ public: /** Creates a data series object with initialized source links. */ XDataSeriesRef CreateDataSeries() const; + void FillAllSourceLinks(::std::vector<ScSharedTokenRef>& rTokens) const; + private: /** Reads a CHSOURCELINK record. */ void ReadChSourceLink( XclImpStream& rStrm ); @@ -1353,7 +1358,7 @@ public: inline sal_Size GetProgressSize() const { return 2 * EXC_CHART_PROGRESS_SIZE; } /** Converts and writes all properties to the passed chart. */ - void Convert( XChartDocRef xChartDoc, ScfProgressBar& rProgress ) const; + void Convert( XChartDocRef xChartDoc, ScfProgressBar& rProgress, const ::rtl::OUString& rObjName ) const; private: /** Reads a CHSERIES group (data series source and formatting). */ @@ -1421,7 +1426,7 @@ public: inline bool IsPivotChart() const { return mbIsPivotChart; } /** Creates the chart object in the passed component. */ - void Convert( XModelRef xModel, ScfProgressBar& rProgress ) const; + void Convert( XModelRef xModel, ScfProgressBar& rProgress, const ::rtl::OUString& rObjName ) const; private: /** Reads the CHCHART group (entire chart data). */ |