From c3f9e8c12256d19ed6c89d15470945855ee16a94 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Wed, 17 Mar 2021 22:31:20 -0700 Subject: Docx writer: make nsid in abstractNum deterministic. Previously we assigned a random number (though in a deterministic way). But changes in the random package mean we get different results now on different architectures, even with the same random seed. We don't need random values; so now we just assign a value based on the list number id, which is guaranteed to be unique to the list marker. --- test/docx/golden/block_quotes.docx | Bin 10071 -> 10067 bytes test/docx/golden/codeblock.docx | Bin 9920 -> 9916 bytes test/docx/golden/comments.docx | Bin 10258 -> 10254 bytes test/docx/golden/custom_style_no_reference.docx | Bin 10021 -> 10017 bytes test/docx/golden/custom_style_preserve.docx | Bin 10650 -> 10646 bytes test/docx/golden/custom_style_reference.docx | Bin 12403 -> 12400 bytes test/docx/golden/definition_list.docx | Bin 9920 -> 9916 bytes .../docx/golden/document-properties-short-desc.docx | Bin 9925 -> 9922 bytes test/docx/golden/document-properties.docx | Bin 10404 -> 10399 bytes test/docx/golden/headers.docx | Bin 10059 -> 10055 bytes test/docx/golden/image.docx | Bin 26736 -> 26733 bytes test/docx/golden/inline_code.docx | Bin 9859 -> 9855 bytes test/docx/golden/inline_formatting.docx | Bin 10038 -> 10035 bytes test/docx/golden/inline_images.docx | Bin 26793 -> 26789 bytes test/docx/golden/link_in_notes.docx | Bin 10081 -> 10077 bytes test/docx/golden/links.docx | Bin 10251 -> 10248 bytes test/docx/golden/lists.docx | Bin 10332 -> 10314 bytes test/docx/golden/lists_continuing.docx | Bin 10123 -> 10110 bytes test/docx/golden/lists_multiple_initial.docx | Bin 10210 -> 10192 bytes test/docx/golden/lists_restarting.docx | Bin 10122 -> 10108 bytes test/docx/golden/nested_anchors_in_header.docx | Bin 10216 -> 10212 bytes test/docx/golden/notes.docx | Bin 10028 -> 10024 bytes test/docx/golden/raw-blocks.docx | Bin 9960 -> 9956 bytes test/docx/golden/raw-bookmarks.docx | Bin 10094 -> 10090 bytes test/docx/golden/table_one_row.docx | Bin 9906 -> 9903 bytes test/docx/golden/table_with_list_cell.docx | Bin 10225 -> 10212 bytes test/docx/golden/tables.docx | Bin 10241 -> 10238 bytes test/docx/golden/track_changes_deletion.docx | Bin 9903 -> 9899 bytes test/docx/golden/track_changes_insertion.docx | Bin 9886 -> 9882 bytes test/docx/golden/track_changes_move.docx | Bin 9920 -> 9916 bytes .../golden/track_changes_scrubbed_metadata.docx | Bin 10032 -> 10028 bytes test/docx/golden/unicode.docx | Bin 9845 -> 9841 bytes test/docx/golden/verbatim_subsuper.docx | Bin 9892 -> 9888 bytes 33 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 ed7d1165c..af1b33ca2 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 07ae75676..f748f1f01 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 e5f034378..ac9d56680 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 174942135..f27727edd 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 b5c31a851..1da499d6a 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 c42ca1b05..4d2fe245d 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 1cb4c1fd7..f386fcea3 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 7122456ea..debe9a3f6 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 616ba0f81..cd17400bf 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 c30dcdee9..d3af8a3dd 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 8a704b41e..1c4e738c0 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 b1906c8c4..35f43f19f 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 8adf1cf75..8de3f70f6 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 584117503..e76558be9 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 8859fe55c..88bae8142 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 b80f3b3ba..455adcfc7 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 35beed68a..081d9ddba 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 2c29fd674..fc9213fc5 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_multiple_initial.docx b/test/docx/golden/lists_multiple_initial.docx index 10a948886..b636fd3f8 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 5b90e74a0..252623215 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 cc81b46d1..a8c3f5478 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 1394dc442..43e650ebd 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 0d1688694..fe4f7845b 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 be1caef2d..45e90608f 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 1178f7c6e..6eaea2ac2 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 84be2720f..45a97ccaa 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.docx b/test/docx/golden/tables.docx index 140366d8b..115a16a48 100644 Binary files a/test/docx/golden/tables.docx and b/test/docx/golden/tables.docx differ diff --git a/test/docx/golden/track_changes_deletion.docx b/test/docx/golden/track_changes_deletion.docx index 9cc7a075f..247725aaa 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 f8b8dcfde..3863afef2 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 1c3baf0bf..5c848b63a 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 28686970d..e0c843713 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 7051cefbd..78a773bdd 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 9df631640..c66a45b74 100644 Binary files a/test/docx/golden/verbatim_subsuper.docx and b/test/docx/golden/verbatim_subsuper.docx differ -- cgit v1.2.3