summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-08-14 17:14:18 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-08-16 08:54:42 +0200
commitc5ff0696bddc6fdcdc92d7585c70e2b5e202d11b (patch)
tree0a1eb16b505ce5ad4d13674dfd4b5e277cff949a
parent9202597373f745b7b83dde1396636e1e619e4e81 (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>
-rw-r--r--sc/inc/tokenuno.hxx2
-rw-r--r--sc/source/filter/oox/defnamesbuffer.cxx2
-rw-r--r--sc/source/ui/unoobj/cellsuno.cxx2
-rw-r--r--sc/source/ui/unoobj/nameuno.cxx2
-rw-r--r--sc/source/ui/unoobj/tokenuno.cxx6
5 files changed, 6 insertions, 8 deletions
diff --git a/sc/inc/tokenuno.hxx b/sc/inc/tokenuno.hxx
index 2eab2a816f02..4946c5b8a536 100644
--- a/sc/inc/tokenuno.hxx
+++ b/sc/inc/tokenuno.hxx
@@ -42,7 +42,7 @@ public:
ScDocument& rDoc,
ScTokenArray& rTokenArray,
const css::uno::Sequence< css::sheet::FormulaToken >& rSequence );
- static SC_DLLPUBLIC bool ConvertToTokenSequence(
+ static SC_DLLPUBLIC void ConvertToTokenSequence(
const ScDocument& rDoc,
css::uno::Sequence< css::sheet::FormulaToken >& rSequence,
const ScTokenArray& rTokenArray );
diff --git a/sc/source/filter/oox/defnamesbuffer.cxx b/sc/source/filter/oox/defnamesbuffer.cxx
index 84bba7249227..d424e2f662cf 100644
--- a/sc/source/filter/oox/defnamesbuffer.cxx
+++ b/sc/source/filter/oox/defnamesbuffer.cxx
@@ -353,7 +353,7 @@ void DefinedName::convertFormula( const css::uno::Sequence<css::sheet::ExternalL
ScTokenArray* pTokenArray = mpScRangeData->GetCode();
Sequence< FormulaToken > aFTokenSeq;
- (void)ScTokenConversion::ConvertToTokenSequence( getScDocument(), aFTokenSeq, *pTokenArray );
+ ScTokenConversion::ConvertToTokenSequence( getScDocument(), aFTokenSeq, *pTokenArray );
// set built-in names (print ranges, repeated titles, filter ranges)
if( !isGlobalName() ) switch( mcBuiltinId )
{
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)