#559 Always add new numbering to output document

During numIdCopy, if numbering isn't found in template, look it up in generated doc

adapt test templates for 559 back to 3.3.5

Signed-off-by: Erwann Traisnel <erwann.traisnel@obeo.fr>

Author: etraisnel2

plugins/org.obeonetwork.m2doc.html/src/org/obeonetwork/m2doc/html/services/M2DocHTMLParser.java

@@ -28,7 +28,9 @@
 import java.util.Set;
 import java.util.Stack;
 
+import org.apache.poi.xwpf.usermodel.XWPFAbstractNum;
 import org.apache.poi.xwpf.usermodel.XWPFDocument;
+import org.apache.poi.xwpf.usermodel.XWPFNum;
 import org.apache.poi.xwpf.usermodel.XWPFNumbering;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.URIConverter;
@@ -61,7 +63,6 @@
 import org.obeonetwork.m2doc.element.impl.MTableImpl.MCellImpl;
 import org.obeonetwork.m2doc.element.impl.MTableImpl.MRowImpl;
 import org.obeonetwork.m2doc.element.impl.MTextImpl;
-import org.obeonetwork.m2doc.services.PaginationServices;
 import org.openxmlformats.schemas.officeDocument.x2006.sharedTypes.STOnOff;
 import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTAbstractNum;
 import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTDecimalNumber;
@@ -71,7 +72,6 @@
 import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTLvl;
 import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTNum;
 import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTNumFmt;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTNumbering;
 import org.openxmlformats.schemas.wordprocessingml.x2006.main.STJc;
 import org.openxmlformats.schemas.wordprocessingml.x2006.main.STMultiLevelType;
 import org.openxmlformats.schemas.wordprocessingml.x2006.main.STNumberFormat;
@@ -1985,19 +1985,30 @@ private void setOrderedListNumbering(Context context, Element element) {
      *            the {@link Context}
      */
     private void createNumbering(Context context) {
-        final CTAbstractNum res;
         final XWPFNumbering numbering = destinationDocument.createNumbering();
-        final CTNumbering ctNumbering = PaginationServices.getCTNumbering(numbering);
-        res = ctNumbering.addNewAbstractNum();
+
+        // Create CTAbstractNum using the factory to avoid duplicate when creating XWPFAbstractNum
+        CTAbstractNum res = CTAbstractNum.Factory.newInstance();
         res.addNewMultiLevelType().setVal(STMultiLevelType.HYBRID_MULTILEVEL);
-        BigInteger id = BigInteger.valueOf(ctNumbering.sizeOfAbstractNumArray() - 1);
-        res.setAbstractNumId(id);
-        final CTNum ctNum = ctNumbering.addNewNum();
-        ctNum.setNumId(BigInteger.valueOf(ctNumbering.sizeOfNumArray()));
-        ctNum.addNewAbstractNumId().setVal(id);
+        BigInteger abstractNumId = BigInteger.valueOf(numbering.getAbstractNums().size());
+        res.setAbstractNumId(abstractNumId);
+        XWPFAbstractNum newAbstractNum = new XWPFAbstractNum(res);
+        BigInteger finalAbsId = numbering.addAbstractNum(newAbstractNum);
+
+        // Update the reference (that was changed through addAbstractNum)
+        res = newAbstractNum.getCTAbstractNum();
+        newAbstractNum.setNumbering(numbering);
+
+        final CTNum ctNum = CTNum.Factory.newInstance();
+        ctNum.addNewAbstractNumId().setVal(finalAbsId);
+        BigInteger numId = BigInteger.valueOf(numbering.getNums().size() + 1);
+        ctNum.setNumId(numId);
+        XWPFNum newNum = new XWPFNum(ctNum);
+        newNum.setNumbering(numbering);
+        numbering.addNum(newNum);
 
         context.numbering = res;
-        context.numberingID = ctNum.getNumId();
+        context.numberingID = numId;
     }
 
     /**

plugins/org.obeonetwork.m2doc/src/org/obeonetwork/m2doc/generator/RawCopier.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- *  Copyright (c) 2016, 2025 Obeo. 
+ *  Copyright (c) 2016, 2026 Obeo. 
  *  All rights reserved. This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License v2.0
  *  which accompanies this distribution, and is available at
@@ -367,16 +367,20 @@ private XWPFParagraph copyParagraph(final IBody outputBody, final Map<String, St
     @SuppressWarnings("resource")
     private BigInteger copyNumID(IBody inputBody, IBody outputBody, BigInteger inputNumID) {
         final XWPFDocument inputDocument = inputBody.getXWPFDocument();
-        final XWPFDocument ouptutDocument = outputBody.getXWPFDocument();
+        final XWPFDocument outputDocument = outputBody.getXWPFDocument();
 
         final BigInteger numId = inputDocument.getNumbering().getAbstractNumID(inputNumID);
+        if (numId == null) {
+            // If it's not found in the template, check in the generated document (implicit numbering from template constructs)
+            return outputDocument.getNumbering().getAbstractNumID(inputNumID);
+        }
         final XWPFAbstractNum inputNum = inputDocument.getNumbering().getAbstractNum(numId);
 
         final XWPFAbstractNum outputNum = new XWPFAbstractNum((CTAbstractNum) inputNum.getCTAbstractNum().copy());
-        final BigInteger newID = BigInteger.valueOf(ouptutDocument.getNumbering().getAbstractNums().size());
+        final BigInteger newID = BigInteger.valueOf(outputDocument.getNumbering().getAbstractNums().size());
         outputNum.getAbstractNum().setAbstractNumId(newID);
-        BigInteger outputNumID = ouptutDocument.getNumbering().addAbstractNum(outputNum);
-        ouptutDocument.getNumbering().addNum(outputNumID);
+        BigInteger outputNumID = outputDocument.getNumbering().addAbstractNum(outputNum);
+        outputDocument.getNumbering().addNum(outputNumID);
         return outputNumID;
     }
 

tests/org.obeonetwork.m2doc.tests/resources/template/bug533/bug533-expected-generation.docx

@@ -1,3 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<genconf:Generation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:genconf="http://www.obeonetwork.org/m2doc/genconf/1.0" name="bug399" templateFileName="bug399-template.docx" resultFileName="bug399-actual-generation.docx" validationFileName="bug399-actual-validation.docx">
+<genconf:Generation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:genconf="http://www.obeonetwork.org/m2doc/genconf/1.0" name="bug399" templateFileName="bug533-template.docx" resultFileName="bug533-actual-generation.docx" validationFileName="bug533-actual-validation.docx">
+  <options name="UpdateFields" value="false"/>
+  <options name="IgnoreVersionCheck" value="false"/>
 </genconf:Generation>

tests/org.obeonetwork.m2doc.tests/resources/template/bug533/bug533-template.docx

@@ -1,3 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<genconf:Generation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:genconf="http://www.obeonetwork.org/m2doc/genconf/1.0" name="bug399" templateFileName="bug399-template.docx" resultFileName="bug399-actual-generation.docx" validationFileName="bug399-actual-validation.docx">
+<genconf:Generation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:genconf="http://www.obeonetwork.org/m2doc/genconf/1.0" name="bug399" templateFileName="bug533MultiCalls-template.docx" resultFileName="bug533MultiCalls-actual-generation.docx" validationFileName="bug533MultiCalls-actual-validation.docx">
+  <options name="UpdateFields" value="false"/>
+  <options name="IgnoreVersionCheck" value="false"/>
 </genconf:Generation>