[Libreoffice-commits] core.git: Branch 'feature/cib_contract3756' - sc/source sd/source sw/source

[Vasily Melenchuk (via logerrit)]

 sc/source/filter/excel/excel.cxx |    3 ++-
 sd/source/filter/sdpptwrp.cxx    |    3 ++-
 sw/source/filter/ww8/wrtww8.cxx  |    3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 444cc96935fdd4c5411c7ffdf4411eb5bd7e11fc
Author:     Vasily Melenchuk <vasily.melenchuk at cib.de>
AuthorDate: Wed Nov 13 09:19:42 2019 +0300
Commit:     Vasily Melenchuk <vasily.melenchuk at cib.de>
CommitDate: Wed Nov 13 09:23:23 2019 +0300

    ms doc: pass additional arguments to encryption service
    
    XPackageEncryption mplementation should distingush types
    of files fo possibility to encrypt them in a different way.
    So additional parameter is provided to resolve this issue.
    
    Change-Id: I3cdff6c6b85f2483138ad5ddba7799fb7bf8be95

diff --git a/sc/source/filter/excel/excel.cxx b/sc/source/filter/excel/excel.cxx
index 2e4015e34569..463afe74b90a 100644
--- a/sc/source/filter/excel/excel.cxx
+++ b/sc/source/filter/excel/excel.cxx
@@ -261,7 +261,8 @@ static ErrCode lcl_ExportExcelBiff( SfxMedium& rMedium, ScDocument *pDocument,
         if (sCryptoType.getLength())
         {
             uno::Reference<uno::XComponentContext> xComponentContext(comphelper::getProcessComponentContext());
-            uno::Sequence<uno::Any> aArguments;
+            uno::Sequence<uno::Any> aArguments(1);
+            aArguments[0] = uno::makeAny(beans::NamedValue("Binary", uno::makeAny(true)));
             xPackageEncryption.set(
                 xComponentContext->getServiceManager()->createInstanceWithArgumentsAndContext(
                     "com.sun.star.comp.oox.crypto." + sCryptoType, aArguments, xComponentContext), uno::UNO_QUERY);
diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx
index cc418fd7fc5a..2a21dbcaa06b 100644
--- a/sd/source/filter/sdpptwrp.cxx
+++ b/sd/source/filter/sdpptwrp.cxx
@@ -264,7 +264,8 @@ bool SdPPTFilter::Export()
                 if (sCryptoType.getLength())
                 {
                     Reference<XComponentContext> xComponentContext(comphelper::getProcessComponentContext());
-                    Sequence<Any> aArguments;
+                    Sequence<Any> aArguments(1);
+                    aArguments[0] = makeAny(NamedValue("Binary", makeAny(true)));
                     xPackageEncryption.set(
                         xComponentContext->getServiceManager()->createInstanceWithArgumentsAndContext(
                             "com.sun.star.comp.oox.crypto." + sCryptoType, aArguments, xComponentContext), UNO_QUERY);
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 5a9ea326b379..e309b44cb81f 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -3627,7 +3627,8 @@ ErrCode SwWW8Writer::WriteStorage()
             if (sCryptoType.getLength())
             {
                 uno::Reference<uno::XComponentContext> xComponentContext(comphelper::getProcessComponentContext());
-                uno::Sequence<uno::Any> aArguments;
+                uno::Sequence<uno::Any> aArguments(1);
+                aArguments[0] = uno::makeAny(beans::NamedValue("Binary", uno::makeAny(true)));
                 xPackageEncryption.set(
                     xComponentContext->getServiceManager()->createInstanceWithArgumentsAndContext(
                         "com.sun.star.comp.oox.crypto." + sCryptoType, aArguments, xComponentContext), uno::UNO_QUERY);