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

[Rashesh (via logerrit)]

 sw/source/uibase/docvw/AnnotationWin.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 676d31297652f4a8c72a31b0d5e1a97a448a7d65
Author:     Rashesh <rashesh.pa...@collabora.com>
AuthorDate: Wed Dec 11 15:40:11 2024 +0530
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Wed Dec 11 13:12:45 2024 +0100

    sw: lokit: make sure to read annotation html with utf-8
    
    - its online specific patch where the we pass html for annotation
    - to test:
      1. Open document in online
      2. Use "pt" keyboard to type comment "légend" and save
      3. Before: légend; After: légend
    
    Change-Id: Ibd32fbd70c780938e8036362313067e8c1bc8f61
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178296
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/sw/source/uibase/docvw/AnnotationWin.cxx 
b/sw/source/uibase/docvw/AnnotationWin.cxx
index 0f23e3c7f396..9aa505850f6c 100644
--- a/sw/source/uibase/docvw/AnnotationWin.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin.cxx
@@ -97,6 +97,7 @@ void ImportHTML(Outliner& rOutliner, const OUString& rHtml)
     // Insert newlines for divs, not normally done, so to keep things simple
     // only enable that for this case.
     xValues->Append(SvKeyValue("newline-on-div", "true"));
+    xValues->Append(SvKeyValue("content-type", "text/html;charset=utf-8"));
     rOutliner.Read(aHTMLStream, "", EETextFormat::Html, xValues.get());
 }