diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-11-30 18:19:40 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-12-01 03:00:38 +0100 |
| commit | d0f664014d02e02fbcfa80c118a0950f45513ada (patch) | |
| tree | 39c15108fac2574edb4deb581bee46bd1d0ae317 | |
| parent | 5ce4d7233fa3ea627cfbdc97a68d2b23e4abd057 (diff) | |
more OOXML export validation fixes, fdo#71971
Change-Id: Ic322d58817986887bbcd666ac3abc416609adf5c
| -rw-r--r-- | sc/source/filter/excel/excdoc.cxx | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/sc/source/filter/excel/excdoc.cxx b/sc/source/filter/excel/excdoc.cxx index 574dcbb09bb7..a8bfbf77c5d3 100644 --- a/sc/source/filter/excel/excdoc.cxx +++ b/sc/source/filter/excel/excdoc.cxx @@ -561,6 +561,7 @@ void ExcTable::FillAsXmlTable( SCTAB nCodeNameIdx ) aRecList.AppendRecord( mxCellTable ); // label ranges + // missing SaveXML Add( new XclExpLabelranges( GetRoot() ) ); // DFF not needed in MSOOXML export @@ -572,15 +573,23 @@ void ExcTable::FillAsXmlTable( SCTAB nCodeNameIdx ) // Add( rR.pObjRecs ); // pivot tables + // not in the worksheet file aRecList.AppendRecord( GetPivotTableManager().CreatePivotTablesRecord( mnScTab ) ); // list of NOTE records, generated by the cell table + // not in the worksheet file if( mxNoteList != 0 && !mxNoteList->IsEmpty() ) aRecList.AppendNewRecord( new XclExpComments( mnScTab, *mxNoteList ) ); // web queries + // missing SaveXML implementation Add( new XclExpWebQueryBuffer( GetRoot() ) ); + ScDocument& rDoc = GetDoc(); + const ScTableProtection* pTabProtect = rDoc.GetTabProtection(mnScTab); + if (pTabProtect && pTabProtect->isProtected()) + Add( new XclExpSheetProtection(true, mnScTab) ); + lcl_AddScenariosAndFilters( aRecList, GetRoot(), mnScTab ); // MERGEDCELLS record, generated by the cell table @@ -589,11 +598,6 @@ void ExcTable::FillAsXmlTable( SCTAB nCodeNameIdx ) // conditional formats Add( new XclExpCondFormatBuffer( GetRoot(), xExtLst ) ); - ScDocument& rDoc = GetDoc(); - const ScTableProtection* pTabProtect = rDoc.GetTabProtection(mnScTab); - if (pTabProtect && pTabProtect->isProtected()) - Add( new XclExpSheetProtection(true, mnScTab) ); - if( HasVbaStorage() ) if( nCodeNameIdx < GetExtDocOptions().GetCodeNameCount() ) Add( new XclCodename( GetExtDocOptions().GetCodeName( nCodeNameIdx ) ) ); |