Kaydet (Commit) d945bc45 authored tarafından Caolán McNamara's avatar Caolán McNamara

ofz#4122 use EnableExecuteLink instead

Change-Id: Id680df2145ac691a30f93cea4e565a2467b45dc6
Reviewed-on: https://gerrit.libreoffice.org/44640Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst d092dd1b
...@@ -229,6 +229,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportQPW(SvStream &rStream) ...@@ -229,6 +229,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportQPW(SvStream &rStream)
aDocOpt.SetLookUpColRowNames(false); aDocOpt.SetLookUpColRowNames(false);
aDocument.SetDocOptions(aDocOpt); aDocument.SetDocOptions(aDocOpt);
aDocument.MakeTable(0); aDocument.MakeTable(0);
aDocument.EnableExecuteLink(false);
return ScFormatFilter::Get().ScImportQuattroPro(&rStream, &aDocument) == ERRCODE_NONE; return ScFormatFilter::Get().ScImportQuattroPro(&rStream, &aDocument) == ERRCODE_NONE;
} }
...@@ -240,6 +241,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportCalcRTF(SvStream &rStrea ...@@ -240,6 +241,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportCalcRTF(SvStream &rStrea
aDocOpt.SetLookUpColRowNames(false); aDocOpt.SetLookUpColRowNames(false);
aDocument.SetDocOptions(aDocOpt); aDocument.SetDocOptions(aDocOpt);
aDocument.MakeTable(0); aDocument.MakeTable(0);
aDocument.EnableExecuteLink(false);
ScRange aRange; ScRange aRange;
return ScFormatFilter::Get().ScImportRTF(rStream, OUString(), &aDocument, aRange) == ERRCODE_NONE; 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) ...@@ -255,6 +257,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportXLS(SvStream& rStream)
aDocOpt.SetLookUpColRowNames(false); aDocOpt.SetLookUpColRowNames(false);
aDocument.SetDocOptions(aDocOpt); aDocument.SetDocOptions(aDocOpt);
aDocument.MakeTable(0); aDocument.MakeTable(0);
aDocument.EnableExecuteLink(false);
bool bRet(false); bool bRet(false);
try try
{ {
...@@ -277,6 +280,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportWKS(SvStream& rStream) ...@@ -277,6 +280,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportWKS(SvStream& rStream)
aDocOpt.SetLookUpColRowNames(false); aDocOpt.SetLookUpColRowNames(false);
aDocument.SetDocOptions(aDocOpt); aDocument.SetDocOptions(aDocOpt);
aDocument.MakeTable(0); aDocument.MakeTable(0);
aDocument.EnableExecuteLink(false);
return ScFormatFilter::Get().ScImportLotus123(aMedium, &aDocument, RTL_TEXTENCODING_ASCII_US) == ERRCODE_NONE; 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) ...@@ -288,6 +292,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportDIF(SvStream &rStream)
aDocOpt.SetLookUpColRowNames(false); aDocOpt.SetLookUpColRowNames(false);
aDocument.SetDocOptions(aDocOpt); aDocument.SetDocOptions(aDocOpt);
aDocument.MakeTable(0); aDocument.MakeTable(0);
aDocument.EnableExecuteLink(false);
return ScFormatFilter::Get().ScImportDif(rStream, &aDocument, ScAddress(0, 0, 0), RTL_TEXTENCODING_IBM_850) == ERRCODE_NONE; return ScFormatFilter::Get().ScImportDif(rStream, &aDocument, ScAddress(0, 0, 0), RTL_TEXTENCODING_IBM_850) == ERRCODE_NONE;
} }
......
...@@ -3249,6 +3249,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportSLK(SvStream &rStream) ...@@ -3249,6 +3249,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportSLK(SvStream &rStream)
aDocOpt.SetLookUpColRowNames(false); aDocOpt.SetLookUpColRowNames(false);
aDocument.SetDocOptions(aDocOpt); aDocument.SetDocOptions(aDocOpt);
aDocument.MakeTable(0); aDocument.MakeTable(0);
aDocument.EnableExecuteLink(false);
ScImportExport aImpEx(&aDocument); ScImportExport aImpEx(&aDocument);
return aImpEx.ImportStream(rStream, OUString(), SotClipboardFormatId::SYLK); return aImpEx.ImportStream(rStream, OUString(), SotClipboardFormatId::SYLK);
} }
......
...@@ -2109,7 +2109,7 @@ bool ScExternalRefManager::isValidRangeName(sal_uInt16 nFileId, const OUString& ...@@ -2109,7 +2109,7 @@ bool ScExternalRefManager::isValidRangeName(sal_uInt16 nFileId, const OUString&
// Range name is cached. // Range name is cached.
return true; return true;
pSrcDoc = utl::ConfigManager::IsFuzzing() ? nullptr : getSrcDocument(nFileId); pSrcDoc = getSrcDocument(nFileId);
if (!pSrcDoc) if (!pSrcDoc)
// failed to load document from disk. // failed to load document from disk.
return false; return false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment