diff options
author | Caolán McNamara <caolanm@redhat.com> | 2020-09-12 14:23:16 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2020-09-13 15:14:43 +0200 |
commit | 6cf2d7e9b5ea749fe4770a4cf7d12d86a4791978 (patch) | |
tree | 39f39c3d64fba9a79b3cb4b32f3bbded13b46b9a /sc/source/core/tool/interpr8.cxx | |
parent | 85f12e47f4a086a3923dd3a6b097776d60c6dc82 (diff) |
establish ScInterpreter::pDok is never null
Change-Id: I493eedebcb35fbbf4917ea77f812be43989db6ef
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102523
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc/source/core/tool/interpr8.cxx')
-rw-r--r-- | sc/source/core/tool/interpr8.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sc/source/core/tool/interpr8.cxx b/sc/source/core/tool/interpr8.cxx index c8645083c2ef..19cdd7eac3cb 100644 --- a/sc/source/core/tool/interpr8.cxx +++ b/sc/source/core/tool/interpr8.cxx @@ -1404,7 +1404,7 @@ void ScInterpreter::ScConcat_MS() PopSingleRef( aAdr ); if ( nGlobalError != FormulaError::NONE ) break; - ScRefCellValue aCell( *pDok, aAdr ); + ScRefCellValue aCell( mrDoc, aAdr ); if ( !aCell.isEmpty() ) { if ( !aCell.hasEmptyValue() ) @@ -1447,7 +1447,7 @@ void ScInterpreter::ScConcat_MS() { aAdr.SetRow( nRow ); aAdr.SetCol( nCol ); - ScRefCellValue aCell( *pDok, aAdr ); + ScRefCellValue aCell( mrDoc, aAdr ); if ( !aCell.isEmpty() ) { if ( !aCell.hasEmptyValue() ) @@ -1535,7 +1535,7 @@ void ScInterpreter::ScTextJoin_MS() PopSingleRef( aAdr ); if ( nGlobalError != FormulaError::NONE ) break; - ScRefCellValue aCell( *pDok, aAdr ); + ScRefCellValue aCell( mrDoc, aAdr ); if ( !aCell.isEmpty() ) { if ( !aCell.hasEmptyValue() ) @@ -1576,7 +1576,7 @@ void ScInterpreter::ScTextJoin_MS() { aAdr.SetRow( nRow ); aAdr.SetCol( nCol ); - ScRefCellValue aCell( *pDok, aAdr ); + ScRefCellValue aCell( mrDoc, aAdr ); if ( !aCell.isEmpty() ) { if ( !aCell.hasEmptyValue() ) @@ -1678,7 +1678,7 @@ void ScInterpreter::ScTextJoin_MS() PopSingleRef( aAdr ); if ( nGlobalError != FormulaError::NONE ) break; - ScRefCellValue aCell( *pDok, aAdr ); + ScRefCellValue aCell( mrDoc, aAdr ); OUString aStr; if ( !aCell.isEmpty() ) { @@ -1739,7 +1739,7 @@ void ScInterpreter::ScTextJoin_MS() { aAdr.SetRow( nRow ); aAdr.SetCol( nCol ); - ScRefCellValue aCell( *pDok, aAdr ); + ScRefCellValue aCell( mrDoc, aAdr ); if ( !aCell.isEmpty() ) { if ( !aCell.hasEmptyValue() ) @@ -1947,7 +1947,7 @@ void ScInterpreter::ScSwitch_MS() ScAddress aAdr; if (!PopDoubleRefOrSingleRef( aAdr )) break; - ScRefCellValue aCell( *pDok, aAdr ); + ScRefCellValue aCell( mrDoc, aAdr ); isValue = !( aCell.hasString() || aCell.hasEmptyValue() || aCell.isEmpty() ); if ( isValue ) fRefVal = GetCellValue( aAdr, aCell); |