mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more OOXML export validation fixes, fdo#71971

Browse Source 
Change-Id: Ic322d58817986887bbcd666ac3abc416609adf5c
This commit is contained in:
Markus Mohrhard
2013-11-30 18:19:40 +01:00
parent 7415fc31f5
commit e361f6b81b
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sc/source/filter/excel/excdoc.cxx
View File

@@ -561,6 +561,7 @@ void ExcTable::FillAsXmlTable( SCTAB nCodeNameIdx )
aRecList.AppendRecord( mxCellTable ); aRecList.AppendRecord( mxCellTable );
// label ranges // label ranges
// missing SaveXML
Add( new XclExpLabelranges( GetRoot() ) ); Add( new XclExpLabelranges( GetRoot() ) );
// DFF not needed in MSOOXML export // DFF not needed in MSOOXML export
@@ -572,15 +573,23 @@ void ExcTable::FillAsXmlTable( SCTAB nCodeNameIdx )
// Add( rR.pObjRecs ); // Add( rR.pObjRecs );
// pivot tables // pivot tables
// not in the worksheet file
aRecList.AppendRecord( GetPivotTableManager().CreatePivotTablesRecord( mnScTab ) ); aRecList.AppendRecord( GetPivotTableManager().CreatePivotTablesRecord( mnScTab ) );
// list of NOTE records, generated by the cell table // list of NOTE records, generated by the cell table
// not in the worksheet file
if( mxNoteList != 0 && !mxNoteList->IsEmpty() ) if( mxNoteList != 0 && !mxNoteList->IsEmpty() )
aRecList.AppendNewRecord( new XclExpComments( mnScTab, *mxNoteList ) ); aRecList.AppendNewRecord( new XclExpComments( mnScTab, *mxNoteList ) );
// web queries // web queries
// missing SaveXML implementation
Add( new XclExpWebQueryBuffer( GetRoot() ) ); 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 ); lcl_AddScenariosAndFilters( aRecList, GetRoot(), mnScTab );
// MERGEDCELLS record, generated by the cell table // MERGEDCELLS record, generated by the cell table
@@ -589,11 +598,6 @@ void ExcTable::FillAsXmlTable( SCTAB nCodeNameIdx )
// conditional formats // conditional formats
Add( new XclExpCondFormatBuffer( GetRoot(), xExtLst ) ); 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( HasVbaStorage() )
if( nCodeNameIdx < GetExtDocOptions().GetCodeNameCount() ) if( nCodeNameIdx < GetExtDocOptions().GetCodeNameCount() )
Add( new XclCodename( GetExtDocOptions().GetCodeName( nCodeNameIdx ) ) ); Add( new XclCodename( GetExtDocOptions().GetCodeName( nCodeNameIdx ) ) );