package/source/manifest/ManifestExport.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 32f42d093d4408666151d03f04823e2bb39e46cd
Author: himajin100000 <himajin100...@gmail.com>
Date:   Mon Mar 12 04:52:30 2018 +0900

    tdf#116351: fix re-use of AttributeList on PGP manifest
    
    multiple attributes of the same name on the same element,
    because AttributeList was wrongly re-used
    
    Change-Id: I29b2317ce3d836d7349fa0474709726bed2c5ad4
    Reviewed-on: https://gerrit.libreoffice.org/51087
    Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
    Tested-by: Thorsten Behrens <thorsten.behr...@cib.de>

diff --git a/package/source/manifest/ManifestExport.cxx 
b/package/source/manifest/ManifestExport.cxx
index 46ace993b581..2c819b346ff0 100644
--- a/package/source/manifest/ManifestExport.cxx
+++ b/package/source/manifest/ManifestExport.cxx
@@ -232,8 +232,6 @@ ManifestExport::ManifestExport( uno::Reference< 
xml::sax::XDocumentHandler > con
         {
             // yeah, so that goes directly below the manifest:manifest
             // element
-            ::comphelper::AttributeList * pNewAttrList = new 
::comphelper::AttributeList;
-            uno::Reference < xml::sax::XAttributeList > xNewAttrList 
(pNewAttrList);
             OUStringBuffer aBuffer;
 
             xHandler->ignorableWhitespace ( sWhiteSpace );
@@ -268,6 +266,8 @@ ManifestExport::ManifestExport( uno::Reference< 
xml::sax::XDocumentHandler > con
                     xHandler->startElement( sEncryptedKeyElement, nullptr );
                     xHandler->ignorableWhitespace ( sWhiteSpace );
 
+                    ::comphelper::AttributeList * pNewAttrList = new 
::comphelper::AttributeList;
+                    uno::Reference < xml::sax::XAttributeList > xNewAttrList 
(pNewAttrList);
                     // TODO: the algorithm should rather be configurable
                     pNewAttrList->AddAttribute ( sAlgorithmAttribute, 
sCdataAttribute,
                                                  
"http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"; );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to