summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKatarina Machalkova <kmachalkova@suse.cz>2010-10-20 18:30:56 +0200
committerKatarina Machalkova <kmachalkova@suse.cz>2010-10-20 18:30:56 +0200
commit026c85ff21efaf569b9a40dff83ef5027d0292b9 (patch)
treea8bb6fad83811e65c8cb5ae7898d0538f3ad1baa
parente114713e26a65460cf275fb8b3d66107724c92c9 (diff)
Undoing pptx filter as a separate lib ( + related changes)
Shared ppt + pptx filter will be merged from cws later
-rw-r--r--sc/source/filter/excel/xestream.cxx5
-rw-r--r--sc/source/filter/inc/xestream.hxx2
-rw-r--r--sc/source/filter/xcl97/xcl97rec.cxx2
3 files changed, 5 insertions, 4 deletions
diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx
index aad63aceb..9e8de9340 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 577991b7d..87cff88af 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 a9932a6d1..debf7e826 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 ),