[ooo-build-commit] .: patches/dev300
Katarina Machalkova
bubli at kemper.freedesktop.org
Wed Jun 2 02:56:12 PDT 2010
patches/dev300/apply | 2
patches/dev300/xlsx-shared-xlsx-export-no-more-svstream-sotstorage.diff | 4
patches/dev300/xlsx-shared-xlsx-shared-import-and-export.diff | 19 ---
patches/dev300/xlsx-shared-xlsx-snapshot.diff | 52 ++++------
4 files changed, 28 insertions(+), 49 deletions(-)
New commits:
commit 989b373a0b58e03057aca9b98ce8156cea193b9b
Author: Katarina Machalkova <kmachalkova at suse.cz>
Date: Wed Jun 2 11:53:41 2010 +0200
Some cleanup to make dev300-m77 buildable with OOXMLExportDevel enabled
* patches/dev300/apply:
* patches/dev300/xlsx-shared-xlsx-export-no-more-svstream-sotstorage.diff:
* patches/dev300/xlsx-shared-xlsx-shared-import-and-export.diff:
* patches/dev300/xlsx-shared-xlsx-snapshot.diff:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index dfc0c9c..f86d7ef 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3127,7 +3127,7 @@ odf-converter-ignore-writerfilter.diff, n#348471, n#502173, jholesov
[ OOXMLExportDevel ]
# depends on oox-smartart-import.diff
-xlsx-shared-oox-smartart-import-m13.diff
+# FIXME dev300-m77 xlsx-shared-oox-smartart-import-m13.diff
[ OOXML ]
oox-pptx-export-fix-hidden-slides.diff, n#499131, rodo
diff --git a/patches/dev300/xlsx-shared-xlsx-export-no-more-svstream-sotstorage.diff b/patches/dev300/xlsx-shared-xlsx-export-no-more-svstream-sotstorage.diff
index bb208c2..09767d9 100644
--- a/patches/dev300/xlsx-shared-xlsx-export-no-more-svstream-sotstorage.diff
+++ b/patches/dev300/xlsx-shared-xlsx-export-no-more-svstream-sotstorage.diff
@@ -17,9 +17,9 @@ index 7a57718..36ab09e 100644
XclExpRootData aData( EXC_BIFF8, *pShell->GetMedium (), rStorage, *pDoc, RTL_TEXTENCODING_DONTKNOW );
aData.meOutput = EXC_OUTPUT_XML_2007;
@@ -1147,7 +1148,7 @@ bool XclExpXmlStream::exportDocument() throw()
+ mpRoot = &aRoot;
+ aRoot.GetOldRoot().pER = &aRoot;
aRoot.GetOldRoot().eDateiTyp = Biff8;
- XclEscher escher( *aRoot.GetOldRoot ().pER, pDoc->GetTableCount () );
- aRoot.GetOldRoot().pEscher = &escher;
-
+#if 0 // FIXME: Re-write this block without using SotStorage.
if ( SvtFilterOptions* pOptions = SvtFilterOptions::Get() )
diff --git a/patches/dev300/xlsx-shared-xlsx-shared-import-and-export.diff b/patches/dev300/xlsx-shared-xlsx-shared-import-and-export.diff
index f798867..7968ad5 100644
--- a/patches/dev300/xlsx-shared-xlsx-shared-import-and-export.diff
+++ b/patches/dev300/xlsx-shared-xlsx-shared-import-and-export.diff
@@ -159,18 +159,9 @@
--- sc/source/filter/excel/expop2.cxx.old 2010-03-03 17:00:06.000000000 +0100
+++ sc/source/filter/excel/expop2.cxx 2010-03-03 17:00:06.000000000 +0100
-@@ -153,59 +153,12 @@ ExportBiff8::~ExportBiff8()
- ExportBiff5( rExpData, rStrm )
- {
- pExcRoot->eDateiTyp = Biff8;
-+ pExcRoot->pEscher = new XclEscher( GetRoot(), GetDoc().GetTableCount() );
- }
-
-
+@@ -153,59 +153,3 @@ ExportBiff8::~ExportBiff8()
ExportBiff8::~ExportBiff8()
{
-+ delete pExcRoot->pEscher;
-+ pExcRoot->pEscher = NULL;
}
-
-
@@ -231,13 +222,11 @@
--- sc/source/filter/excel/xestream.cxx.old 2010-03-03 17:00:06.000000000 +0100
+++ sc/source/filter/excel/xestream.cxx 2010-03-03 17:00:06.000000000 +0100
-@@ -49,6 +49,11 @@
+@@ -49,6 +49,9 @@
#include "rangelst.hxx"
#include "compiler.hxx"
+#include <../../ui/inc/docsh.hxx>
-+#include <svtools/fltrcfg.hxx>
-+#include <svx/svxmsbas.hxx>
+#include <excdoc.hxx>
+
#include <oox/core/tokens.hxx>
@@ -298,7 +287,7 @@
}
XclExpXmlStream::~XclExpXmlStream()
-@@ -1116,14 +1108,59 @@ oox::drawingml::chart::ChartConverter* X
+@@ -1116,14 +1108,57 @@ oox::drawingml::chart::ChartConverter* X
return * (oox::drawingml::chart::ChartConverter*) NULL;
}
@@ -330,8 +319,6 @@
+ mpRoot = &aRoot;
+ aRoot.GetOldRoot().pER = &aRoot;
+ aRoot.GetOldRoot().eDateiTyp = Biff8;
-+ XclEscher escher( *aRoot.GetOldRoot ().pER, pDoc->GetTableCount () );
-+ aRoot.GetOldRoot().pEscher = &escher;
+
+ if ( SvtFilterOptions* pOptions = SvtFilterOptions::Get() )
+ if ( pShell && pOptions->IsLoadExcelBasicStorage() )
diff --git a/patches/dev300/xlsx-shared-xlsx-snapshot.diff b/patches/dev300/xlsx-shared-xlsx-snapshot.diff
index 5940159..f8cb51b 100644
--- a/patches/dev300/xlsx-shared-xlsx-snapshot.diff
+++ b/patches/dev300/xlsx-shared-xlsx-snapshot.diff
@@ -134,17 +134,17 @@
lcl_AddBookviews( aRecList, *this );
}
-@@ -443,6 +435,10 @@ void ExcTable::FillAsTable( size_t nCode
-
- // create a new OBJ list for this sheet (may be used by notes, autofilter, data validation)
- GetObjectManager().StartSheet();
-+
-+ if ( eBiff == EXC_BIFF8 )
-+ // list holding OBJ records and creating MSODRAWING per-sheet data
-+ rR.pObjRecs = new XclExpObjList( GetRoot(), mnScTab );
-
- // cell table: DEFROWHEIGHT, DEFCOLWIDTH, COLINFO, DIMENSIONS, ROW, cell records
- mxCellTable.reset( new XclExpCellTable( GetRoot() ) );
+#@@ -443,6 +435,10 @@ void ExcTable::FillAsTable( size_t nCode
+#
+# // create a new OBJ list for this sheet (may be used by notes, autofilter, data validation)
+# GetObjectManager().StartSheet();
+#+
+#+ if ( eBiff == EXC_BIFF8 )
+#+ // list holding OBJ records and creating MSODRAWING per-sheet data
+#+ rR.pObjRecs = new XclExpObjList( GetRoot(), mnScTab );
+#
+# // cell table: DEFROWHEIGHT, DEFCOLWIDTH, COLINFO, DIMENSIONS, ROW, cell records
+# mxCellTable.reset( new XclExpCellTable( GetRoot() ) );
#@@ -597,8 +589,6 @@ void ExcTable::FillAsXmlTable( size_t nC
# //! close Escher group shape and ESCHER_DgContainer
# //! opened by XclObjList ctor MSODRAWING
@@ -154,16 +154,16 @@
#
# // pivot tables
# aRecList.AppendRecord( GetPivotTableManager().CreatePivotTablesRecord( mnScTab ) );
-@@ -649,6 +639,9 @@ void ExcTable::FillAsXmlTable( size_t nC
- }
- }
-
-+ // all MSODRAWING and OBJ stuff of this sheet goes here
-+ Add( rR.pObjRecs );
-+
- // EOF
- Add( new ExcEof );
- }
+#@@ -649,6 +639,9 @@ void ExcTable::FillAsXmlTable( size_t nC
+# }
+# }
+#
+#+ // all MSODRAWING and OBJ stuff of this sheet goes here
+#+ Add( rR.pObjRecs );
+#+
+# // EOF
+# Add( new ExcEof );
+# }
@@ -804,25 +797,33 @@ void ExcDocument::Write( SvStream& rSvSt
void ExcDocument::WriteXml( SvStream& rStrm )
@@ -197,8 +197,6 @@
- XclExpXmlStream aStrm( ::comphelper::getProcessServiceFactory(), rStrm, GetRoot() );
-
-# GetOldRoot().pEscher->GetStrm().Seek(0); // ready for take off
-#
- sax_fastparser::FSHelperPtr& rWorkbook = aStrm.GetCurrentStream();
- rWorkbook->startElement( XML_workbook,
- XML_xmlns, "http://schemas.openxmlformats.org/spreadsheetml/2006/main",
@@ -1146,7 +1144,7 @@
#define EXC_EXP_OCX_CTRL 0
--- sc/source/filter/inc/xcl97rec.hxx.old 2010-03-03 17:00:05.000000000 +0100
+++ sc/source/filter/inc/xcl97rec.hxx 2010-03-03 17:00:06.000000000 +0100
-@@ -36,11 +36,12 @@
+@@ -36,6 +36,7 @@
class XclObj;
class XclExpMsoDrawing;
@@ -1154,12 +1152,6 @@
class XclExpObjList : public List, public ExcEmptyRec, protected XclExpRoot
{
- public:
-- explicit XclExpObjList( const XclExpRoot& rRoot, XclEscherEx& rEscherEx );
-+ explicit XclExpObjList( const XclExpRoot& rRoot, XclEscherEx& rEscherEx, SCTAB nScTab );
- virtual ~XclExpObjList();
-
- XclObj* First() { return (XclObj*) List::First(); }
@@ -56,8 +57,14 @@
void EndSheet();
More information about the ooo-build-commit
mailing list