From 82d587493d97536a64110902f647d953b5f28dd4 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Mon, 4 Oct 2021 11:50:32 -0700 Subject: Revert "Powerpoint writer: consolidate text run nodes." This reverts commit 62f83aa48633af477913bde6f615fe9f8793901a. This was already being done, it seems. I misidentified the problem; it is really with `Str ""` nodes. --- .../comparison/both-columns/deleted-layouts.pptx | Bin 47449 -> 47453 bytes .../pptx/comparison/both-columns/moved-layouts.pptx | Bin 58169 -> 58172 bytes test/pptx/comparison/both-columns/output.pptx | Bin 44578 -> 44581 bytes test/pptx/comparison/both-columns/templated.pptx | Bin 57671 -> 57674 bytes .../comparison/extra-image/deleted-layouts.pptx | Bin 47481 -> 47482 bytes test/pptx/comparison/extra-image/moved-layouts.pptx | Bin 58196 -> 58200 bytes test/pptx/comparison/extra-image/output.pptx | Bin 44610 -> 44610 bytes test/pptx/comparison/extra-image/templated.pptx | Bin 57699 -> 57702 bytes .../pptx/comparison/extra-text/deleted-layouts.pptx | Bin 47449 -> 47453 bytes test/pptx/comparison/extra-text/moved-layouts.pptx | Bin 58168 -> 58172 bytes test/pptx/comparison/extra-text/output.pptx | Bin 44578 -> 44581 bytes test/pptx/comparison/extra-text/templated.pptx | Bin 57671 -> 57674 bytes .../comparison/non-text-first/deleted-layouts.pptx | Bin 47370 -> 47366 bytes .../comparison/non-text-first/moved-layouts.pptx | Bin 58063 -> 58065 bytes test/pptx/comparison/non-text-first/output.pptx | Bin 44499 -> 44494 bytes test/pptx/comparison/non-text-first/templated.pptx | Bin 57566 -> 57567 bytes .../pptx/comparison/one-column/deleted-layouts.pptx | Bin 30785 -> 30785 bytes test/pptx/comparison/one-column/moved-layouts.pptx | Bin 41506 -> 41506 bytes test/pptx/comparison/one-column/output.pptx | Bin 27907 -> 27906 bytes test/pptx/comparison/one-column/templated.pptx | Bin 41006 -> 41006 bytes 20 files changed, 0 insertions(+), 0 deletions(-) (limited to 'test/pptx/comparison') diff --git a/test/pptx/comparison/both-columns/deleted-layouts.pptx b/test/pptx/comparison/both-columns/deleted-layouts.pptx index 03ee6c408..27f9d9ac7 100644 Binary files a/test/pptx/comparison/both-columns/deleted-layouts.pptx and b/test/pptx/comparison/both-columns/deleted-layouts.pptx differ diff --git a/test/pptx/comparison/both-columns/moved-layouts.pptx b/test/pptx/comparison/both-columns/moved-layouts.pptx index bb5f046fd..a658045ef 100644 Binary files a/test/pptx/comparison/both-columns/moved-layouts.pptx and b/test/pptx/comparison/both-columns/moved-layouts.pptx differ diff --git a/test/pptx/comparison/both-columns/output.pptx b/test/pptx/comparison/both-columns/output.pptx index 345833b8b..560c7d41a 100644 Binary files a/test/pptx/comparison/both-columns/output.pptx and b/test/pptx/comparison/both-columns/output.pptx differ diff --git a/test/pptx/comparison/both-columns/templated.pptx b/test/pptx/comparison/both-columns/templated.pptx index 3dcc6274f..2fb38880d 100644 Binary files a/test/pptx/comparison/both-columns/templated.pptx and b/test/pptx/comparison/both-columns/templated.pptx differ diff --git a/test/pptx/comparison/extra-image/deleted-layouts.pptx b/test/pptx/comparison/extra-image/deleted-layouts.pptx index 0ad383194..267c7cb69 100644 Binary files a/test/pptx/comparison/extra-image/deleted-layouts.pptx and b/test/pptx/comparison/extra-image/deleted-layouts.pptx differ diff --git a/test/pptx/comparison/extra-image/moved-layouts.pptx b/test/pptx/comparison/extra-image/moved-layouts.pptx index 30bf2450b..b7023026c 100644 Binary files a/test/pptx/comparison/extra-image/moved-layouts.pptx and b/test/pptx/comparison/extra-image/moved-layouts.pptx differ diff --git a/test/pptx/comparison/extra-image/output.pptx b/test/pptx/comparison/extra-image/output.pptx index 464a07d88..06d632ee7 100644 Binary files a/test/pptx/comparison/extra-image/output.pptx and b/test/pptx/comparison/extra-image/output.pptx differ diff --git a/test/pptx/comparison/extra-image/templated.pptx b/test/pptx/comparison/extra-image/templated.pptx index 771b16cda..af84388c4 100644 Binary files a/test/pptx/comparison/extra-image/templated.pptx and b/test/pptx/comparison/extra-image/templated.pptx differ diff --git a/test/pptx/comparison/extra-text/deleted-layouts.pptx b/test/pptx/comparison/extra-text/deleted-layouts.pptx index 03ee6c408..27f9d9ac7 100644 Binary files a/test/pptx/comparison/extra-text/deleted-layouts.pptx and b/test/pptx/comparison/extra-text/deleted-layouts.pptx differ diff --git a/test/pptx/comparison/extra-text/moved-layouts.pptx b/test/pptx/comparison/extra-text/moved-layouts.pptx index 2541e97d3..a658045ef 100644 Binary files a/test/pptx/comparison/extra-text/moved-layouts.pptx and b/test/pptx/comparison/extra-text/moved-layouts.pptx differ diff --git a/test/pptx/comparison/extra-text/output.pptx b/test/pptx/comparison/extra-text/output.pptx index 345833b8b..560c7d41a 100644 Binary files a/test/pptx/comparison/extra-text/output.pptx and b/test/pptx/comparison/extra-text/output.pptx differ diff --git a/test/pptx/comparison/extra-text/templated.pptx b/test/pptx/comparison/extra-text/templated.pptx index 8d78e715a..2fb38880d 100644 Binary files a/test/pptx/comparison/extra-text/templated.pptx and b/test/pptx/comparison/extra-text/templated.pptx differ diff --git a/test/pptx/comparison/non-text-first/deleted-layouts.pptx b/test/pptx/comparison/non-text-first/deleted-layouts.pptx index d2fab6c94..be30d8368 100644 Binary files a/test/pptx/comparison/non-text-first/deleted-layouts.pptx and b/test/pptx/comparison/non-text-first/deleted-layouts.pptx differ diff --git a/test/pptx/comparison/non-text-first/moved-layouts.pptx b/test/pptx/comparison/non-text-first/moved-layouts.pptx index 16d59be78..c4879b7d5 100644 Binary files a/test/pptx/comparison/non-text-first/moved-layouts.pptx and b/test/pptx/comparison/non-text-first/moved-layouts.pptx differ diff --git a/test/pptx/comparison/non-text-first/output.pptx b/test/pptx/comparison/non-text-first/output.pptx index 5f5d12d2f..099cf6729 100644 Binary files a/test/pptx/comparison/non-text-first/output.pptx and b/test/pptx/comparison/non-text-first/output.pptx differ diff --git a/test/pptx/comparison/non-text-first/templated.pptx b/test/pptx/comparison/non-text-first/templated.pptx index 520021af3..31ac01f18 100644 Binary files a/test/pptx/comparison/non-text-first/templated.pptx and b/test/pptx/comparison/non-text-first/templated.pptx differ diff --git a/test/pptx/comparison/one-column/deleted-layouts.pptx b/test/pptx/comparison/one-column/deleted-layouts.pptx index 5a31c333a..27620f05f 100644 Binary files a/test/pptx/comparison/one-column/deleted-layouts.pptx and b/test/pptx/comparison/one-column/deleted-layouts.pptx differ diff --git a/test/pptx/comparison/one-column/moved-layouts.pptx b/test/pptx/comparison/one-column/moved-layouts.pptx index cce84cc9f..fc64d3af5 100644 Binary files a/test/pptx/comparison/one-column/moved-layouts.pptx and b/test/pptx/comparison/one-column/moved-layouts.pptx differ diff --git a/test/pptx/comparison/one-column/output.pptx b/test/pptx/comparison/one-column/output.pptx index cc690844f..854a968af 100644 Binary files a/test/pptx/comparison/one-column/output.pptx and b/test/pptx/comparison/one-column/output.pptx differ diff --git a/test/pptx/comparison/one-column/templated.pptx b/test/pptx/comparison/one-column/templated.pptx index 309a25d6e..9e671af1d 100644 Binary files a/test/pptx/comparison/one-column/templated.pptx and b/test/pptx/comparison/one-column/templated.pptx differ -- cgit v1.2.3