[Libreoffice-commits] core.git: starmath/source

[Takeshi Abe]

 starmath/source/mathmlimport.cxx |    6 ++----
 starmath/source/parse.cxx        |    8 +++-----
 2 files changed, 5 insertions(+), 9 deletions(-)

New commits:
commit 93eb0896bc30163dba47e20459dd0d14fb9770f9
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Fri Aug 12 17:44:40 2016 +0900

    starmath: Avoid temporary arrays
    
    Change-Id: I5ebb0acd1e6a808f3341d9b18a4a8e87b0679c5d
    Reviewed-on: https://gerrit.libreoffice.org/28068
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Takeshi Abe <tabe at fixedpoint.jp>

diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index 8946c6f..2690824 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -2082,15 +2082,13 @@ SvXMLImportContext *SmXMLDocContext_Impl::CreateChildContext(
 
 void SmXMLDocContext_Impl::EndElement()
 {
-    SmNodeArray ContextArray;
-    ContextArray.resize(1);
     SmNodeStack &rNodeStack = GetSmImport().GetNodeStack();
 
-    ContextArray[0] = popOrZero(rNodeStack);
+    SmNode *pContextNode = popOrZero(rNodeStack);
 
     SmToken aDummy;
     std::unique_ptr<SmStructureNode> pSNode(new SmLineNode(aDummy));
-    pSNode->SetSubNodes(ContextArray);
+    pSNode->SetSubNodes(pContextNode, nullptr);
     rNodeStack.push_front(std::move(pSNode));
 
     SmNodeArray  LineArray;
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 1e11be3..7a6c995 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -2138,11 +2138,9 @@ void SmParser::DoBinom()
     DoSum();
     DoSum();
 
-    SmNodeArray ExpressionArray(2);
-    ExpressionArray[1] = popOrZero(m_aNodeStack);
-    ExpressionArray[0] = popOrZero(m_aNodeStack);
-
-    pSNode->SetSubNodes(ExpressionArray);
+    SmNode *pSecond = popOrZero(m_aNodeStack);
+    SmNode *pFirst = popOrZero(m_aNodeStack);
+    pSNode->SetSubNodes(pFirst, pSecond);
     m_aNodeStack.push_front(std::move(pSNode));
 }