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

[Caolán McNamara (via logerrit)]

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

New commits:
commit c1cade454e613fd4277cf24d3349180d73883039
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Thu Apr 11 19:33:19 2024 +0100
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Dec 2 13:00:56 2024 +0100

    crashtesting: assert on exporting fdo48097-1.doc to docx
    
    noticeable since:
    
    commit ad4b72a0eacf6bb6887236ea3a3807b1264de822
    Date:   Thu Mar 21 12:10:40 2024 +0100
    
        tdf#160301 import DOCVARIABLE fields as user fields
    
    but not really caused by it
    
    Change-Id: I44910756df3938829589f230716363beaf0f4f91
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166023
    Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177635
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 36dc8ff8ed35..624fdc2f9b6d 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -32,6 +32,7 @@
 #include <i18nlangtag/languagetag.hxx>
 
 #include <unotools/configmgr.hxx>
+#include <comphelper/string.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <unotools/streamwrap.hxx>
 #include <rtl/random.h>
@@ -4824,7 +4825,8 @@ void SwWW8ImplReader::ReadDocVars()
             OUString value = aDocValueStrings[i];
             value = value.replaceAll("
", "
");
             value = value.replaceAll(" ", "
");
-            aValue <<= value;
+            // fdo48097-1.doc is an example of a case needing 
sanitizeStringSurrogates
+            aValue <<= comphelper::string::sanitizeStringSurrogates(value);
         }
 
         uno::Reference< beans::XPropertySet > xMaster;