diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-08-21 16:24:47 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-08-22 21:55:59 -0400 |
| commit | 16f9011c9c8d9835997cc7c800c3f289dfcb9719 (patch) | |
| tree | 17f2391240cbd21855f0a5b068d676bc495c15dc /sc/source | |
| parent | d40700d58e3a418fa54d8f1e424a1bccbd2f188e (diff) | |
Make header (workbook) export and worksheet export clearer.
Change-Id: I9540fa32ca6a4ce041e15b272a049fcdf267fb0c
Diffstat (limited to 'sc/source')
| -rw-r--r-- | sc/source/filter/excel/excdoc.cxx | 37 |
1 files changed, 21 insertions, 16 deletions
diff --git a/sc/source/filter/excel/excdoc.cxx b/sc/source/filter/excel/excdoc.cxx index 416e4111f16d..d683d46115cb 100644 --- a/sc/source/filter/excel/excdoc.cxx +++ b/sc/source/filter/excel/excdoc.cxx @@ -676,31 +676,36 @@ void ExcTable::Write( XclExpStream& rStrm ) void ExcTable::WriteXml( XclExpXmlStream& rStrm ) { - if (GetTabInfo().IsExportTab( mnScTab ) ) + if (!GetTabInfo().IsExportTab(mnScTab)) { - // worksheet export - OUString sSheetName = XclXmlUtils::GetStreamName( "xl/", "worksheets/sheet", mnScTab+1 ); + // header export. + SetCurrScTab(mnScTab); + if (mxCellTable) + mxCellTable->Finalize(); + aRecList.SaveXml(rStrm); - sax_fastparser::FSHelperPtr pWorksheet = rStrm.GetStreamForPath( sSheetName ); + return; + } - rStrm.PushStream( pWorksheet ); + // worksheet export + OUString sSheetName = XclXmlUtils::GetStreamName( "xl/", "worksheets/sheet", mnScTab+1 ); - pWorksheet->startElement( XML_worksheet, - XML_xmlns, "http://schemas.openxmlformats.org/spreadsheetml/2006/main", - FSNS( XML_xmlns, XML_r ), "http://schemas.openxmlformats.org/officeDocument/2006/relationships", - FSEND ); - } + sax_fastparser::FSHelperPtr pWorksheet = rStrm.GetStreamForPath( sSheetName ); + + rStrm.PushStream( pWorksheet ); + + pWorksheet->startElement( XML_worksheet, + XML_xmlns, "http://schemas.openxmlformats.org/spreadsheetml/2006/main", + FSNS( XML_xmlns, XML_r ), "http://schemas.openxmlformats.org/officeDocument/2006/relationships", + FSEND ); SetCurrScTab( mnScTab ); - if( mxCellTable.get() ) + if (mxCellTable) mxCellTable->Finalize(); aRecList.SaveXml( rStrm ); - if (GetTabInfo().IsExportTab( mnScTab ) ) - { - rStrm.GetCurrentStream()->endElement( XML_worksheet ); - rStrm.PopStream(); - } + rStrm.GetCurrentStream()->endElement( XML_worksheet ); + rStrm.PopStream(); } ExcDocument::ExcDocument( const XclExpRoot& rRoot ) : |