[Libreoffice-commits] core.git: 9 commits - sc/qa sc/source
Tor Lillqvist
tml at collabora.com
Tue Jun 13 17:33:01 UTC 2017
sc/qa/unit/ucalc.cxx | 2 +-
sc/source/core/data/clipcontext.cxx | 2 +-
sc/source/core/data/column.cxx | 2 +-
sc/source/core/data/column3.cxx | 2 +-
sc/source/core/data/conditio.cxx | 8 ++++----
sc/source/core/tool/interpr4.cxx | 4 ++--
sc/source/filter/excel/xecontent.cxx | 2 +-
sc/source/filter/excel/xelink.cxx | 2 +-
sc/source/ui/condformat/condformatdlgentry.cxx | 2 +-
9 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit 83358557c14dd3796c3a6c0a31e5a49fb857e91b
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Jun 13 20:00:16 2017 +0300
Use FormulaTokenArray::FirstToken() in one more place
Change-Id: If43aaff9665b5be2d9b358dea0f3369be755791a
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx
index 4231d447ba58..c47b7dc74643 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -326,7 +326,7 @@ IMPL_LINK(ScConditionFrmtEntry, OnEdChanged, Edit&, rEdit, void)
}
// Recognized col/row name or string token, warn the user
- formula::FormulaToken* token = ta->First();
+ formula::FormulaToken* token = ta->FirstToken();
formula::StackVar t = token->GetType();
OpCode op = token->GetOpCode();
if( ( op == ocColRowName ) ||
commit a5d26d09d62978aaa8872e756ba1890f6dac48e7
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Jun 13 19:59:23 2017 +0300
Use FormulaTokenArray::FirstToken() in one more place
Change-Id: Idd80ed837ab35890ecdda386965eb037ff4af5c5
diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx
index 55b320a50b1e..ea430a54f962 100644
--- a/sc/source/filter/excel/xelink.cxx
+++ b/sc/source/filter/excel/xelink.cxx
@@ -967,7 +967,7 @@ void XclExpExtName::WriteAddData( XclExpStream& rStrm )
if (mpArray->GetLen() != 1)
break;
- const formula::FormulaToken* p = mpArray->First();
+ const formula::FormulaToken* p = mpArray->FirstToken();
if (!p->IsExternalRef())
break;
commit a9ea29db8982699eb5977d0b942f8dd8ee8c847c
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Jun 13 19:57:56 2017 +0300
Use FormulaTokenArray::FirstToken() in one more place
Change-Id: Id839dde6453b75e59a6903eb0e18ce6f2d75adbf
diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx
index 4df9300152b4..5e7ad2d01d65 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -958,7 +958,7 @@ void XclExpCFImpl::SaveXml( XclExpXmlStream& rStrm )
// the token array for that
std::unique_ptr<ScTokenArray> pTokenArray(mrFormatEntry.CreateFlatCopiedTokenArray(0));
if(pTokenArray->GetLen())
- aText = XclXmlUtils::ToOString(pTokenArray->First()->GetString().getString());
+ aText = XclXmlUtils::ToOString(pTokenArray->FirstToken()->GetString().getString());
}
sax_fastparser::FSHelperPtr& rWorksheet = rStrm.GetCurrentStream();
commit f1f5ffb71690b78bee787527f592efa40ce10aec
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Jun 13 19:35:31 2017 +0300
Use FormulaTokenArray::FirstToken() in more places
Change-Id: I4cb4a739027f03a81d758db552f9951880a79fdd
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 1af3a019f95a..37c9db979aec 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -1251,7 +1251,7 @@ void ScInterpreter::PopExternalDoubleRef(ScMatrixRef& rMat)
// For now, we only support single range data for external
// references, which means the array should only contain a
// single matrix token.
- formula::FormulaToken* p = pArray->First();
+ formula::FormulaToken* p = pArray->FirstToken();
if (!p || p->GetType() != svMatrix)
SetError( FormulaError::IllegalParameter);
else
@@ -1532,7 +1532,7 @@ bool ScInterpreter::ConvertMatrixParameters()
GetExternalDoubleRef(nFileId, aTabName, rRef, pArray);
if (nGlobalError != FormulaError::NONE || !pArray)
break;
- formula::FormulaToken* pTemp = pArray->First();
+ formula::FormulaToken* pTemp = pArray->FirstToken();
if (!pTemp)
break;
commit ccbb61a9dbc93d181944e8f4437503e0050e7171
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Jun 13 19:30:05 2017 +0300
Use FormulaTokenArray::FirstToken() in more places
Change-Id: I7dabdfee3c90dd87c86d1b92a7131d695a5f07d4
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index 8cbfc706f634..6ca66da581cb 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -310,7 +310,7 @@ ScConditionEntry::ScConditionEntry( ScConditionMode eOper,
if ( pFormula1->GetLen() == 1 )
{
// Single (constant number)?
- FormulaToken* pToken = pFormula1->First();
+ FormulaToken* pToken = pFormula1->FirstToken();
if ( pToken->GetOpCode() == ocPush )
{
if ( pToken->GetType() == svDouble )
@@ -334,7 +334,7 @@ ScConditionEntry::ScConditionEntry( ScConditionMode eOper,
if ( pFormula2->GetLen() == 1 )
{
// Single (constant number)?
- FormulaToken* pToken = pFormula2->First();
+ FormulaToken* pToken = pFormula2->FirstToken();
if ( pToken->GetOpCode() == ocPush )
{
if ( pToken->GetType() == svDouble )
@@ -398,7 +398,7 @@ void ScConditionEntry::Compile( const OUString& rExpr1, const OUString& rExpr2,
if ( pFormula1->GetLen() == 1 )
{
// Single (constant number)?
- FormulaToken* pToken = pFormula1->First();
+ FormulaToken* pToken = pFormula1->FirstToken();
if ( pToken->GetOpCode() == ocPush )
{
if ( pToken->GetType() == svDouble )
@@ -436,7 +436,7 @@ void ScConditionEntry::Compile( const OUString& rExpr1, const OUString& rExpr2,
if ( pFormula2->GetLen() == 1 )
{
// Sigle (constant number)?
- FormulaToken* pToken = pFormula2->First();
+ FormulaToken* pToken = pFormula2->FirstToken();
if ( pToken->GetOpCode() == ocPush )
{
if ( pToken->GetType() == svDouble )
commit d677d7e30116ebd85bf757608a9a5426e73ac618
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Jun 13 19:24:50 2017 +0300
Use FormulaTokenArray::FirstToken() in one more place
Change-Id: I5b8e8997586255004820df97f1ea10494b536d3b
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index a19675dd7341..92765d1314bc 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -981,7 +981,7 @@ public:
ScTokenArray* pCode = rSrcCell.GetCode();
if (pCode && pCode->GetLen() == 1)
{
- const formula::FormulaToken* p = pCode->First();
+ const formula::FormulaToken* p = pCode->FirstToken();
if (p->GetOpCode() == ocTrue || p->GetOpCode() == ocFalse)
// This is a boolean formula.
bForceFormula = true;
commit 0057b2163eca1781c85a4dbb90bcf8d5258a4ea5
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Jun 13 19:21:30 2017 +0300
Use FormulaTokenArray::FirstToken() in one more place
Change-Id: Ie331b77ec2079c4f0dca2808cafaa728378f699d
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 314cf453f765..9d68fbf8381b 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -1421,7 +1421,7 @@ class CopyByCloneHandler
ScTokenArray* pCode = rSrcCell.GetCode();
if (pCode && pCode->GetLen() == 1)
{
- const formula::FormulaToken* p = pCode->First();
+ const formula::FormulaToken* p = pCode->FirstToken();
if (p->GetOpCode() == ocTrue || p->GetOpCode() == ocFalse)
// This is a boolean formula.
bForceFormula = true;
commit 56bfa463149fbce0fe7a0dc9e4f8fd8979845ca0
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Jun 13 19:20:47 2017 +0300
Use FormulaTokenArray::FirstToken() in one place where we can
Change-Id: I1ecc1fc69e8be1ba329f2436903654740dbfea9a
diff --git a/sc/source/core/data/clipcontext.cxx b/sc/source/core/data/clipcontext.cxx
index 5980de7f2ce4..93ecd0527a5b 100644
--- a/sc/source/core/data/clipcontext.cxx
+++ b/sc/source/core/data/clipcontext.cxx
@@ -194,7 +194,7 @@ void CopyFromClipContext::setSingleCell( const ScAddress& rSrcPos, const ScColum
ScTokenArray* pCode = rSrcCell.mpFormula->GetCode();
if (pCode && pCode->GetLen() == 1)
{
- const formula::FormulaToken* p = pCode->First();
+ const formula::FormulaToken* p = pCode->FirstToken();
if (p->GetOpCode() == ocTrue || p->GetOpCode() == ocFalse)
// This is a boolean formula. Good.
break;
commit 2495a4e807a775819486faee14eb3acde8b1cbdf
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Jun 13 19:18:53 2017 +0300
Use FormulaTokenArray::FirstToken() in one place where we can
Change-Id: I84a108d9c0f1a0982fb7144b32be007498e5f0ea
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 1948add201cd..0372de6abf01 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -1126,7 +1126,7 @@ formula::FormulaToken* getSingleRefToken(ScDocument& rDoc, const ScAddress& rPos
return nullptr;
}
- formula::FormulaToken* pToken = pTokens->First();
+ formula::FormulaToken* pToken = pTokens->FirstToken();
if (!pToken || pToken->GetType() != formula::svSingleRef)
{
cerr << "Not a single reference token." << endl;
More information about the Libreoffice-commits
mailing list