diff options
| author | Katarina Machalkova <kmachalkova@suse.cz> | 2010-10-20 18:30:56 +0200 |
|---|---|---|
| committer | Katarina Machalkova <kmachalkova@suse.cz> | 2010-10-20 18:30:56 +0200 |
| commit | c88cfc7a672473256d1f7bc8bf6b16d98f54fe5a (patch) | |
| tree | 863f16a2f8bcecedb6a0ae70276d80b750b94554 /sc/source | |
| parent | f719556424d91ffe3fd2e18e6e2c74d670d1d4dd (diff) | |
Undoing pptx filter as a separate lib ( + related changes)
Shared ppt + pptx filter will be merged from cws later
Diffstat (limited to 'sc/source')
| -rw-r--r-- | sc/source/filter/excel/xestream.cxx | 5 | ||||
| -rw-r--r-- | sc/source/filter/inc/xestream.hxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/xcl97/xcl97rec.cxx | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx index e869c19479f6..660ddd48c014 100644 --- a/sc/source/filter/excel/xestream.cxx +++ b/sc/source/filter/excel/xestream.cxx @@ -1075,9 +1075,10 @@ const oox::drawingml::table::TableStyleListPtr XclExpXmlStream::getTableStyles() return oox::drawingml::table::TableStyleListPtr(); } -oox::drawingml::chart::ChartConverter* XclExpXmlStream::getChartConverter() +oox::drawingml::chart::ChartConverter& XclExpXmlStream::getChartConverter() { - return NULL; + // DO NOT CALL + return * (oox::drawingml::chart::ChartConverter*) NULL; } ScDocShell* XclExpXmlStream::getDocShell() diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx index 74fb55d7bbe9..f0bcb70cf033 100644 --- a/sc/source/filter/inc/xestream.hxx +++ b/sc/source/filter/inc/xestream.hxx @@ -337,7 +337,7 @@ public: virtual oox::vml::Drawing* getVmlDrawing(); virtual const oox::drawingml::Theme* getCurrentTheme() const; virtual const oox::drawingml::table::TableStyleListPtr getTableStyles(); - virtual oox::drawingml::chart::ChartConverter* getChartConverter(); + virtual oox::drawingml::chart::ChartConverter& getChartConverter(); void Trace( const char* format, ...); private: diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx index 0d7188cfb04e..fe6bf5cf6bf3 100644 --- a/sc/source/filter/xcl97/xcl97rec.cxx +++ b/sc/source/filter/xcl97/xcl97rec.cxx @@ -1028,7 +1028,7 @@ void XclObjAny::SaveXml( XclExpXmlStream& rStrm ) sax_fastparser::FSHelperPtr pDrawing = rStrm.GetCurrentStream(); - ShapeExport aDML( XML_xdr, pDrawing, NULL, &rStrm, DrawingML::DOCUMENT_XLSX ); + ShapeExport aDML( XML_xdr, pDrawing, &rStrm, DrawingML::DOCUMENT_XLSX ); pDrawing->startElement( FSNS( XML_xdr, XML_twoCellAnchor ), // OOXTODO: oneCellAnchor, absoluteAnchor XML_editAs, GetEditAs( *this ), |