diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-09-15 19:16:12 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-09-17 15:04:06 +0200 |
| commit | 44af87f7392792e045e5afe5df19e946ef81241b (patch) | |
| tree | 464e5b1821859bb3bd3b7188ba3d75d00a171b43 /sc/source/core/data/conditio.cxx | |
| parent | d7ef802bbb3b2f01fdbf7af6da50d272bcf0abd1 (diff) | |
ScCompiler ctors never passed a null ScDocument*
add one assert to ScXMLConditionalFormatContext where this isn't
immediately certain.
Change-Id: I2103c5cd42288e0a5d2a1c2e2d2d031f806773bb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102906
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc/source/core/data/conditio.cxx')
| -rw-r--r-- | sc/source/core/data/conditio.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx index 2fa970066e9c..ee70b5d70a03 100644 --- a/sc/source/core/data/conditio.cxx +++ b/sc/source/core/data/conditio.cxx @@ -343,7 +343,7 @@ void ScConditionEntry::Compile( const OUString& rExpr1, const OUString& rExpr2, { if ( !rExpr1.isEmpty() || !rExpr2.isEmpty() ) { - ScCompiler aComp( mpDoc, aSrcPos ); + ScCompiler aComp( *mpDoc, aSrcPos ); if ( !rExpr1.isEmpty() ) { @@ -1246,7 +1246,7 @@ OUString ScConditionEntry::GetExpression( const ScAddress& rCursor, sal_uInt16 n { if ( pFormula1 ) { - ScCompiler aComp(mpDoc, rCursor, *pFormula1, eGrammar); + ScCompiler aComp(*mpDoc, rCursor, *pFormula1, eGrammar); OUStringBuffer aBuffer; aComp.CreateStringFromTokenArray( aBuffer ); aRet = aBuffer.makeStringAndClear(); @@ -1262,7 +1262,7 @@ OUString ScConditionEntry::GetExpression( const ScAddress& rCursor, sal_uInt16 n { if ( pFormula2 ) { - ScCompiler aComp(mpDoc, rCursor, *pFormula2, eGrammar); + ScCompiler aComp(*mpDoc, rCursor, *pFormula2, eGrammar); OUStringBuffer aBuffer; aComp.CreateStringFromTokenArray( aBuffer ); aRet = aBuffer.makeStringAndClear(); |