summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre-Eric Pelloux-Prayer <pierre-eric@lanedo.com>2012-06-20 12:55:24 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2012-06-21 20:19:12 +0200
commit17c85c9a5c447f9db6f3b91e6840709df8542345 (patch)
tree6223a61f0358921c1dfcba24fe7e34184eae8a4b
parent5cfb974d41642d1acbaadb553c16cf8d174f524a (diff)
fdo#51249 Disable stream copy when saving a file with 'Changes Record' active
Change-Id: Id06caa5d0552e4f3695244de4f6096f80885a783 (cherry picked from commit d212cbd96e648c10d875161b8ab1fc67ae509bd7) Signed-off-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
-rw-r--r--sc/source/filter/xml/xmlexprt.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index 2c3e1c116595..e62a48fb8290 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -1731,7 +1731,7 @@ void ScXMLExport::_ExportContent()
{
sal_Int32 nStartOffset = -1;
sal_Int32 nEndOffset = -1;
- if (pSheetData && pDoc && pDoc->IsStreamValid((SCTAB)nTable))
+ if (pSheetData && pDoc && pDoc->IsStreamValid((SCTAB)nTable) && !pDoc->GetChangeTrack())
pSheetData->GetStreamPos( nTable, nStartOffset, nEndOffset );
if ( nStartOffset >= 0 && nEndOffset >= 0 && xSourceStream.is() )
@@ -2354,7 +2354,8 @@ void ScXMLExport::_ExportAutoStyles()
for (sal_Int32 nTable = 0; nTable < nTableCount; ++nTable, IncrementProgressBar(false))
{
bool bUseStream = pSheetData && pDoc && pDoc->IsStreamValid((SCTAB)nTable) &&
- pSheetData->HasStreamPos(nTable) && xSourceStream.is();
+ pSheetData->HasStreamPos(nTable) && xSourceStream.is() &&
+ !pDoc->GetChangeTrack();
Reference <sheet::XSpreadsheet> xTable(xIndex->getByIndex(nTable), uno::UNO_QUERY);
if (!xTable.is())