core.git: Branch 'libreoffice-24-8' - sw/source

[Christian Lohmaier (via logerrit)]

 sw/source/filter/ww8/docxattributeoutput.cxx |   24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

New commits:
commit e1da02ca724316fb2609488d1246dae0c386fd5f
Author:     Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Mon Jun 17 16:33:11 2024 +0200
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Fri Jul 26 13:01:10 2024 +0200

    workaround clang-14 bug
    
    affects both macOS XCode 14 as well as the em++ / emsdk clang 14 used by
    the wasm builder
    
    Change-Id: Id3e9a923b7f18ca8d18fd4bc2fd5de83ab3c591f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169031
    Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
    Tested-by: Jenkins
    (cherry picked from commit 8ee0b01f226665c877d5ed59b23eec278800a667)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170960
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index ca66bb289ac0..4d421bd1eeaf 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -6695,18 +6695,18 @@ static bool lcl_guessQFormat(const OUString& rName, 
sal_uInt16 nWwId)
             nWwId == ww::stiEmphasis )
         return true;
 
-    static o3tl::sorted_vector<OUString, OUStringIgnoreCase> const aAllowlist
-    {
-        u"No Spacing"_ustr,
-        u"List Paragraph"_ustr,
-        u"Quote"_ustr,
-        u"Intense Quote"_ustr,
-        u"Subtle Emphasis"_ustr,
-        u"Intense Emphasis"_ustr,
-        u"Subtle Reference"_ustr,
-        u"Intense Reference"_ustr,
-        u"Book Title"_ustr,
-        u"TOC Heading"_ustr,
+    static o3tl::sorted_vector<std::u16string_view, OUStringIgnoreCase> const 
aAllowlist
+    {
+        u"No Spacing",
+        u"List Paragraph",
+        u"Quote",
+        u"Intense Quote",
+        u"Subtle Emphasis",
+        u"Intense Emphasis",
+        u"Subtle Reference",
+        u"Intense Reference",
+        u"Book Title",
+        u"TOC Heading",
     };
     // Not custom style? Then we have a list of standard styles which should 
be qFormat.
     return aAllowlist.find(rName) != aAllowlist.end();