sc/source/core/tool/compiler.cxx | 6 ++++++ svx/source/svdraw/svdograf.cxx | 4 ++++ 2 files changed, 10 insertions(+)
New commits: commit ca3991825da49827ba81b2cfb667624e3761ed6c Author: Eike Rathke <[email protected]> AuthorDate: Tue Apr 6 20:58:25 2021 +0200 Commit: Andras Timar <[email protected]> CommitDate: Wed Apr 7 14:13:21 2021 +0200 Resolves: tdf#128334 Reset mnCurrentSheetEndPos, mnCurrentSheetTab in all cases Encountered for a single decimal separator not being a value either, but could be for any condition within IsReference() returning false up to the IsSingleReference() call. Change-Id: I6222adf2a2d06904001175da8798b2ba9fdef99c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113697 Reviewed-by: Eike Rathke <[email protected]> Tested-by: Jenkins (cherry picked from commit 4d4fd4cc57a37a5f24178cf8bac63d979f4323da) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113647 Reviewed-by: Caolán McNamara <[email protected]> diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index 85ceb6a0d8f3..7dd0ca5374a7 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -3333,6 +3333,12 @@ bool ScCompiler::IsSingleReference( const OUString& rName, const OUString* pErrR bool ScCompiler::IsReference( const OUString& rName, const OUString* pErrRef ) { // Has to be called before IsValue + + // A later IsNamedRange() relies on these, being set in IsSingleReference() + // if so, reset in all cases. + mnCurrentSheetEndPos = 0; + mnCurrentSheetTab = -1; + sal_Unicode ch1 = rName[0]; sal_Unicode cDecSep = ( mxSymbols->isEnglish() ? '.' : ScGlobal::getLocaleDataPtr()->getNumDecimalSep()[0] ); if ( ch1 == cDecSep ) commit 2bb27d0a5bac0fc3b3ede46688a0b04fb41ca246 Author: Arnaud Versini <[email protected]> AuthorDate: Mon Apr 5 12:33:11 2021 +0200 Commit: Andras Timar <[email protected]> CommitDate: Wed Apr 7 14:13:14 2021 +0200 tdf#141297 : remove link to the file Change-Id: I5c14f46f5fbd51d95eeb58ea0a6d3aa39afef3cf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113597 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <[email protected]> (cherry picked from commit 7289b9a90f5f8349875856c552330d512004925e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113642 Reviewed-by: Xisco Fauli <[email protected]> diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index f175f9c33181..6bf317f29c02 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -498,6 +498,10 @@ void SdrGrafObj::ReleaseGraphicLink() ImpDeregisterLink(); aFileName.clear(); aFilterName.clear(); + + auto aGraphic = mpGraphicObject->GetGraphic(); + aGraphic.setOriginURL(""); + SetGraphic(aGraphic); } bool SdrGrafObj::IsLinkedGraphic() const _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
