diff options
| author | Noel Power <noel.power@suse.com> | 2013-07-31 15:52:05 +0100 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-07-31 15:36:35 +0000 |
| commit | c32feb2921aec20c017c63d62269482c483f81d5 (patch) | |
| tree | b082764e30a3a81fc372c3ec6af9525d492eae80 /sfx2 | |
| parent | 2f9c340b4f8f54872eb97880d03c802a1620a1b6 (diff) | |
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/5219
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/templatedlg.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index 2db2c8bbfb97..a31c235532bf 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -53,6 +53,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" @@ -750,13 +751,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); |