diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-02-14 11:41:02 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-02-14 11:47:29 -0500 |
| commit | 5000e64ecc55efd47d92714cf6db375ff37aac4b (patch) | |
| tree | 1073d76d955c318b14a2f5d07f6bc50688544770 | |
| parent | 17845be27dacba0abc72647209f5324546b6c8b6 (diff) | |
fdo#72390: Let's not skip auto styles from unmodified sheets.
We do re-use sheet XML stream for unmodified sheets on re-save, which
is okay. But skipping auto style population from unmodified sheets
is not okay because autostyles are shared across all sheets and written
outside the sheet XML streams. Skipping styles from unmodified sheets
could potentially fail to export used styles, not to mention could
cause a crash as reported in the bug.
Change-Id: I73e439f7354e341c2c07e28ecca5452193985860
| -rw-r--r-- | sc/source/filter/xml/xmlexprt.cxx | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 211883fd22aa..f1d247cc7d08 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -2534,10 +2534,6 @@ void ScXMLExport::_ExportAutoStyles() CollectShapesAutoStyles(nTableCount); for (sal_Int32 nTable = 0; nTable < nTableCount; ++nTable, IncrementProgressBar(false)) { - bool bUseStream = pSheetData && pDoc && pDoc->IsStreamValid((SCTAB)nTable) && - pSheetData->HasStreamPos(nTable) && xSourceStream.is() && - !pDoc->GetChangeTrack(); - Reference <sheet::XSpreadsheet> xTable(xIndex->getByIndex(nTable), uno::UNO_QUERY); if (!xTable.is()) continue; @@ -2556,9 +2552,6 @@ void ScXMLExport::_ExportAutoStyles() } } - if (bUseStream) - continue; - // collect other auto-styles only for non-copied sheets Reference<sheet::XUniqueCellFormatRangesSupplier> xCellFormatRanges ( xTable, uno::UNO_QUERY ); if ( xCellFormatRanges.is() ) |