Attachment 63261 Details for Bug 51249 – Patch disallowing usage of stream copy when "Changes Record" is enabled

[patch] Patch disallowing usage of stream copy when "Changes Record" is enabled

0001-fdo-51249-Disable-stream-copy-when-saving-a-file-wit.patch (text/plain), 1.69 KB, created by Pierre-Eric Pelloux-Prayer on 2012-06-20 04:53:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pierre-Eric Pelloux-Prayer

Created: 2012-06-20 04:53:16 UTC

Size: 1.69 KB

patch

obsolete

>From caa38d397d5ddb1ed422894d0b423adeeae07066 Mon Sep 17 00:00:00 2001
>From: Pierre-Eric Pelloux-Prayer <pierre-eric@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
>

Actions: View | Splinter Review

Attachments on bug 51249: 63250 | 63261

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.