[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - 2 commits - download.lst sw/source

[Michael Stahl (via logerrit)]

 download.lst                                 |    4 ++--
 sw/source/filter/ww8/docxattributeoutput.cxx |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 8aab322e9d722096cb2c3761c1b117515f90b122
Author:     Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Thu Dec 2 10:35:20 2021 +0100
Commit:     Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Thu Dec 2 17:14:26 2021 +0100

    nss: upgrade to release 3.73
    
    Fixes:
    CVE-2021-43527 Memory corruption via DER-encoded DSA and RSA-PSS signatures
    
    Conflicts:
         download.lst
    
    Change-Id: I5c3f169c57fc2763029b07ad7e325b2f53b7e28f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126218
    Tested-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
    Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
    (cherry picked from commit c8e21d246bcb4289cb25c82be440cd07b7418436)
    (cherry picked from commit c0be9f7f82d3e9e371b3b08585ad15dd31ebd786)

diff --git a/download.lst b/download.lst
index d20af4b159f7..bc4d609efa07 100644
--- a/download.lst
+++ b/download.lst
@@ -181,8 +181,8 @@ export MYTHES_SHA256SUM := 
1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b
 export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
 export NEON_SHA256SUM := 
db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca
 export NEON_TARBALL := neon-0.30.2.tar.gz
-export NSS_SHA256SUM := 
ec6032d78663c6ef90b4b83eb552dedf721d2bce208cec3bf527b8f637db7e45
-export NSS_TARBALL := nss-3.55-with-nspr-4.27.tar.gz
+export NSS_SHA256SUM := 
07a9e5b70f121a62706140d4cacc3006d3efb869da40f3a2bf7a65d37847f4d9
+export NSS_TARBALL := nss-3.73-with-nspr-4.32.tar.gz
 export ODFGEN_SHA256SUM := 
55200027fd46623b9bdddd38d275e7452d1b0ff8aeddcad6f9ae6dc25f610625
 export ODFGEN_VERSION_MICRO := 8
 export ODFGEN_TARBALL := libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.xz
commit 63430f70664a39ecfb900e6919c19d00661aeb61
Author:     Vasily Melenchuk <vasily.melenc...@cib.de>
AuthorDate: Fri Nov 26 14:03:22 2021 +0300
Commit:     Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Mon Nov 29 13:05:24 2021 +0100

    docx export: preserve spaces in field instructions
    
    MS Word is putting spaces between field mark and field instruction
    text. Writer preserves these spaces, but without xml:space="preserve"
    they are not displayed by Word later.
    
    Conflicts:
          sw/source/filter/ww8/docxattributeoutput.cxx
    
    Change-Id: I480e6febf0ee278b56e9dfc6e0430c5fd5bdfd71
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125875
    Tested-by: Jenkins
    Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 366670f86974..be3d70f4a036 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1772,7 +1772,7 @@ void DocxAttributeOutput::DoWriteCmd( const OUString& 
rCmd )
         m_aSeqBookmarksNames[sSeqName].push_back(m_sLastOpenedBookmark);
     }
     // Write the Field command
-    m_pSerializer->startElementNS( XML_w, XML_instrText, FSEND );
+    m_pSerializer->startElementNS( XML_w, XML_instrText, FSNS(XML_xml, 
XML_space), "preserve" );
     m_pSerializer->writeEscaped( rCmd );
     m_pSerializer->endElementNS( XML_w, XML_instrText );