From a6d8608595fd1ecfdff35c2003a28589ea1214ad Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.com>
Date: Tue, 19 Aug 2025 08:40:53 +0200
Subject: [PATCH] tdf#167761 sw format redline, char style: implement DOCX
 import

Open the bugdoc, there should be a format redline that tracks the change
of the char style from Strong to QuoteChar, but the doc model contains
no redlines.

What happens is that we try to handle character style as a character
property, but SwUnoCursorHelper::makeRedline() uses
SfxItemPropertySet::setPropertyValue() for CharStyleName, which calls
into SwFormatCharFormat::PutValue(), which fails, so the redline is not
created.

Fix the problem by reusing lcl_setCharStyle(), that knows how to set the
character style on an item set.

The DOCX export worked already.

Change-Id: I9479cadfdf6cb598cd4b11d49d851236c8ec09e3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189918
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
---
 .../OpenDocument-v1.4+libreoffice-schema.rng  |   4 +-
 sw/CppunitTest_sw_core_unocore.mk             |   1 +
 sw/inc/unocrsrhelper.hxx                      |   2 +
 .../data/format-char-style-change.docx        | Bin 0 -> 14453 bytes
 sw/qa/core/unocore/unocrsrhelper.cxx          |  65 ++++++++++++++++++
 sw/source/core/unocore/unocrsrhelper.cxx      |  10 +++
 sw/source/core/unocore/unoobj.cxx             |  13 ++--
 7 files changed, 88 insertions(+), 7 deletions(-)
 create mode 100644 sw/qa/core/unocore/data/format-char-style-change.docx
 create mode 100644 sw/qa/core/unocore/unocrsrhelper.cxx

diff --git a/schema/libreoffice/OpenDocument-v1.4+libreoffice-schema.rng b/schema/libreoffice/OpenDocument-v1.4+libreoffice-schema.rng
index a9c923703e0f..7b0ce565ab5e 100644
--- a/schema/libreoffice/OpenDocument-v1.4+libreoffice-schema.rng
+++ b/schema/libreoffice/OpenDocument-v1.4+libreoffice-schema.rng
@@ -4160,7 +4160,7 @@ xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.
     </rng:element>
   </rng:define>
 
-  <!-- https://lists.freedesktop.org/archives/libreoffice/2025-May/093327.html Hierarchical tracked changes -->
+  <!-- https://issues.oasis-open.org/browse/OFFICE-4174 Hierarchical tracked changes -->
   <rng:define name="text-changed-region" combine="choice">
     <rng:element name="text:changed-region">
       <rng:ref name="text-changed-region-attr"/>
@@ -4171,7 +4171,7 @@ xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.
     </rng:element>
   </rng:define>
 
-  <!-- TODO(vmiklos) no proposal for style on format changes -->
+  <!-- https://issues.oasis-open.org/browse/OFFICE-4173 Style on format changes -->
   <rng:define name="text-changed-region-content" combine="choice">
     <rng:element name="text:format-change">
       <rng:optional>
diff --git a/sw/CppunitTest_sw_core_unocore.mk b/sw/CppunitTest_sw_core_unocore.mk
index 43fb58bf4fe1..abdad82fa74b 100644
--- a/sw/CppunitTest_sw_core_unocore.mk
+++ b/sw/CppunitTest_sw_core_unocore.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_CppunitTest_use_common_precompiled_header,sw_core_unocore))
 
 $(eval $(call gb_CppunitTest_add_exception_objects,sw_core_unocore, \
     sw/qa/core/unocore/unocore \
+    sw/qa/core/unocore/unocrsrhelper \
 ))
 
 # note: this links msword only for the reason to have an order dependency,
diff --git a/sw/inc/unocrsrhelper.hxx b/sw/inc/unocrsrhelper.hxx
index 270b2a69d6dd..0eda90fdc7c5 100644
--- a/sw/inc/unocrsrhelper.hxx
+++ b/sw/inc/unocrsrhelper.hxx
@@ -242,6 +242,8 @@ namespace SwUnoCursorHelper
     css::uno::Reference<css::text::XFlatParagraphIterator>
             CreateFlatParagraphIterator(SwDoc &, sal_Int32,  bool);
 
