Remove stale binary previews from output ODF file

The ODF original file includes a binary graphic version of all of the
graphs.  These graphs are no longer valid once we've replaced the data
in the sheet, so remove them from the file and manifest to ensure
OpenOffice will rebuild the graph using our new data.  Same for the
thumbnail image.

Author: earlephilhower

ezfio.ps1

@@ -546,7 +546,10 @@ function DefineTests {
     $threadslist = (1, 2, 4, 8, 16, 32, 64, 128, 256)
     $shorttime = 120 # Runtime of point tests
     $longtime = 1200 # Runtime of long-running tests
-
+$threadslist=(1)
+$bslist=(4096)
+$shorttime=2
+$longtime=4
     function AddTest( $name, $seqrand, $writepct, $blocksize, $threads, $qdperthread, $desc, $cmdline ) {
         if ($threads -eq "") { $qd = '' } else { $qd = ([int]$threads) * ([int]$qdperthread) }
         if ($blocksize -ne "") { if ($blocksize -lt 1024) { $bsstr = "${blocksize}b" } else { $bsstr = "{0:N0}K" -f ([int]$blocksize/1024) } }
@@ -949,7 +952,10 @@ VNEBUEsFBgAAAAABAAEAWgAAAFQAAAAAAA==
         $zasrc = [System.IO.Compression.ZipFile]::Open( $odssrc, [System.IO.Compression.ZipArchiveMode]::Read )
         $zadst = [System.IO.Compression.ZipFile]::Open( $odsdest, [System.IO.Compression.ZipArchiveMode]::Update )
         foreach ($entry in $zasrc.Entries) {
-            if ($entry.FullName -eq "mimetype") { continue }
+            if (($entry.FullName -eq "mimetype") -or $entry.FullName.StartsWith("Thumbnails") -or $entry.FullName.StartsWith("ObjectReplacement")) {
+                # Skip binary versions, and the copied-over mimetype
+                continue
+            }
             $newentry = $zadst.CreateEntry( $entry )
             if ($entry.FullName.EndsWith("/") -or $entry.FullName.EndsWith("\")) {
                 # Directory, don't copy anything
@@ -958,6 +964,20 @@ VNEBUEsFBgAAAAABAAEAWgAAAFQAAAAAAA==
                 $wr = New-Object System.IO.StreamWriter( $newentry.Open() )
                 $wr.Write( $xmltext )
                 $wr.Close()
+            } elseif ($entry.FullName -eq "META-INF/manifest.xml") {
+                # Remove ObjectReplacements from the list
+                $rd = New-Object System.IO.StreamReader( $entry.Open() )
+                $wr = New-Object System.IO.StreamWriter( $newentry.Open() )
+                $rdbytes = $rd.ReadToEnd()
+                $rd.close()
+                $lines = $rdbytes.Split("`n")
+                foreach ($line in $lines) {
+                    if ( -not ( ($line -contains "ObjectReplacement") -or ($line -contains "Thumbnails") ) ) {
+                        $wr.Write($line)
+                        $wr.Write("`n")
+                    }
+                }
+                $wr.Close();
             } else {
                 # Copying data for from the source ZIP
                 $wr = New-Object System.IO.StreamWriter( $newentry.Open() )

ezfio.py

@@ -776,7 +776,11 @@ def UpdateContentXMLToODS_text( odssrc, odsdest, xmltext ):
         Replace content.xml in an ODS file with in-memory, modified copy and
         write new ODS. Can't just copy source.zip and replace one file, the
         output ZIP file is not correct in many cases (opens in Excel but fails
-        ODF validation and LibreOffice fails to load under Windows)
+        ODF validation and LibreOffice fails to load under Windows).
+
+        Also strips out any binary versions of objects and the thumbnail,
+        since they are no longer valid once we've changed the data in the
+        sheet.
         """
         if os.path.exists(odsdest):
             os.unlink(odsdest)
@@ -802,6 +806,18 @@ def UpdateContentXMLToODS_text( odssrc, odsdest, xmltext ):
                 continue
             elif entry == "content.xml":
                 zadst.writestr( "content.xml", xmltext)
+            elif entry == "META-INF/manifest.xml":
+                # Remove ObjectReplacements from the list
+                rdbytes = zasrc.read(entry)
+                outbytes = ""
+                lines = rdbytes.split("\n")
+                for line in lines:
+                    if not ( ("ObjectReplacement" in line) or ("Thumbnails" in line) ):
+                        outbytes = outbytes + line + "\n"
+                zadst.writestr(entry, outbytes)
+            elif ("Thumbnails" in entry) or ("ObjectReplacement" in entry):
+                # Skip binary versions
+                continue
             else:
                 rdbytes = zasrc.read(entry)
                 zadst.writestr(entry, rdbytes)