[Libreoffice-commits] .: 2 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, 4 insertions(+), 5 deletions(-)

New commits:
commit 1ef92988d1004d7c6d3ee51b33c711ab45faee42
Author: Katarina Machalkova <kmachalkova at suse.cz>
Date:   Tue Oct 19 17:01:21 2010 +0200

    Merged oox-smartart-import.diff from ooo-build

diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx
index 9e8de93..aad63ac 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -1075,10 +1075,9 @@ const oox::drawingml::table::TableStyleListPtr XclExpXmlStream::getTableStyles()
     return oox::drawingml::table::TableStyleListPtr();
 }
 
-oox::drawingml::chart::ChartConverter& XclExpXmlStream::getChartConverter()
+oox::drawingml::chart::ChartConverter* XclExpXmlStream::getChartConverter()
 {
-    // DO NOT CALL
-    return * (oox::drawingml::chart::ChartConverter*) NULL;
+    return NULL;
 }
 
 ScDocShell* XclExpXmlStream::getDocShell()
diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx
index 87cff88..577991b 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:
commit c456440dbd0f2bd5a7744b49d77eebb904590482
Author: Katarina Machalkova <kmachalkova at suse.cz>
Date:   Tue Oct 19 16:39:50 2010 +0200

    Merged xlsx-shared-oox-drawingml-fix-shapes-map-crash.diff

diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx
index debf7e8..a9932a6 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, &rStrm, DrawingML::DOCUMENT_XLSX );
+    ShapeExport aDML( XML_xdr, pDrawing, NULL, &rStrm, DrawingML::DOCUMENT_XLSX );
 
     pDrawing->startElement( FSNS( XML_xdr, XML_twoCellAnchor ), // OOXTODO: oneCellAnchor, absoluteAnchor
             XML_editAs, GetEditAs( *this ),