diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-08-14 17:14:18 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-08-16 08:54:42 +0200 |
| commit | c5ff0696bddc6fdcdc92d7585c70e2b5e202d11b (patch) | |
| tree | 0a1eb16b505ce5ad4d13674dfd4b5e277cff949a /sc/source/ui/unoobj | |
| parent | 9202597373f745b7b83dde1396636e1e619e4e81 (diff) | |
loplugin:returnconstant in ScTokenConversion
Change-Id: I17d8d188cb4a51978af41788ee3adf9d221c8bdb
Reviewed-on: https://gerrit.libreoffice.org/59126
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc/source/ui/unoobj')
| -rw-r--r-- | sc/source/ui/unoobj/cellsuno.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/unoobj/nameuno.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/unoobj/tokenuno.cxx | 6 |
3 files changed, 4 insertions, 6 deletions
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index 4ede9777957f..1d951628466c 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -5066,7 +5066,7 @@ uno::Sequence<sheet::FormulaToken> SAL_CALL ScCellRangeObj::getArrayTokens() { const ScTokenArray* pTokenArray = pFCell1->GetCode(); if (pTokenArray) - (void)ScTokenConversion::ConvertToTokenSequence(rDoc, aSequence, *pTokenArray); + ScTokenConversion::ConvertToTokenSequence(rDoc, aSequence, *pTokenArray); } } } diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx index 5e5ad772c0fe..61674c9751d1 100644 --- a/sc/source/ui/unoobj/nameuno.cxx +++ b/sc/source/ui/unoobj/nameuno.cxx @@ -320,7 +320,7 @@ uno::Sequence<sheet::FormulaToken> SAL_CALL ScNamedRangeObj::getTokens() { ScTokenArray* pTokenArray = pData->GetCode(); if ( pTokenArray ) - (void)ScTokenConversion::ConvertToTokenSequence( pDocShell->GetDocument(), aSequence, *pTokenArray ); + ScTokenConversion::ConvertToTokenSequence( pDocShell->GetDocument(), aSequence, *pTokenArray ); } return aSequence; } diff --git a/sc/source/ui/unoobj/tokenuno.cxx b/sc/source/ui/unoobj/tokenuno.cxx index d8df0b439ec6..a5a1bca2ffe9 100644 --- a/sc/source/ui/unoobj/tokenuno.cxx +++ b/sc/source/ui/unoobj/tokenuno.cxx @@ -140,7 +140,7 @@ uno::Sequence<sheet::FormulaToken> SAL_CALL ScFormulaParserObj::parseFormula( SetCompilerFlags( aCompiler ); ScTokenArray* pCode = aCompiler.CompileString( aFormula ); - (void)ScTokenConversion::ConvertToTokenSequence( rDoc, aRet, *pCode ); + ScTokenConversion::ConvertToTokenSequence( rDoc, aRet, *pCode ); delete pCode; } @@ -353,7 +353,7 @@ bool ScTokenConversion::ConvertToTokenArray( ScDocument& rDoc, return !rTokenArray.Fill(rSequence, rDoc.GetSharedStringPool(), rDoc.GetExternalRefManager()); } -bool ScTokenConversion::ConvertToTokenSequence( const ScDocument& rDoc, +void ScTokenConversion::ConvertToTokenSequence( const ScDocument& rDoc, uno::Sequence<sheet::FormulaToken>& rSequence, const ScTokenArray& rTokenArray ) { sal_Int32 nLen = static_cast<sal_Int32>(rTokenArray.GetLen()); @@ -473,8 +473,6 @@ bool ScTokenConversion::ConvertToTokenSequence( const ScDocument& rDoc, } else rSequence.realloc(0); - - return true; } ScFormulaOpCodeMapperObj::ScFormulaOpCodeMapperObj(::std::unique_ptr<formula::FormulaCompiler> && _pCompiler) |