[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sfx2/source

Noel Power noel.power at suse.com
Wed Jul 31 08:36:44 PDT 2013


 sfx2/source/doc/templatedlg.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit d125339986db266025faa344f87a89bb34a9901b
Author: Noel Power <noel.power at suse.com>
Date:   Wed Jul 31 15:52:05 2013 +0100

    fix for fdo#60883 ( macros disabled for documents opened from templates )
    
    Change-Id: I5d4478176bd18a5d7a08dd4472393ea56e1ea280
    (cherry picked from commit 4bc42b6d7140144f5e17528276e8ddc80c033d6d)
    Reviewed-on: https://gerrit.libreoffice.org/5220
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 82289ba..e6d16dd 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -52,6 +52,7 @@
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/ui/dialogs/FolderPicker.hpp>
+#include <com/sun/star/task/InteractionHandler.hpp>
 
 #include "doc.hrc"
 #include "templatedlg.hrc"
@@ -740,13 +741,15 @@ IMPL_LINK(SfxTemplateManagerDlg, OpenTemplateHdl, ThumbnailViewItem*, pItem)
 {
     if (!mbIsSaveMode)
     {
-        uno::Sequence< PropertyValue > aArgs(3);
+        uno::Sequence< PropertyValue > aArgs(4);
         aArgs[0].Name = "AsTemplate";
         aArgs[0].Value <<= sal_True;
         aArgs[1].Name = "MacroExecutionMode";
         aArgs[1].Value <<= MacroExecMode::USE_CONFIG;
         aArgs[2].Name = "UpdateDocMode";
         aArgs[2].Value <<= UpdateDocMode::ACCORDING_TO_CONFIG;
+        aArgs[3].Name = "InteractionHandler";
+        aArgs[3].Value <<= task::InteractionHandler::createWithParent( ::comphelper::getProcessComponentContext(), 0 );
 
         TemplateViewItem *pTemplateItem = static_cast<TemplateViewItem*>(pItem);
 


More information about the Libreoffice-commits mailing list