sc/Library_sc.mk | 1
sc/inc/document.hxx | 8 +-
sc/inc/documentlinkmgr.hxx | 6 -
sc/qa/unit/ucalc.cxx | 2
sc/source/core/data/conditio.cxx | 6 +
sc/source/core/data/documen2.cxx | 2
sc/source/core/data/documen8.cxx | 23 ++++++
sc/source/core/data/formulacell.cxx | 7 -
sc/source/core/inc/webservicelink.hxx | 49 +++++++++++++
sc/source/core/tool/interpr2.cxx | 8 +-
sc/source/core/tool/interpr7.cxx | 106 ++++++++++++++++++++++--------
sc/source/core/tool/rangenam.cxx | 8 +-
sc/source/core/tool/webservicelink.cxx | 106 ++++++++++++++++++++++++++++++
sc/source/filter/excel/excform.cxx | 1
sc/source/filter/excel/excform8.cxx | 1
sc/source/filter/excel/impop.cxx | 1
sc/source/filter/excel/xicontent.cxx | 6 +
sc/source/filter/excel/xiname.cxx | 3
sc/source/filter/oox/condformatbuffer.cxx | 2
sc/source/filter/oox/defnamesbuffer.cxx | 2
sc/source/filter/oox/formulabuffer.cxx | 4 +
sc/source/ui/docshell/docsh4.cxx | 4 -
sc/source/ui/docshell/documentlinkmgr.cxx | 20 ++++-
sc/source/ui/view/tabvwsh4.cxx | 2
24 files changed, 329 insertions(+), 49 deletions(-)
New commits:
commit 8705f7fc2312345ee03481a9b7662451493209b0
Author: Eike Rathke <er...@redhat.com>
Date: Mon Jan 29 18:19:33 2018 +0100
CheckLinkFormulaNeedingCheck() for named expressions
This is a combination of 3 commits.
CheckLinkFormulaNeedingCheck() for .ods named expressions
This is specifically necessary for named expressions that are used
in conditional format formulas, for which RPN is generated at a
later stage, not during import.
(cherry picked from commit eae9648e99be53ba441d9d8207aac6f3ce211ef2)
CheckLinkFormulaNeedingCheck() for .xls named expressions
(cherry picked from commit 8512f13c42ae3fbb287a555616fe10ff04295616)
CheckLinkFormulaNeedingCheck() for .xlsx named expressions
(cherry picked from commit a1f933ee2b9e23a505d937035821e9571cf4119c)
Conflicts:
sc/source/filter/oox/defnamesbuffer.cxx
e03cb5767c34f8157a492a6d6c3b0700d065052d
217c89822ab477a6c383d170ae739e44efd10fa3
Change-Id: I54ab8dc14f81d6b18b0d17f448187d19d8e396fc
Reviewed-on: https://gerrit.libreoffice.org/48858
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit 908854a7b281454332af434be9468ec45d420030)
diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx
index d7fba04de639..1932534300e1 100644
--- a/sc/source/core/tool/rangenam.cxx
+++ b/sc/source/core/tool/rangenam.cxx
@@ -64,9 +64,14 @@ ScRangeData::ScRangeData( ScDocument* pDok,
mnMaxCol (-1)
{
if (!rSymbol.isEmpty())
- CompileRangeData( rSymbol, pDoc->IsImportingXML());
+ {
// Let the compiler set an error on unknown names for a subsequent
// CompileUnresolvedXML().
+ const bool bImporting = pDoc->IsImportingXML();
+ CompileRangeData( rSymbol, bImporting);
+ if (bImporting)
+ pDoc->CheckLinkFormulaNeedingCheck( *pCode);
+ }
else
{
// #i63513#/#i65690# don't leave pCode as NULL.
@@ -197,6 +202,7 @@ void ScRangeData::CompileUnresolvedXML(
sc::CompileFormulaContext& rCxt )
// Don't let the compiler set an error for unknown names on final
// compile, errors are handled by the interpreter thereafter.
CompileRangeData( aSymbol, false);
+ rCxt.getDoc()->CheckLinkFormulaNeedingCheck( *pCode);
}
}
diff --git a/sc/source/filter/excel/xiname.cxx
b/sc/source/filter/excel/xiname.cxx
index 7189c2a0a2f2..efc181921091 100644
--- a/sc/source/filter/excel/xiname.cxx
+++ b/sc/source/filter/excel/xiname.cxx
@@ -265,7 +265,10 @@ void XclImpName::InsertName(const ScTokenArray* pArray)
}
}
if (pData)
+ {
+ GetDoc().CheckLinkFormulaNeedingCheck( *pData->GetCode());
mpScData = pData; // cache for later use
+ }
}
XclImpNameManager::XclImpNameManager( const XclImpRoot& rRoot ) :
diff --git a/sc/source/filter/oox/defnamesbuffer.cxx
b/sc/source/filter/oox/defnamesbuffer.cxx
index 79457ab57e5f..a1d10906c687 100644
--- a/sc/source/filter/oox/defnamesbuffer.cxx
+++ b/sc/source/filter/oox/defnamesbuffer.cxx
@@ -38,6 +38,7 @@
#include "tokenarray.hxx"
#include "tokenuno.hxx"
#include "compiler.hxx"
+#include "document.hxx"
namespace oox {
namespace xls {
@@ -334,6 +335,7 @@ std::unique_ptr<ScTokenArray> DefinedName::getScTokens(
// after, a resulting error must be reset.
FormulaError nErr = pArray->GetCodeError();
aCompiler.CompileTokenArray();
+ getScDocument().CheckLinkFormulaNeedingCheck( *pArray);
pArray->DelRPN();
pArray->SetCodeError(nErr);
commit 0c8264b7aae1fdb11c23767afb60efacd70f1ac9
Author: Eike Rathke <er...@redhat.com>
Date: Thu Jan 25 13:20:27 2018 +0100
CheckLinkFormulaNeedingCheck() for conditional format expressions
This is a combination of 4 commits.
Prepare CheckLinkFormulaNeedingCheck() to use either RPN or tokenized code
Conditional format formulas aren't finally compiled until needed
so the check will have to operate on the tokenized expression
instead of RPN code.
(cherry picked from commit faa0305ba3d0dc698fce4915d4f3a1fb52422380)
CheckLinkFormulaNeedingCheck() for .ods conditional format expressions
(cherry picked from commit 2930ba2ac5d9423f2848b968edcd8ddc71966186)
CheckLinkFormulaNeedingCheck() for .xlsx conditional format expressions
(cherry picked from commit fef24d9f999ee54d7936900485d97ff26656f517)
CheckLinkFormulaNeedingCheck() for .xls conditional format expressions
(cherry picked from commit af2a2a0c72db312902e466c36697b5c198041e82)
45eb1ab5efa0ec9da2663f20427d2474ce300826
31ede1a23223a798141a0891deeabd8cf88fff58
afa112cc591b411d80ead48bf726788d361f6eb3
Change-Id: I68837e9bd33f125ab47b10b1a6fa18175abd1627
Reviewed-on: https://gerrit.libreoffice.org/48719
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit dc44111ad5965bf4179fc654b677e1e445dea2f0)
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index c970520f3377..1fc8ee34b60b 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -522,6 +522,12 @@ void ScConditionEntry::CompileXML()
Compile( GetExpression(aSrcPos, 0, 0, eTempGrammar1),
GetExpression(aSrcPos, 1, 0, eTempGrammar2),
aStrNmsp1, aStrNmsp2, eTempGrammar1, eTempGrammar2, true );
+
+ // Importing ocDde/ocWebservice?
+ if (pFormula1)
+ mpDoc->CheckLinkFormulaNeedingCheck(*pFormula1);
+ if (pFormula2)
+ mpDoc->CheckLinkFormulaNeedingCheck(*pFormula2);
}
void ScConditionEntry::SetSrcString( const OUString& rNew )
diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx
index cb495856708f..a1aba4e6b226 100644
--- a/sc/source/core/data/documen8.cxx
+++ b/sc/source/core/data/documen8.cxx
@@ -1159,8 +1159,21 @@ void ScDocument::CheckLinkFormulaNeedingCheck( const
ScTokenArray& rCode )
if (HasLinkFormulaNeedingCheck())
return;
- if (rCode.HasOpCodeRPN(ocDde) || rCode.HasOpCodeRPN(ocWebservice))
- SetLinkFormulaNeedingCheck(true);
+ // Prefer RPN over tokenized formula if available.
+ if (rCode.GetCodeLen())
+ {
+ if (rCode.HasOpCodeRPN(ocDde) || rCode.HasOpCodeRPN(ocWebservice))
+ SetLinkFormulaNeedingCheck(true);
+ }
+ else if (rCode.GetLen())
+ {
+ if (rCode.HasOpCode(ocDde) || rCode.HasOpCode(ocWebservice))
+ SetLinkFormulaNeedingCheck(true);
+ }
+ else
+ {
+ assert(!"called with empty ScTokenArray");
+ }
}
// TimerDelays etc.
diff --git a/sc/source/filter/excel/xicontent.cxx
b/sc/source/filter/excel/xicontent.cxx
index e0724e228a18..c1226bcfaf21 100644
--- a/sc/source/filter/excel/xicontent.cxx
+++ b/sc/source/filter/excel/xicontent.cxx
@@ -662,7 +662,10 @@ void XclImpCondFormat::ReadCF( XclImpStream& rStrm )
rFmlaConv.Convert( pTokArr, rStrm, nFmlaSize1, false, FT_CondFormat );
// formula converter owns pTokArr -> create a copy of the token array
if( pTokArr )
+ {
xTokArr1.reset( pTokArr->Clone() );
+ GetDocRef().CheckLinkFormulaNeedingCheck( *xTokArr1);
+ }
}
::std::unique_ptr< ScTokenArray > pTokArr2;
@@ -673,7 +676,10 @@ void XclImpCondFormat::ReadCF( XclImpStream& rStrm )
rFmlaConv.Convert( pTokArr, rStrm, nFmlaSize2, false, FT_CondFormat );
// formula converter owns pTokArr -> create a copy of the token array
if( pTokArr )
+ {
pTokArr2.reset( pTokArr->Clone() );
+ GetDocRef().CheckLinkFormulaNeedingCheck( *pTokArr2);
+ }
}
// *** create the Calc conditional formatting ***
diff --git a/sc/source/filter/oox/condformatbuffer.cxx
b/sc/source/filter/oox/condformatbuffer.cxx
index 1d0dd13fd773..aa8fbbaa4d96 100644
--- a/sc/source/filter/oox/condformatbuffer.cxx
+++ b/sc/source/filter/oox/condformatbuffer.cxx
@@ -874,11 +874,13 @@ void CondFormatRule::finalizeImport()
{
pTokenArray2.reset(new ScTokenArray());
ScTokenConversion::ConvertToTokenArray( rDoc, *pTokenArray2.get(),
maModel.maFormulas[ 1 ] );
+ rDoc.CheckLinkFormulaNeedingCheck( *pTokenArray2.get());
}
ScTokenArray aTokenArray;
OUString aStyleName = getStyles().createDxfStyle( maModel.mnDxfId );
ScTokenConversion::ConvertToTokenArray( rDoc, aTokenArray,
maModel.maFormulas[ 0 ] );
+ rDoc.CheckLinkFormulaNeedingCheck( aTokenArray);
ScCondFormatEntry* pNewEntry = new ScCondFormatEntry(eOperator,
&aTokenArray, pTokenArray2.get(),
&rDoc, aPos, aStyleName);
mpFormat->AddEntry(pNewEntry);
commit 2d22ad299ef159c5cafcdd761d295786c942d99b
Author: Eike Rathke <er...@redhat.com>
Date: Wed Jan 17 22:22:55 2018 +0100
CheckLinkFormulaNeedingCheck() for .xls and .xlsx formula cells
This is a combination of 3 commits.
Move implementation to CheckLinkFormulaNeedingCheck() for further reuse
(cherry picked from commit 55e484c7bcd3ef218e08d3fd93f97bf98fd8cb7f)
CheckLinkFormulaNeedingCheck() for .xlsx cell formulas
(cherry picked from commit f96dbc3dd9c33202f75e29ef49d962386595995d)
CheckLinkFormulaNeedingCheck() for .xls cell formulas
(cherry picked from commit 6bc48275558c3f76c4da25eb8af3c48583ac5599)
a6dd195f7eb4d43483e87eeca59f651e7bf2dcb8
2587fbc4fec39b6f2c8e733331815a2953dee308
Change-Id: I541d2b6e12a88371c064b901b00e71206ee0c18e
Reviewed-on: https://gerrit.libreoffice.org/48143
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit 2bef4debcf7650f3b3922134dff0332d4a95da3f)
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 671528d8d43c..a40c07509d27 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1942,6 +1942,8 @@ public:
bool HasLinkFormulaNeedingCheck() const { return
bLinkFormulaNeedingCheck; }
void SetLinkFormulaNeedingCheck(bool bSet) {
bLinkFormulaNeedingCheck = bSet; }
+ /** Check token array and set link check if ocDde/ocWebservice is
contained. */
+ SC_DLLPUBLIC void CheckLinkFormulaNeedingCheck( const ScTokenArray& rCode
);
void SetRangeOverflowType(sal_uInt32 nType) {
nRangeOverflowType = nType; }
bool HasRangeOverflow() const { return
nRangeOverflowType != 0; }
diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx
index e2a339c528a7..cb495856708f 100644
--- a/sc/source/core/data/documen8.cxx
+++ b/sc/source/core/data/documen8.cxx
@@ -88,6 +88,7 @@
#include "stringutil.hxx"
#include <documentlinkmgr.hxx>
#include <scopetools.hxx>
+#include <tokenarray.hxx>
#include <memory>
@@ -1153,6 +1154,15 @@ void ScDocument::UpdateRefAreaLinks( UpdateRefMode
eUpdateRefMode,
}
}
+void ScDocument::CheckLinkFormulaNeedingCheck( const ScTokenArray& rCode )
+{
+ if (HasLinkFormulaNeedingCheck())
+ return;
+
+ if (rCode.HasOpCodeRPN(ocDde) || rCode.HasOpCodeRPN(ocWebservice))
+ SetLinkFormulaNeedingCheck(true);
+}
+
// TimerDelays etc.
void ScDocument::KeyInput( const KeyEvent& )
{
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index 97806852834f..6ded3611fa79 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -1381,8 +1381,7 @@ void ScFormulaCell::CompileXML(
sc::CompileFormulaContext& rCxt, ScProgress& rPr
// After loading, it must be known if ocDde/ocWebservice is in any formula
// (for external links warning, CompileXML is called at the end of
loading XML file)
- if (!pDocument->HasLinkFormulaNeedingCheck() &&
(pCode->HasOpCodeRPN(ocDde) || pCode->HasOpCodeRPN(ocWebservice)))
- pDocument->SetLinkFormulaNeedingCheck(true);
+ pDocument->CheckLinkFormulaNeedingCheck(*pCode);
//volatile cells must be added here for import
if( pCode->IsRecalcModeAlways() || pCode->IsRecalcModeForced() ||
diff --git a/sc/source/filter/excel/excform.cxx
b/sc/source/filter/excel/excform.cxx
index 67e7657f3428..889225c364bc 100644
--- a/sc/source/filter/excel/excform.cxx
+++ b/sc/source/filter/excel/excform.cxx
@@ -156,6 +156,7 @@ void ImportExcel::Formula(
{
pCell = new ScFormulaCell(&rDoc.getDoc(), aScPos, *pResult);
pCell->GetCode()->WrapReference(aScPos, EXC_MAXCOL8, EXC_MAXROW8);
+ rDoc.getDoc().CheckLinkFormulaNeedingCheck( *pCell->GetCode());
rDoc.getDoc().EnsureTable(aScPos.Tab());
rDoc.setFormulaCell(aScPos, pCell);
SetLastFormula(aScPos.Col(), aScPos.Row(), fCurVal, nXF, pCell);
diff --git a/sc/source/filter/excel/excform8.cxx
b/sc/source/filter/excel/excform8.cxx
index ef3d09ae1c8b..ff3387bf916b 100644
--- a/sc/source/filter/excel/excform8.cxx
+++ b/sc/source/filter/excel/excform8.cxx
@@ -730,6 +730,7 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*&
rpTokArray, XclImpStream& aIn,
<< nMerk0 << ocClose;
aPool >> aStack;
pExtName->CreateDdeData( GetDoc(), aApplic,
aTopic );
+ GetDoc().SetLinkFormulaNeedingCheck(true);
}
}
break;
diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx
index 01b5b736951e..a76a81db3ff8 100644
--- a/sc/source/filter/excel/impop.cxx
+++ b/sc/source/filter/excel/impop.cxx
@@ -866,6 +866,7 @@ void ImportExcel::Shrfmla()
ScFormulaCell* pCell = new ScFormulaCell(pD, aPos, *pErgebnis);
pCell->GetCode()->WrapReference(aPos, EXC_MAXCOL8, EXC_MAXROW8);
+ rDoc.getDoc().CheckLinkFormulaNeedingCheck( *pCell->GetCode());
rDoc.getDoc().EnsureTable(aPos.Tab());
rDoc.setFormulaCell(aPos, pCell);
pCell->SetNeedNumberFormat(false);
diff --git a/sc/source/filter/oox/formulabuffer.cxx
b/sc/source/filter/oox/formulabuffer.cxx
index 003d0b96769b..bfa229292775 100644
--- a/sc/source/filter/oox/formulabuffer.cxx
+++ b/sc/source/filter/oox/formulabuffer.cxx
@@ -223,6 +223,10 @@ void applyCellFormulas(
continue;
aCompiler.CompileTokenArray(); // Generate RPN tokens.
+
+ // Check if ocDde/ocWebservice is in any formula for external links
warning.
+ rDoc.getDoc().CheckLinkFormulaNeedingCheck(*pCode);
+
ScFormulaCell* pCell = new ScFormulaCell(&rDoc.getDoc(), aPos, pCode);
rDoc.setFormulaCell(aPos, pCell);
rCache.store(aPos, pCell);
commit 3deef9e834b990b4190b0748eb5f52bc3478387f
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Jan 11 20:43:28 2018 +0000
handle ocWebservice similarly to ocDde
might have too much in here seeing as we don't need to worry about
ocWebservice calling into itself
Reviewed-on: https://gerrit.libreoffice.org/47819
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Eike Rathke <er...@redhat.com>
(cherry picked from commit e1946d75a1095c2596d7815600454ff01fcd3270)
Signed-off-by: Andras Timar <andras.ti...@collabora.com>
(cherry picked from commit 78c1ae24007d8098ee4f4add6d72e84411181785)
Change-Id: I0145f38cc1c1f9ff514a496f7101d81cde9e7c67
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index a36b6a9fc37e..2eeab50eaa64 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -285,6 +285,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
sc/source/core/tool/unitconv \
sc/source/core/tool/userlist \
sc/source/core/tool/viewopti \
+ sc/source/core/tool/webservicelink \
sc/source/core/tool/zforauto \
sc/source/filter/xml/datastreamimport \
sc/source/filter/xml/XMLCalculationSettingsContext \
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 9a0b41a58785..671528d8d43c 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -449,7 +449,7 @@ private:
// for detective update, is set for each change of a formula
bool bDetectiveDirty;
- bool bLinkFormulaNeedingCheck; // valid only after loading,
for ocDde
+ bool bLinkFormulaNeedingCheck; // valid only after loading,
for ocDde and ocWebservice
sal_uInt8 nAsianCompression;
sal_uInt8 nAsianKerning;
diff --git a/sc/inc/documentlinkmgr.hxx b/sc/inc/documentlinkmgr.hxx
index d5d801a4aeb2..86dba66f2d3d 100644
--- a/sc/inc/documentlinkmgr.hxx
+++ b/sc/inc/documentlinkmgr.hxx
@@ -55,9 +55,9 @@ public:
bool idleCheckLinks();
bool hasDdeLinks() const;
- bool hasDdeOrOleLinks() const;
+ bool hasDdeOrOleOrWebServiceLinks() const;
- bool updateDdeOrOleLinks(vcl::Window* pWin);
+ bool updateDdeOrOleOrWebServiceLinks(vcl::Window* pWin);
void updateDdeLink( const OUString& rAppl, const OUString& rTopic, const
OUString& rItem );
@@ -65,7 +65,7 @@ public:
void disconnectDdeLinks();
private:
- bool hasDdeOrOleLinks(bool bDde, bool bOle) const;
+ bool hasDdeOrOleOrWebServiceLinks(bool bDde, bool bOle, bool bWebService)
const;
};
}
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index dc6cc3a0e5a6..97806852834f 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -1379,9 +1379,9 @@ void ScFormulaCell::CompileXML(
sc::CompileFormulaContext& rCxt, ScProgress& rPr
bChanged = true;
}
- // After loading, it must be known if ocDde is in any formula
+ // After loading, it must be known if ocDde/ocWebservice is in any formula
// (for external links warning, CompileXML is called at the end of
loading XML file)
- if (!pDocument->HasLinkFormulaNeedingCheck() && pCode->HasOpCodeRPN(ocDde))
+ if (!pDocument->HasLinkFormulaNeedingCheck() &&
(pCode->HasOpCodeRPN(ocDde) || pCode->HasOpCodeRPN(ocWebservice)))
pDocument->SetLinkFormulaNeedingCheck(true);
//volatile cells must be added here for import
diff --git a/sc/source/core/inc/webservicelink.hxx
b/sc/source/core/inc/webservicelink.hxx
new file mode 100644
index 000000000000..e61ebfdb4347
--- /dev/null
+++ b/sc/source/core/inc/webservicelink.hxx
@@ -0,0 +1,49 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_SC_SOURCE_CORE_INC_WEBSERVICE_HXX
+#define INCLUDED_SC_SOURCE_CORE_INC_WEBSERVICE_HXX
+
+#include <address.hxx>
+#include <sfx2/lnkbase.hxx>
+#include <svl/broadcast.hxx>
+#include <types.hxx>
+
+class ScDocument;
+
+class ScWebServiceLink : public ::sfx2::SvBaseLink, public SvtBroadcaster
+{
+private:
+ ScDocument* pDoc;
+ OUString aURL; // connection/ link data
+ bool bHasResult; // is set aResult is useful
+ OUString aResult;
+
+public:
+ ScWebServiceLink(ScDocument* pD, const OUString& rURL);
+ virtual ~ScWebServiceLink() override;
+
+ // SvBaseLink override:
+ virtual ::sfx2::SvBaseLink::UpdateResult DataChanged(const OUString&
rMimeType,
+ const css::uno::Any&
rValue) override;
+
+ // SvtBroadcaster override:
+ virtual void ListenersGone() override;
+
+ // for interpreter:
+
+ const OUString& GetResult() const { return aResult; }
+ bool HasResult() const { return bHasResult; }
+
+ const OUString& GetURL() const { return aURL; }
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/sc/source/core/tool/interpr7.cxx b/sc/source/core/tool/interpr7.cxx
index 138125b3c88d..f08ded15634f 100644
--- a/sc/source/core/tool/interpr7.cxx
+++ b/sc/source/core/tool/interpr7.cxx
@@ -13,6 +13,7 @@
#include "scmatrix.hxx"
#include <rtl/strbuf.hxx>
#include <formula/errorcodes.hxx>
+#include <sfx2/bindings.hxx>
#include <svtools/miscopt.hxx>
#include <tools/urlobj.hxx>
@@ -24,6 +25,10 @@
#include <datastreamgettime.hxx>
#include <dpobject.hxx>
#include <document.hxx>
+#include <tokenarray.hxx>
+#include <webservicelink.hxx>
+
+#include <sc.hrc>
#include <cstring>
#include <memory>
@@ -235,6 +240,22 @@ void ScInterpreter::ScFilterXML()
}
}
+static ScWebServiceLink* lcl_GetWebServiceLink(const sfx2::LinkManager*
pLinkMgr, const OUString& rURL)
+{
+ size_t nCount = pLinkMgr->GetLinks().size();
+ for (size_t i=0; i<nCount; ++i)
+ {
+ ::sfx2::SvBaseLink* pBase = pLinkMgr->GetLinks()[i].get();
+ if (ScWebServiceLink* pLink = dynamic_cast<ScWebServiceLink*>(pBase))
+ {
+ if (pLink->GetURL() == rURL)
+ return pLink;
+ }
+ }
+
+ return nullptr;
+}
+
void ScInterpreter::ScWebservice()
{
sal_uInt8 nParamCount = GetByte();
@@ -242,7 +263,7 @@ void ScInterpreter::ScWebservice()
{
OUString aURI = GetString().getString();
- if(aURI.isEmpty())
+ if (aURI.isEmpty())
{
PushError( FormulaError::NoValue );
return;
@@ -252,52 +273,72 @@ void ScInterpreter::ScWebservice()
INetProtocol eProtocol = aObj.GetProtocol();
if (eProtocol != INetProtocol::Http && eProtocol !=
INetProtocol::Https)
{
- PushError( FormulaError::NoValue );
+ PushError(FormulaError::NoValue);
return;
}
- uno::Reference< ucb::XSimpleFileAccess3 > xFileAccess(
ucb::SimpleFileAccess::create( comphelper::getProcessComponentContext() ),
uno::UNO_QUERY );
- if(!xFileAccess.is())
+ if (!mpLinkManager)
{
- PushError( FormulaError::NoValue );
+ PushError(FormulaError::NoValue);
return;
}
- uno::Reference< io::XInputStream > xStream;
- try {
- xStream = xFileAccess->openFileRead( aURI );
- }
- catch (...)
- {
- // don't let any exceptions pass
- PushError( FormulaError::NoValue );
- return;
- }
- if ( !xStream.is() )
- {
- PushError( FormulaError::NoValue );
- return;
- }
+ // Need to reinterpret after loading (build links)
+ if (rArr.IsRecalcModeNormal())
+ rArr.SetExclusiveRecalcModeOnLoad();
- const sal_Int32 BUF_LEN = 8000;
- uno::Sequence< sal_Int8 > buffer( BUF_LEN );
- OStringBuffer aBuffer( 64000 );
+ // while the link is not evaluated, idle must be disabled (to avoid
circular references)
+ bool bOldEnabled = pDok->IsIdleEnabled();
+ pDok->EnableIdle(false);
- sal_Int32 nRead = 0;
- while ( ( nRead = xStream->readBytes( buffer, BUF_LEN ) ) == BUF_LEN )
+ // Get/ Create link object
+ ScWebServiceLink* pLink = lcl_GetWebServiceLink(mpLinkManager, aURI);
+
+ bool bWasError = (pMyFormulaCell && pMyFormulaCell->GetRawError() !=
FormulaError::NONE);
+
+ if (!pLink)
{
- aBuffer.append( reinterpret_cast< const char* >(
buffer.getConstArray() ), nRead );
- }
+ pLink = new ScWebServiceLink(pDok, aURI);
+ mpLinkManager->InsertFileLink(*pLink, OBJECT_CLIENT_FILE, aURI);
+ if ( mpLinkManager->GetLinks().size() == 1 ) //
the first one?
+ {
+ SfxBindings* pBindings = pDok->GetViewBindings();
+ if (pBindings)
+ pBindings->Invalidate( SID_LINKS ); //
Link-Manager enabled
+ }
+
+ //if the document was just loaded, but the ScDdeLink entry was
missing, then
+ //don't update this link until the links are updated in response
to the users
+ //decision
+ if (!pDok->HasLinkFormulaNeedingCheck())
+ {
+ pLink->Update();
+ }
- if ( nRead > 0 )
+ if (pMyFormulaCell)
+ {
+ // StartListening after the Update to avoid circular references
+ pMyFormulaCell->StartListening(*pLink);
+ }
+ }
+ else
{
- aBuffer.append( reinterpret_cast< const char* >(
buffer.getConstArray() ), nRead );
+ if (pMyFormulaCell)
+ pMyFormulaCell->StartListening(*pLink);
}
- xStream->closeInput();
+ // If an new Error from Reschedule appears when the link is executed
then reset the errorflag
+ if (pMyFormulaCell && pMyFormulaCell->GetRawError() !=
FormulaError::NONE && !bWasError)
+ pMyFormulaCell->SetErrCode(FormulaError::NONE);
+
+ // check the value
+ if (pLink->HasResult())
+ PushString(pLink->GetResult());
+ else
+ PushError(FormulaError::NoValue);
- OUString aContent = OStringToOUString( aBuffer.makeStringAndClear(),
RTL_TEXTENCODING_UTF8 );
- PushString( aContent );
+ pDok->EnableIdle(bOldEnabled);
+ mpLinkManager->CloseCachedComps();
}
}
diff --git a/sc/source/core/tool/webservicelink.cxx
b/sc/source/core/tool/webservicelink.cxx
new file mode 100644
index 000000000000..0d9e32cdef60
--- /dev/null
+++ b/sc/source/core/tool/webservicelink.cxx
@@ -0,0 +1,106 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include <comphelper/fileformat.h>
+#include <comphelper/string.hxx>
+#include <osl/thread.h>
+#include <sfx2/linkmgr.hxx>
+#include <sfx2/bindings.hxx>
+
+#include <com/sun/star/ucb/XSimpleFileAccess3.hpp>
+#include <com/sun/star/ucb/SimpleFileAccess.hpp>
+#include <com/sun/star/io/XInputStream.hpp>
+
+#include <webservicelink.hxx>
+#include <brdcst.hxx>
+#include <document.hxx>
+#include <scmatrix.hxx>
+#include <patattr.hxx>
+#include <rechead.hxx>
+#include <rangeseq.hxx>
+#include <sc.hrc>
+#include <hints.hxx>
+
+ScWebServiceLink::ScWebServiceLink(ScDocument* pD, const OUString& rURL)
+ : ::sfx2::SvBaseLink(SfxLinkUpdateMode::ALWAYS,
SotClipboardFormatId::STRING)
+ , pDoc(pD)
+ , aURL(rURL)
+ , bHasResult(false)
+{
+}
+
+ScWebServiceLink::~ScWebServiceLink() {}
+
+sfx2::SvBaseLink::UpdateResult ScWebServiceLink::DataChanged(const OUString&,
const css::uno::Any&)
+{
+ aResult.clear();
+ bHasResult = false;
+
+ css::uno::Reference<css::ucb::XSimpleFileAccess3> xFileAccess(
+
css::ucb::SimpleFileAccess::create(comphelper::getProcessComponentContext()),
+ css::uno::UNO_QUERY);
+ if (!xFileAccess.is())
+ return ERROR_GENERAL;
+
+ css::uno::Reference<css::io::XInputStream> xStream;
+ try
+ {
+ xStream = xFileAccess->openFileRead(aURL);
+ }
+ catch (...)
+ {
+ // don't let any exceptions pass
+ return ERROR_GENERAL;
+ }
+ if (!xStream.is())
+ return ERROR_GENERAL;
+
+ const sal_Int32 BUF_LEN = 8000;
+ css::uno::Sequence<sal_Int8> buffer(BUF_LEN);
+ OStringBuffer aBuffer(64000);
+
+ sal_Int32 nRead = 0;
+ while ((nRead = xStream->readBytes(buffer, BUF_LEN)) == BUF_LEN)
+ aBuffer.append(reinterpret_cast<const char*>(buffer.getConstArray()),
nRead);
+
+ if (nRead > 0)
+ aBuffer.append(reinterpret_cast<const char*>(buffer.getConstArray()),
nRead);
+
+ xStream->closeInput();
+
+ aResult = OStringToOUString(aBuffer.makeStringAndClear(),
RTL_TEXTENCODING_UTF8);
+ bHasResult = true;
+
+ // Something happened...
+ if (HasListeners())
+ {
+ Broadcast(ScHint(SFX_HINT_DATACHANGED, ScAddress()));
+ pDoc->TrackFormulas(); // must happen immediately
+ pDoc->StartTrackTimer();
+ }
+
+ return SUCCESS;
+}
+
+void ScWebServiceLink::ListenersGone()
+{
+ ScDocument* pStackDoc = pDoc; // member pDoc can't be used after removing
the link
+
+ sfx2::LinkManager* pLinkMgr = pDoc->GetLinkManager();
+ pLinkMgr->Remove(this); // deletes this
+
+ if (pLinkMgr->GetLinks().empty()) // deleted the last one ?
+ {
+ SfxBindings* pBindings = pStackDoc->GetViewBindings(); // don't use
member pDoc!
+ if (pBindings)
+ pBindings->Invalidate(SID_LINKS);
+ }
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 8625664efe35..8a8730773981 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -454,7 +454,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
ReloadTabLinks();
aDocument.UpdateExternalRefLinks(GetActiveDialogParent());
- bool bAnyDde =
aDocument.GetDocLinkManager().updateDdeOrOleLinks(GetActiveDialogParent());
+ bool bAnyDde =
aDocument.GetDocLinkManager().updateDdeOrOleOrWebServiceLinks(GetActiveDialogParent());
if (bAnyDde)
{
diff --git a/sc/source/ui/docshell/documentlinkmgr.cxx
b/sc/source/ui/docshell/documentlinkmgr.cxx
index 520b8542afc0..b8a9df65cb6b 100644
--- a/sc/source/ui/docshell/documentlinkmgr.cxx
+++ b/sc/source/ui/docshell/documentlinkmgr.cxx
@@ -20,6 +20,7 @@
#include <documentlinkmgr.hxx>
#include <datastream.hxx>
#include <ddelink.hxx>
+#include <webservicelink.hxx>
#include <sc.hrc>
#include <scresid.hxx>
@@ -115,15 +116,15 @@ bool DocumentLinkManager::idleCheckLinks()
bool DocumentLinkManager::hasDdeLinks() const
{
- return hasDdeOrOleLinks(true, false);
+ return hasDdeOrOleOrWebServiceLinks(true, false, false);
}
-bool DocumentLinkManager::hasDdeOrOleLinks() const
+bool DocumentLinkManager::hasDdeOrOleOrWebServiceLinks() const
{
- return hasDdeOrOleLinks(true, true);
+ return hasDdeOrOleOrWebServiceLinks(true, true, true);
}
-bool DocumentLinkManager::hasDdeOrOleLinks(bool bDde, bool bOle) const
+bool DocumentLinkManager::hasDdeOrOleOrWebServiceLinks(bool bDde, bool bOle,
bool bWebService) const
{
if (!mpImpl->mpLinkManager)
return false;
@@ -136,12 +137,14 @@ bool DocumentLinkManager::hasDdeOrOleLinks(bool bDde,
bool bOle) const
return true;
if (bOle && dynamic_cast<SdrEmbedObjectLink*>(pBase))
return true;
+ if (bWebService && dynamic_cast<ScWebServiceLink*>(pBase))
+ return true;
}
return false;
}
-bool DocumentLinkManager::updateDdeOrOleLinks( vcl::Window* pWin )
+bool DocumentLinkManager::updateDdeOrOleOrWebServiceLinks(vcl::Window* pWin)
{
if (!mpImpl->mpLinkManager)
return false;
@@ -163,6 +166,13 @@ bool DocumentLinkManager::updateDdeOrOleLinks(
vcl::Window* pWin )
continue;
}
+ ScWebServiceLink* pWebserviceLink =
dynamic_cast<ScWebServiceLink*>(pBase);
+ if (pWebserviceLink)
+ {
+ pWebserviceLink->Update();
+ continue;
+ }
+
ScDdeLink* pDdeLink = dynamic_cast<ScDdeLink*>(pBase);
if (!pDdeLink)
continue;
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index 306f7927d4e1..0103a8541d58 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -1576,7 +1576,7 @@ void ScTabViewShell::Construct( TriState nForceDesignMode
)
if (!bLink)
{
const sc::DocumentLinkManager& rMgr = rDoc.GetDocLinkManager();
- if (rMgr.hasDdeOrOleLinks() || rDoc.HasAreaLinks() ||
rDoc.HasLinkFormulaNeedingCheck())
+ if (rDoc.HasLinkFormulaNeedingCheck() || rDoc.HasAreaLinks()
|| rMgr.hasDdeOrOleOrWebServiceLinks())
bLink = true;
}
if (bLink)
commit a9ece5416905a23b22a35e832a4df2f02ac49038
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Jan 11 14:16:15 2018 +0000
Better handle ScDde formulas with missing dde-link entries
typically each ScDde formula has a matching table:dde-link which
results in a ScDdeLink getting inserted during the load. If that dde-link
is missing then no ScDdeLink exists and ScDde() will create a new one
without
cached content. So detect that ScDde is used in the freshing loaded ods
and defer fetching new content until the right time.
only call GetHasMacroFunc to set SetHasMacroFunc
and bHasMacroFunc is not accessed any other way, so this is an oxbow
Reviewed-on: https://gerrit.libreoffice.org/47757
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit b0597ba5d745974fce752e1b677451a19350d351)
Reviewed-on: https://gerrit.libreoffice.org/47818
Reviewed-by: Eike Rathke <er...@redhat.com>
(cherry picked from commit 4ede45eb239b1604bca900c22481b7d13e4c2790)
Signed-off-by: Andras Timar <andras.ti...@collabora.com>
Change-Id: I016b53288076d83dd49e92e245346a5f7f560522
(cherry picked from commit 3139914eb6379837fbf309642a63371128042db1)
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 911e441a0d14..9a0b41a58785 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -449,7 +449,7 @@ private:
// for detective update, is set for each change of a formula
bool bDetectiveDirty;
- bool bHasMacroFunc; // valid only after loading
+ bool bLinkFormulaNeedingCheck; // valid only after loading,
for ocDde
sal_uInt8 nAsianCompression;
sal_uInt8 nAsianKerning;
@@ -1940,8 +1940,8 @@ public:
bool IsDetectiveDirty() const { return bDetectiveDirty; }
void SetDetectiveDirty(bool bSet) { bDetectiveDirty = bSet; }
- bool GetHasMacroFunc() const { return bHasMacroFunc; }
- void SetHasMacroFunc(bool bSet) { bHasMacroFunc = bSet; }
+ bool HasLinkFormulaNeedingCheck() const { return
bLinkFormulaNeedingCheck; }
+ void SetLinkFormulaNeedingCheck(bool bSet) {
bLinkFormulaNeedingCheck = bSet; }
void SetRangeOverflowType(sal_uInt32 nType) {
nRangeOverflowType = nType; }
bool HasRangeOverflow() const { return
nRangeOverflowType != 0; }
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 9e0f9496b9d4..174e738f2924 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -6264,7 +6264,7 @@ void Test::testEmptyCalcDocDefaults()
CPPUNIT_ASSERT_EQUAL( false, m_pDoc->IdleCalcTextWidth() );
CPPUNIT_ASSERT_EQUAL( true, m_pDoc->IsIdleEnabled() );
CPPUNIT_ASSERT_EQUAL( false, m_pDoc->IsDetectiveDirty() );
- CPPUNIT_ASSERT_EQUAL( false, m_pDoc->GetHasMacroFunc() );
+ CPPUNIT_ASSERT_EQUAL( false, m_pDoc->HasLinkFormulaNeedingCheck() );
CPPUNIT_ASSERT_EQUAL( false,
m_pDoc->IsChartListenerCollectionNeedsUpdate() );
CPPUNIT_ASSERT_EQUAL( false, m_pDoc->HasRangeOverflow() );
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index ef319256e858..c6016cc15320 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -200,7 +200,7 @@ ScDocument::ScDocument( ScDocumentMode eMode,
SfxObjectShell* pDocShell ) :
bInDtorClear( false ),
bExpandRefs( false ),
bDetectiveDirty( false ),
- bHasMacroFunc( false ),
+ bLinkFormulaNeedingCheck( false ),
nAsianCompression(SC_ASIANCOMPRESSION_INVALID),
nAsianKerning(SC_ASIANKERNING_INVALID),
bPastingDrawFromOtherDoc( false ),
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index 4c6471f781a0..dc6cc3a0e5a6 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -1379,10 +1379,10 @@ void ScFormulaCell::CompileXML(
sc::CompileFormulaContext& rCxt, ScProgress& rPr
bChanged = true;
}
- // Same as in Load: after loading, it must be known if ocMacro is in any
formula
- // (for macro warning, CompileXML is called at the end of loading XML
file)
- if ( !pDocument->GetHasMacroFunc() && pCode->HasOpCodeRPN( ocMacro ) )
- pDocument->SetHasMacroFunc( true );
+ // After loading, it must be known if ocDde is in any formula
+ // (for external links warning, CompileXML is called at the end of
loading XML file)
+ if (!pDocument->HasLinkFormulaNeedingCheck() && pCode->HasOpCodeRPN(ocDde))
+ pDocument->SetLinkFormulaNeedingCheck(true);
//volatile cells must be added here for import
if( pCode->IsRecalcModeAlways() || pCode->IsRecalcModeForced() ||
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index c40623320b3d..7f215495538b 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -2742,8 +2742,14 @@ void ScInterpreter::ScDde()
pBindings->Invalidate( SID_LINKS ); //
Link-Manager enablen
}
+ //if the document was just loaded, but the ScDdeLink entry was
missing, then
+ //don't update this link until the links are updated in response
to the users
+ //decision
+ if (!pDok->HasLinkFormulaNeedingCheck())
+ {
//TODO: evaluate asynchron ???
- pLink->TryUpdate(); // TryUpdate doesn't call Update multiple
times
+ pLink->TryUpdate(); // TryUpdate doesn't call Update multiple
times
+ }
if (pMyFormulaCell)
{
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 20f962546326..8625664efe35 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -476,6 +476,8 @@ void ScDocShell::Execute( SfxRequest& rReq )
rEmbeddedObjectContainer.setUserAllowsLinkUpdate(false);
rReq.Ignore();
}
+
+ rDoc.SetLinkFormulaNeedingCheck(false);
}
break;
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index 9889bea2b52f..306f7927d4e1 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -1576,7 +1576,7 @@ void ScTabViewShell::Construct( TriState nForceDesignMode
)
if (!bLink)
{
const sc::DocumentLinkManager& rMgr = rDoc.GetDocLinkManager();
- if (rMgr.hasDdeOrOleLinks() || rDoc.HasAreaLinks())
+ if (rMgr.hasDdeOrOleLinks() || rDoc.HasAreaLinks() ||
rDoc.HasLinkFormulaNeedingCheck())
bLink = true;
}
if (bLink)
commit bc0399cd5f083cc208f21020561f6516f2cdd776
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Jan 10 14:27:35 2018 +0000
limit WEBSERVICE to http[s] protocols
and like excel...
'For protocols that aren’t supported, such as ftp:// or file://, WEBSERVICE
returns the #VALUE! error value.'
Change-Id: I0e9c6fd3426fad56a199eafac48de9b0f23914b3
(cherry picked from commit c6c3ed3c750a3c71cb57909c60773fde2c43cd2a)
diff --git a/sc/source/core/tool/interpr7.cxx b/sc/source/core/tool/interpr7.cxx
index b226717c2935..138125b3c88d 100644
--- a/sc/source/core/tool/interpr7.cxx
+++ b/sc/source/core/tool/interpr7.cxx
@@ -14,6 +14,7 @@
#include <rtl/strbuf.hxx>
#include <formula/errorcodes.hxx>
#include <svtools/miscopt.hxx>
+#include <tools/urlobj.hxx>
#include <com/sun/star/ucb/XSimpleFileAccess3.hpp>
#include <com/sun/star/ucb/SimpleFileAccess.hpp>
@@ -247,6 +248,14 @@ void ScInterpreter::ScWebservice()
return;
}
+ INetURLObject aObj(aURI, INetProtocol::File);
+ INetProtocol eProtocol = aObj.GetProtocol();
+ if (eProtocol != INetProtocol::Http && eProtocol !=
INetProtocol::Https)
+ {
+ PushError( FormulaError::NoValue );
+ return;
+ }
+
uno::Reference< ucb::XSimpleFileAccess3 > xFileAccess(
ucb::SimpleFileAccess::create( comphelper::getProcessComponentContext() ),
uno::UNO_QUERY );
if(!xFileAccess.is())
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
