diff options
| author | Eike Rathke <erack@redhat.com> | 2015-10-09 09:49:01 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-10-09 10:16:33 +0000 |
| commit | 2e566ad837d736c7f465c216916d9b8a6fc695bf (patch) | |
| tree | b2999cccf663aab902b89eb3c40a183e37c09261 | |
| parent | 81d9f6982a222c8f777a80fdeb89a391b81dd5d3 (diff) | |
Resolves: tdf#93613 let referenced document evaluate macro config
... if the current document allows macros.
Change-Id: I927981334e27d073696286ba680777a645d53653
(cherry picked from commit 8e2acdbcbd3afc1777d6e68a83ebbe6d8dd77645)
Reviewed-on: https://gerrit.libreoffice.org/19264
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sc/source/ui/docshell/externalrefmgr.cxx | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index 36a388249be3..8c557af0c8d5 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -55,6 +55,7 @@ #include "scmatrix.hxx" #include <columnspanset.hxx> #include <column.hxx> +#include <com/sun/star/document/MacroExecMode.hpp> #include <memory> #include <algorithm> @@ -2397,6 +2398,21 @@ SfxObjectShellRef ScExternalRefManager::loadSrcDocument(sal_uInt16 nFileId, OUSt // make medium hidden to prevent assertion from progress bar pSet->Put( SfxBoolItem(SID_HIDDEN, true) ); + // If the current document is allowed to execute macros then the referenced + // document may execute macros according to the security configuration. + SfxObjectShell* pShell = mpDoc->GetDocumentShell(); + if (pShell) + { + SfxMedium* pMedium = pShell->GetMedium(); + if (pMedium) + { + const SfxPoolItem* pItem; + if (pMedium->GetItemSet()->GetItemState( SID_MACROEXECMODE, false, &pItem ) == SfxItemState::SET && + static_cast<const SfxUInt16Item*>(pItem)->GetValue() != css::document::MacroExecMode::NEVER_EXECUTE) + pSet->Put( SfxUInt16Item( SID_MACROEXECMODE, css::document::MacroExecMode::USE_CONFIG)); + } + } + unique_ptr<SfxMedium> pMedium(new SfxMedium(aFile, STREAM_STD_READ, pFilter, pSet)); if (pMedium->GetError() != ERRCODE_NONE) return NULL; |