[Libreoffice-commits] .: Branch 'libreoffice-3-5-5' - sc/source

[Lionel Dricot]

 sc/source/filter/xml/xmlexprt.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 3e6d34e4afa67d01a40804e93b6d3f94b09dcc5e
Author: Pierre-Eric Pelloux-Prayer <pierre-eric at lanedo.com>
Date:   Wed Jun 20 12:55:24 2012 +0200

    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 at googlemail.com>
    Signed-off-by: Lionel Dricot <lionel at lanedo.com>

diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index 2c3e1c1..e62a48f 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())