sw/source/filter/ww8/docxexport.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit f2e49634cdb1826ae55d5fc3479f1c20cb2dbb8e
Author:     Noel Grandin <[email protected]>
AuthorDate: Tue Nov 18 09:44:25 2025 +0200
Commit:     Noel Grandin <[email protected]>
CommitDate: Tue Nov 18 13:16:38 2025 +0100

    improve element ordering in writeCompat
    
    regression from
        commit 0c29ba0c4690e9f135390f2cef5da02842987329
        Author: Noel Grandin <[email protected]>
        Date:   Fri Nov 14 17:47:34 2025 +0200
        officeotron: config elements out of schema order
    
    Change-Id: Ic5f0524a379aa5e7961af3e6019219fffef69b30
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194145
    Reviewed-by: Noel Grandin <[email protected]>
    Tested-by: Jenkins

diff --git a/sw/source/filter/ww8/docxexport.cxx 
b/sw/source/filter/ww8/docxexport.cxx
index 896b8401d794..fa8ce467faf3 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -1069,6 +1069,10 @@ static auto
 WriteCompat(SwDoc const& rDoc, ::sax_fastparser::FSHelperPtr const& rpFS) -> 
void
 {
     const IDocumentSettingAccess& rIDSA = rDoc.getIDocumentSettingAccess();
+    if (!rIDSA.get(DocumentSettingId::ADD_EXT_LEADING))
+    {
+        rpFS->singleElementNS(XML_w, XML_noLeading);
+    }
     // tdf#88908 adjust CJK-context normal spaces to half of an ideographic 
space
     if (rIDSA.get(DocumentSettingId::BALANCE_SPACES_AND_IDEOGRAPHIC_SPACES))
     {
@@ -1081,10 +1085,6 @@ WriteCompat(SwDoc const& rDoc, 
::sax_fastparser::FSHelperPtr const& rpFS) -> voi
     {
         rpFS->singleElementNS(XML_w, XML_doNotExpandShiftReturn);
     }
-    if (!rIDSA.get(DocumentSettingId::ADD_EXT_LEADING))
-    {
-        rpFS->singleElementNS(XML_w, XML_noLeading);
-    }
     // tdf#146515 export "Use printer metrics for document formatting"
     if (!rIDSA.get(DocumentSettingId::USE_VIRTUAL_DEVICE))
         rpFS->singleElementNS(XML_w, XML_usePrinterMetrics);

Reply via email to