From 7db19db341608ba2059543a3c8d61cd458470602 Mon Sep 17 00:00:00 2001
From: Mike Kaganski <mike.kaganski@collabora.com>
Date: Thu, 15 Jun 2023 10:34:41 +0300
Subject: ODF export: simplify restart handling to skip list id where possible

This continues to minimize cases where random ids are written, helping
to make the output more deterministic; it builds upon commits
8f48f91009caa86d896f247059874242ed18bf39 (ODT export: omit unreferenced
<text:list xml:id="...">, 2022-03-10), and
82bbf63582bdf28e7918e58ebf6657a9144bc9f3 (tdf#155823: Improve the check
if the list id is not required, 2023-06-14).

The previous code used to write 'text:continue-list' when the list is
restarted. It is unnecessary when there is no other condition requiring
such a reference (like style change, or interleaving lists); so relax
the conditions allowing to put simple 'text:continue-numbering="true"'.
This also allows to simplify a bit the code around 'ShouldSkipListId'.

Change-Id: Idf8be455953d08fd578266bda22f3a55d7b9ee23
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153104
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
---
 xmloff/qa/unit/data/listRestartAfterBreak.fodt | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 xmloff/qa/unit/data/listRestartAfterBreak.fodt

(limited to 'xmloff/qa/unit/data')

diff --git a/xmloff/qa/unit/data/listRestartAfterBreak.fodt b/xmloff/qa/unit/data/listRestartAfterBreak.fodt
new file mode 100644
index 000000000000..7ae5c84d7060
--- /dev/null
+++ b/xmloff/qa/unit/data/listRestartAfterBreak.fodt
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text">
+ <office:body>
+  <office:text>
+   <text:list text:style-name="Numbering 123">
+    <text:list-item>
+     <text:p>Item1</text:p>
+    </text:list-item>
+   </text:list>
+   <text:p/>
+   <text:list text:continue-numbering="true" text:style-name="Numbering 123">
+    <text:list-item>
+     <text:p>Item2</text:p>
+    </text:list-item>
+   </text:list>
+   <text:p/>
+   <text:list text:continue-numbering="true" text:style-name="Numbering 123">
+    <text:list-item text:start-value="1">
+     <text:p>Item3 (restarted)</text:p>
+    </text:list-item>
+   </text:list>
+  </office:text>
+ </office:body>
+</office:document>
\ No newline at end of file
-- 
cgit