diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-11-11 19:34:49 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-11-11 21:57:36 +0100 |
| commit | d945bc4598f75e4cb1a1bf9df8942f14ef065d74 (patch) | |
| tree | 1a65ef085e4af7a41587dce7d44acca76eb870a2 | |
| parent | d092dd1b784fcf83fc9c63810bac24d4508edbbc (diff) | |
ofz#4122 use EnableExecuteLink instead
Change-Id: Id680df2145ac691a30f93cea4e565a2467b45dc6
Reviewed-on: https://gerrit.libreoffice.org/44640
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sc/source/filter/excel/excel.cxx | 5 | ||||
| -rw-r--r-- | sc/source/ui/docshell/docsh.cxx | 1 | ||||
| -rw-r--r-- | sc/source/ui/docshell/externalrefmgr.cxx | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/sc/source/filter/excel/excel.cxx b/sc/source/filter/excel/excel.cxx index 5c590dd407c9..2b5df5c4fc97 100644 --- a/sc/source/filter/excel/excel.cxx +++ b/sc/source/filter/excel/excel.cxx @@ -229,6 +229,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportQPW(SvStream &rStream) aDocOpt.SetLookUpColRowNames(false); aDocument.SetDocOptions(aDocOpt); aDocument.MakeTable(0); + aDocument.EnableExecuteLink(false); return ScFormatFilter::Get().ScImportQuattroPro(&rStream, &aDocument) == ERRCODE_NONE; } @@ -240,6 +241,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportCalcRTF(SvStream &rStrea aDocOpt.SetLookUpColRowNames(false); aDocument.SetDocOptions(aDocOpt); aDocument.MakeTable(0); + aDocument.EnableExecuteLink(false); ScRange aRange; return ScFormatFilter::Get().ScImportRTF(rStream, OUString(), &aDocument, aRange) == ERRCODE_NONE; } @@ -255,6 +257,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportXLS(SvStream& rStream) aDocOpt.SetLookUpColRowNames(false); aDocument.SetDocOptions(aDocOpt); aDocument.MakeTable(0); + aDocument.EnableExecuteLink(false); bool bRet(false); try { @@ -277,6 +280,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportWKS(SvStream& rStream) aDocOpt.SetLookUpColRowNames(false); aDocument.SetDocOptions(aDocOpt); aDocument.MakeTable(0); + aDocument.EnableExecuteLink(false); return ScFormatFilter::Get().ScImportLotus123(aMedium, &aDocument, RTL_TEXTENCODING_ASCII_US) == ERRCODE_NONE; } @@ -288,6 +292,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportDIF(SvStream &rStream) aDocOpt.SetLookUpColRowNames(false); aDocument.SetDocOptions(aDocOpt); aDocument.MakeTable(0); + aDocument.EnableExecuteLink(false); return ScFormatFilter::Get().ScImportDif(rStream, &aDocument, ScAddress(0, 0, 0), RTL_TEXTENCODING_IBM_850) == ERRCODE_NONE; } diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index f4e19318d23d..a5cea0179018 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -3249,6 +3249,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportSLK(SvStream &rStream) aDocOpt.SetLookUpColRowNames(false); aDocument.SetDocOptions(aDocOpt); aDocument.MakeTable(0); + aDocument.EnableExecuteLink(false); ScImportExport aImpEx(&aDocument); return aImpEx.ImportStream(rStream, OUString(), SotClipboardFormatId::SYLK); } diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index 0f28f6317312..e1fc3d5a95d2 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -2109,7 +2109,7 @@ bool ScExternalRefManager::isValidRangeName(sal_uInt16 nFileId, const OUString& // Range name is cached. return true; - pSrcDoc = utl::ConfigManager::IsFuzzing() ? nullptr : getSrcDocument(nFileId); + pSrcDoc = getSrcDocument(nFileId); if (!pSrcDoc) // failed to load document from disk. return false; |