+    void SetCharStyle(SwDoc& rDoc, const css::uno::Any& rValue, SfxItemSet& rSet);
+
 } // namespace SwUnoCursorHelper
 
 #endif
diff --git a/sw/qa/core/unocore/data/format-char-style-change.docx b/sw/qa/core/unocore/data/format-char-style-change.docx
new file mode 100644
index 0000000000000000000000000000000000000000..febf5dc3231dc31f2a448e25461be8300a0a3b95
GIT binary patch
literal 14453
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
OFASjBO0fR=^nU<G%KNkc

literal 0
HcmV?d00001

diff --git a/sw/qa/core/unocore/unocrsrhelper.cxx b/sw/qa/core/unocore/unocrsrhelper.cxx
new file mode 100644
index 000000000000..24bc03413a56
--- /dev/null
+++ b/sw/qa/core/unocore/unocrsrhelper.cxx
@@ -0,0 +1,65 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include <swmodeltestbase.hxx>
+
+#include <IDocumentRedlineAccess.hxx>
+#include <docsh.hxx>
+#include <fchrfmt.hxx>
+#include <redline.hxx>
+#include <wrtsh.hxx>
+
+using namespace com::sun::star;
+
+namespace
+{
+/// Covers sw/source/core/unocore/unocrsrhelper.cxx fixes.
+class Test : public SwModelTestBase
+{
+public:
+    Test()
+        : SwModelTestBase(u"/sw/qa/core/unocore/data/"_ustr)
+    {
+    }
+};
+
+CPPUNIT_TEST_FIXTURE(Test, testFormatCharStyleChangeDocxImport)
+{
+    // Given a document with a format redline, containing a char style change (strong -> quote):
+    // When importing that document:
+    createSwDoc("format-char-style-change.docx");
+
+    // Then make sure the model has the new style name, the redline has the old style name:
+    SwDocShell* pDocShell = getSwDocShell();
+    SwDoc* pDoc = pDocShell->GetDoc();
+    SwWrtShell* pWrtShell = pDocShell->GetWrtShell();
+    pWrtShell->SttEndDoc(/*bStt=*/false);
+    SfxItemSetFixed<RES_TXTATR_CHARFMT, RES_TXTATR_CHARFMT> aSet(pDoc->GetAttrPool());
+    pWrtShell->GetCurAttr(aSet);
+    const SwFormatCharFormat& rNewCharFormat = aSet.Get(RES_TXTATR_CHARFMT);
+    CPPUNIT_ASSERT_EQUAL(u"Quote Char"_ustr, rNewCharFormat.GetCharFormat()->GetName().toString());
+    const IDocumentRedlineAccess& rIDRA = pDoc->getIDocumentRedlineAccess();
+    const SwRedlineTable& rRedlineTable = rIDRA.GetRedlineTable();
+    // Without the accompanying fix in place, this test would have failed with:
+    // - Expected: 1
+    // - Actual  : 0
+    // i.e. the import result had no redlines.
+    CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), rRedlineTable.size());
+    const SwRangeRedline* pRedline = rRedlineTable[0];
+    auto pExtraData = dynamic_cast<const SwRedlineExtraData_FormatColl*>(pRedline->GetExtraData());
+    CPPUNIT_ASSERT(pExtraData);
+    std::shared_ptr<SfxItemSet> pRedlineSet = pExtraData->GetItemSet();
+    CPPUNIT_ASSERT(pRedlineSet);
+    const SwFormatCharFormat& rOldCharFormat = pRedlineSet->Get(RES_TXTATR_CHARFMT);
+    CPPUNIT_ASSERT_EQUAL(u"Strong Emphasis"_ustr,
+                         rOldCharFormat.GetCharFormat()->GetName().toString());
+}
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx
index defa0496db1a..f78a2c86f590 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -1324,6 +1324,7 @@ void makeRedline( SwPaM const & rPaM,
             std::vector<uno::Any> aValues;
             aEntries.reserve(aRevertProperties.getLength());
             sal_uInt16 nStyleId = USHRT_MAX;
+            sal_uInt16 nCharStyleId = USHRT_MAX;
             sal_uInt16 nNumId = USHRT_MAX;
             for (const auto& rRevertProperty : aRevertProperties)
             {
@@ -1349,6 +1350,10 @@ void makeRedline( SwPaM const & rPaM,
                     aWhichPairs = aWhichPairs.MergeRange(pEntry->nWID, pEntry->nWID);
                     if (rPropertyName == "ParaStyleName")
                         nStyleId = aEntries.size();
+                    else if (rPropertyName == "CharStyleName")
+                    {
+                        nCharStyleId = aEntries.size();
+                    }
                 }
                 aEntries.push_back(pEntry);
                 aValues.push_back(rRevertProperty.Value);
@@ -1378,6 +1383,11 @@ void makeRedline( SwPaM const & rPaM,
                                 pRule->SetUsedByRedline(true);
                         }
                     }
+                    else if (i == nCharStyleId)
+                    {
+                        // Set this manually, SwFormatCharFormat::PutValue() would fail.
+                        SwUnoCursorHelper::SetCharStyle(rDoc, rValue, aItemSet);
+                    }
                     else
                     {
                         SfxItemPropertyMapEntry const*const pEntry = aEntries[i];
diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index 1c3f9d06a610..6921b3bba5ad 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -177,10 +177,12 @@ void SwUnoCursorHelper::GetTextFromPam(SwPaM & rPam, OUString & rBuffer,
 
 }
 
+namespace SwUnoCursorHelper
+{
 /// @throws lang::IllegalArgumentException
 /// @throws uno::RuntimeException
-static void
-lcl_setCharStyle(SwDoc& rDoc, const uno::Any & rValue, SfxItemSet & rSet)
+void
+SetCharStyle(SwDoc& rDoc, const uno::Any & rValue, SfxItemSet & rSet)
 {
     SwDocShell *const pDocSh = rDoc.GetDocShell();
     if(!pDocSh)
@@ -203,6 +205,7 @@ lcl_setCharStyle(SwDoc& rDoc, const uno::Any & rValue, SfxItemSet & rSet)
     const SwFormatCharFormat aFormat(pStyle->GetCharFormat());
     rSet.Put(aFormat);
 };
+}
 
 /// @throws lang::IllegalArgumentException
 static void
@@ -352,7 +355,7 @@ lcl_setCharFormatSequence(SwPaM & rPam, uno::Any const& rValue)
         aStyle <<= aCharStyles.getConstArray()[nStyle];
         // create a local set and apply each format directly
         SfxItemSetFixed<RES_TXTATR_CHARFMT, RES_TXTATR_CHARFMT> aSet(rPam.GetDoc().GetAttrPool());
-        lcl_setCharStyle(rPam.GetDoc(), aStyle, aSet);
+        SwUnoCursorHelper::SetCharStyle(rPam.GetDoc(), aStyle, aSet);
         // the first style should replace the current attributes,
         // all other have to be added
         SwUnoCursorHelper::SetCursorAttr(rPam, aSet, nStyle
@@ -444,7 +447,7 @@ SwUnoCursorHelper::SetCursorPropertyValue(
     switch (rEntry.nWID)
     {
         case RES_TXTATR_CHARFMT:
-            lcl_setCharStyle(rPam.GetDoc(), rValue, rItemSet);
+            SwUnoCursorHelper::SetCharStyle(rPam.GetDoc(), rValue, rItemSet);
         break;
         case RES_TXTATR_AUTOFMT:
             lcl_setAutoStyle(rPam.GetDoc().GetIStyleAccess(),
@@ -538,7 +541,7 @@ SwUnoCursorHelper::SetCursorPropertyValue(
                         }
                         if (prop.Name == "CharStyleName")
                         {
-                            lcl_setCharStyle(rPam.GetDoc(), prop.Value, items);
+                            SwUnoCursorHelper::SetCharStyle(rPam.GetDoc(), prop.Value, items);
                         }
                         else
                         {