[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 552def0b069f979d57b3c69250ffda6b141ea951
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Wed Jan 9 14:53:15 2013 +0100
lp#1097748: Do not consider timestamp differences as corruption
diff --git a/changelog b/changelog
index 55f18ce..c507e77 100644
--- a/changelog
+++ b/changelog
@@ -14,6 +14,7 @@ libreoffice (1:3.5.7-0ubuntu3) UNRELEASED; urgency=low
* backport Clipboard must be disposed before Selection (LP: #1097727)
* backport fix default hori/vert frame anchor during RTF import (LP: #1097735)
* backport Load Java scripts with class loaders (LP: #1097744)
+ * backport Do not consider timestamp differences as corruption (LP: #1097748)
-- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Tue, 08 Jan 2013 17:09:36 +0100
diff --git a/patches/lp-1097748-fdo-49819-fdo-54609-Do-not-consider-timestamp-differ.diff b/patches/lp-1097748-fdo-49819-fdo-54609-Do-not-consider-timestamp-differ.diff
new file mode 100644
index 0000000..925b308
--- /dev/null
+++ b/patches/lp-1097748-fdo-49819-fdo-54609-Do-not-consider-timestamp-differ.diff
@@ -0,0 +1,34 @@
+From b6bab29681d62fa6b1697535ef75cdb7dda531a3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
+Date: Mon, 24 Sep 2012 09:27:15 +0200
+Subject: [PATCH 08/14] fdo#49819, fdo#54609: Do not consider timestamp
+ differences as corruption
+
+MSO 2010 can produce a files with different timestamps in the
+central directory entry and local file header
+
+Change-Id: Ic6fc0b2fad96eb30babdd7e6ef4a0175936da4c5
+---
+ package/source/zipapi/ZipFile.cxx | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx
+index f154dfe..53ace46 100644
+--- a/package/source/zipapi/ZipFile.cxx
++++ b/package/source/zipapi/ZipFile.cxx
+@@ -699,9 +699,11 @@ sal_Bool ZipFile::readLOC( ZipEntry &rEntry )
+ // Do *not* compare nMethod / nHow, older versions with
+ // encrypted streams write mismatching DEFLATE/STORE pairs
+ // there.
++ // Do *not* compare timestamps, since MSO 2010 can produce documents
++ // with timestamp difference in the central directory entry and local
++ // file header.
+ bBroken = rEntry.nVersion != nVersion
+ || (rEntry.nFlag & ~6L) != (nFlag & ~6L)
+- || rEntry.nTime != nTime
+ || rEntry.nPathLen != nPathLen
+ || !rEntry.sPath.equals( sLOCPath );
+ }
+--
+1.7.10.4
+
diff --git a/patches/series b/patches/series
index 421ac3a..4908b91 100644
--- a/patches/series
+++ b/patches/series
@@ -49,3 +49,4 @@ lp-1097722-Resolves-rhbz-805743-a11y-call-doShow-after-we-have-.diff
lp-1097727-rhbz-846775-Clipboard-must-be-disposed-befo.diff
lp-1097735-fdo-48442-fix-default-hori-vert-frame-anchor-during-.diff
lp-1097744-fdo-49517-Revert-fdo-46102-Load-Java-scripts-with-cl.diff
+lp-1097748-fdo-49819-fdo-54609-Do-not-consider-timestamp-differ.diff
--
LibreOffice packaging repository
Reply to: