[Libreoffice-commits] .: sc/source

[Katarina Machalkova]

 sc/source/filter/excel/xestream.cxx |    5 +++--
 sc/source/filter/inc/xestream.hxx   |    2 +-
 sc/source/filter/xcl97/xcl97rec.cxx |    2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 026c85ff21efaf569b9a40dff83ef5027d0292b9
Author: Katarina Machalkova <kmachalkova at suse.cz>
Date:   Wed Oct 20 18:30:56 2010 +0200

    Undoing pptx filter as a separate lib ( + related changes)
    
    Shared ppt + pptx filter will be merged from cws later

diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx
index aad63ac..9e8de93 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 577991b..87cff88 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 a9932a6..debf7e8 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 ),