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

[Caolán McNamara (via logerrit)]

 sw/source/filter/ww8/wrtw8esh.cxx |    8 ++++----
 sw/source/filter/ww8/wrtw8nds.cxx |    2 +-
 sw/source/filter/ww8/wrtw8sty.cxx |    2 +-
 sw/source/filter/ww8/wrtww8.cxx   |    2 +-
 sw/source/filter/ww8/wrtww8gr.cxx |    2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 4561c4365b8203a2a9074882e08e3cf0e05ae00e
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Fri Jul 11 16:35:58 2025 +0100
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Jul 14 12:59:55 2025 +0200

    don't use a static mutable array
    
    Change-Id: I7a85f9b189f56a09f724c157a620fa6fff0f92a5
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187757
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>

diff --git a/sw/source/filter/ww8/wrtw8esh.cxx 
b/sw/source/filter/ww8/wrtw8esh.cxx
index c9a457b2961e..1190d84e9b60 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -427,7 +427,7 @@ void WW8Export::DoComboBox(const OUString &rName,
 
     WriteChar( 0x01 );
 
-    static sal_uInt8 aArr1[] =
+    sal_uInt8 aArr1[] =
     {
         0x03, 0x6a, 0,0,0,0,    // sprmCPicLocation
         0x06, 0x08, 0x01,       // sprmCFData
@@ -435,7 +435,7 @@ void WW8Export::DoComboBox(const OUString &rName,
         0x02, 0x08, 0x01        // sprmCFFieldVanish
     };
     sal_uInt8* pDataAdr = aArr1 + 2;
-    Set_UInt32( pDataAdr, nDataStt );
+    Set_UInt32(pDataAdr, nDataStt);
 
     m_pChpPlc->AppendFkpEntry(Strm().Tell(), sizeof(aArr1), aArr1);
 
@@ -470,7 +470,7 @@ void WW8Export::DoFormText(const SwInputField * pField)
     m_pChpPlc->AppendFkpEntry( Strm().Tell() );
 
     WriteChar( 0x01 );
-    static sal_uInt8 aArr1[] = {
+    sal_uInt8 aArr1[] = {
         0x02, 0x08, 0x81,        // sprmCFFieldVanish
         0x03, 0x6a, 0,0,0,0,    // sprmCPicLocation
 
@@ -496,7 +496,7 @@ void WW8Export::DoFormText(const SwInputField * pField)
     const OUString fieldStr( pField->ExpandField(true, nullptr) );
     SwWW8Writer::WriteString16(Strm(), fieldStr, false);
 
-    static sal_uInt8 aArr2[] = {
+    sal_uInt8 aArr2[] = {
         0x55, 0x08, 0x01,  // sprmCFSpec
         0x75, 0x08, 0x01       // ???
     };
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx 
b/sw/source/filter/ww8/wrtw8nds.cxx
index feedee5f0e69..513e267d0275 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -1170,7 +1170,7 @@ bool WW8AttributeOutput::StartURL(const OUString& rUrl, 
const OUString& rTarget,
     // WinWord 2000 doesn't write this - so it's a temp solution by W97 ?
     m_rWW8Export.WriteChar( 0x01 );
 
-    static sal_uInt8 aArr1[] = {
+    sal_uInt8 aArr1[] = {
         0x03, 0x6a, 0,0,0,0,    // sprmCPicLocation
 
         0x06, 0x08, 0x01,       // sprmCFData
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx 
b/sw/source/filter/ww8/wrtw8sty.cxx
index 64a685254f2a..a5628c52e889 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -2105,7 +2105,7 @@ void WW8_WrPlcSepx::WritePlcSed( WW8Export& rWrt ) const
         rWrt.m_pTableStrm->WriteUInt32(nP);
     }
 
-    static WW8_SED aSed = {{4, 0},{0, 0, 0, 0},{0, 0},{0xff, 0xff, 0xff, 
0xff}};
+    WW8_SED aSed = {{4, 0},{0, 0, 0, 0},{0, 0},{0xff, 0xff, 0xff, 0xff}};
 
     for (const auto & rSectionAttribute : m_SectionAttributes)
     {
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 9be1020af648..e7220735896f 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -4204,7 +4204,7 @@ void WW8Export::WriteFormData( const 
::sw::mark::Fieldmark& rFieldmark )
     m_pChpPlc->AppendFkpEntry(Strm().Tell());
 
     WriteChar(0x01);
-    static sal_uInt8 aArr1[] =
+    sal_uInt8 aArr1[] =
     {
         0x03, 0x6a, 0,0,0,0,    // sprmCPicLocation
 
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx 
b/sw/source/filter/ww8/wrtww8gr.cxx
index f56074685a3a..505a9f966c57 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -195,7 +195,7 @@ void WW8Export::OutputOLENode( const SwOLENode& rOLENode )
     sal_uInt8 *pSpecOLE;
     sal_uInt8 *pDataAdr;
     short nSize;
-    static sal_uInt8 aSpecOLE_WW8[] = {
+    sal_uInt8 aSpecOLE_WW8[] = {
             0x03, 0x6a, 0, 0, 0, 0, // sprmCPicLocation
             0x0a, 0x08, 1,          // sprmCFOLE2
             0x56, 0x08, 1           // sprmCFObj