[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - desktop/source

[Henry Castro (via logerrit)]

 desktop/source/lib/init.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 5e4941d1c9ebfca900dd3a2414184e2f82472cc9
Author:     Henry Castro <hcastro at collabora.com>
AuthorDate: Thu Dec 17 10:16:52 2020 -0400
Commit:     Henry Castro <hcastro at collabora.com>
CommitDate: Mon Jan 18 22:49:06 2021 +0100

    lok: add parameter "MacroExecMode"
    
    It is required to execute VBA scripts.
    
    Change-Id: Ibaafc62ecedcefcd0596c701728039783b5a0de7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107891
    Tested-by: Jenkins
    Reviewed-by: Henry Castro <hcastro at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109139
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 82b1bfb79a7d..1800ff5ed7db 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -60,6 +60,7 @@
 #include <comphelper/threadpool.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 
+#include <com/sun/star/document/MacroExecMode.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
@@ -2245,7 +2246,7 @@ static LibreOfficeKitDocument* lo_documentLoadWithOptions(LibreOfficeKit* pThis,
         const OUString aDeviceFormFactor = extractParameter(aOptions, "DeviceFormFactor");
         SfxLokHelper::setDeviceFormFactor(aDeviceFormFactor);
 
-        uno::Sequence<css::beans::PropertyValue> aFilterOptions(2);
+        uno::Sequence<css::beans::PropertyValue> aFilterOptions(3);
         aFilterOptions[0] = css::beans::PropertyValue( "FilterOptions",
                                                        0,
                                                        uno::makeAny(aOptions),
@@ -2264,11 +2265,11 @@ static LibreOfficeKitDocument* lo_documentLoadWithOptions(LibreOfficeKit* pThis,
         aFilterOptions[1].Name = "InteractionHandler";
         aFilterOptions[1].Value <<= xInteraction;
 
-        /* TODO
         sal_Int16 nMacroExecMode = document::MacroExecMode::USE_CONFIG;
         aFilterOptions[2].Name = "MacroExecutionMode";
         aFilterOptions[2].Value <<= nMacroExecMode;
 
+        /* TODO
         sal_Int16 nUpdateDoc = document::UpdateDocMode::ACCORDING_TO_CONFIG;
         aFilterOptions[3].Name = "UpdateDocMode";
         aFilterOptions[3].Value <<= nUpdateDoc;