diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-02-14 11:41:02 -0500 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-02-18 00:20:42 +0000 |
| commit | a8a4d42c15f38ed7c8595179263239f9e8b7824f (patch) | |
| tree | 7afb1f0a5211110e30430b89eb2632a980f81d05 | |
| parent | 8deefff6659fda0e38734c2b3176826276debb5d (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
(cherry picked from commit 5000e64ecc55efd47d92714cf6db375ff37aac4b)
(cherry picked from commit 47e540d8323e8ea2db5e7aae455503b32f306ca3)
Reviewed-on: https://gerrit.libreoffice.org/8050
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Reviewed-by: Jacobo Aragunde Pérez <jaragunde@igalia.com>
Tested-by: Jacobo Aragunde Pérez <jaragunde@igalia.com>
| -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 2bb67699a256..d5c025d45c18 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -2533,10 +2533,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; @@ -2555,9 +2551,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() ) |