[SCM] LibreOffice packaging repository branch, ubuntu-precise-3.5, updated. libreoffice_3.5.2_rc2-1-164-g10e447e
The following commit has been merged in the ubuntu-precise-3.5 branch:
commit 7af2f1e94ef1b8dd10cf83e4e4ca4988cb5d1716
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Wed Jan 9 13:41:03 2013 +0100
lp#1097710: Do not check the stored DIFAT sector count
diff --git a/changelog b/changelog
index ac004c9..089a1fb 100644
--- a/changelog
+++ b/changelog
@@ -7,6 +7,7 @@ libreoffice (1:3.5.7-0ubuntu3) UNRELEASED; urgency=low
* backport Writer crashed while editing a table (LP: #1097406)
* backport Objects anchored to cell wrongly positionned to A1 (LP: #1097433)
* backport Do not move nCurUndoAction < 0 (LP: #1097437)
+ * backport Do not check the stored DIFAT sector count (LP: #1097710)
-- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Tue, 08 Jan 2013 17:09:36 +0100
diff --git a/patches/lp-1097710-Do-not-check-the-stored-DIFAT-sector-count.diff b/patches/lp-1097710-Do-not-check-the-stored-DIFAT-sector-count.diff
new file mode 100644
index 0000000..11a1c42
--- /dev/null
+++ b/patches/lp-1097710-Do-not-check-the-stored-DIFAT-sector-count.diff
@@ -0,0 +1,29 @@
+From f9c8975bc28b362ff7bc8d814484b3d3a04e4c2c Mon Sep 17 00:00:00 2001
+From: Kohei Yoshida <kohei.yoshida@gmail.com>
+Date: Wed, 15 Aug 2012 14:06:06 -0400
+Subject: [PATCH 01/14] Do not check the stored DIFAT sector count.
+
+Refer to this thread for details.
+http://lists.freedesktop.org/archives/libreoffice/2012-August/036852.html
+
+Change-Id: Id2115732a1e1bcd78c13445f5aaefe1ec7cfa0c2
+---
+ sot/source/sdstor/stgelem.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sot/source/sdstor/stgelem.cxx b/sot/source/sdstor/stgelem.cxx
+index 1af72f9..90f1e2d 100644
+--- a/sot/source/sdstor/stgelem.cxx
++++ b/sot/source/sdstor/stgelem.cxx
+@@ -203,7 +203,7 @@ sal_Bool StgHeader::Check()
+ && nTOCstrm >= 0
+ && nThreshold > 0
+ && ( nDataFAT == -2 || ( nDataFAT >= 0 && nDataFATSize > 0 ) )
+- && ( nMasterChain == -2 || ( nMasterChain >=0 && nMaster > 109 ) )
++ && ( nMasterChain == -2 || nMasterChain >=0 )
+ && nMaster >= 0;
+ }
+
+--
+1.7.10.4
+
diff --git a/patches/series b/patches/series
index e3ed8be..94e562e 100644
--- a/patches/series
+++ b/patches/series
@@ -42,3 +42,4 @@ lp-1097393-rhbz-855972-crash-on-switching-to-outline-v.diff
lp-1097406-rhbz-852128-sw-avoid-table-undo-crash.diff
lp-1097433-fdo-56009-fdo-54695-Calculate-positions-of-.diff
lp-1097437-Do-not-move-nCurUndoAction-0.diff
+lp-1097710-Do-not-check-the-stored-DIFAT-sector-count.diff
--
LibreOffice packaging repository
Reply to: