core.git: sw/source

[Caolán McNamara (via logerrit)]

 sw/source/core/doc/DocumentStylePoolManager.cxx |   11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

New commits:
commit 21f913dbeb7ae25cb4b18898fad74d4f48175442
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Mon Jul 14 21:37:50 2025 +0100
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Tue Jul 15 12:09:12 2025 +0200

    drop mutable static
    
    Change-Id: Ib5f9660d6bc66798952c0c93283768e411aeb167
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187896
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    Tested-by: Jenkins

diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx 
b/sw/source/core/doc/DocumentStylePoolManager.cxx
index 9833efb2d591..dce213fb5bd5 100644
--- a/sw/source/core/doc/DocumentStylePoolManager.cxx
+++ b/sw/source/core/doc/DocumentStylePoolManager.cxx
@@ -148,18 +148,15 @@ namespace
     void lcl_SetDfltFont( DefaultFontType nLatinFntType, DefaultFontType 
nCJKFntType,
                             DefaultFontType nCTLFntType, SfxItemSet& rSet )
     {
-        static struct {
+        const struct {
             sal_uInt16 nResLngId;
             sal_uInt16 nResFntId;
             DefaultFontType nFntType;
         } aArr[ 3 ] = {
-            { RES_CHRATR_LANGUAGE, RES_CHRATR_FONT, 
static_cast<DefaultFontType>(0) },
-            { RES_CHRATR_CJK_LANGUAGE, RES_CHRATR_CJK_FONT, 
static_cast<DefaultFontType>(0) },
-            { RES_CHRATR_CTL_LANGUAGE, RES_CHRATR_CTL_FONT, 
static_cast<DefaultFontType>(0) }
+            { RES_CHRATR_LANGUAGE, RES_CHRATR_FONT, nLatinFntType },
+            { RES_CHRATR_CJK_LANGUAGE, RES_CHRATR_CJK_FONT, nCJKFntType },
+            { RES_CHRATR_CTL_LANGUAGE, RES_CHRATR_CTL_FONT, nCTLFntType }
         };
-        aArr[0].nFntType = nLatinFntType;
-        aArr[1].nFntType = nCJKFntType;
-        aArr[2].nFntType = nCTLFntType;
 
         for(const auto & n : aArr)
         {