core.git: Branch 'distro/collabora/co-24.04' - sw/source

[Aron Budea (via logerrit)]

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

New commits:
commit cb25ead281d00364718a895da980581b6ea46681
Author:     Aron Budea <aron.bu...@collabora.com>
AuthorDate: Mon Jun 9 11:31:07 2025 +0200
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Mon Jun 9 15:05:43 2025 +0200

    cool#12059 sw: preserve compatibilityMode in OOXML files
    
    Only in 24.04, see tdf#164201 for fix in current versions.
    
    Change-Id: Ia534c28eac1a8a3325f79d0f7d679abd9fe02196
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186288
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/sw/source/filter/ww8/docxexport.cxx 
b/sw/source/filter/ww8/docxexport.cxx
index 104f0c92ac89..7d93a562804b 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -1267,8 +1267,11 @@ void DocxExport::WriteSettings()
      * 2.) Many years later, change the TargetCompatilityMode for new 
documents, when we no longer care
      *     about working with perfect compatibility with older versions of MS 
Word.
      */
+    // in 24.04, let's keep original compatibility mode, if one exists
     sal_Int32 nTargetCompatibilityMode =
-        (GetFilter().getVersion() == oox::core::ECMA_376_1ST_EDITION)
+        getWordCompatibilityModeFromGrabBag();
+    if (nTargetCompatibilityMode < 12)
+        nTargetCompatibilityMode = (GetFilter().getVersion() == 
oox::core::ECMA_376_1ST_EDITION)
         ? 12 : 15; //older versions might not open our files well
     bool bHasCompatibilityMode = false;
     const OUString aGrabBagName = UNO_NAME_MISC_OBJ_INTEROPGRABBAG;