From c9bf4da74ffa21b4cf4b5fdfdcf02807db5dc5bd Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sun, 17 Dec 2023 17:03:14 -0800 Subject: Docx writer: ensure that elements in settings are ordered correctly. The elements must occur in a specific order. This was being messed up when integrating a custom reference.docx. Closes #9264. --- test/docx/golden/block_quotes.docx | Bin 10096 -> 9985 bytes test/docx/golden/codeblock.docx | Bin 9912 -> 9800 bytes test/docx/golden/comments.docx | Bin 10249 -> 10138 bytes test/docx/golden/custom_style_no_reference.docx | Bin 10012 -> 9900 bytes test/docx/golden/custom_style_preserve.docx | Bin 10642 -> 10530 bytes test/docx/golden/custom_style_reference.docx | Bin 12388 -> 12552 bytes test/docx/golden/definition_list.docx | Bin 9911 -> 9800 bytes .../docx/golden/document-properties-short-desc.docx | Bin 9918 -> 9807 bytes test/docx/golden/document-properties.docx | Bin 10403 -> 10292 bytes test/docx/golden/headers.docx | Bin 10051 -> 9940 bytes test/docx/golden/image.docx | Bin 26792 -> 26682 bytes test/docx/golden/inline_code.docx | Bin 9850 -> 9740 bytes test/docx/golden/inline_formatting.docx | Bin 10030 -> 9920 bytes test/docx/golden/inline_images.docx | Bin 26790 -> 26680 bytes test/docx/golden/link_in_notes.docx | Bin 10072 -> 9961 bytes test/docx/golden/links.docx | Bin 10243 -> 10133 bytes test/docx/golden/lists.docx | Bin 10309 -> 10199 bytes test/docx/golden/lists_continuing.docx | Bin 10105 -> 9994 bytes test/docx/golden/lists_div_bullets.docx | Bin 9958 -> 9847 bytes test/docx/golden/lists_multiple_initial.docx | Bin 10187 -> 10076 bytes test/docx/golden/lists_restarting.docx | Bin 10103 -> 9992 bytes test/docx/golden/nested_anchors_in_header.docx | Bin 10243 -> 10133 bytes test/docx/golden/notes.docx | Bin 10019 -> 9908 bytes test/docx/golden/raw-blocks.docx | Bin 9951 -> 9840 bytes test/docx/golden/raw-bookmarks.docx | Bin 10085 -> 9974 bytes test/docx/golden/table_one_row.docx | Bin 9940 -> 9829 bytes test/docx/golden/table_with_list_cell.docx | Bin 10259 -> 10148 bytes test/docx/golden/tables-default-widths.docx | Bin 10286 -> 10175 bytes test/docx/golden/tables.docx | Bin 10301 -> 10190 bytes .../docx/golden/tables_separated_with_rawblock.docx | Bin 9936 -> 9825 bytes test/docx/golden/track_changes_deletion.docx | Bin 9894 -> 9783 bytes test/docx/golden/track_changes_insertion.docx | Bin 9878 -> 9766 bytes test/docx/golden/track_changes_move.docx | Bin 9911 -> 9800 bytes .../golden/track_changes_scrubbed_metadata.docx | Bin 10023 -> 9912 bytes test/docx/golden/unicode.docx | Bin 9836 -> 9726 bytes test/docx/golden/verbatim_subsuper.docx | Bin 9883 -> 9773 bytes 36 files changed, 0 insertions(+), 0 deletions(-) (limited to 'test/docx') diff --git a/test/docx/golden/block_quotes.docx b/test/docx/golden/block_quotes.docx index 2c00e9ef0..e1e296f9e 100644 Binary files a/test/docx/golden/block_quotes.docx and b/test/docx/golden/block_quotes.docx differ diff --git a/test/docx/golden/codeblock.docx b/test/docx/golden/codeblock.docx index 224c3c839..62c250088 100644 Binary files a/test/docx/golden/codeblock.docx and b/test/docx/golden/codeblock.docx differ diff --git a/test/docx/golden/comments.docx b/test/docx/golden/comments.docx index 79e19d04b..eec06b554 100644 Binary files a/test/docx/golden/comments.docx and b/test/docx/golden/comments.docx differ diff --git a/test/docx/golden/custom_style_no_reference.docx b/test/docx/golden/custom_style_no_reference.docx index 561fb1534..08fb23e35 100644 Binary files a/test/docx/golden/custom_style_no_reference.docx and b/test/docx/golden/custom_style_no_reference.docx differ diff --git a/test/docx/golden/custom_style_preserve.docx b/test/docx/golden/custom_style_preserve.docx index b49f66856..e319402f2 100644 Binary files a/test/docx/golden/custom_style_preserve.docx and b/test/docx/golden/custom_style_preserve.docx differ diff --git a/test/docx/golden/custom_style_reference.docx b/test/docx/golden/custom_style_reference.docx index da579ca2f..4ff5e0d1f 100644 Binary files a/test/docx/golden/custom_style_reference.docx and b/test/docx/golden/custom_style_reference.docx differ diff --git a/test/docx/golden/definition_list.docx b/test/docx/golden/definition_list.docx index c1d06bc66..fda2f36ff 100644 Binary files a/test/docx/golden/definition_list.docx and b/test/docx/golden/definition_list.docx differ diff --git a/test/docx/golden/document-properties-short-desc.docx b/test/docx/golden/document-properties-short-desc.docx index b0d7b131f..bca089815 100644 Binary files a/test/docx/golden/document-properties-short-desc.docx and b/test/docx/golden/document-properties-short-desc.docx differ diff --git a/test/docx/golden/document-properties.docx b/test/docx/golden/document-properties.docx index 152149d89..197edc2d8 100644 Binary files a/test/docx/golden/document-properties.docx and b/test/docx/golden/document-properties.docx differ diff --git a/test/docx/golden/headers.docx b/test/docx/golden/headers.docx index f3832437d..e8865a24e 100644 Binary files a/test/docx/golden/headers.docx and b/test/docx/golden/headers.docx differ diff --git a/test/docx/golden/image.docx b/test/docx/golden/image.docx index bbc632aea..6d6b4c9f3 100644 Binary files a/test/docx/golden/image.docx and b/test/docx/golden/image.docx differ diff --git a/test/docx/golden/inline_code.docx b/test/docx/golden/inline_code.docx index 51eb15567..61bd6ba80 100644 Binary files a/test/docx/golden/inline_code.docx and b/test/docx/golden/inline_code.docx differ diff --git a/test/docx/golden/inline_formatting.docx b/test/docx/golden/inline_formatting.docx index 78391faee..bfb3a110b 100644 Binary files a/test/docx/golden/inline_formatting.docx and b/test/docx/golden/inline_formatting.docx differ diff --git a/test/docx/golden/inline_images.docx b/test/docx/golden/inline_images.docx index f43dbd9bc..b73c35e2e 100644 Binary files a/test/docx/golden/inline_images.docx and b/test/docx/golden/inline_images.docx differ diff --git a/test/docx/golden/link_in_notes.docx b/test/docx/golden/link_in_notes.docx index ac1f91c9e..c6fb930af 100644 Binary files a/test/docx/golden/link_in_notes.docx and b/test/docx/golden/link_in_notes.docx differ diff --git a/test/docx/golden/links.docx b/test/docx/golden/links.docx index 2fc3a973b..93db9c769 100644 Binary files a/test/docx/golden/links.docx and b/test/docx/golden/links.docx differ diff --git a/test/docx/golden/lists.docx b/test/docx/golden/lists.docx index 645d55ed9..d4d95b0a3 100644 Binary files a/test/docx/golden/lists.docx and b/test/docx/golden/lists.docx differ diff --git a/test/docx/golden/lists_continuing.docx b/test/docx/golden/lists_continuing.docx index e0c70ec8b..3d346262e 100644 Binary files a/test/docx/golden/lists_continuing.docx and b/test/docx/golden/lists_continuing.docx differ diff --git a/test/docx/golden/lists_div_bullets.docx b/test/docx/golden/lists_div_bullets.docx index e9830e2b4..3fdf638bb 100644 Binary files a/test/docx/golden/lists_div_bullets.docx and b/test/docx/golden/lists_div_bullets.docx differ diff --git a/test/docx/golden/lists_multiple_initial.docx b/test/docx/golden/lists_multiple_initial.docx index 43ecec97b..e374a5b64 100644 Binary files a/test/docx/golden/lists_multiple_initial.docx and b/test/docx/golden/lists_multiple_initial.docx differ diff --git a/test/docx/golden/lists_restarting.docx b/test/docx/golden/lists_restarting.docx index 9a996f345..a15f34504 100644 Binary files a/test/docx/golden/lists_restarting.docx and b/test/docx/golden/lists_restarting.docx differ diff --git a/test/docx/golden/nested_anchors_in_header.docx b/test/docx/golden/nested_anchors_in_header.docx index 2e6ba5048..5f586c7b5 100644 Binary files a/test/docx/golden/nested_anchors_in_header.docx and b/test/docx/golden/nested_anchors_in_header.docx differ diff --git a/test/docx/golden/notes.docx b/test/docx/golden/notes.docx index 1aee1887e..2fae1180c 100644 Binary files a/test/docx/golden/notes.docx and b/test/docx/golden/notes.docx differ diff --git a/test/docx/golden/raw-blocks.docx b/test/docx/golden/raw-blocks.docx index b654496af..faa83617a 100644 Binary files a/test/docx/golden/raw-blocks.docx and b/test/docx/golden/raw-blocks.docx differ diff --git a/test/docx/golden/raw-bookmarks.docx b/test/docx/golden/raw-bookmarks.docx index 4b159b79b..508a4b17b 100644 Binary files a/test/docx/golden/raw-bookmarks.docx and b/test/docx/golden/raw-bookmarks.docx differ diff --git a/test/docx/golden/table_one_row.docx b/test/docx/golden/table_one_row.docx index 1f390bad3..26aa84e43 100644 Binary files a/test/docx/golden/table_one_row.docx and b/test/docx/golden/table_one_row.docx differ diff --git a/test/docx/golden/table_with_list_cell.docx b/test/docx/golden/table_with_list_cell.docx index 47a169b39..acafc4e5e 100644 Binary files a/test/docx/golden/table_with_list_cell.docx and b/test/docx/golden/table_with_list_cell.docx differ diff --git a/test/docx/golden/tables-default-widths.docx b/test/docx/golden/tables-default-widths.docx index d1b4b9359..8a8bde8b7 100644 Binary files a/test/docx/golden/tables-default-widths.docx and b/test/docx/golden/tables-default-widths.docx differ diff --git a/test/docx/golden/tables.docx b/test/docx/golden/tables.docx index 6de810420..a5d11c27c 100644 Binary files a/test/docx/golden/tables.docx and b/test/docx/golden/tables.docx differ diff --git a/test/docx/golden/tables_separated_with_rawblock.docx b/test/docx/golden/tables_separated_with_rawblock.docx index 90727c06e..1085a0949 100644 Binary files a/test/docx/golden/tables_separated_with_rawblock.docx and b/test/docx/golden/tables_separated_with_rawblock.docx differ diff --git a/test/docx/golden/track_changes_deletion.docx b/test/docx/golden/track_changes_deletion.docx index 77ce29a8c..41d26562d 100644 Binary files a/test/docx/golden/track_changes_deletion.docx and b/test/docx/golden/track_changes_deletion.docx differ diff --git a/test/docx/golden/track_changes_insertion.docx b/test/docx/golden/track_changes_insertion.docx index 27a36ed6e..3e0380049 100644 Binary files a/test/docx/golden/track_changes_insertion.docx and b/test/docx/golden/track_changes_insertion.docx differ diff --git a/test/docx/golden/track_changes_move.docx b/test/docx/golden/track_changes_move.docx index 93141cf25..ee83709c9 100644 Binary files a/test/docx/golden/track_changes_move.docx and b/test/docx/golden/track_changes_move.docx differ diff --git a/test/docx/golden/track_changes_scrubbed_metadata.docx b/test/docx/golden/track_changes_scrubbed_metadata.docx index 9864ca04d..f3b12bfad 100644 Binary files a/test/docx/golden/track_changes_scrubbed_metadata.docx and b/test/docx/golden/track_changes_scrubbed_metadata.docx differ diff --git a/test/docx/golden/unicode.docx b/test/docx/golden/unicode.docx index e08c9ffd6..c118c7ebd 100644 Binary files a/test/docx/golden/unicode.docx and b/test/docx/golden/unicode.docx differ diff --git a/test/docx/golden/verbatim_subsuper.docx b/test/docx/golden/verbatim_subsuper.docx index adf72b847..5388d126c 100644 Binary files a/test/docx/golden/verbatim_subsuper.docx and b/test/docx/golden/verbatim_subsuper.docx differ -- cgit v1.2.3