starmath/source/node.cxx | 4 ++-- starmath/source/parse.cxx | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-)
New commits: commit 5f80687188db3a29fb0c3a5fe587aeeb3e13dccd Author: Ivan Timofeev <timofeev....@gmail.com> Date: Sun Apr 8 14:11:11 2012 +0400 Revert "fdo#41739: Math: do not skip "newline" on error" This reverts commit f52138deee9e129d0566f06d1d2138b6b159d16a. It was the cause of infinite recursive loops (huh, why, that was obvious!). diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx index e5c1ff4..b386cf3 100644 --- a/starmath/source/parse.cxx +++ b/starmath/source/parse.cxx @@ -2424,9 +2424,7 @@ void SmParser::Error(SmParseError eError) AddError(eError, pSNode); - // Even if the newline token is unexpected, do not skip it. (fdo#41739) - if (m_aCurToken.eType != TNEWLINE) - NextToken(); + NextToken(); } commit eab7e131ecebe4cdefcdcb1ad176bbdce83cb467 Author: Ivan Timofeev <timofeev....@gmail.com> Date: Sat Apr 7 21:20:48 2012 +0400 starmath: fix DEBUG_ENABLE_DUMPASDOT build diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx index 09d2ee8..e05f188 100644 --- a/starmath/source/node.cxx +++ b/starmath/source/node.cxx @@ -647,8 +647,8 @@ void SmNode::DumpAsDot(std::ostream &out, String* label, int number, int& id, in //Dump subnodes int myid = id; const SmNode *pNode; - USHORT nSize = GetNumSubNodes(); - for (USHORT i = 0; i < nSize; i++) + sal_uInt16 nSize = GetNumSubNodes(); + for (sal_uInt16 i = 0; i < nSize; i++) if (NULL != (pNode = GetSubNode(i))) pNode->DumpAsDot(out, NULL, i, ++id, myid); _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits