[patch for 3.5.X] proposal of a patch to solve a crasher when saving a spreadsheet with track-change

[Lionel Dricot]

Hello,

The crasher my colleague Pierre-Éric solved as been pushed to master,
thanks Eike, thanks a lot for that :-)
https://bugs.freedesktop.org/show_bug.cgi?id=51249

Because this patch fixes a crasher, I would like to know if it would be
possible to review it for the 3.5.X series.

Thanks a lot,


Lionel


PS: please put me in CC: when replying to this message.


>From caa38d397d5ddb1ed422894d0b423adeeae07066 Mon Sep 17 00:00:00 2001
From: Pierre-Eric Pelloux-Prayer <pierre-e...@lanedo.com>
Date: Wed, 20 Jun 2012 12:55:24 +0200
Subject: [PATCH] fdo#51249 Disable stream copy when saving a file with
 'Changes Record' active

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

diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index 9b105d6..1bfe200 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -1721,7 +1721,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() )
@@ -2342,7 +2342,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())
-- 
1.7.10



_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice