[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sc/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Thu Feb 27 11:58:59 UTC 2020
sc/source/filter/oox/worksheetbuffer.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 866476dd6a901a9657fd3bb7eef561abeed5a79a
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Feb 27 10:11:39 2020 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Feb 27 12:58:28 2020 +0100
tdf#130959 crash when opening file with non-existing hyperlinks
regression from
commit 0ef5c47547bec6319b853326603f3b807407fe78
sc: rowcol: tdf#50916 convert core/tool
Change-Id: I8cb8fa4c6abf7450386a284a26be0a6d3ab9a623
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89617
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
(cherry picked from commit 8f90d3bf33fde7759046a13282381bbd710357f1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89578
Reviewed-by: Michael Stahl <michael.stahl at cib.de>
diff --git a/sc/source/filter/oox/worksheetbuffer.cxx b/sc/source/filter/oox/worksheetbuffer.cxx
index 59872603cb7f..12c2c618b9bb 100644
--- a/sc/source/filter/oox/worksheetbuffer.cxx
+++ b/sc/source/filter/oox/worksheetbuffer.cxx
@@ -125,7 +125,7 @@ void WorksheetBuffer::convertSheetNameRef( OUString& sSheetNameRef ) const
if (nSepPos < sSheetNameRef.getLength() - 1)
{
ScRange aRange;
- if ((aRange.ParseAny( sSheetNameRef.copy( nSepPos + 1 ), nullptr,
+ if ((aRange.ParseAny( sSheetNameRef.copy( nSepPos + 1 ), &getScDocument(),
formula::FormulaGrammar::CONV_XL_R1C1) & ScRefFlags::VALID) == ScRefFlags::ZERO)
sSheetNameRef = sSheetNameRef.replaceAt( nSepPos, 1, OUString( '.' ) );
}
More information about the Libreoffice-commits
mailing list